Michael Stefaniuc : dsound/tests: Fix the capture COM tests for older Win2k versions.
Alexandre Julliard
julliard at winehq.org
Wed Feb 15 13:14:05 CST 2012
Module: wine
Branch: master
Commit: 0872572a6d12b0ff82cca9f07dc0b5e861a49510
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0872572a6d12b0ff82cca9f07dc0b5e861a49510
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Feb 13 21:37:38 2012 +0100
dsound/tests: Fix the capture COM tests for older Win2k versions.
---
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);
More information about the wine-cvs
mailing list