diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-13 19:43:17 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-13 19:43:17 +0000 |
commit | c7eafc3610b65eafe408d4959ded4c1aab44157a (patch) | |
tree | 18e034fefe8c9e37af6f49a902ca3bfe887531c4 /loader/wine | |
parent | 0f6fe4b67312a11395c372831f7228fc78752714 (diff) | |
download | mpv-c7eafc3610b65eafe408d4959ded4c1aab44157a.tar.bz2 mpv-c7eafc3610b65eafe408d4959ded4c1aab44157a.tar.xz |
avifile sync - 95% cosmetics 5% bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7387 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/wine')
-rw-r--r-- | loader/wine/avifmt.h | 2 | ||||
-rw-r--r-- | loader/wine/mmreg.h | 8 | ||||
-rw-r--r-- | loader/wine/module.h | 10 | ||||
-rw-r--r-- | loader/wine/msacm.h | 3 | ||||
-rw-r--r-- | loader/wine/pe_image.h | 2 | ||||
-rw-r--r-- | loader/wine/vfw.h | 24 |
6 files changed, 28 insertions, 21 deletions
diff --git a/loader/wine/avifmt.h b/loader/wine/avifmt.h index 33646a9f34..757a6328c0 100644 --- a/loader/wine/avifmt.h +++ b/loader/wine/avifmt.h @@ -11,7 +11,7 @@ #ifndef __WINE_WINDEF_H -#include <wine/windef.h> +#include "wine/windef.h" #endif #ifndef __WINE_MMSYSTEM_H diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index fbed019763..e59ae0a474 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -17,7 +17,7 @@ #define WAVE_FILTER_UNKNOWN 0x0000 #define WAVE_FILTER_DEVELOPMENT 0xFFFF -typedef struct _WAVEFILTER { +typedef struct __attribute__((__packed__)) _WAVEFILTER { DWORD cbStruct; DWORD dwFilterTag; DWORD fdwFilter; @@ -28,7 +28,7 @@ typedef struct _WAVEFILTER { #ifndef WAVE_FILTER_VOLUME #define WAVE_FILTER_VOLUME 0x0001 -typedef struct _WAVEFILTER_VOLUME { +typedef struct __attribute__((__packed__)) _WAVEFILTER_VOLUME { WAVEFILTER wfltr; DWORD dwVolume; } VOLUMEWAVEFILTER, *PVOLUMEWAVEFILTER, *NPVOLUMEWAVEFILTER, *LPVOLUMEWAVEFILTER; @@ -37,7 +37,7 @@ typedef struct _WAVEFILTER_VOLUME { #ifndef WAVE_FILTER_ECHO #define WAVE_FILTER_ECHO 0x0002 -typedef struct WAVEFILTER_ECHO { +typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO { WAVEFILTER wfltr; DWORD dwVolume; DWORD dwDelay; @@ -46,7 +46,7 @@ typedef struct WAVEFILTER_ECHO { #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ -typedef struct _WAVEFORMATEX { +typedef struct __attribute__((__packed__)) _WAVEFORMATEX { WORD wFormatTag; WORD nChannels; DWORD nSamplesPerSec; diff --git a/loader/wine/module.h b/loader/wine/module.h index 91e94b1224..6f6b31a0a7 100644 --- a/loader/wine/module.h +++ b/loader/wine/module.h @@ -128,6 +128,16 @@ typedef struct resource_nameinfo_s NE_NAMEINFO; #define NE_MODULE_NAME(pModule) \ (((OFSTRUCT *)((char*)(pModule) + (pModule)->fileinfo))->szPathName) +struct modref_list_t; + +typedef struct modref_list_t +{ + WINE_MODREF* wm; + struct modref_list_t *next; + struct modref_list_t *prev; +} modref_list; + + /* module.c */ extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, WIN_BOOL snoop ); extern WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hModule ); diff --git a/loader/wine/msacm.h b/loader/wine/msacm.h index b76c1095a8..10e87e61a5 100644 --- a/loader/wine/msacm.h +++ b/loader/wine/msacm.h @@ -25,7 +25,9 @@ typedef DWORD FOURCC; /* a four character code */ +#if !defined(WAVE_FORMAT_PCM) #define WAVE_FORMAT_PCM 1 +#endif /*********************************************************************** * Defines/Enums @@ -931,7 +933,6 @@ MMRESULT WINAPI acmStreamSize( MMRESULT WINAPI acmStreamUnprepareHeader( HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare ); -void MSACM_RegisterAllDrivers(void); #ifdef __cplusplus } /* extern "C" */ diff --git a/loader/wine/pe_image.h b/loader/wine/pe_image.h index 9b4f322c6d..3f550ba467 100644 --- a/loader/wine/pe_image.h +++ b/loader/wine/pe_image.h @@ -1,7 +1,7 @@ #ifndef __WINE_PE_IMAGE_H #define __WINE_PE_IMAGE_H -#include "windef.h" +#include "winnt.h" #include "winbase.h" #define PE_HEADER(module) \ diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index 1eb599c729..9855b5100e 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -69,11 +69,7 @@ typedef struct tagWINE_HIC { long type; /* 08: */ long handler; /* 0C: */ HDRVR hdrv; /* 10: */ -#ifndef __cplusplus - long private; /* 14:(handled by SendDriverMessage)*/ -#else - long _private; /* 14:(handled by SendDriverMessage)*/ -#endif + long driverid; /* 14:(handled by SendDriverMessage)*/ DRIVERPROC driverproc; /* 18:(handled by SendDriverMessage)*/ long x1; /* 1c: name? */ short x2; /* 20: */ @@ -200,7 +196,7 @@ typedef struct { LPBITMAPINFOHEADER lpbiOutput; void* lpOutput; LPBITMAPINFOHEADER lpbiInput; - void* lpInput; + const void* lpInput; long* lpckid; long* lpdwFlags; long lFrameNum; @@ -211,10 +207,10 @@ typedef struct { } ICCOMPRESS; long VFWAPIV ICCompress( - HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpOutputBuf, - LPBITMAPINFOHEADER lpbiInput,void* lpImage,long* lpckid, + HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpData, + LPBITMAPINFOHEADER lpbiInput,void* lpBits,long* lpckid, long* lpdwFlags,long lFrameNum,long dwFrameSize,long dwQuality, - LPBITMAPINFOHEADER lpbiInputPrev,void* lpImagePrev + LPBITMAPINFOHEADER lpbiPrev,void* lpPrev ); @@ -350,7 +346,7 @@ typedef struct { typedef struct { long dwFlags; /* flags (from AVI index...) */ LPBITMAPINFOHEADER lpbiInput; /* BITMAPINFO of compressed data */ - void* lpInput; /* compressed data */ + const void* lpInput; /* compressed data */ LPBITMAPINFOHEADER lpbiOutput; /* DIB to decompress to */ void* lpOutput; long ckid; /* ckid from AVI file */ @@ -358,8 +354,8 @@ typedef struct { typedef struct { long dwFlags; - LPBITMAPINFOHEADER lpbiSrc; - void* lpSrc; + LPBITMAPINFOHEADER lpbiSrc; + const void* lpSrc; LPBITMAPINFOHEADER lpbiDst; void* lpDst; @@ -437,11 +433,11 @@ long VFWAPIV ICUniversalEx(HIC hic,int command,LPBITMAPINFOHEADER lpbiFormat,LPB WIN_BOOL VFWAPI ICInfo(long fccType, long fccHandler, ICINFO * lpicinfo); LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, long cb); HIC VFWAPI ICOpen(long fccType, long fccHandler, UINT wMode); -HIC VFWAPI ICOpenFunction(long fccType, long fccHandler, unsigned int wMode, void* lpfnHandler); +//HIC VFWAPI ICOpenFunction(long fccType, long fccHandler, unsigned int wMode, void* lpfnHandler); LRESULT VFWAPI ICClose(HIC hic); LRESULT VFWAPI ICSendMessage(HIC hic, unsigned int msg, long dw1, long dw2); -HIC VFWAPI ICLocate(long fccType, long fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, short wFlags); +//HIC VFWAPI ICLocate(long fccType, long fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, short wFlags); int VFWAPI ICDoSomething(void); |