--- MPlayer-20030619/loader/dshow/DS_Filter.c.loader Thu May 1 16:06:50 2003 +++ MPlayer-20030619/loader/dshow/DS_Filter.c Thu Jun 19 17:05:46 2003 @@ -139,7 +139,7 @@ struct IUnknown* object = NULL; IEnumPins* enum_pins = 0; IPin* array[256]; - ULONG fetched; + unsigned long fetched; unsigned int i; This->m_iHandle = LoadLibraryA(dllname); --- MPlayer-20030619/loader/dshow/allocator.c.loader Thu May 1 16:06:50 2003 +++ MPlayer-20030619/loader/dshow/allocator.c Thu Jun 19 17:05:46 2003 @@ -213,7 +213,7 @@ /* [out] */ IMediaSample **ppBuffer, /* [in] */ REFERENCE_TIME *pStartTime, /* [in] */ REFERENCE_TIME *pEndTime, - /* [in] */ DWORD dwFlags) + /* [in] */ unsigned long dwFlags) { MemAllocator* me = (MemAllocator*)This; CMediaSample* sample; --- MPlayer-20030619/loader/dshow/outputpin.c.loader Thu May 1 16:06:50 2003 +++ MPlayer-20030619/loader/dshow/outputpin.c Thu Jun 19 17:05:46 2003 @@ -36,9 +36,9 @@ }; static HRESULT STDCALL CEnumMediaTypes_Next(IEnumMediaTypes * This, - /* [in] */ ULONG cMediaTypes, + /* [in] */ unsigned long cMediaTypes, /* [size_is][out] */ AM_MEDIA_TYPE **ppMediaTypes, - /* [out] */ ULONG *pcFetched) + /* [out] */ unsigned long *pcFetched) { AM_MEDIA_TYPE* type = &((CEnumMediaTypes*)This)->type; Debug printf("CEnumMediaTypes::Next(%p) called\n", This); @@ -66,7 +66,7 @@ /* I expect that these methods are unused. */ static HRESULT STDCALL CEnumMediaTypes_Skip(IEnumMediaTypes * This, - /* [in] */ ULONG cMediaTypes) + /* [in] */ unsigned long cMediaTypes) { return output_unimplemented("CEnumMediaTypes::Skip", This); } @@ -260,7 +260,7 @@ static HRESULT STDCALL COutputPin_QueryInternalConnections(IPin * This, /* [out] */ IPin **apPin, - /* [out][in] */ ULONG *nPin) + /* [out][in] */ unsigned long *nPin) { return output_unimplemented("COutputPin_QueryInternalConnections", This); } --- MPlayer-20030619/loader/wine/mmreg.h.loader Fri Sep 13 21:43:17 2002 +++ MPlayer-20030619/loader/wine/mmreg.h Thu Jun 19 17:05:46 2003 @@ -12,6 +12,7 @@ #ifndef _ACM_WAVEFILTER #define _ACM_WAVEFILTER +#include #include "windef.h" #define WAVE_FILTER_UNKNOWN 0x0000 @@ -47,13 +48,13 @@ #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ typedef struct __attribute__((__packed__)) _WAVEFORMATEX { - WORD wFormatTag; - WORD nChannels; - DWORD nSamplesPerSec; - DWORD nAvgBytesPerSec; - WORD nBlockAlign; - WORD wBitsPerSample; - WORD cbSize; + uint16_t wFormatTag; + uint16_t nChannels; + uint32_t nSamplesPerSec; + uint32_t nAvgBytesPerSec; + uint16_t nBlockAlign; + uint16_t wBitsPerSample; + uint16_t cbSize; } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ @@ -61,10 +62,10 @@ #define GUID_TYPE typedef struct { - unsigned long f1; - unsigned short f2; - unsigned short f3; - unsigned char f4[8]; + uint32_t f1; + uint16_t f2; + uint16_t f3; + uint8_t f4[8]; } GUID; #endif @@ -73,29 +74,29 @@ typedef struct { WAVEFORMATEX Format; union { - WORD wValidBitsPerSample; /* bits of precision */ - WORD wSamplesPerBlock; /* valid if wBitsPerSample==0 */ - WORD wReserved; /* If neither applies, set to zero. */ + uint16_t wValidBitsPerSample; /* bits of precision */ + uint16_t wSamplesPerBlock; /* valid if wBitsPerSample==0 */ + uint16_t wReserved; /* If neither applies, set to zero. */ } Samples; - DWORD dwChannelMask; /* which channels are */ + uint32_t dwChannelMask; /* which channels are */ /* present in stream */ GUID SubFormat; } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif // !_WAVEFORMATEXTENSIBLE_ typedef struct mpeglayer3waveformat_tag { - WORD wFormatTag WINE_PACKED; - WORD nChannels WINE_PACKED; - DWORD nSamplesPerSec WINE_PACKED; - DWORD nAvgBytesPerSec WINE_PACKED; - WORD nBlockAlign WINE_PACKED; - WORD wBitsPerSample WINE_PACKED; - WORD cbSize WINE_PACKED; - WORD wID WINE_PACKED; - DWORD fdwFlags WINE_PACKED; - WORD nBlockSize WINE_PACKED; - WORD nFramesPerBlock WINE_PACKED; - WORD nCodecDelay WINE_PACKED; + uint16_t wFormatTag WINE_PACKED; + uint16_t nChannels WINE_PACKED; + uint32_t nSamplesPerSec WINE_PACKED; + uint32_t nAvgBytesPerSec WINE_PACKED; + uint16_t nBlockAlign WINE_PACKED; + uint16_t wBitsPerSample WINE_PACKED; + uint16_t cbSize WINE_PACKED; + uint16_t wID WINE_PACKED; + uint32_t fdwFlags WINE_PACKED; + uint16_t nBlockSize WINE_PACKED; + uint16_t nFramesPerBlock WINE_PACKED; + uint16_t nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; /* WAVE form wFormatTag IDs */ --- MPlayer-20030619/loader/wine/vfw.h.loader Wed Oct 9 15:16:27 2002 +++ MPlayer-20030619/loader/wine/vfw.h Thu Jun 19 17:05:46 2003 @@ -1,6 +1,7 @@ #ifndef __WINE_VFW_H #define __WINE_VFW_H //#include "pshpack1.h" +#include #ifdef __cplusplus extern "C" { #endif @@ -19,21 +20,21 @@ #define _BITMAPINFOHEADER_ typedef struct __attribute__((__packed__)) { - int biSize; - int biWidth; - int biHeight; - short biPlanes; - short biBitCount; - int biCompression; - int biSizeImage; - int biXPelsPerMeter; - int biYPelsPerMeter; - int biClrUsed; - int biClrImportant; + uint32_t biSize; + uint32_t biWidth; + int32_t biHeight; + uint16_t biPlanes; + uint16_t biBitCount; + uint32_t biCompression; + uint32_t biSizeImage; + uint32_t biXPelsPerMeter; + uint32_t biYPelsPerMeter; + uint32_t biClrUsed; + uint32_t biClrImportant; } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; typedef struct { BITMAPINFOHEADER bmiHeader; - int bmiColors[1]; + uint32_t bmiColors[1]; } BITMAPINFO, *LPBITMAPINFO; #endif --- MPlayer-20030619/loader/win32.c.loader Sun Jun 1 16:00:40 2003 +++ MPlayer-20030619/loader/win32.c Thu Jun 19 17:05:46 2003 @@ -816,7 +816,7 @@ } #ifdef QTX -static void* WINAPI expWaitForMultipleObjects(int count, const void** objects, +static void* WINAPI expWaitForMultipleObjects(int count, void** objects, int WaitAll, int duration) { int i; @@ -3534,7 +3534,7 @@ */ static DWORD WINAPI expGetFullPathNameA ( - LPCTSTR lpFileName, + LPTSTR lpFileName, DWORD nBufferLength, LPTSTR lpBuffer, LPTSTR lpFilePart --- MPlayer-20030619/loader/module.c.loader Mon Dec 16 02:17:19 2002 +++ MPlayer-20030619/loader/module.c Thu Jun 19 17:05:46 2003 @@ -29,7 +29,7 @@ #include "wine/pe_image.h" #include "wine/debugtools.h" -#undef HAVE_LIBDL +//#undef HAVE_LIBDL #ifdef HAVE_LIBDL #include