20 Mar
2009
20 Mar
'09
9:51 a.m.
Author: sserapion
Date: Fri Mar 20 12:51:21 2009
New Revision: 40127
URL: http://svn.reactos.org/svn/reactos?rev=40127&view=rev
Log:
Fix 64bit build. Dedicated to silverblade (please review).
Modified:
branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1]
Fri Mar 20 12:51:21 2009
@@ -160,7 +160,7 @@
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 @@
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 @@
MMRESULT
MmeResetWavePlayback(
- IN DWORD PrivateHandle);
+ IN SIZE_T PrivateHandle);
/*
@@ -398,7 +398,7 @@
MMRESULT
GetSoundDeviceCapabilities(
IN PSOUND_DEVICE SoundDevice,
- OUT PVOID Capabilities,
+ OUT DWORD_PTR Capabilities,
IN DWORD CapabilitiesSize);
Modified:
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -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 @@
{
Result = MmeGetSoundDeviceCapabilities(AUX_DEVICE_TYPE,
DeviceId,
- (PVOID) Parameter1,
+ Parameter1,
Parameter2);
break;
}
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -28,7 +28,7 @@
MMRESULT
GetSoundDeviceCapabilities(
IN PSOUND_DEVICE SoundDevice,
- OUT PVOID Capabilities,
+ OUT DWORD_PTR Capabilities,
IN DWORD CapabilitiesSize)
{
MMDEVICE_TYPE DeviceType;
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -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 @@
{
Result = MmeGetSoundDeviceCapabilities(MIDI_IN_DEVICE_TYPE,
DeviceId,
- (PVOID) Parameter1,
+ Parameter1,
Parameter2);
break;
}
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -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 @@
{
Result = MmeGetSoundDeviceCapabilities(MIDI_OUT_DEVICE_TYPE,
DeviceId,
- (PVOID) Parameter1,
+ Parameter1,
Parameter2);
break;
}
Modified:
branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -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 @@
{
Result = MmeGetSoundDeviceCapabilities(MIXER_DEVICE_TYPE,
DeviceId,
- (PVOID) Parameter1,
+ Parameter1,
Parameter2);
break;
}
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1]
Fri Mar 20 12:51:21 2009
@@ -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 @@
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 @@
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 @@
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 @@
MMRESULT
MmeCloseDevice(
- IN DWORD PrivateHandle)
+ IN SIZE_T PrivateHandle)
{
MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@@ -193,7 +193,7 @@
MMRESULT
MmeResetWavePlayback(
- IN DWORD PrivateHandle)
+ IN SIZE_T PrivateHandle)
{
PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -351,5 +351,5 @@
/* 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);
+}
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -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 @@
{
Result = MmeGetSoundDeviceCapabilities(WAVE_IN_DEVICE_TYPE,
DeviceId,
- (PVOID) Parameter1,
+ Parameter1,
Parameter2);
break;
}
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
[iso-8859-1] Fri Mar 20 12:51:21 2009
@@ -33,11 +33,11 @@
*/
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 @@
{
Result = MmeGetSoundDeviceCapabilities(WAVE_OUT_DEVICE_TYPE,
DeviceId,
- (PVOID) Parameter1,
+ Parameter1,
Parameter2);
break;
}
@@ -68,7 +68,7 @@
DeviceId,
(LPWAVEOPENDESC) Parameter1,
Parameter2,
- (DWORD*) PrivateHandle);
+ (SIZE_T*)PrivateHandle);
break;
}