dsound/tests: Fix the capture COM tests for older Win2k versions.

Michael Stefaniuc mstefani at redhat.de
Mon Feb 13 14:37:38 CST 2012


---
Fixes the crashes on Francois' not fully up to date Win2k machines.



 dlls/dsound/tests/capture.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c
index cb53a02..96fb417 100644
--- a/dlls/dsound/tests/capture.c
+++ b/dlls/dsound/tests/capture.c
@@ -695,9 +695,15 @@ static void test_COM(void)
     bufdesc.lpwfxFormat = &wfx;
 
     hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef);
+    if (hr == E_INVALIDARG) {
+        /* Old DirectX has only the 1st version of the DSCBUFFERDESC struct */
+        bufdesc.dwSize = sizeof(DSCBUFFERDESC1);
+        hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef);
+    }
     ok(hr == DSERR_NOAGGREGATION,
        "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DSERR_NOAGGREGATION\n", hr);
-    ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef, "buffer = %p\n", buffer);
+    ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef || !buffer /* Win2k without DirectX9 */,
+       "buffer = %p\n", buffer);
 
     hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, NULL);
     ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DS_OK\n", hr);
-- 
1.7.6.5



More information about the wine-patches mailing list