If given a bad device id waveOutGetDevCapsA is supposed to return

MMSYSERR_BADDEVICEID. Fixes a todo_wine in the winmm test.

If given a bad device id waveOutGetDevCapsA is supposed to return
f6502221 · Francois Gouget · Alexandre Julliard · caf31cee · f6502221 · f6502221
Commit f6502221 authored Dec 15, 2002 by Francois Gouget Committed by Alexandre Julliard Dec 15, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

wave.c dlls/winmm/tests/wave.c +3 -5

winmm.c dlls/winmm/winmm.c +1 -1

No files found.
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -55,11 +55,9 @@ void wave_out_tests()
    ndev=waveOutGetNumDevs();
    trace("found %d WaveOut devices\n",ndev);
-    todo_wine {
+    rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps));
-        rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps));
+    ok(rc==MMSYSERR_BADDEVICEID,
-        ok(rc==MMSYSERR_BADDEVICEID,
+       "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc);
-           "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc);
-    }
    format.wFormatTag=WAVE_FORMAT_PCM;
    format.nChannels=2;

--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -2225,7 +2225,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT uDeviceID, LPWAVEOUTCAPSA lpCaps,
    if (lpCaps == NULL)	return MMSYSERR_INVALPARAM;
    if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_WAVEOUT, TRUE)) == NULL)
-	return MMSYSERR_INVALHANDLE;
+        return MMSYSERR_BADDEVICEID;
    return MMDRV_Message(wmld, WODM_GETDEVCAPS, (DWORD)lpCaps, uSize, TRUE);