Mercurial > mplayer.hg

comparison libmpdvdkit2/libdvdcss_changes.diff @ 15692:05f2d8e27cf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge the mingw gcc 4.1 diff
author faust3
date Tue, 07 Jun 2005 17:33:03 +0000
parents d55bd88c2b42
children 954cdf2171f6
comparison
equal deleted inserted replaced
15691:0a07aa511c2a 15692:05f2d8e27cf4
60 -#include "dvdcss/dvdcss.h" 60 -#include "dvdcss/dvdcss.h"
61 +#include "dvdcss.h" 61 +#include "dvdcss.h"
62 62
63 #include "common.h" 63 #include "common.h"
64 #include "css.h" 64 #include "css.h"
65 --- device.c 2003-07-29 01:37:06.000000000 +0200 65 --- dvdcss/device.c 2005-06-07 19:22:40.181853664 +0200
66 +++ device.c 2005-03-01 07:41:41.000000000 +0100 66 +++ device.c 2005-06-07 15:36:21.000000000 +0200
67 @@ -33,18 +36,9 @@ 67 @@ -33,18 +36,9 @@
68 #include <string.h> 68 #include <string.h>
69 #include <sys/types.h> 69 #include <sys/types.h>
70 #include <sys/stat.h> 70 #include <sys/stat.h>
71 -#ifdef HAVE_SYS_PARAM_H 71 -#ifdef HAVE_SYS_PARAM_H
106 + (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3]))) 106 + (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3])))
107 + dvdcss->b_file = 0; 107 + dvdcss->b_file = 0;
108 108
109 /* Initialize readv temporary buffer */ 109 /* Initialize readv temporary buffer */
110 dvdcss->p_readv_buffer = NULL; 110 dvdcss->p_readv_buffer = NULL;
111 @@ -276,14 +273,14 @@
112 * won't send back the right result).
113 * (See Microsoft Q241374: Read and Write Access Required for SCSI
114 * Pass Through Requests) */
115 - (HANDLE) dvdcss->i_fd =
116 + dvdcss->i_fd = (int)
117 CreateFile( psz_dvd, GENERIC_READ | GENERIC_WRITE,
118 FILE_SHARE_READ | FILE_SHARE_WRITE,
119 NULL, OPEN_EXISTING,
120 FILE_FLAG_RANDOM_ACCESS, NULL );
121
122 if( (HANDLE) dvdcss->i_fd == INVALID_HANDLE_VALUE )
123 - (HANDLE) dvdcss->i_fd =
124 + dvdcss->i_fd = (int)
125 CreateFile( psz_dvd, GENERIC_READ, FILE_SHARE_READ,
126 NULL, OPEN_EXISTING,
127 FILE_FLAG_RANDOM_ACCESS, NULL );
128 @@ -305,8 +302,8 @@
129 DWORD dwSupportInfo;
130 struct w32_aspidev *fd;
131 int i, j, i_hostadapters;
132 - long (*lpGetSupport)( void );
133 - long (*lpSendCommand)( void* );
134 + GETASPI32SUPPORTINFO lpGetSupport;
135 + SENDASPI32COMMAND lpSendCommand;
136 char c_drive = psz_device[0];
137
138 /* load aspi and init w32_aspidev structure */
139 @@ -317,8 +314,8 @@
140 return -1;
141 }
142
143 - (FARPROC) lpGetSupport = GetProcAddress( hASPI, "GetASPI32SupportInfo" );
144 - (FARPROC) lpSendCommand = GetProcAddress( hASPI, "SendASPI32Command" );
145 + lpGetSupport = (GETASPI32SUPPORTINFO) GetProcAddress( hASPI, "GetASPI32SupportInfo" );
146 + lpSendCommand = (SENDASPI32COMMAND) GetProcAddress( hASPI, "SendASPI32Command" );
147
148 if(lpGetSupport == NULL || lpSendCommand == NULL )
149 {
111 --- error.c 2003-03-10 01:15:31.000000000 +0100 150 --- error.c 2003-03-10 01:15:31.000000000 +0100
112 +++ error.c 2005-03-01 07:41:41.000000000 +0100 151 +++ error.c 2005-03-01 07:41:41.000000000 +0100
113 @@ -25,16 +28,9 @@ 152 @@ -25,16 +28,9 @@
114 153
115 #include <stdio.h> 154 #include <stdio.h>
497 +extern int dvdcss_title ( dvdcss_t, 536 +extern int dvdcss_title ( dvdcss_t,
498 + int i_block ); 537 + int i_block );
499 extern int dvdcss_seek ( dvdcss_t, 538 extern int dvdcss_seek ( dvdcss_t,
500 int i_blocks, 539 int i_blocks,
501 int i_flags ); 540 int i_flags );
541 --- dvdcss/ioctl.h 2005-06-07 19:22:40.187852752 +0200
542 +++ ioctl.h 2005-06-07 15:31:43.000000000 +0200
543 @@ -318,6 +318,9 @@
544 * win32 aspi specific
545 *****************************************************************************/
546
547 +typedef WINAPI DWORD (*GETASPI32SUPPORTINFO)(VOID);
548 +typedef WINAPI DWORD (*SENDASPI32COMMAND)(LPVOID);
549 +
550 #define WIN2K ( GetVersion() < 0x80000000 )
551 #define ASPI_HAID 0
552 #define ASPI_TARGET 0
553 @@ -339,7 +342,7 @@
554 long hASPI;
555 short i_sid;
556 int i_blocks;
557 - long (*lpSendCommand)( void* );
558 + SENDASPI32COMMAND lpSendCommand;
559 };
560
561 #pragma pack(1)