From 3dec70bf32ddb875a79393186a8a9ea6f788b0f6 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 25 Jan 2021 19:18:14 +1100 Subject: [PATCH] Updated dsound-EAX patchset --- ...ess-for-EAX-Set-Buffer-ListenerPrope.patch | 48 +++++++++++++++++++ patches/patchinstall.sh | 1 + 2 files changed, 49 insertions(+) create mode 100644 patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch diff --git a/patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch b/patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch new file mode 100644 index 00000000..2c38be04 --- /dev/null +++ b/patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch @@ -0,0 +1,48 @@ +From f8f6f53f2bb3d138717ac7a82c78010bce874d4a Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Mon, 25 Jan 2021 19:14:32 +1100 +Subject: [PATCH] dsound: Fake success for EAX Set Buffer/ListenerProperties + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50551 +--- + dlls/dsound/buffer.c | 3 ++- + dlls/dsound/eax.c | 8 ++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c +index 6393656c9fa..24ff1a6198c 100644 +--- a/dlls/dsound/buffer.c ++++ b/dlls/dsound/buffer.c +@@ -1299,7 +1299,8 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid + + TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); + +- if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet)) ++ if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet) || ++ IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) + return EAX_Set(This, guidPropSet, dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData); + + return E_PROP_ID_UNSUPPORTED; +diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c +index 6a6d22bc031..b3f48cdb5bd 100644 +--- a/dlls/dsound/eax.c ++++ b/dlls/dsound/eax.c +@@ -1082,11 +1082,11 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet, + + return S_OK; + } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) { +- FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID); +- return E_PROP_ID_UNSUPPORTED; ++ FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d - Faking Success\n", dwPropID); ++ return S_OK; + } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) { +- FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID); +- return E_PROP_ID_UNSUPPORTED; ++ FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d - Faking Success\n", dwPropID); ++ return S_OK; + } + + FIXME("(%p,%s,%d,%p,%d,%p,%d)\n", +-- +2.29.2 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f0a05c46..6b642607 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2384,6 +2384,7 @@ if test "$enable_dsound_EAX" -eq 1; then patch_apply dsound-EAX/0020-dsound-Add-stub-support-for-DSPROPSETID_EAX20_Listen.patch patch_apply dsound-EAX/0021-dsound-Add-stub-support-for-DSPROPSETID_EAX20_Buffer.patch patch_apply dsound-EAX/0022-dsound-Enable-EAX-by-default.patch + patch_apply dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch fi # Patchset dwrite-FontFallback