Fix 64bit build. Dedicated to silverblade (please review).

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

diff --git a/reactos/include/reactos/libs/sound/mmebuddy.h b/reactos/include/reactos/libs/sound/mmebuddy.h
index d3aa6c5..071077b 100644 (file)
--- a/reactos/include/reactos/libs/sound/mmebuddy.h
+++ b/reactos/include/reactos/libs/sound/mmebuddy.h
@@ -160,7 +160,7 @@ struct _SOUND_DEVICE_INSTANCE;
         IN  DWORD CapabilitiesSize);
 
 /* This one is for those of us who don't care */
-DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, PVOID);
+DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, DWORD_PTR);
 
 /* These are for those of us that do */
 DEFINE_GETCAPS_FUNCTYPE(MMGETWAVEOUTCAPS_FUNC, LPWAVEOUTCAPS);
@@ -355,27 +355,27 @@ ReleaseEntrypointMutex(
 VOID
 NotifyMmeClient(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
-    IN  DWORD Message,
-    IN  DWORD Parameter);
+    IN  UINT Message,
+    IN  DWORD_PTR Parameter);
 
 MMRESULT
 MmeGetSoundDeviceCapabilities(
     IN  MMDEVICE_TYPE DeviceType,
     IN  DWORD DeviceId,
-    IN  PVOID Capabilities,
+    IN  DWORD_PTR Capabilities,
     IN  DWORD CapabilitiesSize);
 
 MMRESULT
 MmeOpenWaveDevice(
     IN  MMDEVICE_TYPE DeviceType,
-    IN  DWORD DeviceId,
+    IN  UINT DeviceId,
     IN  LPWAVEOPENDESC OpenParameters,
     IN  DWORD Flags,
-    OUT DWORD* PrivateHandle);
+    OUT SIZE_T* PrivateHandle);
 
 MMRESULT
 MmeCloseDevice(
-    IN  DWORD PrivateHandle);
+    IN  DWORD_PTR PrivateHandle);
 
 #define MmePrepareWaveHeader(private_handle, header) \
     PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header)
@@ -388,7 +388,7 @@ MmeCloseDevice(
 
 MMRESULT
 MmeResetWavePlayback(
-    IN  DWORD PrivateHandle);
+    IN  SIZE_T PrivateHandle);
 
 
 /*
@@ -398,7 +398,7 @@ MmeResetWavePlayback(
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
-    OUT PVOID Capabilities,
+    OUT DWORD_PTR Capabilities,
     IN  DWORD CapabilitiesSize);
 
 

diff --git a/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c b/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
index 96b4ca2..5774b44 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
@@ -23,11 +23,11 @@
 */
 APIENTRY DWORD
 auxMessage(
-    DWORD DeviceId,
-    DWORD Message,
-    DWORD PrivateHandle,
-    DWORD Parameter1,
-    DWORD Parameter2)
+    UINT DeviceId,
+    UINT Message,
+    DWORD_PTR PrivateHandle,
+    DWORD_PTR Parameter1,
+    DWORD_PTR Parameter2)
 {
     MMRESULT Result = MMSYSERR_NOTSUPPORTED;
 
@@ -47,7 +47,7 @@ auxMessage(
         {
             Result = MmeGetSoundDeviceCapabilities(AUX_DEVICE_TYPE,
                                                    DeviceId,
-                                                   (PVOID) Parameter1,
+                                                   Parameter1,
                                                    Parameter2);
             break;
         }

diff --git a/reactos/lib/drivers/sound/mmebuddy/capabilities.c b/reactos/lib/drivers/sound/mmebuddy/capabilities.c
index a2dec7f..3411372 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/capabilities.c
+++ b/reactos/lib/drivers/sound/mmebuddy/capabilities.c
@@ -28,7 +28,7 @@
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
-    OUT PVOID Capabilities,
+    OUT DWORD_PTR Capabilities,
     IN  DWORD CapabilitiesSize)
 {
     MMDEVICE_TYPE DeviceType;

diff --git a/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c b/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
index 9afe610..2ff10c7 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
@@ -23,11 +23,11 @@
 */
 APIENTRY DWORD
 midMessage(
-    DWORD DeviceId,
-    DWORD Message,
-    DWORD PrivateHandle,
-    DWORD Parameter1,
-    DWORD Parameter2)
+    UINT DeviceId,
+    UINT Message,
+    DWORD_PTR PrivateHandle,
+    DWORD_PTR Parameter1,
+    DWORD_PTR Parameter2)
 {
     MMRESULT Result = MMSYSERR_NOTSUPPORTED;
 
@@ -47,7 +47,7 @@ midMessage(
         {
             Result = MmeGetSoundDeviceCapabilities(MIDI_IN_DEVICE_TYPE,
                                                    DeviceId,
-                                                   (PVOID) Parameter1,
+                                                   Parameter1,
                                                    Parameter2);
             break;
         }

diff --git a/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c b/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
index 78db820..43f3c70 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
@@ -23,11 +23,11 @@
 */
 APIENTRY DWORD
 modMessage(
-    DWORD DeviceId,
-    DWORD Message,
-    DWORD PrivateHandle,
-    DWORD Parameter1,
-    DWORD Parameter2)
+    UINT DeviceId,
+    UINT Message,
+    DWORD_PTR PrivateHandle,
+    DWORD_PTR Parameter1,
+    DWORD_PTR Parameter2)
 {
     MMRESULT Result = MMSYSERR_NOTSUPPORTED;
 
@@ -47,7 +47,7 @@ modMessage(
         {
             Result = MmeGetSoundDeviceCapabilities(MIDI_OUT_DEVICE_TYPE,
                                                    DeviceId,
-                                                   (PVOID) Parameter1,
+                                                   Parameter1,
                                                    Parameter2);
             break;
         }

diff --git a/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c b/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
index 1f330f8..08b9b99 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
@@ -23,11 +23,11 @@
 */
 APIENTRY DWORD
 mxdMessage(
-    DWORD DeviceId,
-    DWORD Message,
-    DWORD PrivateHandle,
-    DWORD Parameter1,
-    DWORD Parameter2)
+    UINT DeviceId,
+    UINT Message,
+    DWORD_PTR PrivateHandle,
+    DWORD_PTR Parameter1,
+    DWORD_PTR Parameter2)
 {
     MMRESULT Result = MMSYSERR_NOTSUPPORTED;
 
@@ -47,7 +47,7 @@ mxdMessage(
         {
             Result = MmeGetSoundDeviceCapabilities(MIXER_DEVICE_TYPE,
                                                    DeviceId,
-                                                   (PVOID) Parameter1,
+                                                   Parameter1,
                                                    Parameter2);
             break;
         }

diff --git a/reactos/lib/drivers/sound/mmebuddy/mmewrap.c b/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
index 321efbb..aa66a9e 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
+++ b/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
@@ -23,8 +23,8 @@
 VOID
 NotifyMmeClient(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
-    IN  DWORD Message,
-    IN  DWORD Parameter)
+    IN  UINT Message,
+    IN  DWORD_PTR Parameter)
 {
     SND_ASSERT( SoundDeviceInstance );
 
@@ -52,7 +52,7 @@ MMRESULT
 MmeGetSoundDeviceCapabilities(
     IN  MMDEVICE_TYPE DeviceType,
     IN  DWORD DeviceId,
-    IN  PVOID Capabilities,
+    IN  DWORD_PTR Capabilities,
     IN  DWORD CapabilitiesSize)
 {
     PSOUND_DEVICE SoundDevice;
@@ -79,10 +79,10 @@ MmeGetSoundDeviceCapabilities(
 MMRESULT
 MmeOpenWaveDevice(
     IN  MMDEVICE_TYPE DeviceType,
-    IN  DWORD DeviceId,
+    IN  UINT DeviceId,
     IN  LPWAVEOPENDESC OpenParameters,
     IN  DWORD Flags,
-    OUT DWORD* PrivateHandle)
+    OUT SIZE_T* PrivateHandle)
 {
     MMRESULT Result;
 
@@ -128,8 +128,8 @@ MmeOpenWaveDevice(
         return TranslateInternalMmResult(Result);
     }
 
-    /* Store the device instance pointer in the private handle - is DWORD safe here? */
-    *PrivateHandle = (DWORD) SoundDeviceInstance;
+    /* Store the device instance pointer in the private handle */
+    *PrivateHandle = (DWORD_PTR)SoundDeviceInstance;
 
     /* Store the additional information we were given - FIXME: Need flags! */
     SetSoundDeviceInstanceMmeData(SoundDeviceInstance,
@@ -153,7 +153,7 @@ MmeOpenWaveDevice(
 
 MMRESULT
 MmeCloseDevice(
-    IN  DWORD PrivateHandle)
+    IN SIZE_T PrivateHandle)
 {
     MMRESULT Result;
     PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@@ -193,7 +193,7 @@ MmeCloseDevice(
 
 MMRESULT
 MmeResetWavePlayback(
-    IN  DWORD PrivateHandle)
+    IN SIZE_T PrivateHandle)
 {
     PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
 

diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/header.c b/reactos/lib/drivers/sound/mmebuddy/wave/header.c
index 62cf831..fd497c3 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/wave/header.c
+++ b/reactos/lib/drivers/sound/mmebuddy/wave/header.c
@@ -351,5 +351,5 @@ CompleteWaveHeader(
     /* Safe to do this without thread protection, as we're done with the header */
     NotifyMmeClient(SoundDeviceInstance,
                     DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_DONE : WIM_DATA,
-                    (DWORD) Header);
+                    (DWORD_PTR)Header);
 }

diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c b/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
index a3815b8..dc8a69f 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
@@ -24,11 +24,11 @@
 */
 APIENTRY DWORD
 widMessage(
-    DWORD DeviceId,
-    DWORD Message,
-    DWORD PrivateHandle,
-    DWORD Parameter1,
-    DWORD Parameter2)
+    UINT DeviceId,
+    UINT Message,
+    DWORD_PTR PrivateHandle,
+    DWORD_PTR Parameter1,
+    DWORD_PTR Parameter2)
 {
     MMRESULT Result = MMSYSERR_NOTSUPPORTED;
 
@@ -48,7 +48,7 @@ widMessage(
         {
             Result = MmeGetSoundDeviceCapabilities(WAVE_IN_DEVICE_TYPE,
                                                    DeviceId,
-                                                   (PVOID) Parameter1,
+                                                   Parameter1,
                                                    Parameter2);
             break;
         }

diff --git a/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c b/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
index 7c456f4..d2fd787 100644 (file)
--- a/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
+++ b/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
@@ -33,11 +33,11 @@ MMRESULT HelloWorld(PSOUND_DEVICE_INSTANCE Instance, PVOID String)
 */
 APIENTRY DWORD
 wodMessage(
-    DWORD DeviceId,
-    DWORD Message,
-    DWORD PrivateHandle,
-    DWORD Parameter1,
-    DWORD Parameter2)
+    UINT DeviceId,
+    UINT Message,
+    DWORD_PTR PrivateHandle,
+    DWORD_PTR Parameter1,
+    DWORD_PTR Parameter2)
 {
     MMRESULT Result = MMSYSERR_NOTSUPPORTED;
 
@@ -57,7 +57,7 @@ wodMessage(
         {
             Result = MmeGetSoundDeviceCapabilities(WAVE_OUT_DEVICE_TYPE,
                                                    DeviceId,
-                                                   (PVOID) Parameter1,
+                                                   Parameter1,
                                                    Parameter2);
             break;
         }
@@ -68,7 +68,7 @@ wodMessage(
                                        DeviceId,
                                        (LPWAVEOPENDESC) Parameter1,
                                        Parameter2,
-                                       (DWORD*) PrivateHandle);
+                                       (SIZE_T*)PrivateHandle);
             break;
         }