Don't consider MMSYSERR_NOTSUPPORTED an error for wide functions.

This commit is contained in:
Robert Reif 2004-10-18 23:14:54 +00:00 committed by Alexandre Julliard
parent 4e44eb2c9c
commit 9c8dd0a294
2 changed files with 11 additions and 9 deletions

View File

@ -586,15 +586,15 @@ static void wave_in_tests()
"expected, got %s\n",dev_name(ndev+1),wave_in_error(rc));
rc=waveInGetDevCapsW(ndev+1,&capsW,sizeof(capsW));
ok(rc==MMSYSERR_BADDEVICEID,
"waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID expected, got %s\n",
dev_name(ndev+1),wave_in_error(rc));
ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTSUPPORTED,
"waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(ndev+1),wave_in_error(rc));
rc=waveInGetDevCapsW(WAVE_MAPPER,&capsW,sizeof(capsW));
if (ndev>0)
ok(rc==MMSYSERR_NOERROR,
"waveInGetDevCapsW(%s): MMSYSERR_NOERROR expected, got %s\n",
dev_name(ndev+1),wave_in_error(rc));
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED,
"waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n",dev_name(ndev+1),wave_in_error(rc));
else
ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER,
"waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER "

View File

@ -995,9 +995,11 @@ void mixer_testsW()
trace("found %d Mixer devices\n",ndev);
rc=mixerGetDevCapsW(ndev+1,&capsW,sizeof(capsW));
ok(rc==MMSYSERR_BADDEVICEID,
"mixerGetDevCapsW: MMSYSERR_BADDEVICEID expected, got %s\n",
mmsys_error(rc));
ok(rc==MMSYSERR_BADDEVICEID||rc==MMSYSERR_NOTSUPPORTED,
"mixerGetDevCapsW: MMSYSERR_BADDEVICEID or MMSYSERR_NOTSUPPORTED "
"expected, got %s\n", mmsys_error(rc));
if (rc==MMSYSERR_NOTSUPPORTED)
return;
rc=mixerOpen(&mix, ndev+1, 0, 0, 0);
ok(rc==MMSYSERR_BADDEVICEID,