Commit 72d67a2d authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

dsound/tests: Version differences in flag handling for 3d buffers.

parent c92ba788
...@@ -805,9 +805,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, ...@@ -805,9 +805,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2;
if (has_3dbuffer) if (has_3dbuffer)
bufdesc.dwFlags|=DSBCAPS_CTRL3D; bufdesc.dwFlags|=DSBCAPS_CTRL3D;
else bufdesc.dwFlags|= DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN;
bufdesc.dwFlags|=
(DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN);
bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000,
wfx.nBlockAlign); wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx; bufdesc.lpwfxFormat=&wfx;
......
...@@ -649,12 +649,16 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, ...@@ -649,12 +649,16 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play,
ok(rc==DSERR_INVALIDPARAM, ok(rc==DSERR_INVALIDPARAM,
"IDirectSound8_CreateSoundBuffer(secondary) should have " "IDirectSound8_CreateSoundBuffer(secondary) should have "
"returned DSERR_INVALIDPARAM, returned %08x\n", rc); "returned DSERR_INVALIDPARAM, returned %08x\n", rc);
if (secondary)
{
ref=IDirectSoundBuffer_Release(secondary);
ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, should have 0\n",ref);
}
init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1);
/* Invalid flag combination */
bufdesc.dwFlags|=DSBCAPS_CTRLPAN;
rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
todo_wine
ok(rc==DSERR_INVALIDPARAM,
"IDirectSound8_CreateSoundBuffer(secondary) should have "
"returned DSERR_INVALIDPARAM, returned %08x\n", rc);
bufdesc.dwFlags&=~DSBCAPS_CTRLPAN;
} }
if (winetest_interactive) { if (winetest_interactive) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment