Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-10 04:14:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MMEBUDDY]

Browse source 
Make mmebuddy more 64bit compliant. Based on r40127 by Samuel Serapion with some modifications by me.

svn path=/trunk/; revision=47573
This commit is contained in:
Timo Kreuzer 2010-06-04 18:37:14 +00:00
parent 6659ae1d98
commit ffc6aac247
9 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/include/reactos/libs/sound/mmebuddy.h
View file

@ -400,8 +400,8 @@ ReleaseEntrypointMutex(
VOID VOID
NotifyMmeClient( NotifyMmeClient(
IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
IN DWORD Message, IN UINT Message,
IN DWORD Parameter); IN DWORD_PTR Parameter);
MMRESULT MMRESULT
MmeGetSoundDeviceCapabilities( MmeGetSoundDeviceCapabilities(
@ -413,20 +413,20 @@ MmeGetSoundDeviceCapabilities(
MMRESULT MMRESULT
MmeOpenWaveDevice( MmeOpenWaveDevice(
IN MMDEVICE_TYPE DeviceType, IN MMDEVICE_TYPE DeviceType,
IN DWORD DeviceId, IN UINT DeviceId,
IN LPWAVEOPENDESC OpenParameters, IN LPWAVEOPENDESC OpenParameters,
IN DWORD Flags, IN DWORD Flags,
OUT DWORD* PrivateHandle); OUT DWORD_PTR* PrivateHandle);
MMRESULT MMRESULT
MmeCloseDevice( MmeCloseDevice(
IN DWORD PrivateHandle); IN DWORD_PTR PrivateHandle);
MMRESULT MMRESULT
MmeGetPosition( MmeGetPosition(
IN MMDEVICE_TYPE DeviceType, IN MMDEVICE_TYPE DeviceType,
IN DWORD DeviceId, IN DWORD DeviceId,
IN DWORD PrivateHandle, IN DWORD_PTR PrivateHandle,
IN MMTIME* Time, IN MMTIME* Time,
IN DWORD Size); IN DWORD Size);
@ -441,7 +441,7 @@ MmeGetDeviceInterfaceString(
MMRESULT MMRESULT
MmeSetState( MmeSetState(
IN DWORD PrivateHandle, IN DWORD_PTR PrivateHandle,
IN BOOL bStart); IN BOOL bStart);
@ -456,7 +456,7 @@ MmeSetState(
MMRESULT MMRESULT
MmeResetWavePlayback( MmeResetWavePlayback(
IN DWORD PrivateHandle); IN DWORD_PTR PrivateHandle);
/* /*

10
reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c
View file

@ -24,11 +24,11 @@
DWORD DWORD
APIENTRY APIENTRY
auxMessage( auxMessage(
DWORD DeviceId, UINT DeviceId,
DWORD Message, UINT Message,
DWORD PrivateHandle, DWORD_PTR PrivateHandle,
DWORD Parameter1, DWORD_PTR Parameter1,
DWORD Parameter2) DWORD_PTR Parameter2)
{ {
MMRESULT Result = MMSYSERR_NOTSUPPORTED; MMRESULT Result = MMSYSERR_NOTSUPPORTED;

10
reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
View file

@ -24,11 +24,11 @@
DWORD DWORD
APIENTRY APIENTRY
midMessage( midMessage(
DWORD DeviceId, UINT DeviceId,
DWORD Message, UINT Message,
DWORD PrivateHandle, DWORD_PTR PrivateHandle,
DWORD Parameter1, DWORD_PTR Parameter1,
DWORD Parameter2) DWORD_PTR Parameter2)
{ {
MMRESULT Result = MMSYSERR_NOTSUPPORTED; MMRESULT Result = MMSYSERR_NOTSUPPORTED;

10
reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
View file

@ -24,11 +24,11 @@
DWORD DWORD
APIENTRY APIENTRY
modMessage( modMessage(
DWORD DeviceId, UINT DeviceId,
DWORD Message, UINT Message,
DWORD PrivateHandle, DWORD_PTR PrivateHandle,
DWORD Parameter1, DWORD_PTR Parameter1,
DWORD Parameter2) DWORD_PTR Parameter2)
{ {
MMRESULT Result = MMSYSERR_NOTSUPPORTED; MMRESULT Result = MMSYSERR_NOTSUPPORTED;

22
reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
View file

@ -20,10 +20,10 @@
MMRESULT MMRESULT
MmeGetLineInfo( MmeGetLineInfo(
IN DWORD Message, IN UINT Message,
IN DWORD PrivateHandle, IN DWORD_PTR PrivateHandle,
IN DWORD Parameter1, IN DWORD_PTR Parameter1,
IN DWORD Parameter2) IN DWORD_PTR Parameter2)
{ {
MMRESULT Result; MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance; PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@ -54,7 +54,7 @@ MmeGetLineInfo(
MMRESULT MMRESULT
MmeCloseMixerDevice( MmeCloseMixerDevice(
IN DWORD PrivateHandle) IN DWORD_PTR PrivateHandle)
{ {
MMRESULT Result; MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance; PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@ -122,7 +122,7 @@ MmeOpenMixerDevice(
} }
/* Store the device instance pointer in the private handle - is DWORD safe here? */ /* 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! */ /* Store the additional information we were given - FIXME: Need flags! */
SetSoundDeviceInstanceMmeData(SoundDeviceInstance, SetSoundDeviceInstanceMmeData(SoundDeviceInstance,
@ -151,11 +151,11 @@ MmeOpenMixerDevice(
DWORD DWORD
APIENTRY APIENTRY
mxdMessage( mxdMessage(
DWORD DeviceId, UINT DeviceId,
DWORD Message, UINT Message,
DWORD PrivateHandle, DWORD_PTR PrivateHandle,
DWORD Parameter1, DWORD_PTR Parameter1,
DWORD Parameter2) DWORD_PTR Parameter2)
{ {
MMRESULT Result = MMSYSERR_NOTSUPPORTED; MMRESULT Result = MMSYSERR_NOTSUPPORTED;

20
reactos/lib/drivers/sound/mmebuddy/mmewrap.c
View file

@ -22,7 +22,7 @@
MMRESULT MMRESULT
MmeSetState( MmeSetState(
IN DWORD PrivateHandle, IN DWORD_PTR PrivateHandle,
IN BOOL bStart) IN BOOL bStart)
{ {
MMRESULT Result; MMRESULT Result;
@ -64,8 +64,8 @@ MmeSetState(
VOID VOID
NotifyMmeClient( NotifyMmeClient(
IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
IN DWORD Message, IN UINT Message,
IN DWORD Parameter) IN DWORD_PTR Parameter)
{ {
SND_ASSERT( SoundDeviceInstance ); SND_ASSERT( SoundDeviceInstance );
@ -121,10 +121,10 @@ MmeGetSoundDeviceCapabilities(
MMRESULT MMRESULT
MmeOpenWaveDevice( MmeOpenWaveDevice(
IN MMDEVICE_TYPE DeviceType, IN MMDEVICE_TYPE DeviceType,
IN DWORD DeviceId, IN UINT DeviceId,
IN LPWAVEOPENDESC OpenParameters, IN LPWAVEOPENDESC OpenParameters,
IN DWORD Flags, IN DWORD Flags,
OUT DWORD* PrivateHandle) OUT DWORD_PTR* PrivateHandle)
{ {
MMRESULT Result; MMRESULT Result;
@ -170,8 +170,8 @@ MmeOpenWaveDevice(
return TranslateInternalMmResult(Result); return TranslateInternalMmResult(Result);
} }
/* Store the device instance pointer in the private handle - is DWORD safe here? */ /* Store the device instance pointer in the private handle */
*PrivateHandle = (DWORD) SoundDeviceInstance; *PrivateHandle = (DWORD_PTR)SoundDeviceInstance;
/* Store the additional information we were given - FIXME: Need flags! */ /* Store the additional information we were given - FIXME: Need flags! */
SetSoundDeviceInstanceMmeData(SoundDeviceInstance, SetSoundDeviceInstanceMmeData(SoundDeviceInstance,
@ -195,7 +195,7 @@ MmeOpenWaveDevice(
MMRESULT MMRESULT
MmeCloseDevice( MmeCloseDevice(
IN DWORD PrivateHandle) IN DWORD_PTR PrivateHandle)
{ {
MMRESULT Result; MMRESULT Result;
PSOUND_DEVICE_INSTANCE SoundDeviceInstance; PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@ -235,7 +235,7 @@ MmeCloseDevice(
MMRESULT MMRESULT
MmeResetWavePlayback( MmeResetWavePlayback(
IN DWORD PrivateHandle) IN DWORD_PTR PrivateHandle)
{ {
PSOUND_DEVICE_INSTANCE SoundDeviceInstance; PSOUND_DEVICE_INSTANCE SoundDeviceInstance;
@ -284,7 +284,7 @@ MMRESULT
MmeGetPosition( MmeGetPosition(
IN MMDEVICE_TYPE DeviceType, IN MMDEVICE_TYPE DeviceType,
IN DWORD DeviceId, IN DWORD DeviceId,
IN DWORD PrivateHandle, IN DWORD_PTR PrivateHandle,
IN MMTIME* Time, IN MMTIME* Time,
IN DWORD Size) IN DWORD Size)
{ {

2
reactos/lib/drivers/sound/mmebuddy/wave/header.c
View file

@ -359,5 +359,5 @@ CompleteWaveHeader(
/* Safe to do this without thread protection, as we're done with the header */ /* Safe to do this without thread protection, as we're done with the header */
NotifyMmeClient(SoundDeviceInstance, NotifyMmeClient(SoundDeviceInstance,
DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_DONE : WIM_DATA, DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_DONE : WIM_DATA,
(DWORD) Header); (DWORD_PTR)Header);
} }

12
reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
View file

@ -25,11 +25,11 @@
DWORD DWORD
APIENTRY APIENTRY
widMessage( widMessage(
DWORD DeviceId, UINT DeviceId,
DWORD Message, UINT Message,
DWORD PrivateHandle, DWORD_PTR PrivateHandle,
DWORD Parameter1, DWORD_PTR Parameter1,
DWORD Parameter2) DWORD_PTR Parameter2)
{ {
MMRESULT Result = MMSYSERR_NOTSUPPORTED; MMRESULT Result = MMSYSERR_NOTSUPPORTED;
@ -72,7 +72,7 @@ widMessage(
DeviceId, DeviceId,
(LPWAVEOPENDESC) Parameter1, (LPWAVEOPENDESC) Parameter1,
Parameter2, Parameter2,
(DWORD*) PrivateHandle); (DWORD_PTR*) PrivateHandle);
break; break;
} }

12
reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
View file

@ -34,11 +34,11 @@ MMRESULT HelloWorld(PSOUND_DEVICE_INSTANCE Instance, PVOID String)
DWORD DWORD
APIENTRY APIENTRY
wodMessage( wodMessage(
DWORD DeviceId, UINT DeviceId,
DWORD Message, UINT Message,
DWORD PrivateHandle, DWORD_PTR PrivateHandle,
DWORD Parameter1, DWORD_PTR Parameter1,
DWORD Parameter2) DWORD_PTR Parameter2)
{ {
MMRESULT Result = MMSYSERR_NOTSUPPORTED; MMRESULT Result = MMSYSERR_NOTSUPPORTED;
@ -69,7 +69,7 @@ wodMessage(
DeviceId, DeviceId,
(LPWAVEOPENDESC) Parameter1, (LPWAVEOPENDESC) Parameter1,
Parameter2, Parameter2,
(DWORD*) PrivateHandle); (DWORD_PTR*)PrivateHandle);
break; break;
} }