Module: wine Branch: master Commit: a360cc47d5cd33fe78ab6d67147392bff431ee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a360cc47d5cd33fe78ab6d6714...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Nov 24 22:02:36 2015 +0300
winmm: For consistency forward wReserved1 values from -W to -A calls too.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winmm/waveform.c | 4 ++-- dlls/winmm/winmm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 55f48a8..93a5004 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2629,7 +2629,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, wocA.dwFormats = wocW.dwFormats; wocA.wChannels = wocW.wChannels; wocA.dwSupport = wocW.dwSupport; - wocA.wReserved1 = 0; + wocA.wReserved1 = wocW.wReserved1; memcpy(lpCaps, &wocA, min(uSize, sizeof(wocA))); } return ret; @@ -3355,7 +3355,7 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi sizeof(wicA.szPname), NULL, NULL ); wicA.dwFormats = wicW.dwFormats; wicA.wChannels = wicW.wChannels; - wicA.wReserved1 = 0; + wicA.wReserved1 = wicW.wReserved1; memcpy(lpCaps, &wicA, min(uSize, sizeof(wicA))); } return ret; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index a626a79..f2d0858 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -229,7 +229,7 @@ UINT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) WideCharToMultiByte( CP_ACP, 0, acW.szPname, -1, acA.szPname, sizeof(acA.szPname), NULL, NULL ); acA.wTechnology = acW.wTechnology; - acA.wReserved1 = 0; + acA.wReserved1 = acW.wReserved1; acA.dwSupport = acW.dwSupport; memcpy(lpCaps, &acA, min(uSize, sizeof(acA))); }