Rebase against 1348d9e97b1e83c99b68e0c9b592798038dc7f41.

patches/dsound-EAX/0001-dsound-Get-rid-of-no-longer-needed-mix_buffer_len-fi.patch

@@ -0,0 +1,49 @@
+From 8f6390553dc5a0c32a4d6eb4fa73be0854acee37 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 15 May 2016 02:13:18 +0200
+Subject: dsound: Get rid of no longer needed mix_buffer_len field.
+
+---
+ dlls/dsound/dsound_private.h | 2 +-
+ dlls/dsound/primary.c        | 5 +----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
+index b980453..8bf9c9d 100644
+--- a/dlls/dsound/dsound_private.h
++++ b/dlls/dsound/dsound_private.h
+@@ -88,7 +88,7 @@ struct DirectSoundDevice
+     int                         num_speakers;
+     int                         lfe_channel;
+     float *tmp_buffer;
+-    DWORD                       tmp_buffer_len, mix_buffer_len;
++    DWORD                       tmp_buffer_len;
+ 
+     DSVOLUMEPAN                 volpan;
+ 
+diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
+index 1925d0c..a5fe039 100644
+--- a/dlls/dsound/primary.c
++++ b/dlls/dsound/primary.c
+@@ -338,8 +338,6 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
+ 		device->buflen = ds_hel_buflen;
+ 	device->buflen -= device->buflen % device->pwfx->nBlockAlign;
+ 
+-	device->mix_buffer_len = (device->buflen / (device->pwfx->wBitsPerSample / 8)) * sizeof(float);
+-
+ 	if (device->state == STATE_PLAYING) device->state = STATE_STARTING;
+ 	else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED;
+ 
+@@ -359,8 +357,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
+ 
+     device->buffer = newbuf;
+ 
+-    TRACE("buflen: %u, fraglen: %u, mix_buffer_len: %u\n",
+-            device->buflen, device->fraglen, device->mix_buffer_len);
++    TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen);
+ 
+     if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT ||
+             (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
+-- 
+2.8.0
+

patches/dsound-EAX/0002-dsound-Apply-filters-before-sound-is-multiplied-to-s.patch

@@ -1,4 +1,4 @@
-From dd8497b40ae145da74ca9aeb8aab274572328bbd Mon Sep 17 00:00:00 2001
+From 31e4f44b8a215624ffc771f055ca1012f4c77841 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: dsound: Apply filters before sound is multiplied to speakers.
@@ -11,34 +11,34 @@ Based on a patch by Mark Harmstone.
  3 files changed, 77 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 065c377..ed0bbba 100644
+index cc3feb2..560c1f8 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -238,6 +238,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
+@@ -237,6 +237,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
          if(device->volume)
              IAudioStreamVolume_Release(device->volume);
  
 +        HeapFree(GetProcessHeap(), 0, device->dsp_buffer);
          HeapFree(GetProcessHeap(), 0, device->tmp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->mix_buffer);
          HeapFree(GetProcessHeap(), 0, device->buffer);
+         RtlDeleteResource(&device->buffer_list_lock);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 726452c..ed645db 100644
+index 6cfc33e..c6beaea 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -91,8 +91,8 @@ struct DirectSoundDevice
+@@ -88,8 +88,8 @@ struct DirectSoundDevice
      int                         speaker_num[DS_MAX_CHANNELS];
      int                         num_speakers;
      int                         lfe_channel;
--    float *mix_buffer, *tmp_buffer;
--    DWORD                       tmp_buffer_len, mix_buffer_len;
-+    float                      *mix_buffer, *tmp_buffer, *dsp_buffer;
-+    DWORD                       mix_buffer_len, tmp_buffer_len, dsp_buffer_len;
+-    float *tmp_buffer;
+-    DWORD                       tmp_buffer_len;
++    float                      *tmp_buffer, *dsp_buffer;
++    DWORD                       tmp_buffer_len, dsp_buffer_len;
  
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 4f22f85..ff92cc1 100644
+index c358385..9a6224e 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -266,23 +266,22 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -225,5 +225,5 @@ index 4f22f85..ff92cc1 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.3.3
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From b69c6b88a3628dcaf0f5520f2a33a47013c50aef Mon Sep 17 00:00:00 2001
+From cdfc54a6363804cc8ee9146c3adbd51e431bcbf2 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.
@@ -6,13 +6,13 @@ Subject: 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    | 10 ++++++++--
+ dlls/dsound/dsound_main.c    |  9 ++++++++-
  dlls/dsound/dsound_private.h |  2 ++
  dlls/dsound/eax.c            | 28 ++++++++++++++++++++++++++++
- 4 files changed, 44 insertions(+), 12 deletions(-)
+ 4 files changed, 44 insertions(+), 11 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 3641e32..ca6a5b5 100644
+index b763514..ca93972 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
 @@ -35,6 +35,7 @@
@@ -23,7 +23,7 @@ index 3641e32..ca6a5b5 100644
  
  /*******************************************************************************
   *		IDirectSoundNotify
-@@ -1331,16 +1332,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
+@@ -1329,16 +1330,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
  
      TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
  
@@ -46,12 +46,12 @@ index 3641e32..ca6a5b5 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
-index 1f512a4..4b7e7b0 100644
+index b349eb4..db2ca50 100644
 --- a/dlls/dsound/dsound_main.c
 +++ b/dlls/dsound/dsound_main.c
-@@ -95,8 +95,12 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 };
+@@ -94,8 +94,12 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 };
+ /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
  int ds_hel_buflen = 32768 * 2;
- int ds_snd_queue_max = 10;
  int ds_hq_buffers_max = 4;
 +BOOL ds_eax_enabled = FALSE;
  static HINSTANCE instance;
@@ -62,7 +62,7 @@ index 1f512a4..4b7e7b0 100644
  /*
   * Get a config key from either the app-specific or the default config
   */
-@@ -109,7 +113,6 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name,
+@@ -108,7 +112,6 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name,
      return ERROR_FILE_NOT_FOUND;
  }
  
@@ -70,11 +70,7 @@ index 1f512a4..4b7e7b0 100644
  /*
   * Setup the dsound options.
   */
-@@ -150,16 +153,19 @@ void setup_dsound_options(void)
-     if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH ))
-         ds_snd_queue_max = atoi(buffer);
- 
--
+@@ -149,11 +152,15 @@ void setup_dsound_options(void)
      if (!get_config_key( hkey, appkey, "HQBuffersMax", buffer, MAX_PATH ))
          ds_hq_buffers_max = atoi(buffer);
  
@@ -85,25 +81,24 @@ index 1f512a4..4b7e7b0 100644
      if (hkey) RegCloseKey( hkey );
  
      TRACE("ds_hel_buflen = %d\n", ds_hel_buflen);
-     TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max);
      TRACE("ds_hq_buffers_max = %d\n", ds_hq_buffers_max);
 +    TRACE("ds_eax_enabled = %u\n", ds_eax_enabled);
  }
  
  static const char * get_device_id(LPCGUID pGuid)
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index a9987d0..5c21d1f 100644
+index 5a986ba..4e928a4 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -38,6 +38,7 @@
+@@ -37,6 +37,7 @@
+ 
  extern int ds_hel_buflen DECLSPEC_HIDDEN;
- extern int ds_snd_queue_max DECLSPEC_HIDDEN;
  extern int ds_hq_buffers_max DECLSPEC_HIDDEN;
 +extern BOOL ds_eax_enabled DECLSPEC_HIDDEN;
  
  /*****************************************************************************
   * Predeclare the interface implementation structures
-@@ -234,6 +235,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
+@@ -230,6 +231,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
  HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
  
  /* eax.c */
@@ -112,7 +107,7 @@ index a9987d0..5c21d1f 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 4e98812..c9d5b6c 100644
+index e10156e..857f924 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -809,6 +809,28 @@ void free_eax_buffer(IDirectSoundBufferImpl *dsb)
@@ -165,5 +160,5 @@ index 4e98812..c9d5b6c 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.3.5
+2.8.0