From ca968fbb46a2b5bdd3a6c0c30d4841ff57329694 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 8 Feb 2009 03:10:23 +0000
Subject: [PATCH] fix some definitions in mmsystem.h

svn path=/branches/ros-amd64-bringup/; revision=39468
---
 reactos/include/psdk/mmsystem.h | 38 +++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h
index 2efb44891e4..cc8c79d5d8d 100644
--- 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 LONG(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LONG,LONG);
+typedef LRESULT (CALLBACK* DRIVERPROC)(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM);
 typedef void (CALLBACK DRVCALLBACK)(HDRVR,UINT,DWORD,DWORD,DWORD);
 typedef DRVCALLBACK *LPDRVCALLBACK;
 typedef DRVCALLBACK *PDRVCALLBACK;
@@ -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);
-LONG WINAPI DefDriverProc(DWORD,HDRVR,UINT,LONG,LONG);
+LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM);
 UINT WINAPI mmsystemGetVersion(void);
 #define OutputDebugStr OutputDebugString
 BOOL WINAPI sndPlaySoundA(LPCSTR,UINT);
@@ -1671,7 +1671,13 @@ MMRESULT WINAPI waveOutSetPitch(HWAVEOUT,DWORD);
 MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT,PDWORD);
 MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD);
 MMRESULT WINAPI waveOutGetID(HWAVEOUT,LPUINT);
-DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR);
+#if (WINVER >= 0x030a)
+#ifdef _WIN32
+MMRESULT WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR);
+#else
+DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD);
+#endif
+#endif
 UINT WINAPI waveInGetNumDevs(void);
 MMRESULT WINAPI waveInGetDevCapsA(UINT_PTR,LPWAVEINCAPSA,UINT);
 MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT);
@@ -1687,7 +1693,13 @@ MMRESULT WINAPI waveInStop(HWAVEIN);
 MMRESULT WINAPI waveInReset(HWAVEIN);
 MMRESULT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT);
 MMRESULT WINAPI waveInGetID(HWAVEIN,LPUINT);
-DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR);
+#if (WINVER >= 0x030a)
+#ifdef _WIN32
+MMRESULT WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR);
+#else
+DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD);
+#endif
+#endif
 UINT WINAPI midiOutGetNumDevs(void);
 MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD_PTR,DWORD_PTR,DWORD);
 MMRESULT WINAPI midiStreamClose(HMIDISTRM);
@@ -1715,7 +1727,13 @@ MMRESULT WINAPI midiOutReset(HMIDIOUT);
 MMRESULT WINAPI midiOutCachePatches(HMIDIOUT,UINT,LPWORD,UINT);
 MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,LPWORD,UINT);
 MMRESULT WINAPI midiOutGetID(HMIDIOUT,LPUINT);
-DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR);
+#if (WINVER >= 0x030a)
+#ifdef _WIN32
+MMRESULT WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR);
+#else
+DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD);
+#endif
+#endif
 UINT WINAPI midiInGetNumDevs(void);
 MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR,LPMIDIINCAPSA,UINT);
 MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT);
@@ -1730,7 +1748,13 @@ MMRESULT WINAPI midiInStart(HMIDIIN);
 MMRESULT WINAPI midiInStop(HMIDIIN);
 MMRESULT WINAPI midiInReset(HMIDIIN);
 MMRESULT WINAPI midiInGetID(HMIDIIN,LPUINT);
-DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR);
+#if (WINVER >= 0x030a)
+#ifdef _WIN32
+MMRESULT WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR);
+#else
+DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD);
+#endif
+#endif
 UINT WINAPI auxGetNumDevs(void);
 MMRESULT WINAPI auxGetDevCapsA(UINT_PTR,LPAUXCAPSA,UINT);
 MMRESULT WINAPI auxGetDevCapsW(UINT_PTR,LPAUXCAPSW,UINT);
@@ -1799,7 +1823,7 @@ MCIDEVICEID WINAPI mciGetDeviceIDFromElementIDW(DWORD,LPCWSTR);
 BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT);
 BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT);
 BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
-HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID);
+HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
 YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
 
 typedef struct tagMCI_SEQ_SET_PARMS {