Author: akhaldi Date: Thu Mar 3 13:41:35 2016 New Revision: 70879
URL: http://svn.reactos.org/svn/reactos?rev=70879&view=rev Log: [MSACM32.DRV] Sync with Wine Staging 1.9.4. CORE-10912
Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.d... ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] Thu Mar 3 13:41:35 2016 @@ -522,6 +522,7 @@ 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 @@ 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;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 13:41:35 2016 @@ -103,7 +103,7 @@ 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