dsound/tests: Fix failing propset and capture tests on win98.

This commit is contained in:
Jeff Zaroyko 2008-10-23 16:18:09 +11:00 committed by Alexandre Julliard
parent 68f0e06434
commit b9084bc99f
2 changed files with 12 additions and 2 deletions

View file

@ -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);

View file

@ -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;