[tkreuzer] 47573: [MMEBUDDY] Make mmebuddy more 64bit compliant. Based on r40127 by Samuel Serapion with some modifications by me.
4 Jun
2010
4 Jun
'10
6:37 p.m.
Author: tkreuzer
Date: Fri Jun 4 20:37:14 2010
New Revision: 47573
URL: http://svn.reactos.org/svn/reactos?rev=47573&view=rev
Log:
[MMEBUDDY]
Make mmebuddy more 64bit compliant. Based on r40127 by Samuel Serapion with some
modifications by me.
Modified:
trunk/reactos/ (props changed)
trunk/reactos/include/reactos/libs/sound/mmebuddy.h
trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
Propchange: trunk/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 4 20:37:14 2010
@@ -1,4 +1,4 @@
/branches/header-work:45691-46463
/branches/reactos-yarotows:46966
/branches/ros-amd64-bringup:36852
-/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589
+/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805
Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound…
==============================================================================
--- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Fri Jun 4 20:37:14
2010
@@ -400,8 +400,8 @@
VOID
NotifyMmeClient(
IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
- IN DWORD Message,
- IN DWORD Parameter);
+ IN UINT Message,
+ IN DWORD_PTR Parameter);
MMRESULT
MmeGetSoundDeviceCapabilities(
@@ -413,20 +413,20 @@
MMRESULT
MmeOpenWaveDevice(
IN MMDEVICE_TYPE DeviceType,
- IN DWORD DeviceId,
+ IN UINT DeviceId,
IN LPWAVEOPENDESC OpenParameters,
IN DWORD Flags,
- OUT DWORD* PrivateHandle);
+ OUT DWORD_PTR* PrivateHandle);
MMRESULT
MmeCloseDevice(
- IN DWORD PrivateHandle);
+ IN DWORD_PTR PrivateHandle);
MMRESULT
MmeGetPosition(
IN MMDEVICE_TYPE DeviceType,
IN DWORD DeviceId,
- IN DWORD PrivateHandle,
+ IN DWORD_PTR PrivateHandle,
IN MMTIME* Time,
IN DWORD Size);
@@ -441,7 +441,7 @@
MMRESULT
MmeSetState(
- IN DWORD PrivateHandle,
+ IN DWORD_PTR PrivateHandle,
IN BOOL bStart);
@@ -456,7 +456,7 @@
MMRESULT
MmeResetWavePlayback(
- IN DWORD PrivateHandle);
+ IN DWORD_PTR PrivateHandle);
/*
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1]
(original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Fri Jun
4 20:37:14 2010
@@ -24,11 +24,11 @@
DWORD
APIENTRY
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;
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Fri Jun 4
20:37:14 2010
@@ -24,11 +24,11 @@
DWORD
APIENTRY
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;
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Fri Jun 4
20:37:14 2010
@@ -24,11 +24,11 @@
DWORD
APIENTRY
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;
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Fri Jun 4
20:37:14 2010
@@ -20,10 +20,10 @@
MMRESULT
MmeGetLineInfo(
- IN DWORD Message,
- IN DWORD PrivateHandle,
- IN DWORD Parameter1,
- IN DWORD Parameter2)
+ IN UINT Message,
+ IN DWORD_PTR PrivateHandle,
+ IN DWORD_PTR Parameter1,
+ IN DWORD_PTR Parameter2)
{
MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@@ -54,7 +54,7 @@
MMRESULT
MmeCloseMixerDevice(
- IN DWORD PrivateHandle)
+ IN DWORD_PTR PrivateHandle)
{
MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@@ -122,7 +122,7 @@
}
/* Store the device instance pointer in the private handle - is DWORD safe here? */
- *PrivateHandle = (DWORD) SoundDeviceInstance;
+ *PrivateHandle = (DWORD_PTR) SoundDeviceInstance;
/* Store the additional information we were given - FIXME: Need flags! */
SetSoundDeviceInstanceMmeData(SoundDeviceInstance,
@@ -151,11 +151,11 @@
DWORD
APIENTRY
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;
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Fri Jun 4 20:37:14
2010
@@ -22,7 +22,7 @@
MMRESULT
MmeSetState(
- IN DWORD PrivateHandle,
+ IN DWORD_PTR PrivateHandle,
IN BOOL bStart)
{
MMRESULT Result;
@@ -64,8 +64,8 @@
VOID
NotifyMmeClient(
IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
- IN DWORD Message,
- IN DWORD Parameter)
+ IN UINT Message,
+ IN DWORD_PTR Parameter)
{
SND_ASSERT( SoundDeviceInstance );
@@ -121,10 +121,10 @@
MMRESULT
MmeOpenWaveDevice(
IN MMDEVICE_TYPE DeviceType,
- IN DWORD DeviceId,
+ IN UINT DeviceId,
IN LPWAVEOPENDESC OpenParameters,
IN DWORD Flags,
- OUT DWORD* PrivateHandle)
+ OUT DWORD_PTR* PrivateHandle)
{
MMRESULT Result;
@@ -170,8 +170,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,
@@ -195,7 +195,7 @@
MMRESULT
MmeCloseDevice(
- IN DWORD PrivateHandle)
+ IN DWORD_PTR PrivateHandle)
{
MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@@ -235,7 +235,7 @@
MMRESULT
MmeResetWavePlayback(
- IN DWORD PrivateHandle)
+ IN DWORD_PTR PrivateHandle)
{
PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@@ -284,7 +284,7 @@
MmeGetPosition(
IN MMDEVICE_TYPE DeviceType,
IN DWORD DeviceId,
- IN DWORD PrivateHandle,
+ IN DWORD_PTR PrivateHandle,
IN MMTIME* Time,
IN DWORD Size)
{
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Fri Jun 4
20:37:14 2010
@@ -359,5 +359,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: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Fri Jun 4
20:37:14 2010
@@ -25,11 +25,11 @@
DWORD
APIENTRY
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;
@@ -72,7 +72,7 @@
DeviceId,
(LPWAVEOPENDESC) Parameter1,
Parameter2,
- (DWORD*) PrivateHandle);
+ (DWORD_PTR*) PrivateHandle);
break;
}
Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Jun 4
20:37:14 2010
@@ -34,11 +34,11 @@
DWORD
APIENTRY
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;
@@ -69,7 +69,7 @@
DeviceId,
(LPWAVEOPENDESC) Parameter1,
Parameter2,
- (DWORD*) PrivateHandle);
+ (DWORD_PTR*)PrivateHandle);
break;
}
5319
days inactive
5319
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org