[PATCH 1/2] winmm: Accept open handles in wave{In,Out}GetDevCaps
Andrew Eikum
aeikum at codeweavers.com
Fri May 8 08:45:57 CDT 2020
Based on a patch by Changping Yu <dead.ash at hotmail.com>.
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
dlls/winmm/waveform.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index b08768577bb..39461743c4a 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -2669,10 +2669,18 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps,
caps = &mapper_caps;
}else{
- if(uDeviceID >= g_outmmdevices_count)
- return MMSYSERR_BADDEVICEID;
+ if(uDeviceID >= g_outmmdevices_count){
+ WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID);
- caps = &read_map(g_out_map, uDeviceID)->out_caps;
+ if(!WINMM_ValidateAndLock(device))
+ return MMSYSERR_BADDEVICEID;
+
+ caps = &device->parent->out_caps;
+
+ LeaveCriticalSection(&device->lock);
+ }else{
+ caps = &read_map(g_out_map, uDeviceID)->out_caps;
+ }
}
memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps)));
@@ -3336,10 +3344,18 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi
caps = &mapper_caps;
}else{
- if(uDeviceID >= g_inmmdevices_count)
- return MMSYSERR_BADDEVICEID;
+ if(uDeviceID >= g_inmmdevices_count){
+ WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID);
- caps = &read_map(g_in_map, uDeviceID)->in_caps;
+ if(!WINMM_ValidateAndLock(device))
+ return MMSYSERR_BADDEVICEID;
+
+ caps = &device->parent->in_caps;
+
+ LeaveCriticalSection(&device->lock);
+ }else{
+ caps = &read_map(g_in_map, uDeviceID)->in_caps;
+ }
}
memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps)));
--
2.26.2
More information about the wine-devel
mailing list