Release v8.12

Added missed files to patch.

patches/dinput-scancode/0001-dinput-Avoid-duplicated-objects-in-keyboard-devices.patch

@@ -0,0 +1,34 @@
+From b2764b3d21a64c3c194b29b9cb71379456e03b06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 7 Jul 2023 12:44:26 +0200
+Subject: [PATCH] dinput: Avoid duplicated objects in keyboard devices.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
+---
+ dlls/dinput/keyboard.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
+index cbcbf94f0f6..3fd75bb10e6 100644
+--- a/dlls/dinput/keyboard.c
++++ b/dlls/dinput/keyboard.c
+@@ -265,13 +265,15 @@ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPH
+         .dwOfs = DIK_ESCAPE,
+         .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
+     };
++    BOOL ret, mapped[0x100] = {0};
+     DWORD index, i, dik;
+-    BOOL ret;
+ 
+     for (i = 0, index = 0; i < 512; ++i)
+     {
+         if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
+         if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
++        if (mapped[dik]) continue;
++        mapped[dik] = TRUE;
+         instance.dwOfs = dik;
+         instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
+         ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+-- 
+2.40.1
+

patches/dinput-scancode/0002-dinput-Enumerate-lower-keyboard-scancodes-values-fir.patch

@@ -0,0 +1,64 @@
+From bdf952bf0711a7cf22fee840197234bd413ae611 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 7 Jul 2023 12:45:04 +0200
+Subject: [PATCH] dinput: Enumerate lower keyboard scancodes values first.
+
+Windows usually doesn't have scancodes higher than 0x7f, or extended
+scancodes higher than 0x17f, but X11 does for several XF86 keys.
+
+We want to enumerate the basic keys first including in the extended
+scancode range, so they appear before the XF86 keys in the dinput
+device object list.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
+---
+ dlls/dinput/keyboard.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
+index 3fd75bb10e6..1f1db883b80 100644
+--- a/dlls/dinput/keyboard.c
++++ b/dlls/dinput/keyboard.c
+@@ -256,6 +256,7 @@ static BOOL try_enum_object( struct dinput_device *impl, const DIPROPHEADER *fil
+ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter,
+                                       DWORD flags, enum_object_callback callback, void *context )
+ {
++    static const UINT vsc_base[] = {0, 0x100, 0x80, 0x180};
+     struct keyboard *impl = impl_from_IDirectInputDevice8W( iface );
+     BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType );
+     DIDEVICEOBJECTINSTANCEW instance =
+@@ -266,18 +267,21 @@ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPH
+         .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
+     };
+     BOOL ret, mapped[0x100] = {0};
+-    DWORD index, i, dik;
++    DWORD index, i, dik, vsc;
+ 
+-    for (i = 0, index = 0; i < 512; ++i)
++    for (i = 0, index = 0; i < ARRAY_SIZE(vsc_base); ++i)
+     {
+-        if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
+-        if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
+-        if (mapped[dik]) continue;
+-        mapped[dik] = TRUE;
+-        instance.dwOfs = dik;
+-        instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
+-        ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+-        if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
++        for (vsc = vsc_base[i]; vsc < vsc_base[i] + 0x80; vsc++)
++        {
++            if (!GetKeyNameTextW( vsc << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
++            if (!(dik = map_dik_code( vsc, 0, subtype, impl->base.dinput->dwVersion ))) continue;
++            if (mapped[dik]) continue;
++            mapped[dik] = TRUE;
++            instance.dwOfs = dik;
++            instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
++            ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
++            if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
++        }
+     }
+ 
+     return DIENUM_CONTINUE;
+-- 
+2.40.1
+

patches/dinput-scancode/definition

@@ -0,0 +1,2 @@
+Fixes: [55205] dinput: Improve keyboard devices scancode support.
+# PR 3264

patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch

@@ -1,4 +1,4 @@
-From f58dbcdfedf4d5d78d586d54f507c647e58379c8 Mon Sep 17 00:00:00 2001
+From 9eccf33cb881c2e847a22a72f1c8d8b10886d531 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 2 Dec 2022 14:41:30 +1100
 Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
@@ -10,14 +10,14 @@ Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
  3 files changed, 93 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
-index 4159abffa99..030aab50094 100644
+index 7cdc1534866..39f6cdce790 100644
 --- a/dlls/dmime/dmime_private.h
 +++ b/dlls/dmime/dmime_private.h
 @@ -71,6 +71,8 @@ extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerfor
- extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;
- extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;
+ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
+ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
  
-+extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
++extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
 +
  /*****************************************************************************
   * Auxiliary definitions
@@ -153,5 +153,5 @@ index 6bf9f3abf0c..0ea0c15c5e0 100644
  
  static HRESULT WINAPI IDirectMusicSegment8Impl_Unload(IDirectMusicSegment8 *iface,
 -- 
-2.39.1
+2.40.1
 

patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch

@@ -1,8 +1,7 @@
-From 8ef2197cd4c77bf562ab5b83f2a137ae565bc22d Mon Sep 17 00:00:00 2001
+From 8f92585ece53fbcd940fe028dd7ee24d6b854ec3 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 12 Dec 2022 15:20:10 +1100
-Subject: [PATCH 3/3] dmime: Play a sound in IDirectMusicPerformance8
- PlaySegmentEx
+Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx
 
 ---
  dlls/dmime/dmime_private.h |  1 +
@@ -11,14 +10,14 @@ Subject: [PATCH 3/3] dmime: Play a sound in IDirectMusicPerformance8
  3 files changed, 26 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
-index 030aab50094..d09aba02a5c 100644
+index 39f6cdce790..6cd45697e2f 100644
 --- a/dlls/dmime/dmime_private.h
 +++ b/dlls/dmime/dmime_private.h
 @@ -72,6 +72,7 @@ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffe
- extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;
+ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
  
- extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
-+extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface) DECLSPEC_HIDDEN;
+ extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
++extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface);
  
  /*****************************************************************************
   * Auxiliary definitions
@@ -60,10 +59,10 @@ index 5578c3e523b..03e59e95af3 100644
  
  static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface,
 diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index dbf2f8203d8..9213fbf4a4c 100644
+index 0ea0c15c5e0..b21f93bbfc6 100644
 --- a/dlls/dmime/segment.c
 +++ b/dlls/dmime/segment.c
-@@ -45,6 +45,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu
+@@ -47,6 +47,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu
    return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);
  }
  
@@ -77,5 +76,5 @@ index dbf2f8203d8..9213fbf4a4c 100644
          REFIID riid, void **ret_iface)
  {
 -- 
-2.38.1
+2.40.1
 

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

@@ -1,4 +1,4 @@
-From c2c33dff38e55d87582d8d6526b3d321ba577570 Mon Sep 17 00:00:00 2001
+From c3f44de2b3a1dbcc91b1ed1a864e6995ce1eb87b 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.
@@ -24,10 +24,10 @@ index 6cb653fdfa0..1c04bf34162 100644
  	primary.c \
  	propset.c \
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 8d5ca27c90c..ed710fad43d 100644
+index 447b41bffbb..5c8c495bfe4 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1346,6 +1346,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid
+@@ -1338,6 +1338,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid
      TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
      This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
  
@@ -37,7 +37,7 @@ index 8d5ca27c90c..ed710fad43d 100644
      return E_PROP_ID_UNSUPPORTED;
  }
  
-@@ -1357,6 +1360,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
+@@ -1349,6 +1352,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
  
      TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
  
@@ -48,12 +48,12 @@ index 8d5ca27c90c..ed710fad43d 100644
  }
  
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 304708c26da..c0e254f7a6e 100644
+index b5546c7d9db..185b8efd014 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -229,6 +229,14 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
+@@ -230,6 +230,14 @@ LONG capped_refcount_dec(LONG *ref);
  
- HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
+ HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv);
  
 +/* eax.c */
 +HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
@@ -64,8 +64,8 @@ index 304708c26da..c0e254f7a6e 100644
 +        ULONG cbPropData) DECLSPEC_HIDDEN;
 +
  /* mixer.c */
- void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
- void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN;
+ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
+ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan);
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 new file mode 100644
 index 00000000000..c1264f977b6
@@ -127,5 +127,5 @@ index 00000000000..c1264f977b6
 +    return E_PROP_ID_UNSUPPORTED;
 +}
 -- 
-2.35.1
+2.40.1
 

patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch

@@ -1,4 +1,4 @@
-From e484e3dc512eacc9708c245a9e64372428bc1875 Mon Sep 17 00:00:00 2001
+From 3a08f97fcd9ffd224c917cc52298702b6feaea9e Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:58:37 +0000
 Subject: [PATCH] dsound: Add EAX init and free stubs.
@@ -32,10 +32,10 @@ index ede6d9f1ba1..309d632397a 100644
  
      free(This);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 7a89b047b42..c5e84f07763 100644
+index c2dcda9da67..12203876623 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -240,6 +240,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -241,6 +241,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData) DECLSPEC_HIDDEN;
@@ -43,7 +43,7 @@ index 7a89b047b42..c5e84f07763 100644
 +void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
  
  /* mixer.c */
- void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
+ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 index 03b6e0a9813..91438efc335 100644
 --- a/dlls/dsound/eax.c

patches/dsound-EAX/0009-dsound-Feed-data-through-EAX-function.patch

@@ -1,7 +1,7 @@
-From 735da63bda0fed9b01779bd8922a4cc13b05d598 Mon Sep 17 00:00:00 2001
+From a0ff76bc868a22624a06989f675c5d574125aa5c Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:59:57 +0000
-Subject: dsound: Feed data through EAX function.
+Subject: [PATCH] dsound: Feed data through EAX function.
 
 ---
  dlls/dsound/dsound_private.h | 1 +
@@ -10,19 +10,19 @@ Subject: dsound: Feed data through EAX function.
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index a918cd2..cc55d70 100644
+index 12203876623..11cfa641d77 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -242,6 +242,7 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -243,6 +243,7 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG cbPropData) DECLSPEC_HIDDEN;
  void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
  void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
 +void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
  
  /* mixer.c */
- void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
+ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index c0afb0f..4368594 100644
+index 91438efc335..bf7efdc4f38 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -92,6 +92,11 @@ static const EFXEAXREVERBPROPERTIES efx_presets[] = {
@@ -38,10 +38,10 @@ index c0afb0f..4368594 100644
  {
      /* stub */
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index ff92cc1..b159834 100644
+index f261588454a..33dcd8a953c 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
-@@ -453,7 +453,7 @@ static void putieee32_dsp(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD ch
+@@ -514,7 +514,7 @@ static void putieee32_dsp(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD ch
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -50,7 +50,7 @@ index ff92cc1..b159834 100644
      UINT istride, ostride, size_bytes;
      DWORD channel, i;
      bitsputfunc put;
-@@ -500,6 +500,9 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
+@@ -561,6 +561,9 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
              }
          }
  
@@ -61,5 +61,5 @@ index ff92cc1..b159834 100644
          ostride = dsb->device->pwfx->nChannels * sizeof(float);
          for (i = 0; i < frames; i++) {
 -- 
-2.3.3
+2.40.1
 

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

@@ -1,4 +1,4 @@
-From 38fec88e8dee99a012773648289b228245001c6c Mon Sep 17 00:00:00 2001
+From 375f83afce055fc37c5d453b0f922c604d9ad6f8 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.
@@ -7,12 +7,12 @@ Based on a patch by Mark Harmstone.
 ---
  dlls/dsound/buffer.c         | 16 ++++++----------
  dlls/dsound/dsound_main.c    |  8 ++++++++
- dlls/dsound/dsound_private.h |  2 ++
+ dlls/dsound/dsound_private.h | 15 ++++++++-------
  dlls/dsound/eax.c            | 28 ++++++++++++++++++++++++++++
- 4 files changed, 44 insertions(+), 10 deletions(-)
+ 4 files changed, 50 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 9a603a70ed9..39ce9101266 100644
+index aa7bbe13cc5..18a16535978 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
 @@ -34,6 +34,7 @@
@@ -23,7 +23,7 @@ index 9a603a70ed9..39ce9101266 100644
  
  /*******************************************************************************
   *		IDirectSoundNotify
-@@ -1381,16 +1382,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
+@@ -1373,16 +1374,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
  
      TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
  
@@ -46,10 +46,10 @@ index 9a603a70ed9..39ce9101266 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
-index da5912e216e..808425161a6 100644
+index 11983a4cb47..2c09f9c5b42 100644
 --- a/dlls/dsound/dsound_main.c
 +++ b/dlls/dsound/dsound_main.c
-@@ -93,6 +93,10 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
+@@ -94,6 +94,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;
@@ -60,7 +60,7 @@ index da5912e216e..808425161a6 100644
  
  /*
   * Get a config key from either the app-specific or the default config
-@@ -147,11 +151,15 @@ void setup_dsound_options(void)
+@@ -148,11 +152,15 @@ void setup_dsound_options(void)
      if (!get_config_key( hkey, appkey, "HQBuffersMax", buffer, MAX_PATH ))
          ds_hq_buffers_max = atoi(buffer);
  
@@ -77,25 +77,44 @@ index da5912e216e..808425161a6 100644
  
  static const char * get_device_id(LPCGUID pGuid)
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 0bca36b2540..7d488ab1e45 100644
+index 1c544ad2e96..43f9df866a3 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -37,6 +37,7 @@
+@@ -35,9 +35,9 @@
  
- extern int ds_hel_buflen DECLSPEC_HIDDEN;
- extern int ds_hq_buffers_max DECLSPEC_HIDDEN;
-+extern BOOL ds_eax_enabled DECLSPEC_HIDDEN;
+ #define DS_MAX_CHANNELS 6
+ 
+-
+ extern int ds_hel_buflen;
+ extern int ds_hq_buffers_max;
++extern BOOL ds_eax_enabled;
  
  /*****************************************************************************
   * Predeclare the interface implementation structures
-@@ -234,6 +235,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
- HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
+@@ -235,16 +235,17 @@ LONG capped_refcount_dec(LONG *ref);
+ HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv);
  
  /* eax.c */
-+BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport) DECLSPEC_HIDDEN;
++BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport);
  HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
-         ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
+-        ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
++        ULONG cbPropData, ULONG *pcbReturned);
+ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+         ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
+-        ULONG cbPropData) DECLSPEC_HIDDEN;
+-void init_eax_device(DirectSoundDevice *dev) DECLSPEC_HIDDEN;
+-void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
+-void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
+-void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
++        ULONG cbPropData);
++void init_eax_device(DirectSoundDevice *dev);
++void free_eax_buffer(IDirectSoundBufferImpl *dsb);
++void init_eax_buffer(IDirectSoundBufferImpl *dsb);
++void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count);
+ 
+ /* mixer.c */
+ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 index 2244565897b..3e15ac59480 100644
 --- a/dlls/dsound/eax.c
@@ -150,5 +169,5 @@ index 2244565897b..3e15ac59480 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.35.1
+2.40.1
 

patches/dsound-Fast_Mixer/0001-dsound-Add-a-linear-resampler-for-use-with-a-large-n.patch

@@ -1,4 +1,4 @@
-From cdbe11004fe8b7fb87fff18f2a458259be02fe2d Mon Sep 17 00:00:00 2001
+From 3124bfe7d388479e6c82a766735cc5032654083a Mon Sep 17 00:00:00 2001
 From: "Alexander E. Patrakov" <patrakov at gmail.com>
 Date: Thu, 7 Aug 2014 17:15:00 -0600
 Subject: [PATCH] dsound: Add a linear resampler for use with a large number of
@@ -6,15 +6,15 @@ Subject: [PATCH] dsound: Add a linear resampler for use with a large number of
 
 ---
  dlls/dsound/dsound_main.c    |  5 ++++
- dlls/dsound/dsound_private.h |  1 +
+ dlls/dsound/dsound_private.h |  2 ++
  dlls/dsound/mixer.c          | 48 +++++++++++++++++++++++++++++++++---
- 3 files changed, 51 insertions(+), 3 deletions(-)
+ 3 files changed, 52 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
-index f3bce6062fe..fecb9489678 100644
+index 69cbec72ea3..11983a4cb47 100644
 --- a/dlls/dsound/dsound_main.c
 +++ b/dlls/dsound/dsound_main.c
-@@ -92,6 +92,7 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
+@@ -93,6 +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;
@@ -22,7 +22,7 @@ index f3bce6062fe..fecb9489678 100644
  
  /*
   * Get a config key from either the app-specific or the default config
-@@ -143,10 +144,14 @@ void setup_dsound_options(void)
+@@ -144,10 +145,14 @@ void setup_dsound_options(void)
      if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH ))
          ds_hel_buflen = atoi(buffer);
  
@@ -38,22 +38,24 @@ index f3bce6062fe..fecb9489678 100644
  
  static const char * get_device_id(LPCGUID pGuid)
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index bdb9ebee544..d154e67b0a0 100644
+index 80e6725fd27..172efd6c1cc 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -35,6 +35,7 @@
+@@ -34,7 +34,9 @@
+ 
  #define DS_MAX_CHANNELS 6
  
- extern int ds_hel_buflen DECLSPEC_HIDDEN;
-+extern int ds_hq_buffers_max DECLSPEC_HIDDEN;
++
+ extern int ds_hel_buflen;
++extern int ds_hq_buffers_max;
  
  /*****************************************************************************
   * Predeclare the interface implementation structures
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index a6402b09eff..28f32e9d092 100644
+index bf05805221b..042b9499727 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
-@@ -295,7 +295,47 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
+@@ -314,7 +314,47 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
      return count;
  }
  
@@ -102,7 +104,7 @@ index a6402b09eff..28f32e9d092 100644
  {
      UINT i, channel;
      UINT istride = dsb->pwfx->nBlockAlign;
-@@ -374,9 +414,11 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu
+@@ -405,9 +445,11 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu
      DWORD ipos, adv;
  
      if (dsb->freqAdjustNum == dsb->freqAdjustDen)
@@ -117,5 +119,5 @@ index a6402b09eff..28f32e9d092 100644
      ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
      if (ipos >= dsb->buflen) {
 -- 
-2.30.2
+2.40.1
 

patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch

@@ -1,4 +1,4 @@
-From 9e4371e8d0aaf8b4c5578c41adf8e1dd4436b1f7 Mon Sep 17 00:00:00 2001
+From 221afbcd2a31e7df7e8eddcf7380e4448f420888 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 9 Jan 2016 16:57:49 +0100
 Subject: [PATCH] explorer: Create CurrentControlSet\Control\Video registry key
@@ -10,14 +10,14 @@ Content-Transfer-Encoding: 8bit
 Signed-off-by: Michael Müller <michael@fds-team.de>
 ---
  dlls/advapi32/tests/registry.c | 7 +++++++
- programs/explorer/desktop.c    | 9 +++++++++
- 2 files changed, 16 insertions(+)
+ programs/explorer/desktop.c    | 5 +++++
+ 2 files changed, 12 insertions(+)
 
 diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index 480e96ef6ee..49aacc905b1 100644
+index 9e051056eed..1f710f6ee04 100644
 --- a/dlls/advapi32/tests/registry.c
 +++ b/dlls/advapi32/tests/registry.c
-@@ -1318,6 +1318,13 @@ static void test_reg_create_key(void)
+@@ -1329,6 +1329,13 @@ static void test_reg_create_key(void)
      RegDeleteKeyA(hkey1, "");
      RegCloseKey(hkey1);
  
@@ -32,22 +32,18 @@ index 480e96ef6ee..49aacc905b1 100644
      hkey1 = NULL;
      ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL);
 diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
-index 81eb0d1d01b..f742cd6d30b 100644
+index 9945f689313..d996108c145 100644
 --- a/programs/explorer/desktop.c
 +++ b/programs/explorer/desktop.c
-@@ -878,6 +878,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
- 
+@@ -844,6 +844,7 @@ static BOOL get_default_enable_shell( const WCHAR *name )
  static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
  {
-+    static const WCHAR video_keyW[] = {
-+        'S','y','s','t','e','m','\\',
-+        'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
-+        'C','o','n','t','r','o','l','\\',
-+        'V','i','d','e','o',0};
-     static const WCHAR device_keyW[] = {
-         'S','y','s','t','e','m','\\',
-         'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
-@@ -947,6 +952,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
+     static const WCHAR device_keyW[] = L"System\\CurrentControlSet\\Control\\Video\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\0000";
++    static const WCHAR video_keyW[]  = L"System\\CurrentControlSet\\Control\\Video\\0000";
+ 
+     WCHAR buffer[MAX_PATH], libname[32], *name, *next;
+     WCHAR key[ARRAY_SIZE( device_keyW ) + 39];
+@@ -900,6 +901,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
  
      TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) );
  
@@ -59,5 +55,5 @@ index 81eb0d1d01b..f742cd6d30b 100644
                guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
                guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
 -- 
-2.39.2
+2.40.1
 

patches/gdiplus-Performance-Improvements/0001-gdiplus-Change-the-order-of-x-y-loops-in-the-scaler.patch

@@ -1,29 +0,0 @@
-From f7c317dac3581075e75168ce50c4523973422384 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Sun, 5 Mar 2017 12:55:51 +0800
-Subject: gdiplus: Change the order of x/y loops in the scaler.
-
-This improves performance by about 5%.
----
- dlls/gdiplus/graphics.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
-index 142b68115e..02d699b00b 100644
---- a/dlls/gdiplus/graphics.c
-+++ b/dlls/gdiplus/graphics.c
-@@ -3043,9 +3043,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
-                 y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X;
-                 y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y;
- 
--                for (x=dst_area.left; x<dst_area.right; x++)
-+                for (y=dst_area.top; y<dst_area.bottom; y++)
-                 {
--                    for (y=dst_area.top; y<dst_area.bottom; y++)
-+                    for (x=dst_area.left; x<dst_area.right; x++)
-                     {
-                         GpPointF src_pointf;
-                         ARGB *dst_color;
--- 
-2.11.0
-

patches/gdiplus-Performance-Improvements/0002-gdiplus-Change-multiplications-by-additions-in-the-x.patch

@@ -1,65 +0,0 @@
-From 04aee185cec481587e66fd410cf6ed2b6b6e2f90 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Sun, 5 Mar 2017 13:07:43 +0800
-Subject: gdiplus: Change multiplications by additions in the x/y scaler loops.
-
-This should imrove performance when floating point math will be replaced
-by fixed point calculations.
----
- dlls/gdiplus/graphics.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
-index 02d699b00b..ef26887d14 100644
---- a/dlls/gdiplus/graphics.c
-+++ b/dlls/gdiplus/graphics.c
-@@ -3026,6 +3026,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
- 
-             if (do_resampling)
-             {
-+                REAL delta_xx, delta_xy, delta_yx, delta_yy;
-+
-                 /* Transform the bits as needed to the destination. */
-                 dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top));
-                 if (!dst_data)
-@@ -3043,15 +3045,21 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
-                 y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X;
-                 y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y;
- 
-+                delta_yy = dst_area.top * y_dy;
-+                delta_yx = dst_area.top * y_dx;
-+
-                 for (y=dst_area.top; y<dst_area.bottom; y++)
-                 {
-+                    delta_xx = dst_area.left * x_dx;
-+                    delta_xy = dst_area.left * x_dy;
-+
-                     for (x=dst_area.left; x<dst_area.right; x++)
-                     {
-                         GpPointF src_pointf;
-                         ARGB *dst_color;
- 
--                        src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx;
--                        src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy;
-+                        src_pointf.X = dst_to_src_points[0].X + delta_xx + delta_yx;
-+                        src_pointf.Y = dst_to_src_points[0].Y + delta_xy + delta_yy;
- 
-                         dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left));
- 
-@@ -3060,7 +3068,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
-                                                                imageAttributes, interpolation, offset_mode);
-                         else
-                             *dst_color = 0;
-+
-+                        delta_xx += x_dx;
-+                        delta_yx += y_dx;
-                     }
-+
-+                    delta_xy += x_dy;
-+                    delta_yy += y_dy;
-                 }
-             }
-             else
--- 
-2.11.0
-

patches/gdiplus-Performance-Improvements/0003-gdiplus-Remove-ceilf-floorf-calls-from-bilinear-scal.patch

@@ -1,18 +1,20 @@
-From f1b82c151d064eeafe234cdd95a4b29d7000232a Mon Sep 17 00:00:00 2001
+From bfd7f078bd023915fb857e37fedf2e557df48c9b Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Sun, 5 Mar 2017 13:18:21 +0800
 Subject: gdiplus: Remove ceilf/floorf calls from bilinear scaler. (v2)
 
 This improves performance by about 55%.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
 ---
  dlls/gdiplus/graphics.c | 19 ++++++++++++-------
  1 file changed, 12 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
-index ef26887d14..58cfebb923 100644
+index 835c2889bd1..4e286f959e5 100644
 --- a/dlls/gdiplus/graphics.c
 +++ b/dlls/gdiplus/graphics.c
-@@ -526,7 +526,7 @@ static ARGB blend_colors(ARGB start, ARGB end, REAL position)
+@@ -603,7 +603,7 @@ static ARGB blend_colors(ARGB start, ARGB end, REAL position)
      INT start_a, end_a, final_a;
      INT pos;
  
@@ -21,7 +23,7 @@ index ef26887d14..58cfebb923 100644
  
      start_a = ((start >> 24) & 0xff) * (pos ^ 0xff);
      end_a = ((end >> 24) & 0xff) * pos;
-@@ -928,6 +928,11 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi
+@@ -1009,6 +1009,11 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi
      return ((DWORD*)(bits))[(x - src_rect->X) + (y - src_rect->Y) * src_rect->Width];
  }
  
@@ -33,7 +35,7 @@ index ef26887d14..58cfebb923 100644
  static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width,
      UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes,
      InterpolationMode interpolation, PixelOffsetMode offset_mode)
-@@ -948,12 +953,12 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT
+@@ -1029,12 +1034,12 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT
          ARGB top, bottom;
          float x_offset;
  
@@ -53,5 +55,5 @@ index ef26887d14..58cfebb923 100644
          if (leftx == rightx && topy == bottomy)
              return sample_bitmap_pixel(src_rect, bits, width, height,
 -- 
-2.11.0
+2.38.1
 

patches/gdiplus-Performance-Improvements/0004-gdiplus-Prefer-using-pre-multiplied-ARGB-data-in-the.patch

@@ -1,18 +1,20 @@
-From 37b9499d8da295cd8819d85e9a563629ef13f22e Mon Sep 17 00:00:00 2001
+From ae562535926a6c2524c6d227f9ebf45a0d477c65 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Sun, 5 Mar 2017 14:34:51 +0800
 Subject: gdiplus: Prefer using pre-multiplied ARGB data in the scaler.
 
 This further improves performance by about 20%.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
 ---
- dlls/gdiplus/graphics.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++--
+ dlls/gdiplus/graphics.c | 94 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
-index 58cfebb923..bdee2e8318 100644
+index 4e286f959e5..0233f5c6429 100644
 --- a/dlls/gdiplus/graphics.c
 +++ b/dlls/gdiplus/graphics.c
-@@ -521,6 +521,17 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y,
+@@ -598,6 +598,17 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y,
      return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL, fmt);
  }
  
@@ -30,7 +32,7 @@ index 58cfebb923..bdee2e8318 100644
  static ARGB blend_colors(ARGB start, ARGB end, REAL position)
  {
      INT start_a, end_a, final_a;
-@@ -1002,6 +1013,75 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT
+@@ -1083,6 +1094,75 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT
      }
  }
  
@@ -106,7 +108,7 @@ index 58cfebb923..bdee2e8318 100644
  static REAL intersect_line_scanline(const GpPointF *p1, const GpPointF *p2, REAL y)
  {
      return (p1->X - p2->X) * (p2->Y - y) / (p2->Y - p1->Y) + p2->X;
-@@ -3010,8 +3090,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
+@@ -3216,8 +3296,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
              lockeddata.Scan0 = src_data;
              if (!do_resampling && bitmap->format == PixelFormat32bppPARGB)
                  lockeddata.PixelFormat = apply_image_attributes(imageAttributes, NULL, 0, 0, 0, ColorAdjustTypeBitmap, bitmap->format);
@@ -118,10 +120,10 @@ index 58cfebb923..bdee2e8318 100644
  
              stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf,
                  lockeddata.PixelFormat, &lockeddata);
-@@ -3069,8 +3151,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
-                         dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left));
- 
-                         if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight)
+@@ -3285,8 +3367,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
+                     {
+                         if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth &&
+                             src_pointf.Y >= srcy && src_pointf.Y < srcy + srcheight)
 -                            *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf,
 -                                                               imageAttributes, interpolation, offset_mode);
 +                        {
@@ -132,9 +134,9 @@ index 58cfebb923..bdee2e8318 100644
 +                                *dst_color = resample_bitmap_pixel_premult(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf,
 +                                                                           imageAttributes, interpolation, offset_mode);
 +                        }
-                         else
-                             *dst_color = 0;
- 
+                         dst_color++;
+                     }
+                 }
 -- 
-2.11.0
+2.38.1
 

patches/gdiplus-Performance-Improvements/definition

@@ -1,2 +1,2 @@
 Fixes: Improve performance of bilinear bitmap scaling
-Disabled: True
+

patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch

@@ -1,4 +1,4 @@
-From eb96135501ef2822072e8f774868dd55ab3935ba Mon Sep 17 00:00:00 2001
+From 5f029b7fcffc7b537a02523dc793ec2b4069390a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 05:30:27 +0200
 Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
  2 files changed, 117 insertions(+)
 
 diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
-index 365f4465fc7..aca2b0f24cb 100644
+index 2c9e97d7fc7..9a538edf7ab 100644
 --- a/dlls/kernel32/tests/loader.c
 +++ b/dlls/kernel32/tests/loader.c
-@@ -30,6 +30,7 @@
+@@ -28,6 +28,7 @@
  #include "winbase.h"
  #include "winternl.h"
  #include "winnls.h"
@@ -20,7 +20,7 @@ index 365f4465fc7..aca2b0f24cb 100644
  #include "wine/test.h"
  #include "delayloadhandler.h"
  
-@@ -4056,6 +4057,79 @@ static void test_Wow64Transition(void)
+@@ -4205,6 +4206,79 @@ static void test_Wow64Transition(void)
              debugstr_wn(name->SectionFileName.Buffer, name->SectionFileName.Length / sizeof(WCHAR)));
  }
  
@@ -100,7 +100,7 @@ index 365f4465fc7..aca2b0f24cb 100644
  START_TEST(loader)
  {
      int argc;
-@@ -4128,6 +4202,7 @@ START_TEST(loader)
+@@ -4286,6 +4360,7 @@ START_TEST(loader)
      test_InMemoryOrderModuleList();
      test_LoadPackagedLibrary();
      test_wow64_redirection();
@@ -109,10 +109,10 @@ index 365f4465fc7..aca2b0f24cb 100644
      test_dll_file( "kernel32.dll" );
      test_dll_file( "advapi32.dll" );
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index cbd2fa2d384..693ba94dc71 100644
+index d548ecea944..95ed846dc10 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -129,6 +129,9 @@ struct file_id
+@@ -132,6 +132,9 @@ struct file_id
      BYTE ObjectId[16];
  };
  
@@ -122,7 +122,7 @@ index cbd2fa2d384..693ba94dc71 100644
  /* internal representation of loaded modules */
  typedef struct _wine_modref
  {
-@@ -498,6 +501,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
+@@ -501,6 +504,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
      }
  }
  
@@ -156,7 +156,7 @@ index cbd2fa2d384..693ba94dc71 100644
  /*************************************************************************
   *		get_modref
   *
-@@ -1477,7 +1507,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
+@@ -1475,7 +1505,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
                     &wm->ldr.InLoadOrderLinks);
      InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
                     &wm->ldr.InMemoryOrderLinks);
@@ -169,7 +169,7 @@ index cbd2fa2d384..693ba94dc71 100644
  
      if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
      {
-@@ -2155,6 +2190,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
+@@ -2153,6 +2188,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
              /* the module has only be inserted in the load & memory order lists */
              RemoveEntryList(&wm->ldr.InLoadOrderLinks);
              RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -177,7 +177,7 @@ index cbd2fa2d384..693ba94dc71 100644
  
              /* FIXME: there are several more dangling references
               * left. Including dlls loaded by this dll before the
-@@ -3796,6 +3832,7 @@ static void free_modref( WINE_MODREF *wm )
+@@ -3830,6 +3866,7 @@ static void free_modref( WINE_MODREF *wm )
  
      RemoveEntryList(&wm->ldr.InLoadOrderLinks);
      RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -185,7 +185,7 @@ index cbd2fa2d384..693ba94dc71 100644
      if (wm->ldr.InInitializationOrderLinks.Flink)
          RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
  
-@@ -4167,6 +4204,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+@@ -4205,6 +4242,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
          ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" );
          WINE_MODREF *kernel32;
          PEB *peb = NtCurrentTeb()->Peb;
@@ -193,9 +193,9 @@ index cbd2fa2d384..693ba94dc71 100644
  
          NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation,
                                &meminfo, sizeof(meminfo), NULL );
-@@ -4184,6 +4222,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
-         /* TLS index 0 is always reserved, and wow64 reserves extra TLS entries */
+@@ -4223,6 +4261,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
          RtlSetBits( peb->TlsBitmap, 0, NtCurrentTeb()->WowTebOffset ? WOW64_TLS_MAX_NUMBER : 1 );
+         RtlSetBits( peb->TlsBitmap, NTDLL_TLS_ERRNO, 1 );
  
 +        /* initialize hash table */
 +        for (i = 0; i < HASH_MAP_SIZE; i++)
@@ -205,5 +205,5 @@ index cbd2fa2d384..693ba94dc71 100644
          load_global_options();
          version_init();
 -- 
-2.39.2
+2.40.1
 

patches/ntdll-Junction_Points/0005-server-Implement-FILE_OPEN_REPARSE_POINT-option.patch

@@ -1,4 +1,4 @@
-From 1656f670f68ce218458fc26dc8688c78d99091cb Mon Sep 17 00:00:00 2001
+From c58ac24e08827a2b5aac12f365197d1c5174db3a Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 21:02:11 -0700
 Subject: [PATCH] server: Implement FILE_OPEN_REPARSE_POINT option.
@@ -6,14 +6,14 @@ Subject: [PATCH] server: Implement FILE_OPEN_REPARSE_POINT option.
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
  dlls/kernelbase/file.c |   2 +
- server/fd.c            | 144 +++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 139 insertions(+), 7 deletions(-)
+ server/fd.c            | 152 +++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 147 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
-index ac04388acde..d0da370ae88 100644
+index 7c2e132bdcb..2a8dc8df875 100644
 --- a/dlls/kernelbase/file.c
 +++ b/dlls/kernelbase/file.c
-@@ -735,6 +735,8 @@ static UINT get_nt_file_options( DWORD attributes )
+@@ -732,6 +732,8 @@ static UINT get_nt_file_options( DWORD attributes )
          options |= FILE_SEQUENTIAL_ONLY;
      if (attributes & FILE_FLAG_WRITE_THROUGH)
          options |= FILE_WRITE_THROUGH;
@@ -23,7 +23,7 @@ index ac04388acde..d0da370ae88 100644
  }
  
 diff --git a/server/fd.c b/server/fd.c
-index eaebe044f37..db645779dc6 100644
+index 0b0e91ebfbb..233c9eb94ef 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -31,6 +31,7 @@
@@ -45,7 +45,7 @@ index eaebe044f37..db645779dc6 100644
  #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL_CREATE)
  # include <sys/epoll.h>
  # define USE_EPOLL
-@@ -1140,6 +1145,59 @@ static void inode_dump( struct object *obj, int verbose )
+@@ -1152,6 +1157,59 @@ static void inode_dump( struct object *obj, int verbose )
      fprintf( stderr, "\n" );
  }
  
@@ -105,16 +105,19 @@ index eaebe044f37..db645779dc6 100644
  static void inode_destroy( struct object *obj )
  {
      struct inode *inode = (struct inode *)obj;
-@@ -1159,10 +1217,29 @@ static void inode_destroy( struct object *obj )
-         {
-             /* make sure it is still the same file */
-             struct stat st;
--            if (!stat( fd->unix_name, &st ) && st.st_dev == inode->device->dev && st.st_ino == inode->ino)
+@@ -1168,7 +1226,34 @@ static void inode_destroy( struct object *obj )
+         list_remove( ptr );
+         if (fd->unix_fd != -1) close( fd->unix_fd );
+         if (fd->disp_flags & FILE_DISPOSITION_DELETE)
+-            unlink_closed_fd( inode, fd );
++        {
++            /* make sure it is still the same file */
++            struct stat st;
 +            if (!lstat( fd->unix_name, &st ) && st.st_dev == inode->device->dev && st.st_ino == inode->ino)
-             {
++            {
 +                int is_reparse_point = (is_reparse_dir( fd->unix_name, NULL ) == 0);
-                 if (S_ISDIR(st.st_mode)) rmdir( fd->unix_name );
-                 else unlink( fd->unix_name );
++                if (S_ISDIR(st.st_mode)) rmdir( fd->unix_name );
++                else unlink_closed_fd( inode, fd );
 +                /* remove reparse point metadata (if applicable) */
 +                if (is_reparse_point)
 +                {
@@ -133,10 +136,12 @@ index eaebe044f37..db645779dc6 100644
 +                    rmdir_recursive( AT_FDCWD, metadata_path );
 +                    rmdir( dirname( metadata_path ) );
 +                }
-             }
-         }
++            }
++        }
          free( fd->unix_name );
-@@ -1888,6 +1965,38 @@ void get_nt_name( struct fd *fd, struct unicode_str *name )
+         free( fd );
+     }
+@@ -1902,6 +1987,38 @@ void get_nt_name( struct fd *fd, struct unicode_str *name )
      name->len = fd->nt_namelen;
  }
  
@@ -175,7 +180,7 @@ index eaebe044f37..db645779dc6 100644
  /* open() wrapper that returns a struct fd with no fd user set */
  struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_name,
                      int flags, mode_t *mode, unsigned int access,
-@@ -1948,6 +2057,15 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -1962,6 +2079,15 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
      }
      else rw_mode = O_RDONLY;
  
@@ -191,7 +196,7 @@ index eaebe044f37..db645779dc6 100644
      if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1)
      {
          /* if we tried to open a directory for write access, retry read-only */
-@@ -1972,7 +2090,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -1986,7 +2112,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
      fd->unix_name = NULL;
      if ((path = dup_fd_name( root, name )))
      {
@@ -200,7 +205,7 @@ index eaebe044f37..db645779dc6 100644
          free( path );
      }
  
-@@ -1983,10 +2101,11 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -1997,10 +2123,11 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
      *mode = st.st_mode;
  
      /* only bother with an inode for normal files and directories */
@@ -213,7 +218,7 @@ index eaebe044f37..db645779dc6 100644
  
          if (!inode)
          {
-@@ -2001,13 +2120,17 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -2015,13 +2142,17 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
          list_add_head( &inode->open, &fd->inode_entry );
          closed_fd = NULL;
  
@@ -233,7 +238,7 @@ index eaebe044f37..db645779dc6 100644
          {
              set_error( STATUS_FILE_IS_A_DIRECTORY );
              goto error;
-@@ -2439,6 +2562,7 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl
+@@ -2454,6 +2585,7 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl
  
  static int is_dir_empty( int fd )
  {
@@ -241,7 +246,7 @@ index eaebe044f37..db645779dc6 100644
      DIR *dir;
      int empty;
      struct dirent *de;
-@@ -2446,8 +2570,13 @@ static int is_dir_empty( int fd )
+@@ -2461,8 +2593,13 @@ static int is_dir_empty( int fd )
      if ((fd = dup( fd )) == -1)
          return -1;
  
@@ -256,7 +261,7 @@ index eaebe044f37..db645779dc6 100644
          close( fd );
          return -1;
      }
-@@ -2459,6 +2588,7 @@ static int is_dir_empty( int fd )
+@@ -2474,6 +2611,7 @@ static int is_dir_empty( int fd )
          empty = 0;
      }
      closedir( dir );
@@ -264,15 +269,15 @@ index eaebe044f37..db645779dc6 100644
      return empty;
  }
  
-@@ -2497,7 +2627,7 @@ static void set_fd_disposition( struct fd *fd, int unlink )
+@@ -2512,7 +2650,7 @@ static void set_fd_disposition( struct fd *fd, unsigned int flags )
              file_set_error();
              return;
          }
 -        if (S_ISREG( st.st_mode ))  /* can't unlink files we don't have permission to write */
 +        if (S_ISREG( st.st_mode ) || S_ISLNK( st.st_mode ))  /* can't unlink files we don't have permission to write */
          {
-             if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
-             {
+             if (!(flags & FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE) &&
+                 !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
 -- 
-2.39.1
+2.40.1
 

patches/ntdll-Junction_Points/0013-ntdll-Allow-reparse-points-to-target-the-applicable-.patch

@@ -1,7 +1,7 @@
-From 7413100037edc5d6a0dbd5107cbe083b11a7ca55 Mon Sep 17 00:00:00 2001
+From c491128fb95c0aaf54cc917061d46910b7bd2e4a Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Sun, 4 Sep 2022 13:19:16 -0600
-Subject: ntdll: Allow reparse points to target the applicable Unix
+Subject: [PATCH] ntdll: Allow reparse points to target the applicable Unix
  file/directory.
 
 Allows lookup_unix_name 'shortcut' to succeed, as well as allowing
@@ -10,14 +10,13 @@ the user to follow the symlink outside of Wine.
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
  dlls/ntdll/unix/file.c | 129 +++++++++++++++++++++++++++++++++++++++++
- include/winnt.h        |   2 +
- 2 files changed, 131 insertions(+)
+ 1 file changed, 129 insertions(+)
 
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index ba844e90272..980251b8bbf 100644
+index 71311bec9c9..28aa839b34a 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -3545,6 +3545,125 @@ static NTSTATUS get_reparse_target( UNICODE_STRING *nt_target, REPARSE_DATA_BUFF
+@@ -3581,6 +3581,125 @@ static NTSTATUS get_reparse_target( UNICODE_STRING *nt_target, REPARSE_DATA_BUFF
  }
  
  
@@ -143,7 +142,7 @@ index ba844e90272..980251b8bbf 100644
  /*
   * Retrieve the unix name corresponding to a file handle, remove that directory, and then symlink
   * the requested directory to the location of the old directory.
-@@ -3678,6 +3797,16 @@ NTSTATUS create_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer)
+@@ -3714,6 +3833,16 @@ NTSTATUS create_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer)
          link_dir_fd = fd;
      }
  
@@ -160,19 +159,6 @@ index ba844e90272..980251b8bbf 100644
      /* Atomically move the initial link into position */
      if (!renameat2( -1, tmplink, -1, unix_src, RENAME_EXCHANGE ))
      {
-diff --git a/include/winnt.h b/include/winnt.h
-index 836bd7123e5..19bb5be83c4 100644
---- a/include/winnt.h
-+++ b/include/winnt.h
-@@ -2330,6 +2330,8 @@ extern struct _TEB * WINAPI NtCurrentTeb(void);
- #define IO_REPARSE_TAG_ONEDRIVE         __MSABI_LONG(0x80000021)
- #define IO_REPARSE_TAG_GVFS_TOMBSTONE   __MSABI_LONG(0xA0000022)
- 
-+#define IsReparseTagNameSurrogate(x)    (((x) & (1<<29)) == (1<<29))
-+
- /*
-  * File formats definitions
-  */
 -- 
-2.17.1
+2.40.1
 

patches/ntdll-Syscall_Emulation/definition

@@ -1 +1,2 @@
 Fixes: [48291] Detroit: Become Human crashes on launch
+Disabled: True