Jeff Zaroyko : dsound/tests: Fix failing propset and capture tests on win98 .
Alexandre Julliard
julliard at winehq.org
Thu Oct 23 08:38:09 CDT 2008
Module: wine
Branch: master
Commit: b9084bc99f794155154676400bbfc48209177058
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9084bc99f794155154676400bbfc48209177058
Author: Jeff Zaroyko <jeffz at jeffz.name>
Date: Thu Oct 23 16:18:09 2008 +1100
dsound/tests: Fix failing propset and capture tests on win98.
---
dlls/dsound/tests/capture.c | 6 +++++-
dlls/dsound/tests/propset.c | 8 +++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c
index 2da7fcc..787d670 100644
--- a/dlls/dsound/tests/capture.c
+++ b/dlls/dsound/tests/capture.c
@@ -596,9 +596,13 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,
bufdesc1.lpwfxFormat=&wfx;
rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,
(DSCBUFFERDESC*)&bufdesc1,&dscbo,NULL);
- ok(rc==DS_OK || broken(rc==E_INVALIDARG),
+ ok(rc==DS_OK || broken(rc==DSERR_INVALIDPARAM),
"IDirectSoundCapture_CreateCaptureBuffer() failed to create a "
"%s capture buffer: %08x\n",format_string(&wfx), rc);
+ if (rc==DSERR_INVALIDPARAM) {
+ skip("broken driver\n");
+ goto EXIT;
+ }
if (rc==DS_OK) {
test_capture_buffer(dsco, dscbo, winetest_interactive);
ref=IDirectSoundCaptureBuffer_Release(dscbo);
diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c
index 5d87e89..88ea3dc 100644
--- a/dlls/dsound/tests/propset.c
+++ b/dlls/dsound/tests/propset.c
@@ -591,8 +591,14 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,
bufdesc.dwSize=sizeof(bufdesc);
bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_LOCHARDWARE|DSBCAPS_CTRL3D;
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL);
- ok(rc==DS_OK&&primary!=NULL,"IDirectSound_CreateSoundBuffer() failed to "
+ ok((rc==DS_OK&&primary!=NULL)
+ || broken(rc==DSERR_INVALIDPARAM),
+ "IDirectSound_CreateSoundBuffer() failed to "
"create a hardware 3D primary buffer: %08x\n",rc);
+ if(rc==DSERR_INVALIDPARAM) {
+ skip("broken driver\n");
+ goto EXIT;
+ }
if (rc==DS_OK&&primary!=NULL) {
ZeroMemory(&wfx, sizeof(wfx));
wfx.wFormatTag=WAVE_FORMAT_PCM;
More information about the wine-cvs
mailing list