Commit 458cf0bd authored by Robert Reif's avatar Robert Reif Committed by Alexandre Julliard

Added another possible windows failure mode.

parent 5079a41e
...@@ -66,6 +66,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, ...@@ -66,6 +66,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format,
rc=waveInOpen(&win,device,pwfx,(DWORD)hevent,0,CALLBACK_EVENT|flags); rc=waveInOpen(&win,device,pwfx,(DWORD)hevent,0,CALLBACK_EVENT|flags);
/* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || rc==MMSYSERR_ALLOCATED ||
((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
(flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) || (flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) ||
((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
...@@ -193,9 +194,9 @@ static void wave_in_tests() ...@@ -193,9 +194,9 @@ static void wave_in_tests()
for (d=0;d<ndev;d++) { for (d=0;d<ndev;d++) {
rc=waveInGetDevCapsA(d,&caps,sizeof(caps)); rc=waveInGetDevCapsA(d,&caps,sizeof(caps));
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID, ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER,
"waveInGetDevCapsA: failed to get capabilities of device %d: rc=%s\n",d,wave_in_error(rc)); "waveInGetDevCapsA: failed to get capabilities of device %d: rc=%s\n",d,wave_in_error(rc));
if (rc==MMSYSERR_BADDEVICEID) if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER)
continue; continue;
name=NULL; name=NULL;
......
...@@ -206,6 +206,7 @@ static void wave_out_test_deviceOut(int device, double duration, LPWAVEFORMATEX ...@@ -206,6 +206,7 @@ static void wave_out_test_deviceOut(int device, double duration, LPWAVEFORMATEX
/* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
/* It is acceptable to fail on formats that are not specified to work */ /* It is acceptable to fail on formats that are not specified to work */
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || rc==MMSYSERR_ALLOCATED ||
((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
(flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) || (flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) ||
((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
...@@ -320,9 +321,9 @@ static void wave_out_tests() ...@@ -320,9 +321,9 @@ static void wave_out_tests()
for (d=0;d<ndev;d++) { for (d=0;d<ndev;d++) {
rc=waveOutGetDevCapsA(d,&caps,sizeof(caps)); rc=waveOutGetDevCapsA(d,&caps,sizeof(caps));
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID, ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER,
"waveOutGetDevCapsA: failed to get capabilities of device %d: rc=%s\n",d,wave_out_error(rc)); "waveOutGetDevCapsA: failed to get capabilities of device %d: rc=%s\n",d,wave_out_error(rc));
if (rc==MMSYSERR_BADDEVICEID) if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER)
continue; continue;
name=NULL; name=NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment