[AUDIO-BRINGUP]

[reactos.git] / include / reactos / libs / sound / mmebuddy.h

diff --git a/include/reactos/libs/sound/mmebuddy.h b/include/reactos/libs/sound/mmebuddy.h
index 4e15832..1cc7f52 100644 (file)
--- a/include/reactos/libs/sound/mmebuddy.h
+++ b/include/reactos/libs/sound/mmebuddy.h
@@ -68,7 +68,7 @@
             SND_TRACE(L"-- Current wave header list --\n"); \
             while ( CurrDumpHdr ) \
             { \
-                SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr->lpData, \
+                SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr, \
                           CurrDumpHdr->dwBufferLength, \
                           CurrDumpHdr->dwFlags); \
                 CurrDumpHdr = CurrDumpHdr->lpNext; \
@@ -135,7 +135,7 @@
     { \
         if ( ! (parameter_condition) ) \
         { \
-            SND_ERR(L"FAILED parameter check: %hS\n", #parameter_condition); \
+            SND_ERR(L"FAILED parameter check: %hS at File %S Line %lu\n", #parameter_condition, __FILE__, __LINE__); \
             return MMSYSERR_INVALPARAM; \
         } \
     }
@@ -199,11 +199,11 @@ typedef MMRESULT (*WAVE_COMMIT_FUNC)(
 
 typedef MMRESULT (*MMMIXERQUERY_FUNC) (
     IN  struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance,
+    IN DWORD DeviceId,
     IN UINT uMsg,
     IN LPVOID Parameter,
     IN DWORD Flags);
 
-
 typedef MMRESULT (*MMWAVEQUERYFORMATSUPPORT_FUNC)(
     IN  struct _SOUND_DEVICE* Device,
     IN  PWAVEFORMATEX WaveFormat,
@@ -364,6 +364,8 @@ typedef struct _SOUND_DEVICE_INSTANCE
     WAVEFORMATEX WaveFormatEx;
     HANDLE hNotifyEvent;
     HANDLE hStopEvent;
+    HANDLE hResetEvent;
+    BOOL ResetInProgress;
 } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE;
 
 /* This lives in WAVEHDR.reserved */
@@ -400,8 +402,8 @@ ReleaseEntrypointMutex(
 VOID
 NotifyMmeClient(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
-    IN  DWORD Message,
-    IN  DWORD Parameter);
+    IN  UINT Message,
+    IN  DWORD_PTR Parameter);
 
 MMRESULT
 MmeGetSoundDeviceCapabilities(
@@ -411,22 +413,22 @@ MmeGetSoundDeviceCapabilities(
     IN  DWORD CapabilitiesSize);
 
 MMRESULT
-MmeOpenWaveDevice(
+MmeOpenDevice(
     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 +443,7 @@ MmeGetDeviceInterfaceString(
 
 MMRESULT
 MmeSetState(
-    IN  DWORD PrivateHandle,
+    IN  DWORD_PTR PrivateHandle,
     IN  BOOL bStart);
 
 
@@ -456,7 +458,7 @@ MmeSetState(
 
 MMRESULT
 MmeResetWavePlayback(
-    IN  DWORD PrivateHandle);
+    IN  DWORD_PTR PrivateHandle);
 
 
 /*