Alexandre Julliard : dsound/tests: Mark some Vmware sound driver failures as broken.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Sep 30 11:31:11 2010 +0200

dsound/tests: Mark some Vmware sound driver failures as broken.

---

 dlls/dsound/tests/ds3d.c    |    4 ++--
 dlls/dsound/tests/dsound.c  |   12 ++++++------
 dlls/dsound/tests/propset.c |    4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c
index ad380d8..9ad4e12 100644
--- a/dlls/dsound/tests/ds3d.c
+++ b/dlls/dsound/tests/ds3d.c
@@ -805,8 +805,8 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
                   wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
         }
         rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
-        ok(rc==DS_OK && secondary!=NULL,"IDirectSound_CreateSoundBuffer() "
-           "failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n",
+        ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
+           "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n",
            has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"",
            listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"",
            listener!=NULL?"listener ":"",
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index f059c20..02d93fd 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -326,7 +326,7 @@ static HRESULT test_dsound(LPGUID lpGuid)
                                     wfx.nBlockAlign);
         bufdesc.lpwfxFormat=&wfx;
         rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
-        ok(rc==DS_OK && secondary!=NULL,
+        ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
            "IDirectSound_CreateSoundBuffer() failed to create a secondary "
            "buffer %08x\n",rc);
         if (rc==DS_OK && secondary!=NULL) {
@@ -618,7 +618,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid)
                       wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels);
             }
             rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
-            ok(rc==DS_OK && secondary!=NULL,
+            ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
                "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc);
 
             if (rc==DS_OK && secondary!=NULL) {
@@ -729,7 +729,7 @@ static HRESULT test_secondary(LPGUID lpGuid)
                         "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) "
                         "and NULL, returned: %08x %p\n", rc, secondary);
                 else
-                    ok(rc==DS_OK && secondary!=NULL,
+                    ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
                         "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc);
             }
             else
@@ -883,8 +883,8 @@ static HRESULT test_block_align(LPGUID lpGuid)
     bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec + 1;
     bufdesc.lpwfxFormat=&wfx;
     rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
-    ok(rc==DS_OK,"IDirectSound_CreateSoundBuffer() "
-       "should have returned DS_OK, returned: %08x\n", rc);
+    ok(rc == DS_OK || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
+       "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08x\n", rc);
 
     if (rc==DS_OK && secondary!=NULL) {
         ZeroMemory(&dsbcaps, sizeof(dsbcaps));
@@ -993,7 +993,7 @@ static HRESULT test_frequency(LPGUID lpGuid)
                       wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
             }
             rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
-            ok(rc==DS_OK && secondary!=NULL,
+            ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
                "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc);
 
             if (rc==DS_OK && secondary!=NULL) {
diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c
index 5007fcc..fb902a4 100644
--- a/dlls/dsound/tests/propset.c
+++ b/dlls/dsound/tests/propset.c
@@ -616,8 +616,8 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,
         trace("  Testing a secondary buffer at %dx%dx%d\n",
             wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels);
         rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
-        ok(rc==DS_OK&&secondary!=NULL,"IDirectSound_CreateSoundBuffer() "
-           "failed to create a secondary buffer: %08x\n",rc);
+        ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
+           "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08x\n",rc);
         if (rc==DS_OK&&secondary!=NULL) {
             IKsPropertySet * pPropertySet=NULL;
             rc=IDirectSoundBuffer_QueryInterface(secondary,