From 0e67af3d09636b96da69920da5d1a400aa2f719a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 1 Jan 2021 13:35:27 +1100 Subject: [PATCH] Updated dsound-EAX patchset Enable this feature by default, to allow for more testing. --- .../0022-dsound-Enable-EAX-by-default.patch | 25 +++++++++++++++++++ patches/dsound-EAX/definition | 1 + patches/patchinstall.sh | 6 ++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 patches/dsound-EAX/0022-dsound-Enable-EAX-by-default.patch diff --git a/patches/dsound-EAX/0022-dsound-Enable-EAX-by-default.patch b/patches/dsound-EAX/0022-dsound-Enable-EAX-by-default.patch new file mode 100644 index 00000000..f816813b --- /dev/null +++ b/patches/dsound-EAX/0022-dsound-Enable-EAX-by-default.patch @@ -0,0 +1,25 @@ +From 25450e6cf073bde4f26fec40c59224087017f332 Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Fri, 1 Jan 2021 13:32:48 +1100 +Subject: [PATCH] dsound: Enable EAX by default + +--- + dlls/dsound/dsound_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c +index e12c2208199..bda9a446a08 100644 +--- a/dlls/dsound/dsound_main.c ++++ b/dlls/dsound/dsound_main.c +@@ -93,7 +93,7 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd"; + /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ + int ds_hel_buflen = 32768 * 2; + int ds_hq_buffers_max = 4; +-BOOL ds_eax_enabled = FALSE; ++BOOL ds_eax_enabled = TRUE; + static HINSTANCE instance; + + #define IS_OPTION_TRUE(ch) \ +-- +2.29.2 + diff --git a/patches/dsound-EAX/definition b/patches/dsound-EAX/definition index f400f020..49fc35fd 100644 --- a/patches/dsound-EAX/definition +++ b/patches/dsound-EAX/definition @@ -1,2 +1,3 @@ Fixes: Software support for Environmental Audio Extensions (EAX) +Fixes: [42886] Mushroom Wars - Has no sounds. Depends: dsound-Fast_Mixer diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 8721a2b9..27009894 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "e377786a71c3b6eab5bc11c0b1c9c7c3dc309398" + echo "784cb2060ab63076adc349dcb1d15a6cb5eb2bc4" } # Show version information @@ -2339,6 +2339,9 @@ fi # | This patchset has the following (direct or indirect) dependencies: # | * dsound-Fast_Mixer # | +# | This patchset fixes the following Wine bugs: +# | * [#42886] Mushroom Wars - Has no sounds. +# | # | Modified files: # | * dlls/dsound/Makefile.in, dlls/dsound/buffer.c, dlls/dsound/dsound.c, dlls/dsound/dsound_eax.h, # | dlls/dsound/dsound_main.c, dlls/dsound/dsound_private.h, dlls/dsound/eax.c, dlls/dsound/mixer.c @@ -2365,6 +2368,7 @@ if test "$enable_dsound_EAX" -eq 1; then patch_apply dsound-EAX/0019-dsound-Allow-disabling-of-EAX-support-in-the-registr.patch 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 fi # Patchset dwrite-FontFallback