Maarten Lankhorst : winmm: Make mixer test less strict so it passes with SoundMAX drivers on XP.

Alexandre Julliard julliard at winehq.org
Tue May 6 09:32:16 CDT 2008


Module: wine
Branch: master
Commit: fc777c0ed3adc1f3a81a45fca083595439b2ad75
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fc777c0ed3adc1f3a81a45fca083595439b2ad75

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Mon May  5 20:10:30 2008 -0700

winmm: Make mixer test less strict so it passes with SoundMAX drivers on XP.

---

 dlls/winmm/tests/mixer.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c
index 89ac7c9..ed68f89 100644
--- a/dlls/winmm/tests/mixer.c
+++ b/dlls/winmm/tests/mixer.c
@@ -549,8 +549,8 @@ static void mixer_test_deviceA(int device)
             }
         }
         rc=mixerClose(mix);
-        ok(rc==MMSYSERR_NOERROR,
-           "mixerClose: MMSYSERR_BADDEVICEID expected, got %s\n",
+        ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALHANDLE,
+           "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n",
            mmsys_error(rc));
     }
 }
@@ -954,8 +954,8 @@ static void mixer_test_deviceW(int device)
             }
         }
         rc=mixerClose(mix);
-        ok(rc==MMSYSERR_NOERROR,
-           "mixerClose: MMSYSERR_BADDEVICEID expected, got %s\n",
+        ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALHANDLE,
+           "mixerClose: MMSYSERR_NOERROR or MMSYSERR_INVALHANDLE expected, got %s\n",
            mmsys_error(rc));
     }
 }




More information about the wine-cvs mailing list