From 57634b2a212765fbf8e4fd99ef98d54f580526d9 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 3 Mar 2016 13:41:35 +0000 Subject: [PATCH] [MSACM32.DRV] Sync with Wine Staging 1.9.4. CORE-10912 svn path=/trunk/; revision=70879 --- reactos/dll/win32/msacm32/msacm32.drv/wavemap.c | 2 ++ reactos/media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c index 1b3f04561db..bf9e37cac0e 100644 --- a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c +++ b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c @@ -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))); @@ -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; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 6e8c6a6553f..66f2f95a1af 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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/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 -- 2.17.1