[PATCH 0/1] MR4820: dlls/winmm: waveOutGetID: Return correct id for WAVE_MAPPER.

[Carlo Bramini (＠carlo-bramini)]

Fixes bug 52592.
https://bugs.winehq.org/show_bug.cgi?id=52592

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4820

[PATCH 1/1] dlls/winmm: waveOutGetID: Return correct id for WAVE_MAPPER. Fixes bug 52592. https://bugs.winehq.org/show_bug.cgi?id=52592

[Carlo Bramini]

From: Carlo Bramini <carlo_bramini(a)users.sourceforge.net>

---
 dlls/winmm/waveform.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index 8c0cc4d879c..f033e0a5fed 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -3159,6 +3159,9 @@ UINT WINAPI waveOutGetID(HWAVEOUT hWaveOut, UINT* lpuDeviceID)
 
     WINMM_DecomposeHWAVE((HWAVE)hWaveOut, lpuDeviceID, &is_out, &dev, &junk);
 
+    if (*lpuDeviceID == MAPPER_INDEX)
+        *lpuDeviceID = WAVE_MAPPER;
+
     return MMSYSERR_NOERROR;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4820

[eric pouech (＠epo)]

please also add a test (in wimm/tests/wave.c) to demonstrate that your fix is correct

the demo you wrote in the bug report is a good start, but

* has to be integrated into test framework
* waveOutGetId is not tested yet :-(
* there's no need to get waveOutGetDevCaps as it's already tested
* adding a test for another dev id different from mapper is also interesting

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4820#note_57063