Fix definitions of WAVEOPENDESC, WAVEHDR structures.

Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask.

svn path=/branches/ros-amd64-bringup/; revision=38263

diff --git a/reactos/include/psdk/mmddk.h b/reactos/include/psdk/mmddk.h
index 3b51df3..dd4a865 100644 (file)
--- a/reactos/include/psdk/mmddk.h
+++ b/reactos/include/psdk/mmddk.h
@@ -390,10 +390,10 @@ typedef struct {
 typedef struct {
        HWAVE                   hWave;
        LPWAVEFORMATEX          lpFormat;
-       DWORD                   dwCallback;
-       DWORD                   dwInstance;
+       DWORD_PTR               dwCallback;
+       DWORD_PTR               dwInstance;
        UINT                    uMappedDeviceID;
-        DWORD                  dnDevNode;
+       DWORD                   dnDevNode;
 } WAVEOPENDESC, *LPWAVEOPENDESC;
 
 typedef struct {

diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h
index a6b8fe3..2efb448 100644 (file)
--- a/reactos/include/psdk/mmsystem.h
+++ b/reactos/include/psdk/mmsystem.h
@@ -951,7 +951,7 @@ typedef struct DRVCONFIGINFOEX {
        DWORD dnDevNode;
 } DRVCONFIGINFOEX,*PDRVCONFIGINFOEX,*LPDRVCONFIGINFOEX;
 
-typedef LRESULT(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
+typedef LONG(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LONG,LONG);
 typedef void (CALLBACK DRVCALLBACK)(HDRVR,UINT,DWORD,DWORD,DWORD);
 typedef DRVCALLBACK *LPDRVCALLBACK;
 typedef DRVCALLBACK *PDRVCALLBACK;
@@ -967,11 +967,11 @@ typedef struct wavehdr_tag {
        LPSTR lpData;
        DWORD dwBufferLength;
        DWORD dwBytesRecorded;
-       DWORD dwUser;
+       DWORD_PTR dwUser;
        DWORD dwFlags;
        DWORD dwLoops;
        struct wavehdr_tag *lpNext;
-       DWORD reserved;
+       DWORD_PTR reserved;
 } WAVEHDR,*PWAVEHDR,*LPWAVEHDR;
 
 typedef struct tagWAVEOUTCAPSA {
@@ -1642,7 +1642,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LONG);
 LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG);
 HMODULE WINAPI DrvGetModuleHandle(HDRVR);
 HMODULE WINAPI GetDriverModuleHandle(HDRVR);
-LRESULT WINAPI DefDriverProc(DWORD,HDRVR,UINT,LPARAM,LPARAM);
+LONG WINAPI DefDriverProc(DWORD,HDRVR,UINT,LONG,LONG);
 UINT WINAPI mmsystemGetVersion(void);
 #define OutputDebugStr OutputDebugString
 BOOL WINAPI sndPlaySoundA(LPCSTR,UINT);
@@ -1650,8 +1650,8 @@ BOOL WINAPI sndPlaySoundW(LPCWSTR,UINT);
 BOOL WINAPI PlaySoundA(LPCSTR,HMODULE,DWORD);
 BOOL WINAPI PlaySoundW(LPCWSTR,HMODULE,DWORD);
 UINT WINAPI waveOutGetNumDevs(void);
-MMRESULT WINAPI waveOutGetDevCapsA(UINT,LPWAVEOUTCAPSA,UINT);
-MMRESULT WINAPI waveOutGetDevCapsW(UINT,LPWAVEOUTCAPSW,UINT);
+MMRESULT WINAPI waveOutGetDevCapsA(UINT_PTR,LPWAVEOUTCAPSA,UINT);
+MMRESULT WINAPI waveOutGetDevCapsW(UINT_PTR,LPWAVEOUTCAPSW,UINT);
 MMRESULT WINAPI waveOutGetVolume(HWAVEOUT,PDWORD);
 MMRESULT WINAPI waveOutSetVolume(HWAVEOUT,DWORD);
 MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT,LPSTR,UINT);
@@ -1671,10 +1671,10 @@ MMRESULT WINAPI waveOutSetPitch(HWAVEOUT,DWORD);
 MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT,PDWORD);
 MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD);
 MMRESULT WINAPI waveOutGetID(HWAVEOUT,LPUINT);
-MMRESULT WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD);
+DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR);
 UINT WINAPI waveInGetNumDevs(void);
-MMRESULT WINAPI waveInGetDevCapsA(UINT,LPWAVEINCAPSA,UINT);
-MMRESULT WINAPI waveInGetDevCapsW(UINT,LPWAVEINCAPSW,UINT);
+MMRESULT WINAPI waveInGetDevCapsA(UINT_PTR,LPWAVEINCAPSA,UINT);
+MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT);
 MMRESULT WINAPI waveInGetErrorTextA(MMRESULT,LPSTR,UINT);
 MMRESULT WINAPI waveInGetErrorTextW(MMRESULT,LPWSTR,UINT);
 MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD);
@@ -1687,9 +1687,9 @@ MMRESULT WINAPI waveInStop(HWAVEIN);
 MMRESULT WINAPI waveInReset(HWAVEIN);
 MMRESULT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT);
 MMRESULT WINAPI waveInGetID(HWAVEIN,LPUINT);
-MMRESULT WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD);
+DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR);
 UINT WINAPI midiOutGetNumDevs(void);
-MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD,DWORD,DWORD);
+MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD_PTR,DWORD_PTR,DWORD);
 MMRESULT WINAPI midiStreamClose(HMIDISTRM);
 MMRESULT WINAPI midiStreamProperty(HMIDISTRM,LPBYTE,DWORD);
 MMRESULT WINAPI midiStreamPosition(HMIDISTRM,LPMMTIME,UINT);
@@ -1699,13 +1699,13 @@ MMRESULT WINAPI midiStreamRestart(HMIDISTRM);
 MMRESULT WINAPI midiStreamStop(HMIDISTRM);
 MMRESULT WINAPI midiConnect(HMIDI,HMIDIOUT,PVOID);
 MMRESULT WINAPI midiDisconnect(HMIDI,HMIDIOUT,PVOID);
-MMRESULT WINAPI midiOutGetDevCapsA(UINT,LPMIDIOUTCAPSA,UINT);
-MMRESULT WINAPI midiOutGetDevCapsW(UINT,LPMIDIOUTCAPSW,UINT);
+MMRESULT WINAPI midiOutGetDevCapsA(UINT_PTR,LPMIDIOUTCAPSA,UINT);
+MMRESULT WINAPI midiOutGetDevCapsW(UINT_PTR,LPMIDIOUTCAPSW,UINT);
 MMRESULT WINAPI midiOutGetVolume(HMIDIOUT,PDWORD);
 MMRESULT WINAPI midiOutSetVolume(HMIDIOUT,DWORD);
 MMRESULT WINAPI midiOutGetErrorTextA(MMRESULT,LPSTR,UINT);
 MMRESULT WINAPI midiOutGetErrorTextW(MMRESULT,LPWSTR,UINT);
-MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD,DWORD,DWORD);
+MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD);
 MMRESULT WINAPI midiOutClose(HMIDIOUT);
 MMRESULT WINAPI midiOutPrepareHeader(HMIDIOUT,LPMIDIHDR,UINT);
 MMRESULT WINAPI midiOutUnprepareHeader(HMIDIOUT,LPMIDIHDR,UINT);
@@ -1715,13 +1715,13 @@ MMRESULT WINAPI midiOutReset(HMIDIOUT);
 MMRESULT WINAPI midiOutCachePatches(HMIDIOUT,UINT,LPWORD,UINT);
 MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,LPWORD,UINT);
 MMRESULT WINAPI midiOutGetID(HMIDIOUT,LPUINT);
-MMRESULT WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD);
+DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR);
 UINT WINAPI midiInGetNumDevs(void);
-MMRESULT WINAPI midiInGetDevCapsA(UINT,LPMIDIINCAPSA,UINT);
-MMRESULT WINAPI midiInGetDevCapsW(UINT,LPMIDIINCAPSW,UINT);
+MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR,LPMIDIINCAPSA,UINT);
+MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT);
 MMRESULT WINAPI midiInGetErrorTextA(MMRESULT,LPSTR,UINT);
 MMRESULT WINAPI midiInGetErrorTextW(MMRESULT,LPWSTR,UINT);
-MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD,DWORD,DWORD);
+MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD);
 MMRESULT WINAPI midiInClose(HMIDIIN);
 MMRESULT WINAPI midiInPrepareHeader(HMIDIIN,LPMIDIHDR,UINT);
 MMRESULT WINAPI midiInUnprepareHeader(HMIDIIN,LPMIDIHDR,UINT);
@@ -1730,17 +1730,17 @@ MMRESULT WINAPI midiInStart(HMIDIIN);
 MMRESULT WINAPI midiInStop(HMIDIIN);
 MMRESULT WINAPI midiInReset(HMIDIIN);
 MMRESULT WINAPI midiInGetID(HMIDIIN,LPUINT);
-MMRESULT WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD);
+DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR);
 UINT WINAPI auxGetNumDevs(void);
-MMRESULT WINAPI auxGetDevCapsA(UINT,LPAUXCAPSA,UINT);
-MMRESULT WINAPI auxGetDevCapsW(UINT,LPAUXCAPSW,UINT);
+MMRESULT WINAPI auxGetDevCapsA(UINT_PTR,LPAUXCAPSA,UINT);
+MMRESULT WINAPI auxGetDevCapsW(UINT_PTR,LPAUXCAPSW,UINT);
 MMRESULT WINAPI auxSetVolume(UINT,DWORD);
 MMRESULT WINAPI auxGetVolume(UINT,PDWORD);
-MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD,DWORD);
+MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD_PTR,DWORD_PTR);
 UINT WINAPI mixerGetNumDevs(void);
-MMRESULT WINAPI mixerGetDevCapsA(UINT,LPMIXERCAPSA,UINT);
-MMRESULT WINAPI mixerGetDevCapsW(UINT,LPMIXERCAPSW,UINT);
-MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD,DWORD,DWORD);
+MMRESULT WINAPI mixerGetDevCapsA(UINT_PTR,LPMIXERCAPSA,UINT);
+MMRESULT WINAPI mixerGetDevCapsW(UINT_PTR,LPMIXERCAPSW,UINT);
+MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD_PTR,DWORD_PTR,DWORD);
 MMRESULT WINAPI mixerClose(HMIXER);
 DWORD WINAPI mixerMessage(HMIXER,UINT,DWORD_PTR,DWORD_PTR);
 MMRESULT WINAPI mixerGetLineInfoA(HMIXEROBJ,LPMIXERLINEA,DWORD);
@@ -1753,14 +1753,14 @@ MMRESULT WINAPI mixerGetControlDetailsW(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
 MMRESULT WINAPI mixerSetControlDetails(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
 MMRESULT WINAPI timeGetSystemTime(LPMMTIME,UINT);
 DWORD WINAPI timeGetTime(void);
-MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD,UINT);
+MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD_PTR,UINT);
 MMRESULT WINAPI timeKillEvent(UINT);
 MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS,UINT);
 MMRESULT WINAPI timeBeginPeriod(UINT);
 MMRESULT WINAPI timeEndPeriod(UINT);
 UINT WINAPI joyGetNumDevs(void);
-MMRESULT WINAPI joyGetDevCapsA(UINT,LPJOYCAPSA,UINT);
-MMRESULT WINAPI joyGetDevCapsW(UINT,LPJOYCAPSW,UINT);
+MMRESULT WINAPI joyGetDevCapsA(UINT_PTR,LPJOYCAPSA,UINT);
+MMRESULT WINAPI joyGetDevCapsW(UINT_PTR,LPJOYCAPSW,UINT);
 MMRESULT WINAPI joyGetPos(UINT,LPJOYINFO);
 MMRESULT WINAPI joyGetPosEx(UINT,LPJOYINFOEX);
 MMRESULT WINAPI joyGetThreshold(UINT,LPUINT);
@@ -1788,8 +1788,8 @@ LRESULT WINAPI mmioSendMessage(HMMIO,UINT,LPARAM,LPARAM);
 MMRESULT WINAPI mmioDescend(HMMIO,LPMMCKINFO,const MMCKINFO*,UINT);
 MMRESULT WINAPI mmioAscend(HMMIO,LPMMCKINFO,UINT);
 MMRESULT WINAPI mmioCreateChunk(HMMIO,LPMMCKINFO,UINT);
-MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD);
-MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD);
+MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD_PTR);
+MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD_PTR);
 MCIERROR WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND);
 MCIERROR WINAPI mciSendStringW(LPCWSTR,LPWSTR,UINT,HWND);
 MCIDEVICEID WINAPI mciGetDeviceIDA(LPCSTR);
@@ -1799,7 +1799,7 @@ MCIDEVICEID WINAPI mciGetDeviceIDFromElementIDW(DWORD,LPCWSTR);
 BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT);
 BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT);
 BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
-HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
+HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID);
 YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
 
 typedef struct tagMCI_SEQ_SET_PARMS {

diff --git a/reactos/include/psdk/msacm.h b/reactos/include/psdk/msacm.h
index 8a2c8e7..ea22d5b 100644 (file)
--- a/reactos/include/psdk/msacm.h
+++ b/reactos/include/psdk/msacm.h
@@ -541,7 +541,7 @@ typedef struct _ACMSTREAMHEADER
 {
   DWORD  cbStruct;
   DWORD  fdwStatus;
-  DWORD  dwUser;
+  DWORD_PTR  dwUser;
   LPBYTE pbSrc;
   DWORD  cbSrcLength;
   DWORD  cbSrcLengthUsed;