[MSACM32.DRV] Sync with Wine Staging 1.9.4. CORE-10912
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 3 Mar 2016 13:41:35 +0000 (13:41 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 3 Mar 2016 13:41:35 +0000 (13:41 +0000)
svn path=/trunk/; revision=70879

reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
reactos/media/doc/README.WINE

index 1b3f045..bf9e37c 100644 (file)
@@ -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;
            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)));
 
        woc.dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME;
         memcpy(lpWaveCaps, &woc, min(dwParam2, sizeof(woc)));
 
@@ -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;
            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;
         memcpy(lpWaveCaps, &wic, min(dwParam2, sizeof(wic)));
 
        return MMSYSERR_NOERROR;
index 6e8c6a6..66f2f95 100644 (file)
@@ -103,7 +103,7 @@ reactos/dll/win32/mmdevapi            # Synced to WineStaging-1.9.4
 reactos/dll/win32/mpr                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/mprapi              # Synced to WineStaging-1.7.55
 reactos/dll/win32/msacm32             # Synced to WineStaging-1.9.4
 reactos/dll/win32/mpr                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/mprapi              # Synced to WineStaging-1.7.55
 reactos/dll/win32/msacm32             # Synced to WineStaging-1.9.4
-reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55
+reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.9.4
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-1.7.55
 reactos/dll/win32/mscat32             # Synced to WineStaging-1.7.55
 reactos/dll/win32/mscms               # Synced to WineStaging-1.7.55
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-1.7.55
 reactos/dll/win32/mscat32             # Synced to WineStaging-1.7.55
 reactos/dll/win32/mscms               # Synced to WineStaging-1.7.55