If given a bad device id waveOutGetDevCapsA is supposed to return

MMSYSERR_BADDEVICEID. Fixes a todo_wine in the winmm test.
This commit is contained in:
Francois Gouget 2002-12-15 01:11:41 +00:00 committed by Alexandre Julliard
parent caf31cee32
commit f650222131
2 changed files with 4 additions and 6 deletions

View File

@ -55,11 +55,9 @@ void wave_out_tests()
ndev=waveOutGetNumDevs(); ndev=waveOutGetNumDevs();
trace("found %d WaveOut devices\n",ndev); 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.wFormatTag=WAVE_FORMAT_PCM;
format.nChannels=2; format.nChannels=2;

View File

@ -2225,7 +2225,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT uDeviceID, LPWAVEOUTCAPSA lpCaps,
if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_WAVEOUT, TRUE)) == NULL) 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); return MMDRV_Message(wmld, WODM_GETDEVCAPS, (DWORD)lpCaps, uSize, TRUE);