revised winmm tests patch

[Robert Reif]

More new windows failure modes supported.
-------------- next part --------------
Index: dlls/winmm/tests/capture.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/tests/capture.c,v
retrieving revision 1.3
diff -u -r1.3 capture.c
--- dlls/winmm/tests/capture.c	27 May 2004 20:00:26 -0000	1.3
+++ dlls/winmm/tests/capture.c	30 May 2004 13:21:55 -0000
@@ -65,7 +65,8 @@
     win=NULL;
     rc=waveInOpen(&win,device,pwfx,(DWORD)hevent,0,CALLBACK_EVENT|flags);
     /* 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==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
        (flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) ||
        ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
@@ -193,9 +194,9 @@
 
     for (d=0;d<ndev;d++) {
         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));
-        if (rc==MMSYSERR_BADDEVICEID)
+        if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER)
             continue;
 
         name=NULL;
Index: dlls/winmm/tests/wave.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/tests/wave.c,v
retrieving revision 1.26
diff -u -r1.26 wave.c
--- dlls/winmm/tests/wave.c	27 May 2004 20:00:26 -0000	1.26
+++ dlls/winmm/tests/wave.c	30 May 2004 13:21:55 -0000
@@ -205,7 +205,8 @@
     rc=waveOutOpen(&wout,device,pwfx,(DWORD)hevent,0,CALLBACK_EVENT|flags);
     /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
     /* 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==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
        (flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) ||
        ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
@@ -320,9 +321,9 @@
 
     for (d=0;d<ndev;d++) {
         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));
-        if (rc==MMSYSERR_BADDEVICEID)
+        if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER)
             continue;
 
         name=NULL;