winmm: Accept open handles in wave{In,Out}GetDevCaps.

Based on a patch by Changping Yu <dead.ash@hotmail.com>. Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winmm: Accept open handles in wave{In,Out}GetDevCaps.
ae13a279 · Andrew Eikum · Alexandre Julliard · 2f454fa3 · ae13a279
Commit ae13a279 authored May 08, 2020 by Andrew Eikum Committed by Alexandre Julliard May 08, 2020
Show whitespace changes
Inline Side-by-side

Showing with 18 additions and 2 deletions

waveform.c dlls/winmm/waveform.c +18 -2

No files found.
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -2669,11 +2669,19 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps,

        caps = &mapper_caps;
    }else{
-        if(uDeviceID >= g_outmmdevices_count)
+        if(uDeviceID >= g_outmmdevices_count){
+            WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID);
+
+            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,11 +3344,19 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi

        caps = &mapper_caps;
    }else{
-        if(uDeviceID >= g_inmmdevices_count)
+        if(uDeviceID >= g_inmmdevices_count){
+            WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID);
+
+            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)));