ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Skip WAVE_FORMAT_EXTENSIBLE tests on directx < 8.

This commit is contained in:
Maarten Lankhorst 2008-04-22 17:12:28 -07:00 committed by Alexandre Julliard
parent e0fe0ef01b
commit bf739cbcc3
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/dsound/tests/dsound.c
View File

@ -44,6 +44,8 @@ static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL;
static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*, static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*,
LPUNKNOWN)=NULL; LPUNKNOWN)=NULL;
static BOOL gotdx8;
static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
LPCGUID lpGuid) LPCGUID lpGuid)
{ {
@ -569,8 +571,13 @@ static HRESULT test_primary_secondary(LPGUID lpGuid)
formats[f][2]); formats[f][2]);
wfx2=wfx; wfx2=wfx;
rc=IDirectSoundBuffer_SetFormat(primary,&wfx); rc=IDirectSoundBuffer_SetFormat(primary,&wfx);
ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n",
format_string(&wfx), DXGetErrorString8(rc)); if (wfx.wBitsPerSample <= 16)
ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n",
format_string(&wfx), DXGetErrorString8(rc));
else
ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %s\n",
format_string(&wfx), DXGetErrorString8(rc));
/* There is no guarantee that SetFormat will actually change the /* There is no guarantee that SetFormat will actually change the
* format to what we asked for. It depends on what the soundcard * format to what we asked for. It depends on what the soundcard
@ -723,14 +730,30 @@ static HRESULT test_secondary(LPGUID lpGuid)
wfx.nBlockAlign); wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx; bufdesc.lpwfxFormat=&wfx;
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) if (gotdx8 || wfx.wBitsPerSample <= 16)
ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " {
"should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %s %p\n", if (wfx.wBitsPerSample > 16)
DXGetErrorString8(rc), secondary); ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() "
"should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %s %p\n",
DXGetErrorString8(rc), secondary);
else
ok(rc==DS_OK && secondary!=NULL,
"IDirectSound_CreateSoundBuffer() failed to create a secondary "
"buffer %s\n",DXGetErrorString8(rc));
}
else else
ok(rc==DS_OK && secondary!=NULL, ok(rc==E_INVALIDARG, "Creating %d bpp buffer on dx < 8 returned: %p %s\n",
"IDirectSound_CreateSoundBuffer() failed to create a secondary " wfx.wBitsPerSample, secondary, DXGetErrorString8(rc));
"buffer %s\n",DXGetErrorString8(rc));
if (!gotdx8)
{
skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n");
/* Apparently they succeed with bogus values,
* which means that older dsound doesn't look at them
*/
goto no_wfe;
}
if (secondary) if (secondary)
IDirectSoundBuffer_Release(secondary); IDirectSoundBuffer_Release(secondary);
secondary = NULL; secondary = NULL;
@ -792,6 +815,7 @@ static HRESULT test_secondary(LPGUID lpGuid)
"IDirectSound_CreateSoundBuffer() failed to create a secondary " "IDirectSound_CreateSoundBuffer() failed to create a secondary "
"buffer %s\n",DXGetErrorString8(rc)); "buffer %s\n",DXGetErrorString8(rc));
no_wfe:
if (rc==DS_OK && secondary!=NULL) { if (rc==DS_OK && secondary!=NULL) {
if (winetest_interactive) { if (winetest_interactive) {
trace(" Testing a secondary buffer at %dx%dx%d " trace(" Testing a secondary buffer at %dx%dx%d "
@ -1066,6 +1090,8 @@ START_TEST(dsound)
pDirectSoundCreate = (void*)GetProcAddress(hDsound, pDirectSoundCreate = (void*)GetProcAddress(hDsound,
"DirectSoundCreate"); "DirectSoundCreate");
gotdx8 = !!GetProcAddress(hDsound, "DirectSoundCreate8");
IDirectSound_tests(); IDirectSound_tests();
dsound_tests(); dsound_tests();