winmm tests patch

Robert Reif reif at earthlink.net
Sat May 29 16:55:27 CDT 2004


Windows 95 can return MMSYSERR_NOTENABLED for opens.
-------------- 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	29 May 2004 21:52:04 -0000
@@ -65,7 +65,7 @@
     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==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
        (flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) ||
        ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
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	29 May 2004 21:52:05 -0000
@@ -205,7 +205,7 @@
     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==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
        (flags & WAVE_FORMAT_DIRECT) && !(pcaps->dwFormats & format)) ||
        ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&


More information about the wine-patches mailing list