Robert Reif : winmm: Fix a test failure on Windows with Terminal Server.

[Alexandre Julliard]

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

Author: Robert Reif <reif(a)earthlink.net>
Date:   Thu Apr 24 19:39:43 2008 -0400

winmm: Fix a test failure on Windows with Terminal Server.

---

 dlls/winmm/tests/wave.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 60f0622..2844be4 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -854,9 +854,9 @@ static void wave_out_test_device(int device)
     }
 
     rc=waveOutGetDevCapsA(device,&capsA,4);
-    ok(rc==MMSYSERR_NOERROR,
-       "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n",
-       dev_name(device),wave_out_error(rc));
+    ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALPARAM,
+       "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR or MMSYSERR_INVALPARAM "
+       "expected, got %s\n", dev_name(device),wave_out_error(rc));
 
     rc=waveOutGetDevCapsW(device,&capsW,4);
     ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED,
@@ -888,6 +888,13 @@ static void wave_out_test_device(int device)
         nameA=strdup("not supported");
     }
 
+    rc=waveOutGetDevCapsA(device,&capsA,sizeof(capsA));
+    ok(rc==MMSYSERR_NOERROR,
+       "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n",
+       dev_name(device),wave_out_error(rc));
+    if (rc!=MMSYSERR_NOERROR)
+        return;
+
     trace("  %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname,
           (nameA?nameA:"failed"),capsA.vDriverVersion >> 8,
           capsA.vDriverVersion & 0xff, capsA.wMid,capsA.wPid);