[PATCH] winmm: Cleanup multiple open test

Maarten Lankhorst m.b.lankhorst at gmail.com
Sat Dec 5 17:59:11 CST 2009


Some versions of windows (drivers?) only allow a single waveOutOpen too, so don't judge wine stricter..
---
 dlls/winmm/tests/wave.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 98a16f5..eb3c9f7 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -59,17 +59,10 @@ static void test_multiple_waveopens(void)
     }
 
     ret = waveOutOpen(&handle2, 0, &wfx, 0, 0, 0);
-    /* Modern Windows allows for wave-out devices to be opened multiple times.
-     * Some Wine audio drivers allow that and some don't.  To avoid false alarms
-     * for those that do, don't "todo_wine ok(...)" on success.
-     */
-    if (ret != MMSYSERR_NOERROR)
-    {
-        todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */
-                     "second waveOutOpen returns: %x\n", ret);
-    }
-    else
+    if (ret == MMSYSERR_NOERROR)
         waveOutClose(handle2);
+    ok(ret == MMSYSERR_NOERROR || ret == MMSYSERR_ALLOCATED,
+       "second waveOutOpen returns: %x\n", ret);
 
     waveOutClose(handle1);
 }
-- 
1.6.5.3




More information about the wine-patches mailing list