Sync to trunk head (r42241)

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

diff --git a/reactos/include/reactos/libs/sound/mmebuddy.h b/reactos/include/reactos/libs/sound/mmebuddy.h
index 94e2bea..35b7407 100644 (file)
--- a/reactos/include/reactos/libs/sound/mmebuddy.h
+++ b/reactos/include/reactos/libs/sound/mmebuddy.h
@@ -56,7 +56,7 @@
         { \
             if ( ! ( condition ) ) \
             { \
         { \
             if ( ! ( condition ) ) \
             { \

-                SND_ERR(L"ASSERT FAILED: %hS\n", #condition); \
+                SND_ERR(L"ASSERT FAILED: %hS File %hS Line %u\n", #condition, __FILE__, __LINE__); \

                 POPUP(L"ASSERT FAILED: %hS\n", #condition); \
                 ExitProcess(1); \
             } \
                 POPUP(L"ASSERT FAILED: %hS\n", #condition); \
                 ExitProcess(1); \
             } \


@@ -80,6 +80,7 @@
     #define SND_WARN(...) do {} while ( 0 )
     #define SND_TRACE(...) do {} while ( 0 )
     #define SND_ASSERT(condition) do {} while ( 0 )
     #define SND_WARN(...) do {} while ( 0 )
     #define SND_TRACE(...) do {} while ( 0 )
     #define SND_ASSERT(condition) do {} while ( 0 )

+    #define DUMP_WAVEHDR_QUEUE(condition) do {} while ( 0 )

 #endif
 
 /*
 #endif
 
 /*


@@ -155,6 +156,7 @@ struct _SOUND_DEVICE_INSTANCE;
 #define DEFINE_GETCAPS_FUNCTYPE(func_typename, caps_type) \
     typedef MMRESULT (*func_typename)( \
         IN  struct _SOUND_DEVICE* SoundDevice, \
 #define DEFINE_GETCAPS_FUNCTYPE(func_typename, caps_type) \
     typedef MMRESULT (*func_typename)( \
         IN  struct _SOUND_DEVICE* SoundDevice, \

+        IN  DWORD DeviceId, \

         OUT caps_type Capabilities, \
         IN  DWORD CapabilitiesSize);
 
         OUT caps_type Capabilities, \
         IN  DWORD CapabilitiesSize);
 


@@ -200,6 +202,7 @@ typedef MMRESULT (*MMWAVEQUERYFORMATSUPPORT_FUNC)(
 
 typedef MMRESULT (*MMWAVESETFORMAT_FUNC)(
     IN  struct _SOUND_DEVICE_INSTANCE* Instance,
 
 typedef MMRESULT (*MMWAVESETFORMAT_FUNC)(
     IN  struct _SOUND_DEVICE_INSTANCE* Instance,

+    IN  DWORD DeviceId,

     IN  PWAVEFORMATEX WaveFormat,
     IN  DWORD WaveFormatSize);
 
     IN  PWAVEFORMATEX WaveFormat,
     IN  DWORD WaveFormatSize);
 


@@ -220,6 +223,10 @@ typedef MMRESULT (*MMBUFFER_FUNC)(
     IN  PVOID Buffer,
     IN  DWORD Length);
 
     IN  PVOID Buffer,
     IN  DWORD Length);
 

+typedef MMRESULT(*MMGETPOS_FUNC)(
+    IN  struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance,
+    IN  MMTIME* Time);
+

 typedef struct _MMFUNCTION_TABLE
 {
     union
 typedef struct _MMFUNCTION_TABLE
 {
     union


@@ -239,6 +246,8 @@ typedef struct _MMFUNCTION_TABLE
 
     WAVE_COMMIT_FUNC                CommitWaveBuffer;
 
 
     WAVE_COMMIT_FUNC                CommitWaveBuffer;
 

+    MMGETPOS_FUNC                   GetPos;
+

     // Redundant
     //MMWAVEHEADER_FUNC               PrepareWaveHeader;
     //MMWAVEHEADER_FUNC               UnprepareWaveHeader;
     // Redundant
     //MMWAVEHEADER_FUNC               PrepareWaveHeader;
     //MMWAVEHEADER_FUNC               UnprepareWaveHeader;


@@ -318,6 +327,8 @@ typedef struct _SOUND_DEVICE_INSTANCE
     //PWAVEHDR CurrentWaveHeader;
     DWORD OutstandingBuffers;
     DWORD LoopsRemaining;
     //PWAVEHDR CurrentWaveHeader;
     DWORD OutstandingBuffers;
     DWORD LoopsRemaining;

+    DWORD FrameSize;
+    DWORD BufferCount;

 } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE;
 
 /* This lives in WAVEHDR.reserved */
 } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE;
 
 /* This lives in WAVEHDR.reserved */


@@ -354,27 +365,36 @@ ReleaseEntrypointMutex(
 VOID
 NotifyMmeClient(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
 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,
 
 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 CapabilitiesSize);
 
 MMRESULT
 MmeOpenWaveDevice(
     IN  MMDEVICE_TYPE DeviceType,

-    IN  DWORD DeviceId,
+    IN  UINT DeviceId,

     IN  LPWAVEOPENDESC OpenParameters,
     IN  DWORD Flags,
     IN  LPWAVEOPENDESC OpenParameters,
     IN  DWORD Flags,

-    OUT DWORD* PrivateHandle);
+    OUT SIZE_T* PrivateHandle);

 
 MMRESULT
 MmeCloseDevice(
 
 MMRESULT
 MmeCloseDevice(

-    IN  DWORD PrivateHandle);
+    IN  DWORD_PTR PrivateHandle);
+
+MMRESULT
+MmeGetPosition(
+    IN  MMDEVICE_TYPE DeviceType,
+    IN  DWORD DeviceId,
+    IN  DWORD PrivateHandle,
+    IN  MMTIME* Time,
+    IN  DWORD Size);
+

 
 #define MmePrepareWaveHeader(private_handle, header) \
     PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header)
 
 #define MmePrepareWaveHeader(private_handle, header) \
     PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header)


@@ -387,7 +407,7 @@ MmeCloseDevice(
 
 MMRESULT
 MmeResetWavePlayback(
 
 MMRESULT
 MmeResetWavePlayback(

-    IN  DWORD PrivateHandle);
+    IN  SIZE_T PrivateHandle);

 
 
 /*
 
 
 /*


@@ -397,6 +417,7 @@ MmeResetWavePlayback(
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,

+    IN  DWORD DeviceId,

     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize);
 
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize);
 


@@ -563,6 +584,7 @@ QueryWaveDeviceFormatSupport(
 MMRESULT
 SetWaveDeviceFormat(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
 MMRESULT
 SetWaveDeviceFormat(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,

+    IN  DWORD DeviceId,

     IN  LPWAVEFORMATEX Format,
     IN  DWORD FormatSize);
 
     IN  LPWAVEFORMATEX Format,
     IN  DWORD FormatSize);