[MSACM32.DRV] Sync with Wine Staging 1.9.4. CORE-10912

[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 c2b2a06..bf9e37c 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
+++ b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
@@ -337,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 */
@@ -522,6 +522,7 @@ static      DWORD   wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC
            WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 |
            WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16;
        woc.wChannels = 2;
+       woc.wReserved1 = 0;
        woc.dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME;
         memcpy(lpWaveCaps, &woc, min(dwParam2, sizeof(woc)));
 
@@ -675,7 +676,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) {
@@ -854,8 +855,8 @@ found:
        HeapFree(GetProcessHeap(), 0, wim);
     } else {
         *lpdwUser = (DWORD_PTR)wim;
+        TRACE("Ok (stream=%p)\n", wim->hAcmStream);
     }
-    TRACE("Ok (stream=%p)\n", wim->hAcmStream);
     return MMSYSERR_NOERROR;
 error:
     HeapFree(GetProcessHeap(), 0, wim);
@@ -1077,6 +1078,7 @@ static    DWORD   widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa
            WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 |
            WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16;
        wic.wChannels = 2;
+       wic.wReserved1 = 0;
         memcpy(lpWaveCaps, &wic, min(dwParam2, sizeof(wic)));
 
        return MMSYSERR_NOERROR;