[PATCH 2/3] winmm: For consistency forward wReserved1 values from -W to -A calls too.
Nikolay Sivov
nsivov at codeweavers.com
Tue Nov 24 13:02:36 CST 2015
wave[In,Out]DevCapsW() initialize it, auxGetDevCapsW() is only relevant
for wineoss.drv, which is fixed to do the same.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
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)));
}
--
2.6.2
More information about the wine-patches
mailing list