https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ef7b676154afb931d25c5d21071497907f38fa4
commit 6ef7b676154afb931d25c5d21071497907f38fa4
Author: Oleg Dubinskiy <oleg.dubinskij2...@yandex.ua>
AuthorDate: Mon Sep 27 15:02:52 2021 +0300
Commit: Stanislav Motylkov <x86co...@gmail.com>
CommitDate: Thu Oct 7 23:44:30 2021 +0300
Revert "[DSOUND] Don't force status to failure by default in
primarybuffer_SetFormat (#3911)"
Revert my last dsound fix, because it does not fix the actual problem with
audio formats support. It only makes the situation worse. It prevents the error
when creating an audio stream, but the sound is not playing correctly, both in
ReactOS and Windows (with our dsound.dll). Without this fix, it works perfectly
on Windows, but does not in ROS.
In particular, the sound is not playing properly in AIMP 4.71 with other
audio formats besides default (44100 Hz, 16 bit, stereo). And any other apps
which request these audio formats may be also affected as well.
Force the status back to failure, because otherwise the badly required code
is not executed at all.
I've made a more correct fix(es) in other audio component(s) instead and
will submit them if further PRs.
This reverts commit 183566ee584efbe6377c79e68bfe24b2d1f940ae.
CORE-10907
---
dll/directx/wine/dsound/primary.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dll/directx/wine/dsound/primary.c
b/dll/directx/wine/dsound/primary.c
index 9f8ecf8e593..b04a526929e 100644
--- a/dll/directx/wine/dsound/primary.c
+++ b/dll/directx/wine/dsound/primary.c
@@ -459,7 +459,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex)
HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX
wfex)
{
- HRESULT err = S_OK;
+ HRESULT err = DSERR_BUFFERLOST;
int i;
DWORD nSamplesPerSec, bpp, chans;
LPWAVEFORMATEX oldpwfx;
