Michael Stefaniuc : dsound: A version 1 3d secondary buffer allows SetPan( ).
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Dec 2 10:21:19 CST 2015
Module: wine
Branch: master
Commit: e69d9ec3c4e8829c5c18cea7d8348171d51dcd76
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69d9ec3c4e8829c5c18cea7d8348171d51dcd76
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Dec 1 14:49:04 2015 +0100
dsound: A version 1 3d secondary buffer allows SetPan().
For version 8 DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN are mutually exclusive
and a sound buffer cannot be created when both flags are set.
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dsound/buffer.c | 4 +---
dlls/dsound/tests/ds3d.c | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index d735dc3..5aa2834 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -586,9 +586,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface,
return DSERR_INVALIDPARAM;
}
- /* You cannot use both pan and 3D controls */
- if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN) ||
- (This->dsbd.dwFlags & DSBCAPS_CTRL3D)) {
+ if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) {
WARN("control unavailable\n");
return DSERR_CONTROLUNAVAIL;
}
diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c
index 1a019dd..6c12f71 100644
--- a/dlls/dsound/tests/ds3d.c
+++ b/dlls/dsound/tests/ds3d.c
@@ -892,7 +892,6 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
rc=IDirectSoundBuffer_GetPan(secondary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc);
rc=IDirectSoundBuffer_SetPan(secondary,0);
- todo_wine
ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc);
}
More information about the wine-cvs
mailing list