[MSACM32.DRV]

[reactos.git] / reactos / dll / win32 / msacm32 / msacm32.drv / wavemap.c

diff --git a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
index 556b0c0..8839821 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
+++ b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
@@ -28,17 +28,19 @@
  *             those should be taken care of...
  */
 
+#define WIN32_NO_STATUS
+
 #include <stdarg.h>
-#include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "mmddk.h"
-#include "mmreg.h"
-#include "msacm.h"
-#include "wine/unicode.h"
-#include "wine/debug.h"
+//#include <string.h>
+#include <windef.h>
+//#include "winbase.h"
+#include <wingdi.h>
+#include <winuser.h>
+#include <mmddk.h>
+#include <mmreg.h>
+#include <msacm.h>
+#include <wine/unicode.h>
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(wavemap);
 
@@ -335,7 +337,7 @@ static      DWORD   wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2)
     if (ash->cbSrcLength > ash->cbSrcLengthUsed)
         FIXME("Not all src buffer has been written, expect bogus sound\n");
     else if (ash->cbSrcLength < ash->cbSrcLengthUsed)
-        ERR("CoDec has read more data than it is allowed to\n");
+        ERR("Codec has read more data than it is allowed to\n");
 
     if (ash->cbDstLengthUsed == 0) {
         /* something went wrong in decoding */
@@ -673,7 +675,7 @@ static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance,
        return;
     }
 
-    if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN)
+    if (uMsg != WIM_OPEN && hWave != wim->u.in.hInnerWave)
        ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave);
 
     switch (uMsg) {