[MMEBUDDY]

- Directly invoke streaming

Author: janderwald

sdk/include/reactos/libs/sound/mmebuddy.h

@@ -117,21 +117,33 @@ struct _SOUND_DEVICE_INSTANCE;
 
 typedef struct _SOUND_OVERLAPPED
 {
+    LONG Status;
+    ULONG_PTR Information;
     OVERLAPPED Standard;
     struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance;
     PWAVEHDR Header;
 
-    LPOVERLAPPED_COMPLETION_ROUTINE OriginalCompletionRoutine;
+    PVOID OriginalCompletionRoutine;
     PVOID CompletionContext;
 
 } SOUND_OVERLAPPED, *PSOUND_OVERLAPPED;
 
+
+typedef
+VOID
+(WINAPI *LPSOUND_OVERLAPPED_COMPLETION_ROUTINE)(
+    _In_    DWORD dwErrorCode,
+    _In_    DWORD dwNumberOfBytesTransfered,
+    _Inout_ PSOUND_OVERLAPPED lpOverlapped
+    );
+
+
 typedef MMRESULT (*WAVE_COMMIT_FUNC)(
     IN  struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance,
     IN  PVOID OffsetPtr,
     IN  DWORD Bytes,
     IN  PSOUND_OVERLAPPED Overlap,
-    IN  LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine);
+    IN  LPSOUND_OVERLAPPED_COMPLETION_ROUTINE CompletionRoutine);
 
 typedef MMRESULT (*MMMIXERQUERY_FUNC) (
     IN  struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance,
@@ -342,6 +354,9 @@ typedef struct _SOUND_DEVICE_INSTANCE
 
     BOOL ResetInProgress;
     BOOL bPaused;
+
+    HANDLE hSoundThread;
+
 } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE;
 
 /* This lives in WAVEHDR.reserved */
@@ -672,7 +687,7 @@ VOID CALLBACK
 CompleteIO(
     IN  DWORD dwErrorCode,
     IN  DWORD dwNumberOfBytesTransferred,
-    IN  LPOVERLAPPED lpOverlapped);
+    IN  PSOUND_OVERLAPPED lpOverlapped);
 
 MMRESULT
 CommitWaveHeaderToKernelDevice(

sdk/lib/drivers/sound/mmebuddy/mmewrap.c

@@ -61,11 +61,6 @@ MmeSetState(
 
         /* Store audio stream pause state */
         SoundDeviceInstance->bPaused = !bStart;
-
-        if (SoundDeviceInstance->bPaused == FALSE && (OldState || DeviceType == WAVE_IN_DEVICE_TYPE))
-        {
-            InitiateSoundStreaming(SoundDeviceInstance);
-        }
     }
 
     return Result;

sdk/lib/drivers/sound/mmebuddy/wave/header.c

@@ -271,14 +271,11 @@ EnqueueWaveHeader(
                     DoWaveStreaming(SoundDeviceInstance);
                 }
             }
-        } else if (DeviceType == WAVE_IN_DEVICE_TYPE)
+        }
+        else if (DeviceType == WAVE_IN_DEVICE_TYPE)
         {
-            if (SoundDeviceInstance->RTStreamingStarted)
-            {
-                DoWaveStreaming(SoundDeviceInstance);
-            }
+            DoWaveStreaming(SoundDeviceInstance);
         }
-
     }
     else
     {
@@ -297,7 +294,10 @@ EnqueueWaveHeader(
             /* Only do wave streaming when the stream has not been paused */
             if ( SoundDeviceInstance->LegacyStreaming && SoundDeviceInstance->bPaused == FALSE && SoundDeviceInstance->bClosed == FALSE )
             {
-                DoWaveStreaming(SoundDeviceInstance);
+                if (DeviceType == WAVE_OUT_DEVICE_TYPE)
+                {
+                    DoWaveStreaming(SoundDeviceInstance);
+                }
             }
         }
     }

sdk/lib/drivers/sound/mmebuddy/wave/streaming.c

@@ -180,11 +180,11 @@ DoWaveStreaming(
         Commit buffers using the WriteFileEx API.
 */
 
-VOID CALLBACK
+VOID WINAPI
 CompleteIO(
     IN  DWORD dwErrorCode,
     IN  DWORD dwNumberOfBytesTransferred,
-    IN  LPOVERLAPPED lpOverlapped)
+    IN  PSOUND_OVERLAPPED lpOverlapped)
 {
     MMDEVICE_TYPE DeviceType;
     PSOUND_DEVICE SoundDevice;
@@ -418,21 +418,17 @@ WINAPI
 WaveActivateSoundStreaming(
     IN PVOID lpParameter)
 {
-    CallSoundThread((PSOUND_DEVICE_INSTANCE)lpParameter,
-                    PerformWaveStreaming,
-                    NULL);
+    PSOUND_DEVICE_INSTANCE SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE)lpParameter;
 
+    PerformWaveStreaming(SoundDeviceInstance, NULL);
+    CloseHandle(SoundDeviceInstance->hSoundThread);
+    SoundDeviceInstance->hSoundThread = NULL;
     ExitThread(0);
 }
 
 VOID
 InitiateSoundStreaming(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance)
 {
-    HANDLE hThread;
-
-    hThread = CreateThread(NULL, 0, WaveActivateSoundStreaming, (PVOID)SoundDeviceInstance, 0, NULL);
-
-    if (hThread != NULL)
-        CloseHandle(hThread);
+    SoundDeviceInstance->hSoundThread = CreateThread(NULL, 0, WaveActivateSoundStreaming, (PVOID)SoundDeviceInstance, 0, NULL);
 }