winmm tests patch

Robert Reif reif at earthlink.net
Mon Oct 18 17:35:32 CDT 2004


Don't consider MMSYSERR_NOTSUPPORTED and error for wide functions.
-------------- next part --------------
diff -u wine.cvs/dlls/winmm/tests/capture.c wine/dlls/winmm/tests/capture.c
--- wine.cvs/dlls/winmm/tests/capture.c	2004-09-14 21:15:53.000000000 -0400
+++ wine/dlls/winmm/tests/capture.c	2004-10-18 18:30:47.000000000 -0400
@@ -586,15 +586,15 @@
            "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 "
diff -u wine.cvs/dlls/winmm/tests/mixer.c wine/dlls/winmm/tests/mixer.c
--- wine.cvs/dlls/winmm/tests/mixer.c	2004-09-14 21:15:53.000000000 -0400
+++ wine/dlls/winmm/tests/mixer.c	2004-10-18 18:21:39.000000000 -0400
@@ -995,9 +995,11 @@
     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,


More information about the wine-patches mailing list