[PATCH] Fix test failures on WinXP
Paul Vriens
Paul.Vriens.Wine at gmail.com
Mon Nov 12 09:56:49 CST 2007
---
dlls/dsound/tests/ds3d8.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c
index 359eafd..b072068 100644
--- a/dlls/dsound/tests/ds3d8.c
+++ b/dlls/dsound/tests/ds3d8.c
@@ -211,18 +211,20 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo,
dsbcaps.dwBufferBytes);
}
- /* Query the format size. Note that it may not match sizeof(wfx) */
+ /* Query the format size. */
size=0;
rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size);
ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have "
"returned the needed size: rc=%s size=%d\n",DXGetErrorString8(rc),size);
- rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL);
- if (wfx.wFormatTag == WAVE_FORMAT_EXTENSIBLE)
- {
+ ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE),
+ "Expected a correct structure size, got %d\n", size);
+
+ if (size == sizeof(WAVEFORMATEX)) {
+ rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL);
+ } else if (size == sizeof(WAVEFORMATEXTENSIBLE)) {
WAVEFORMATEXTENSIBLE wfxe;
- ok(rc == DSERR_INVALIDPARAM, "IDirectSoundBuffer_GetFormat returned: %s\n", DXGetErrorString8(rc));
- rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,sizeof(wfxe),NULL);
+ rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL);
wfx = wfxe.Format;
}
ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %s\n",
--
1.5.3.3
--------------070404010903080802090904--
More information about the wine-patches
mailing list