[WDMAUD.DRV]

[reactos.git] / reactos / dll / win32 / wdmaud.drv / legacy.c

diff --git a/reactos/dll/win32/wdmaud.drv/legacy.c b/reactos/dll/win32/wdmaud.drv/legacy.c
index 68486dd..d569d0b 100644 (file)
--- a/reactos/dll/win32/wdmaud.drv/legacy.c
+++ b/reactos/dll/win32/wdmaud.drv/legacy.c
@@ -15,8 +15,11 @@
 
 #include "wdmaud.h"
 
+#include <stdio.h>
+
 #define KERNEL_DEVICE_NAME      L"\\\\.\\wdmaud"
-extern HANDLE KernelHandle;
+
+HANDLE KernelHandle = INVALID_HANDLE_VALUE;
 DWORD OpenCount = 0;
 
 DWORD
@@ -77,14 +80,16 @@ MixerEventThreadRoutine(
     return 0;
 }
 
-VOID
-WdmAudCleanupLegacy()
+MMRESULT
+WdmAudCleanupByLegacy()
 {
-    if ( KernelHandle != INVALID_HANDLE_VALUE )
+    if (KernelHandle != INVALID_HANDLE_VALUE)
     {
         CloseHandle(KernelHandle);
         KernelHandle = INVALID_HANDLE_VALUE;
     }
+
+    return MMSYSERR_NOERROR;
 }
 
 MMRESULT
@@ -325,12 +330,11 @@ WdmAudSetMixerDeviceFormatByLegacy(
     WDMAUD_DEVICE_INFO DeviceInfo;
     HANDLE hThread;
 
-
     Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
     if ( ! Instance->hNotifyEvent )
         return MMSYSERR_NOMEM;
 
-    if (Instance->Handle != KernelHandle)
+    if (Instance->Handle != NULL)
     {
         /* device is already open */
         return MMSYSERR_NOERROR;
@@ -399,7 +403,7 @@ WdmAudSetWaveDeviceFormatByLegacy(
         return TranslateInternalMmResult(Result);
     }
 
-    if (Instance->Handle != KernelHandle)
+    if (Instance->Handle != NULL)
     {
         /* device is already open */
         return MMSYSERR_NOERROR;
@@ -494,7 +498,7 @@ WdmAudSetWaveDeviceFormatByLegacy(
 }
 
 MMRESULT
-WriteFileEx_Committer2(
+WdmAudCommitWaveBufferByLegacy(
     IN  PSOUND_DEVICE_INSTANCE SoundDeviceInstance,
     IN  PVOID OffsetPtr,
     IN  DWORD Length,
@@ -514,7 +518,7 @@ WriteFileEx_Committer2(
     VALIDATE_MMSYS_PARAMETER( CompletionRoutine );
 
     GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle);
-
+    SND_ASSERT(Handle);
 
     Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice);
 
@@ -526,8 +530,6 @@ WriteFileEx_Committer2(
     Result = GetSoundDeviceType(SoundDevice, &DeviceType);
     SND_ASSERT( Result == MMSYSERR_NOERROR );
 
-    SND_ASSERT(Handle);
-
     ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO));
 
     DeviceInfo.Header.FrameExtent = Length;
@@ -542,6 +544,8 @@ WriteFileEx_Committer2(
     DeviceInfo.hDevice = Handle;
     DeviceInfo.DeviceType = DeviceType;
 
+
+
     Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
 
     if (DeviceType == WAVE_OUT_DEVICE_TYPE)
@@ -561,6 +565,7 @@ WriteFileEx_Committer2(
 }
 
 
+
 MMRESULT
 WdmAudSetWaveStateByLegacy(
     IN  struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance,