Andrew Eikum : winmm/tests: Fix test that fails on NT4.

[Alexandre Julliard]

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

Author: Andrew Eikum 
Date:   Fri May 31 10:42:37 2013 -0500

winmm/tests: Fix test that fails on NT4.

---

dlls/winmm/tests/capture.c |    6 ++++--
 dlls/winmm/tests/wave.c    |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index 329130a..f904bb1 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -649,10 +649,12 @@ static void wave_in_tests(void)
     rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET,
             (DWORD_PTR)&preferred, (DWORD_PTR)&status);
     ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) ||
+            rc == MMSYSERR_NOTSUPPORTED ||
             rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc);

-    ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||
-            preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred);
+    if(rc != MMSYSERR_NOTSUPPORTED)
+        ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||
+                preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred);

rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA));
     ok(rc==MMSYSERR_BADDEVICEID,
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index fd05f7b..171bf49 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -1420,10 +1420,12 @@ static void wave_out_tests(void)
     rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET,
             (DWORD_PTR)&preferred, (DWORD_PTR)&status);
     ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) ||
+            rc == MMSYSERR_NOTSUPPORTED ||
             rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc);

-    ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||
-            preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred);
+    if(rc != MMSYSERR_NOTSUPPORTED)
+        ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||
+                preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred);

rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA));
     ok(rc==MMSYSERR_BADDEVICEID,