From f650222131047b28dbf961fb5a03d717bca6dd68 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 15 Dec 2002 01:11:41 +0000 Subject: [PATCH] If given a bad device id waveOutGetDevCapsA is supposed to return MMSYSERR_BADDEVICEID. Fixes a todo_wine in the winmm test. --- dlls/winmm/tests/wave.c | 8 +++----- dlls/winmm/winmm.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 1e2276c425c..7a43e2de0d6 100644 --- 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)); - ok(rc==MMSYSERR_BADDEVICEID, - "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc); - } + rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps)); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc); format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=2; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 44a4952e350..d5c451c55f0 100644 --- 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);