Updated dsound-EAX patchset

Remove warnings.

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

@@ -1,4 +1,4 @@
-From 2af1ec49d958424e2b78f52ae3e3daca1d562b35 Mon Sep 17 00:00:00 2001
+From da59fcb896bc204ea0ea1d866eeddef0c9b962c4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: [PATCH] dsound: Apply filters before sound is multiplied to speakers.
@@ -11,7 +11,7 @@ Based on a patch by Mark Harmstone.
  3 files changed, 80 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 3085d86e5b5..91fa94b943e 100644
+index 346cc4ceca3..e869c4dd251 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
 @@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
@@ -24,7 +24,7 @@ index 3085d86e5b5..91fa94b943e 100644
          HeapFree(GetProcessHeap(), 0, device->cp_buffer);
          HeapFree(GetProcessHeap(), 0, device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 2408f80ba82..2e23f222b03 100644
+index f89588de4d9..d4e74ed0e82 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -89,8 +89,8 @@ struct DirectSoundDevice
@@ -39,7 +39,7 @@ index 2408f80ba82..2e23f222b03 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 1877d61cbf0..13bff1b9ae7 100644
+index 50816b1a582..ddab45893ac 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -54,7 +54,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT committed_samples = 0;
      DWORD channel, i;
  
-@@ -302,17 +301,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
+@@ -305,17 +304,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
  
      for (; i < count; i++)
          for (channel = 0; channel < dsb->mix_channels; channel++)
@@ -75,7 +75,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT channels = dsb->mix_channels;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -340,7 +338,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -343,7 +341,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float s1 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx, channel);
              float s2 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx + istride, channel);
              float result = s1 * cur_freqAcc2 + s2 * cur_freqAcc;
@@ -84,7 +84,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
          }
      }
  
-@@ -348,11 +346,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -351,11 +349,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -98,7 +98,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT committed_samples = 0;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -422,7 +420,7 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -430,23 +428,24 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float* cache = &intermediate[channel * required_input + ipos];
              for (j = 0; j < fir_used; j++)
                  sum += fir_copy[j] * cache[j];
@@ -107,7 +107,6 @@ index 1877d61cbf0..13bff1b9ae7 100644
          }
      }
  
-@@ -431,16 +429,17 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -129,7 +128,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
  
      ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
      if (ipos >= dsb->buflen) {
-@@ -476,6 +475,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -482,6 +481,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
  		return buflen + ptr1 - ptr2;
  	}
  }
@@ -151,7 +150,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
  /**
   * Mix at most the given amount of data into the allocated temporary buffer
   * of the given secondary buffer, starting from the dsb's first currently
-@@ -491,34 +505,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -497,34 +511,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -211,9 +210,9 @@ index 1877d61cbf0..13bff1b9ae7 100644
 +                    hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, frames * sizeof(float) * dsb->mix_channels,
 +                                                     (BYTE *)dsb->device->dsp_buffer, 0, DMO_INPLACE_NORMAL);
 +                    if (FAILED(hr))
-+                        WARN("IMediaObjectInPlace_Process failed for filter %u\n", i);
++                        WARN("IMediaObjectInPlace_Process failed for filter %lu\n", i);
 +                } else
-+                    WARN("filter %u has no inplace object - unsupported\n", i);
++                    WARN("filter %lu has no inplace object - unsupported\n", i);
 +            }
 +        }
  
@@ -235,5 +234,5 @@ index 1877d61cbf0..13bff1b9ae7 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.33.0
+2.35.1
 

patches/dsound-EAX/0004-dsound-Add-EAX-propset-stubs.patch

@@ -1,4 +1,4 @@
-From ee7fe13f2c520e1360e46f825790539b5bc2be3b Mon Sep 17 00:00:00 2001
+From c2c33dff38e55d87582d8d6526b3d321ba577570 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 22 Mar 2015 13:58:53 +0000
 Subject: [PATCH] dsound: Add EAX propset stubs.
@@ -68,7 +68,7 @@ index 304708c26da..c0e254f7a6e 100644
  void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 new file mode 100644
-index 00000000000..c30c7e1a51a
+index 00000000000..c1264f977b6
 --- /dev/null
 +++ b/dlls/dsound/eax.c
 @@ -0,0 +1,54 @@
@@ -109,7 +109,7 @@ index 00000000000..c30c7e1a51a
 +        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
 +        ULONG cbPropData, ULONG *pcbReturned)
 +{
-+    TRACE("(buf=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
++    TRACE("(buf=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,pcbReturned=%p)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
 +
 +    *pcbReturned = 0;
@@ -121,11 +121,11 @@ index 00000000000..c30c7e1a51a
 +        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
 +        ULONG cbPropData)
 +{
-+    TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",
++    TRACE("(%p,%s,%lu,%p,%lu,%p,%lu)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
 +
 +    return E_PROP_ID_UNSUPPORTED;
 +}
 -- 
-2.34.1
+2.35.1
 

patches/dsound-EAX/0006-dsound-Support-getting-and-setting-EAX-properties.patch

@@ -1,16 +1,16 @@
-From fe1de4d0856517f1ce59a3a5eb15a13f6ce4a9e6 Mon Sep 17 00:00:00 2001
+From d60cc4b9f0a45a69813d0faf172a04c32aff3990 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 22 Mar 2015 14:22:02 +0000
-Subject: dsound: Support getting and setting EAX properties.
+Subject: [PATCH] dsound: Support getting and setting EAX properties.
 
 ---
- dlls/dsound/dsound_eax.h     |   8 +++
+ dlls/dsound/dsound_eax.h     |   8 ++
  dlls/dsound/dsound_private.h |   2 +
- dlls/dsound/eax.c            | 167 +++++++++++++++++++++++++++++++++++++++++++
+ dlls/dsound/eax.c            | 167 +++++++++++++++++++++++++++++++++++
  3 files changed, 177 insertions(+)
 
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index 06d961e..c90d82d 100644
+index 06d961e006e..c90d82d9a3f 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -111,6 +111,14 @@ typedef struct {
@@ -29,10 +29,10 @@ index 06d961e..c90d82d 100644
  }
  #endif
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index e4495b2..c16f770 100644
+index c0e254f7a6e..461fbd4fdc8 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -99,6 +99,8 @@ struct DirectSoundDevice
+@@ -97,6 +97,8 @@ struct DirectSoundDevice
  
      normfunc normfunction;
  
@@ -42,7 +42,7 @@ index e4495b2..c16f770 100644
      DS3DLISTENER                ds3dl;
      BOOL                        ds3dl_need_recalc;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 57d88e7..cdd03be 100644
+index c1653a200c5..13471aec3a9 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -92,6 +92,22 @@ static const EFXEAXREVERBPROPERTIES efx_presets[] = {
@@ -145,7 +145,7 @@ index 57d88e7..cdd03be 100644
  {
 +    EAX_REVERBPROPERTIES *props;
 +
-     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",
+     TRACE("(%p,%s,%lu,%p,%lu,%p,%lu)\n",
          buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
  
 +    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet)) {
@@ -236,5 +236,5 @@ index 57d88e7..cdd03be 100644
      return E_PROP_ID_UNSUPPORTED;
  }
 -- 
-2.3.3
+2.35.1
 

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

@@ -1,4 +1,4 @@
-From af21be49d511224d7299ef3d21f08ebfee66f3a5 Mon Sep 17 00:00:00 2001
+From 38fec88e8dee99a012773648289b228245001c6c Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 5 Apr 2015 19:13:18 +0200
 Subject: [PATCH] dsound: Allow disabling of EAX support in the registry.
@@ -97,7 +97,7 @@ index 0bca36b2540..7d488ab1e45 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 ef802b95a7d..570207709f0 100644
+index 2244565897b..3e15ac59480 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -809,6 +809,28 @@ void free_eax_buffer(IDirectSoundBufferImpl *dsb)
@@ -106,7 +106,7 @@ index ef802b95a7d..570207709f0 100644
  
 +BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport)
 +{
-+    TRACE("(%s,%d,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
++    TRACE("(%s,%ld,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
 +
 +    if (!ds_eax_enabled)
 +        return FALSE;
@@ -130,7 +130,7 @@ index ef802b95a7d..570207709f0 100644
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData, ULONG *pcbReturned)
 @@ -816,6 +838,9 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
-     TRACE("(buf=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
+     TRACE("(buf=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,pcbReturned=%p)\n",
          buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
  
 +    if (!ds_eax_enabled)
@@ -140,7 +140,7 @@ index ef802b95a7d..570207709f0 100644
  
      if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet)) {
 @@ -922,6 +947,9 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
-     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",
+     TRACE("(%p,%s,%lu,%p,%lu,%p,%lu)\n",
          buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
  
 +    if (!ds_eax_enabled)
@@ -150,5 +150,5 @@ index ef802b95a7d..570207709f0 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.34.1
+2.35.1
 

patches/dsound-EAX/0020-dsound-Add-stub-support-for-DSPROPSETID_EAX20_Listen.patch

@@ -1,7 +1,8 @@
-From f2c56d857f9e30ba7d15e31c67e20c0698b3df9f Mon Sep 17 00:00:00 2001
+From 3e15d6c0b64a1abe347ec4ab37fe260ee058850b Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Mon, 5 Oct 2015 21:56:15 -0600
-Subject: dsound: Add stub support for DSPROPSETID_EAX20_ListenerProperties.
+Subject: [PATCH] dsound: Add stub support for
+ DSPROPSETID_EAX20_ListenerProperties.
 
 ---
  dlls/dsound/dsound_eax.h | 21 +++++++++++++++++++++
@@ -9,7 +10,7 @@ Subject: dsound: Add stub support for DSPROPSETID_EAX20_ListenerProperties.
  2 files changed, 32 insertions(+)
 
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index a555a75..21450e8 100644
+index a555a75e458..fe85179bf01 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -28,6 +28,7 @@ extern "C" {
@@ -48,7 +49,7 @@ index a555a75..21450e8 100644
  
  #define AL_EAXREVERB_MAX_REFLECTIONS_DELAY       (0.3f)
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 857f924..297d444 100644
+index 3e15ac59480..ed8dd204759 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -826,6 +826,11 @@ BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSu
@@ -68,7 +69,7 @@ index 857f924..297d444 100644
  
          return S_OK;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
@@ -78,11 +79,11 @@ index 857f924..297d444 100644
  
          return S_OK;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
      return E_PROP_ID_UNSUPPORTED;
 -- 
-2.6.0
+2.35.1
 

patches/dsound-EAX/0021-dsound-Add-stub-support-for-DSPROPSETID_EAX20_Buffer.patch

@@ -1,7 +1,8 @@
-From 6147f0b2fe272cdce45785de1efcd323084d5ac7 Mon Sep 17 00:00:00 2001
+From 84bf274c38399dad825c21a9a165730f07f6904c Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Wed, 7 Oct 2015 19:31:53 -0600
-Subject: dsound: Add stub support for DSPROPSETID_EAX20_BufferProperties.
+Subject: [PATCH] dsound: Add stub support for
+ DSPROPSETID_EAX20_BufferProperties.
 
 ---
  dlls/dsound/dsound_eax.h | 20 ++++++++++++++++++++
@@ -9,7 +10,7 @@ Subject: dsound: Add stub support for DSPROPSETID_EAX20_BufferProperties.
  2 files changed, 36 insertions(+)
 
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index fe85179..09563a0 100644
+index fe85179bf01..09563a0d615 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -29,6 +29,7 @@ extern "C" {
@@ -47,7 +48,7 @@ index fe85179..09563a0 100644
  
  #define AL_EAXREVERB_MAX_REFLECTIONS_DELAY       (0.3f)
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 297d444..12c290a 100644
+index ed8dd204759..9237aa055e0 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -831,8 +831,14 @@ BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSu
@@ -61,37 +62,37 @@ index 297d444..12c290a 100644
 +        }
      }
  
-+    FIXME("(%s,%d,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
++    FIXME("(%s,%ld,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
      return FALSE;
  }
  
 @@ -941,8 +947,13 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
+         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
          return E_PROP_ID_UNSUPPORTED;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
-+    FIXME("(buf=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
++    FIXME("(buf=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
      return E_PROP_ID_UNSUPPORTED;
  }
  
 @@ -1073,7 +1084,12 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
+         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
          return E_PROP_ID_UNSUPPORTED;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
-+    FIXME("(%p,%s,%d,%p,%d,%p,%d)\n",
++    FIXME("(%p,%s,%ld,%p,%ld,%p,%ld)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
      return E_PROP_ID_UNSUPPORTED;
  }
 -- 
-2.6.0
+2.35.1
 

patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch

@@ -1,4 +1,4 @@
-From b332a35d8382c6fc77ba663c5db98a6374518bfe Mon Sep 17 00:00:00 2001
+From cb7356ad69c333277313e305cee4dc17b765a184 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 25 Jan 2021 19:14:32 +1100
 Subject: [PATCH] dsound: Fake success for EAX Set Buffer/ListenerProperties
@@ -24,25 +24,25 @@ index 39ce9101266..ba93989f372 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 6a6d22bc031..b3f48cdb5bd 100644
+index 9237aa055e0..7034b5fca07 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);
+-        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
 -        return E_PROP_ID_UNSUPPORTED;
-+        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d - Faking Success\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld - Faking Success\n", dwPropID);
 +        return S_OK;
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
--        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
+-        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld\n", dwPropID);
 -        return E_PROP_ID_UNSUPPORTED;
-+        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d - Faking Success\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld - Faking Success\n", dwPropID);
 +        return S_OK;
      }
  
-     FIXME("(%p,%s,%d,%p,%d,%p,%d)\n",
+     FIXME("(%p,%s,%ld,%p,%ld,%p,%ld)\n",
 -- 
-2.34.1
+2.35.1