Rebase against 2deb8c2825afcb88a9f106b73aa1f4da9253fb87.

patches/dsound-EAX/0019-dsound-Allow-disabling-of-EAX-support-in-the-registr.patch

@@ -1,21 +1,21 @@
-From cdfc54a6363804cc8ee9146c3adbd51e431bcbf2 Mon Sep 17 00:00:00 2001
+From 4ff4b0b2c1a5aeabeec286dc76868acbccc8779d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 5 Apr 2015 19:13:18 +0200
-Subject: dsound: Allow disabling of EAX support in the registry.
+Subject: [PATCH] dsound: Allow disabling of EAX support in the registry.
 
 Based on a patch by Mark Harmstone.
 ---
  dlls/dsound/buffer.c         | 16 ++++++----------
- dlls/dsound/dsound_main.c    |  9 ++++++++-
+ dlls/dsound/dsound_main.c    |  8 ++++++++
  dlls/dsound/dsound_private.h |  2 ++
  dlls/dsound/eax.c            | 28 ++++++++++++++++++++++++++++
- 4 files changed, 44 insertions(+), 11 deletions(-)
+ 4 files changed, 44 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index b763514..ca93972 100644
+index 926dbab1289..6393656c9fa 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -35,6 +35,7 @@
+@@ -34,6 +34,7 @@
  #include "dsconf.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(dsound);
@@ -23,7 +23,7 @@ index b763514..ca93972 100644
  
  /*******************************************************************************
   *		IDirectSoundNotify
-@@ -1329,16 +1330,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
+@@ -1311,16 +1312,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
  
      TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
  
@@ -46,31 +46,21 @@ index b763514..ca93972 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
-index b349eb4..db2ca50 100644
+index fecb9489678..8b396a1939e 100644
 --- a/dlls/dsound/dsound_main.c
 +++ b/dlls/dsound/dsound_main.c
-@@ -94,8 +94,12 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 };
+@@ -93,6 +93,10 @@ 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;
- static HINSTANCE instance;
- 
++
 +#define IS_OPTION_TRUE(ch) \
 +    ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
-+
+ 
  /*
   * Get a config key from either the app-specific or the default config
-  */
-@@ -108,7 +112,6 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name,
-     return ERROR_FILE_NOT_FOUND;
- }
- 
--
- /*
-  * Setup the dsound options.
-  */
-@@ -149,11 +152,15 @@ void setup_dsound_options(void)
+@@ -147,11 +151,15 @@ void setup_dsound_options(void)
      if (!get_config_key( hkey, appkey, "HQBuffersMax", buffer, MAX_PATH ))
          ds_hq_buffers_max = atoi(buffer);
  
@@ -87,7 +77,7 @@ index b349eb4..db2ca50 100644
  
  static const char * get_device_id(LPCGUID pGuid)
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 5a986ba..4e928a4 100644
+index bca2bf46601..47a42e62e7c 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -37,6 +37,7 @@
@@ -98,7 +88,7 @@ index 5a986ba..4e928a4 100644
  
  /*****************************************************************************
   * Predeclare the interface implementation structures
-@@ -230,6 +231,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
+@@ -228,6 +229,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
  HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
  
  /* eax.c */
@@ -107,7 +97,7 @@ index 5a986ba..4e928a4 100644
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index e10156e..857f924 100644
+index ef802b95a7d..570207709f0 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -809,6 +809,28 @@ void free_eax_buffer(IDirectSoundBufferImpl *dsb)
@@ -160,5 +150,5 @@ index e10156e..857f924 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.8.0
+2.30.2
 

patches/dsound-EAX/0022-dsound-Enable-EAX-by-default.patch

@@ -1,4 +1,4 @@
-From 25450e6cf073bde4f26fec40c59224087017f332 Mon Sep 17 00:00:00 2001
+From 173f555d0d4639122bd47d30310152263c1b27bf Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 1 Jan 2021 13:32:48 +1100
 Subject: [PATCH] dsound: Enable EAX by default
@@ -8,7 +8,7 @@ Subject: [PATCH] dsound: Enable EAX by default
  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
+index 8b396a1939e..44463992e92 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";
@@ -17,9 +17,9 @@ index e12c2208199..bda9a446a08 100644
  int ds_hq_buffers_max = 4;
 -BOOL ds_eax_enabled = FALSE;
 +BOOL ds_eax_enabled = TRUE;
- static HINSTANCE instance;
  
  #define IS_OPTION_TRUE(ch) \
+     ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
 -- 
-2.29.2
+2.30.2