Release v8.9.1

Fix the mingw mac build.

patches/ddraw-Silence_FIXMEs/0001-ddraw-Silence-noisy-FIXME-about-unimplemented-D3DPRO.patch

@@ -1,29 +0,0 @@
-From ff117878cb3a0c74a50355ca64ac36c5fe6cee67 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Fri, 10 Mar 2017 22:07:37 +0100
-Subject: ddraw: Silence noisy FIXME about unimplemented
- D3DPROCESSVERTICES_UPDATEEXTENTS.
-
----
- dlls/ddraw/executebuffer.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
-index 393c52c1e2..9b64c687d3 100644
---- a/dlls/ddraw/executebuffer.c
-+++ b/dlls/ddraw/executebuffer.c
-@@ -302,7 +302,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
-                             ci->wStart, ci->wDest, ci->dwCount, ci->dwFlags);
- 
-                     if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
--                        FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n");
-+                    {
-+                        static int once;
-+                        if (!once++) FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n");
-+                    }
-                     if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
-                         FIXME("D3DPROCESSVERTICES_NOCOLOR not implemented.\n");
- 
--- 
-2.11.0
-

patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch

@@ -1,73 +0,0 @@
-From 98a9b8337d40c1f6df21227dff3d993f270aef46 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 24 May 2019 16:16:13 +1000
-Subject: [PATCH] dinput: Allow mapping of controls based of Genre type.
-
----
- dlls/dinput/device.c | 41 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index e826cc89c1e..a4815f24958 100644
---- a/dlls/dinput/device.c
-+++ b/dlls/dinput/device.c
-@@ -1741,8 +1741,15 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
- 
-     /* Count the actions */
-     for (i = 0; i < format->dwNumActions; i++)
--        if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance ))
-+    {
-+        if (IsEqualGUID(&impl->guid, &format->rgoAction[i].guidInstance) ||
-+                (IsEqualGUID(&IID_NULL, &format->rgoAction[i].guidInstance) &&
-+                  ((format->rgoAction[i].dwSemantic & format->dwGenre) == format->dwGenre ||
-+                   (format->rgoAction[i].dwSemantic & 0xff000000) == 0xff000000 /* Any Axis */) ))
-+        {
-             num_actions++;
-+        }
-+    }
- 
-     /* Should return DI_NOEFFECT if we dont have any actions and actionformat has not changed */
-     if (num_actions == 0 && format->dwCRC == new_crc && !(flags & DIDSAM_FORCESAVE)) return DI_NOEFFECT;
-@@ -1779,7 +1786,39 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
- 
-             action++;
-         }
-+        else if ((format->rgoAction[i].dwSemantic & format->dwGenre) == format->dwGenre ||
-+                 (format->rgoAction[i].dwSemantic & 0xff000000) == 0xff000000 /* Any Axis */)
-+        {
-+            DWORD obj_id = semantic_to_obj_id(impl, format->rgoAction[i].dwSemantic);
-+            DWORD type = DIDFT_GETTYPE(obj_id);
-+            DWORD inst = DIDFT_GETINSTANCE(obj_id);
-+            LPDIOBJECTDATAFORMAT obj;
-+
-+            if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON;
-+            else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS;
-+
-+            obj = dataformat_to_odf_by_type(df, inst, type);
-+            TRACE("obj %p, inst 0x%08lx, type 0x%08lx\n", obj, inst, type);
-+            if(obj)
-+            {
-+                memcpy(&obj_df[action], obj, df->dwObjSize);
-+
-+                impl->action_map[action].uAppData = format->rgoAction[i].uAppData;
-+                impl->action_map[action].offset = offset;
-+                obj_df[action].dwOfs = offset;
-+                offset += (type & DIDFT_BUTTON) ? 1 : 4;
-+
-+                action++;
-+            }
-+        }
-+    }
-+
-+    if (action == 0)
-+    {
-+        free( obj_df );
-+        return DI_NOEFFECT;
-     }
-+    data_format.dwNumObjs = action;
- 
-     IDirectInputDevice8_SetDataFormat( iface, &data_format );
- 
--- 
-2.33.0
-

patches/dinput-joy-mappings/definition

@@ -1,3 +1,5 @@
 Fixes: [34108] dinput: Improve support for user Joystick configuration.
 Fixes: [47326] dinput: Allow mapping of controls based of genre type.
 Fixes: [35815] dinput: Allow remapping of joystick buttons.
+# Seeing active work...
+Disabled: true

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

@@ -1,30 +1,29 @@
-From da59fcb896bc204ea0ea1d866eeddef0c9b962c4 Mon Sep 17 00:00:00 2001
+From d09ac9a348309f956a2f3985a1b465b51b6e174c 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.
 
 Based on a patch by Mark Harmstone.
 ---
- dlls/dsound/dsound.c         |   2 +
+ dlls/dsound/dsound.c         |   1 +
  dlls/dsound/dsound_private.h |   4 +-
- dlls/dsound/mixer.c          | 109 ++++++++++++++++++++++++-----------
- 3 files changed, 80 insertions(+), 35 deletions(-)
+ dlls/dsound/mixer.c          | 112 ++++++++++++++++++++++++-----------
+ 3 files changed, 81 insertions(+), 36 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 346cc4ceca3..e869c4dd251 100644
+index 0b8edaaaf06..bdf3a824511 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
+@@ -234,6 +234,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
          if(device->mmdevice)
              IMMDevice_Release(device->mmdevice);
          CloseHandle(device->sleepev);
-+
-+        HeapFree(GetProcessHeap(), 0, device->dsp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->tmp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->cp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->buffer);
++        free(device->dsp_buffer);
+         free(device->tmp_buffer);
+         free(device->cp_buffer);
+         free(device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index f89588de4d9..d4e74ed0e82 100644
+index 124a4311b4c..fe39ca221fa 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -89,8 +89,8 @@ struct DirectSoundDevice
@@ -39,7 +38,7 @@ index f89588de4d9..d4e74ed0e82 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 50816b1a582..ddab45893ac 100644
+index c26b19ea8c1..68a45c46d1e 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -150,7 +149,7 @@ index 50816b1a582..ddab45893ac 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
-@@ -497,34 +511,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -497,31 +511,61 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -165,21 +164,20 @@ index 50816b1a582..ddab45893ac 100644
 -	if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer)
 -	{
 -		dsb->device->tmp_buffer_len = size_bytes;
+-		dsb->device->tmp_buffer = realloc(dsb->device->tmp_buffer, size_bytes);
+-	}
+-	if(dsb->put_aux == putieee32_sum)
+-		memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
 +    put = dsb->put;
 +    ostride = dsb->device->pwfx->nChannels * sizeof(float);
 +    size_bytes = frames * ostride;
-+
-+    if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer) {
- 		if (dsb->device->tmp_buffer)
- 			dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, size_bytes);
- 		else
- 			dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, size_bytes);
-+        dsb->device->tmp_buffer_len = size_bytes;
- 	}
--	if(dsb->put_aux == putieee32_sum)
--		memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
--
+ 
 -	cp_fields(dsb, frames, &dsb->freqAccNum);
++    if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer)
++    {
++        dsb->device->tmp_buffer_len = size_bytes;
++        dsb->device->tmp_buffer = realloc(dsb->device->tmp_buffer, size_bytes);
++    }
 +    if(dsb->put_aux == putieee32_sum)
 +        memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
 +
@@ -234,5 +232,5 @@ index 50816b1a582..ddab45893ac 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.35.1
+2.39.2
 

patches/dsound-EAX/0007-dsound-Support-getting-and-setting-EAX-buffer-proper.patch

@@ -1,4 +1,4 @@
-From f4e3bbf1a91a5a99d703d3fee9a81a5c5089ab79 Mon Sep 17 00:00:00 2001
+From 5bc649eecc617214650f5af105f3ae6b6fae5a11 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:48:19 +0000
 Subject: [PATCH] dsound: Support getting and setting EAX buffer properties.
@@ -11,12 +11,12 @@ Subject: [PATCH] dsound: Support getting and setting EAX buffer properties.
  4 files changed, 72 insertions(+)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index b7a0fb26c4b..0aff7c96842 100644
+index 5c8c495bfe4..ede6d9f1ba1 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1127,6 +1127,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
- 		return DSERR_OUTOFMEMORY;
- 	}
+@@ -1107,6 +1107,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
+ 	dsb->sec_mixpos = 0;
+ 	dsb->state = STATE_STOPPED;
  
 +	dsb->eax.reverb_mix = EAX_REVERBMIX_USEDISTANCE;
 +
@@ -39,7 +39,7 @@ index c90d82d9a3f..2ee83b94ff9 100644
  }
  #endif
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index a11379f0f88..9b537ad80a5 100644
+index 021844c414d..7a89b047b42 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -177,6 +177,8 @@ struct IDirectSoundBufferImpl
@@ -52,7 +52,7 @@ index a11379f0f88..9b537ad80a5 100644
  };
  
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index cdd03becbee..3931681d295 100644
+index 13471aec3a9..03b6e0a9813 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -178,6 +178,38 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
@@ -134,5 +134,5 @@ index cdd03becbee..3931681d295 100644
      }
  
 -- 
-2.33.0
+2.40.1
 

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

@@ -1,4 +1,4 @@
-From 5d29a2de174042ce7bdd52d92337591933e0f761 Mon Sep 17 00:00:00 2001
+From e484e3dc512eacc9708c245a9e64372428bc1875 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.
@@ -10,11 +10,11 @@ Subject: [PATCH] dsound: Add EAX init and free stubs.
  3 files changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index e8b3fb4a832..28f2e95994e 100644
+index ede6d9f1ba1..309d632397a 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1153,6 +1153,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
- 		DSOUND_RecalcVolPan(&(dsb->volpan));
+@@ -1145,6 +1145,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
+ 	}
  
          InitializeSRWLock(&dsb->lock);
 +	if (dsb->device->eax.using_eax)
@@ -22,17 +22,17 @@ index e8b3fb4a832..28f2e95994e 100644
  
          /* register buffer */
          err = DirectSoundDevice_AddBuffer(device, dsb);
-@@ -1194,6 +1196,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
-         HeapFree(GetProcessHeap(), 0, This->filters);
+@@ -1186,6 +1188,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
+         free(This->filters);
      }
  
 +    free_eax_buffer(This);
 +
      TRACE("(%p) released\n", This);
  
-     HeapFree(GetProcessHeap(), 0, This);
+     free(This);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 267b2c044bc..c906eb2adb1 100644
+index 7a89b047b42..c5e84f07763 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,
@@ -97,5 +97,5 @@ index 03b6e0a9813..91438efc335 100644
  
  HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
 -- 
-2.35.1
+2.40.1
 

patches/dsound-EAX/0018-dsound-Various-improvements-to-EAX-support.patch

@@ -1,4 +1,4 @@
-From 3760db8daceee555842425400af01de2075b4568 Mon Sep 17 00:00:00 2001
+From 673e9f32e39fce78a02f6519a435051ffec3664d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 4 Apr 2015 21:09:18 +0200
 Subject: [PATCH] dsound: Various improvements to EAX support.
@@ -24,19 +24,19 @@ the buffers).
  5 files changed, 37 insertions(+), 39 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 6b7414d34ff..b1efa0d3012 100644
+index 72e96765883..bdb93657017 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1213,7 +1213,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1223,7 +1223,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
      VOID *committedbuff;
      TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb);
  
--    dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb));
-+    dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb));
+-    dsb = malloc(sizeof(*dsb));
++    dsb = calloc(1, sizeof(*dsb));
      if (dsb == NULL) {
          WARN("out of memory\n");
          *ppdsb = NULL;
-@@ -1261,6 +1261,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1271,6 +1271,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
  
      InitializeSRWLock(&dsb->lock);
  
@@ -46,7 +46,7 @@ index 6b7414d34ff..b1efa0d3012 100644
      hres = DirectSoundDevice_AddBuffer(device, dsb);
      if (hres != DS_OK) {
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 91fa94b943e..a0931325ebc 100644
+index bdf3a824511..4df26e93c6e 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
 @@ -182,6 +182,8 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
@@ -71,10 +71,10 @@ index a650108f570..a555a75e458 100644
  
      float *SampleBuffer;
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 43e62626161..065fe820055 100644
+index 9131fa8792e..f2b2c353643 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -239,6 +239,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -240,6 +240,7 @@ 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;
@@ -83,7 +83,7 @@ index 43e62626161..065fe820055 100644
  void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
  void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index a05b00e1c02..ef802b95a7d 100644
+index 5f2b8ef07e2..2244565897b 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -114,6 +114,8 @@ static const float LATE_LINE_MULTIPLIER = 4.0f;
@@ -244,5 +244,5 @@ index a05b00e1c02..ef802b95a7d 100644
          switch (dwPropID) {
              case DSPROPERTY_EAXBUFFER_ALL:
 -- 
-2.33.0
+2.39.2
 

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

@@ -1,4 +1,4 @@
-From b332f5a5dd03b7d71515a2fddefa787da3fb7b5e Mon Sep 17 00:00:00 2001
+From 9e4371e8d0aaf8b4c5578c41adf8e1dd4436b1f7 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
@@ -14,7 +14,7 @@ Signed-off-by: Michael Müller <michael@fds-team.de>
  2 files changed, 16 insertions(+)
 
 diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index dfadd13ea8c..b3e5888da92 100644
+index 480e96ef6ee..49aacc905b1 100644
 --- a/dlls/advapi32/tests/registry.c
 +++ b/dlls/advapi32/tests/registry.c
 @@ -1318,6 +1318,13 @@ static void test_reg_create_key(void)
@@ -32,12 +32,12 @@ index dfadd13ea8c..b3e5888da92 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 94d178880a8..95f06e50b7d 100644
+index 81eb0d1d01b..f742cd6d30b 100644
 --- a/programs/explorer/desktop.c
 +++ b/programs/explorer/desktop.c
-@@ -792,6 +792,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
+@@ -878,6 +878,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
  
- static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
  {
 +    static const WCHAR video_keyW[] = {
 +        'S','y','s','t','e','m','\\',
@@ -47,7 +47,7 @@ index 94d178880a8..95f06e50b7d 100644
      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','\\',
-@@ -859,6 +864,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+@@ -947,6 +952,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 +59,5 @@ index 94d178880a8..95f06e50b7d 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.30.2
+2.39.2
 

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch

@@ -1,4 +1,4 @@
-From 8b6a7baacf0a26c7de7524c5f6da37bf4f4c1120 Mon Sep 17 00:00:00 2001
+From bc1d0962b58a45949c91367e84e6f71beb9f698b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 30 Aug 2021 15:16:06 +1000
 Subject: [PATCH] ntoskrnl.exe: Add FltBuildDefaultSecurityDescriptor test
@@ -23,7 +23,7 @@ index ab1db85adbb..9c89e44e70a 100644
  driver2_IMPORTS = winecrt0 ntoskrnl hal
  driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
 diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index de61ed64fa4..a0cdbf0878a 100644
+index 18f2920759d..569007d435e 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
 @@ -32,6 +32,7 @@
@@ -34,7 +34,7 @@ index de61ed64fa4..a0cdbf0878a 100644
  
  #include "driver.h"
  
-@@ -2338,6 +2339,69 @@ static void test_default_modules(void)
+@@ -2374,6 +2375,69 @@ static void test_default_modules(void)
      ok(dxgmms1, "Failed to find dxgmms1.sys\n");
  }
  
@@ -104,14 +104,14 @@ index de61ed64fa4..a0cdbf0878a 100644
  static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
  {
      void *buffer = irp->AssociatedIrp.SystemBuffer;
-@@ -2382,6 +2446,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
-     test_dpc();
+@@ -2419,6 +2483,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
      test_process_memory(test_input);
      test_permanence();
+     test_driver_object_extension();
 +    test_default_security();
  
      IoMarkIrpPending(irp);
      IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp);
 -- 
-2.35.1
+2.39.2
 

patches/gdiplus-Performance-Improvements/definition

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

patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch

@@ -1,4 +1,4 @@
-From f2347ae7216626d248cfaf9445862561b2b5eef7 Mon Sep 17 00:00:00 2001
+From d1d83243555801226876f651b6f3304d3e595ae4 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 1 Jul 2019 09:58:55 +1000
 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries.
@@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  1 file changed, 209 insertions(+)
 
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index ff601e41b26..6ffb8c56d87 100644
+index d5f943861a8..b07843ff237 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
 @@ -63,6 +63,7 @@ AddReg=\
@@ -20,7 +20,7 @@ index ff601e41b26..6ffb8c56d87 100644
      MCI,\
      Misc,\
      OLE,\
-@@ -87,6 +88,7 @@ AddReg=\
+@@ -86,6 +87,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
@@ -28,7 +28,7 @@ index ff601e41b26..6ffb8c56d87 100644
      MCI,\
      Misc,\
      OLE,\
-@@ -113,6 +115,7 @@ AddReg=\
+@@ -111,6 +113,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
@@ -36,15 +36,15 @@ index ff601e41b26..6ffb8c56d87 100644
      MCI,\
      Misc,\
      OLE,\
-@@ -160,6 +163,7 @@ AddReg=\
-     CurrentVersionWow64,\
+@@ -156,6 +159,7 @@ AddReg=\
+     CurrentVersionWow64.ntx86,\
      Debugger,\
      DirectX,\
 +    KeyboardLayouts,\
      MCI,\
      Misc,\
      Tapi,\
-@@ -597,6 +601,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
+@@ -628,6 +632,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
  HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http"
  HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https"
  
@@ -257,5 +257,5 @@ index ff601e41b26..6ffb8c56d87 100644
  HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y"
  HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
 -- 
-2.35.1
+2.39.2
 

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From c1ecb277d4b77d59bd113a530bea556c356f81cc Mon Sep 17 00:00:00 2001
+From 2a1229098b39f923ff6e9a13bde05e161c797b0a Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Do not enumerate the registry in
@@ -13,22 +13,22 @@ not the complete list from the registry.
  3 files changed, 36 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 3b0a13842c8..2027ce10358 100644
+index 8f3cd8acae7..072f1fab23a 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -499,7 +499,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
 -
- static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header)
+ static DWORD CALLBACK devnotify_window_callbackW(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header)
  {
      SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL);
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index f8b40099091..6551367788c 100644
+index 8f3d5750c2f..3bdfd042e85 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4875,6 +4875,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
+@@ -5091,6 +5091,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
      CloseHandle( info.hProcess );
  }
  
@@ -69,7 +69,7 @@ index f8b40099091..6551367788c 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4925,6 +4959,7 @@ START_TEST(input)
+@@ -5142,6 +5176,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index f8b40099091..6551367788c 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index 36f7404b296..bdbd24b5695 100644
+index 11bb129134c..9864d80ceff 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1250,11 +1250,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index 36f7404b296..bdbd24b5695 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -952,33 +948,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1268,33 +1264,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -111,10 +111,10 @@ index 36f7404b296..bdbd24b5695 100644
 -            tmp = wcstoul( key_info->Name, NULL, 16 );
 -            if (query_reg_ascii_value( subkey, "Layout Id", value_info, sizeof(buffer) ) &&
 -                value_info->Type == REG_SZ)
--                tmp = MAKELONG( LOWORD( tmp ),
--                                0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff) );
+-                tmp = 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff);
 -            NtClose( subkey );
 -
+-            tmp = MAKELONG( LOWORD( layout ), LOWORD( tmp ) );
 -            if (layout == UlongToHandle( tmp )) continue;
 -
 -            count++;
@@ -129,5 +129,5 @@ index 36f7404b296..bdbd24b5695 100644
  
      return count;
 -- 
-2.39.1
+2.39.2
 

patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch

@@ -1,4 +1,4 @@
-From eba9e414d60a33dfde7e7b978fcdddbaf9bfe5b6 Mon Sep 17 00:00:00 2001
+From 612c0266b7a8cec562f82f1a2aaf55cffc15f35e Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 21 Oct 2020 16:03:21 -0500
 Subject: [PATCH] winegstreamer: Allow videoconvert to parallelize.
@@ -11,19 +11,19 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index 0573c99858b..5df08dc5fd7 100644
+index dfb3da9a4ab..2135dea456b 100644
 --- a/dlls/winegstreamer/wg_parser.c
 +++ b/dlls/winegstreamer/wg_parser.c
-@@ -760,6 +760,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
-         if (!(vconv = create_element("videoconvert", "base")))
-             goto out;
+@@ -842,6 +842,9 @@ static bool stream_create_post_processing_elements(struct wg_parser_stream *stre
+                 || !append_element(parser->container, element, &first, &last))
+             return false;
  
 +        /* Let GStreamer choose a default number of threads. */
-+        gst_util_set_object_arg(G_OBJECT(vconv), "n-threads", "0");
++        gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0");
 +
          /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */
-         if (!(flip = create_element("videoflip", "good")))
-             goto out;
+         if (!(element = create_element("videoflip", "good"))
+                 || !append_element(parser->container, element, &first, &last))
 -- 
-2.37.2
+2.39.2
 

patches/mfplat-streaming-support/0025-winegstreamer-Report-streams-backwards-in-media-sour.patch

@@ -1,4 +1,4 @@
-From e1c18d8fda84e300fc6ae2b90bf3770c4f2bb2c7 Mon Sep 17 00:00:00 2001
+From 7d0af0dc23f87241726af6f7c48f47df441503a6 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 19 Mar 2021 17:01:54 -0400
 Subject: [PATCH] winegstreamer: Report streams backwards in media source.
@@ -9,18 +9,18 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 542189b28f5..a9e97f545dd 100644
+index 335b617becd..e6117fd0090 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -1496,7 +1496,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
-         DWORD len;
-         char *str;
- 
--        IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]);
-+        IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[object->stream_count - 1 - i]);
- 
-         for (j = 0; j < ARRAY_SIZE(tags); ++j)
-         {
+@@ -1604,7 +1604,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+             }
+             strW = malloc(len * sizeof(*strW));
+             if (MultiByteToWideChar(CP_UTF8, 0, str, -1, strW, len))
+-                IMFStreamDescriptor_SetString(object->descriptors[i], tags[j].mf_attr, strW);
++                IMFStreamDescriptor_SetString(object->descriptors[object->stream_count - 1 - i], tags[j].mf_attr, strW);
+             free(strW);
+             free(str);
+         }
 -- 
-2.38.1
+2.40.1
 

patches/mfplat-streaming-support/0055-winegstreamer-Add-MFVideoFormat_ARGB32-output-for-th.patch

@@ -1,4 +1,4 @@
-From 56ad22a46d27fdc5313aff459f6334bb0051e21a Mon Sep 17 00:00:00 2001
+From af54761b8536f81831f2813ef0ff9b627dcc5ca4 Mon Sep 17 00:00:00 2001
 From: Nikolay Sivov <nsivov@codeweavers.com>
 Date: Wed, 12 Jan 2022 22:48:35 +0300
 Subject: [PATCH] winegstreamer: Add MFVideoFormat_ARGB32 output for the
@@ -12,10 +12,10 @@ CW-Bug-Id: #19975
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index de6a2c2b232..042c635ae93 100644
+index 00c40dc2f47..7a0f65b4247 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -855,7 +855,7 @@ static HRESULT new_media_stream(struct media_source *source,
+@@ -856,7 +856,7 @@ static HRESULT new_media_stream(struct media_source *source,
  static HRESULT media_stream_init_desc(struct media_stream *stream)
  {
      IMFMediaTypeHandler *type_handler = NULL;
@@ -24,14 +24,14 @@ index de6a2c2b232..042c635ae93 100644
      struct wg_format format;
      DWORD type_count = 0;
      unsigned int i;
-@@ -874,6 +874,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-             &MFVideoFormat_YUY2,
-             &MFVideoFormat_IYUV,
-             &MFVideoFormat_I420,
-+            &MFVideoFormat_ARGB32,
+@@ -875,6 +875,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
+             WG_VIDEO_FORMAT_YV12,
+             WG_VIDEO_FORMAT_YUY2,
+             WG_VIDEO_FORMAT_I420,
++            WG_VIDEO_FORMAT_BGRA,
          };
  
          IMFMediaType *base_type = mf_media_type_from_wg_format(&format);
 -- 
-2.37.2
+2.40.0
 

patches/mfplat-streaming-support/definition

@@ -1 +1,2 @@
 Fixes: [49692] Multiple applications need a Media Foundation media source implementation
+Disabled: True

patches/ntdll-ForceBottomUpAlloc/0001-ntdll-Increase-step-after-failed-map-attempt-in-try_.patch

@@ -1,4 +1,4 @@
-From 5814a4b9c7d4dec027b0c2dd29822664aa56ada1 Mon Sep 17 00:00:00 2001
+From 5a81a28605ec0b32b020c84032e3f4a35d0e4768 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 14 Jan 2020 21:39:23 +0300
 Subject: [PATCH] ntdll: Increase step after failed map attempt in
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Increase step after failed map attempt in
  1 file changed, 1 insertion(+)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 84a4e331ad7..a63882023e6 100644
+index 2e61e8ba22f..039007f6a9b 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1327,6 +1327,7 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1336,6 +1336,7 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
              step == 0)
              break;
          start = (char *)start + step;
@@ -21,5 +21,5 @@ index 84a4e331ad7..a63882023e6 100644
  
      return NULL;
 -- 
-2.38.1
+2.40.1
 

patches/ntdll-ForceBottomUpAlloc/0002-ntdll-Increase-free-ranges-view-block-size-on-64-bit.patch

@@ -1,4 +1,4 @@
-From b1e6d32e7dc3bac93419f3a573f509ee6e1177b2 Mon Sep 17 00:00:00 2001
+From b7c39298824976bbbc8788b60aa4195f3815d3b9 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Thu, 23 Jul 2020 18:40:39 +0300
 Subject: [PATCH] ntdll: Increase free ranges view block size on 64 bit.
@@ -8,10 +8,10 @@ Subject: [PATCH] ntdll: Increase free ranges view block size on 64 bit.
  1 file changed, 4 insertions(+)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index a63882023e6..83909f57d4a 100644
+index 039007f6a9b..82a0a91cf14 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -205,7 +205,11 @@ static BYTE *pages_vprot;
+@@ -212,7 +212,11 @@ static BYTE *pages_vprot;
  #endif
  
  static struct file_view *view_block_start, *view_block_end, *next_free_view;
@@ -24,5 +24,5 @@ index a63882023e6..83909f57d4a 100644
  static void *preload_reserve_end;
  static BOOL force_exec_prot;  /* whether to force PROT_EXEC on all PROT_READ mmaps */
 -- 
-2.38.1
+2.40.1
 

patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-virtual-memory-allocation-order.patch

@@ -1,4 +1,4 @@
-From c3252fd68ecdcc0186b4d284df1b36ea11ca7d7f Mon Sep 17 00:00:00 2001
+From 5be3a73fdd9728f6280a2c0b790166c94309bf73 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Mon, 25 Nov 2019 12:19:20 +0300
 Subject: [PATCH] ntdll: Force virtual memory allocation order.
@@ -16,10 +16,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568
  1 file changed, 227 insertions(+), 223 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 83909f57d4a..4bce8f2f806 100644
+index 13aa67c2d82..fd5bb86e6de 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1266,44 +1266,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
+@@ -1275,44 +1275,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
      return NULL;
  }
  
@@ -72,7 +72,7 @@ index 83909f57d4a..4bce8f2f806 100644
  
  /***********************************************************************
   *           try_map_free_area
-@@ -1337,110 +1308,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1346,110 +1317,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
      return NULL;
  }
  
@@ -183,7 +183,7 @@ index 83909f57d4a..4bce8f2f806 100644
  /***********************************************************************
   *           add_reserved_area
   *
-@@ -1608,8 +1475,7 @@ static void free_view( struct file_view *view )
+@@ -1617,8 +1484,7 @@ static void free_view( struct file_view *view )
   */
  static void unregister_view( struct file_view *view )
  {
@@ -193,7 +193,7 @@ index 83909f57d4a..4bce8f2f806 100644
      wine_rb_remove( &views_tree, &view->entry );
  }
  
-@@ -1636,8 +1502,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
+@@ -1646,8 +1512,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
  static void register_view( struct file_view *view )
  {
      wine_rb_put( &views_tree, view->base, &view->entry );
@@ -203,7 +203,7 @@ index 83909f57d4a..4bce8f2f806 100644
  }
  
  
-@@ -1906,55 +1771,229 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
+@@ -1916,55 +1781,229 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
      return ptr;
  }
  
@@ -241,7 +241,10 @@ index 83909f57d4a..4bce8f2f806 100644
 +
 +        if (area->map_area_end <= (char *)start)
 +            return 0;
-+
+ 
+-    if (start < address_space_start) start = address_space_start;
+-    if (is_beyond_limit( start, size, alloc->limit )) end = alloc->limit;
+-    if (start >= end) return 0;
 +        if ((ULONG_PTR)area->map_area_end < area->size)
 +            return 1;
 +
@@ -255,10 +258,7 @@ index 83909f57d4a..4bce8f2f806 100644
 +                    alloc_start, area->size, area->unix_prot )))
 +                return 1;
 +        }
- 
--    if (start < address_space_start) start = address_space_start;
--    if (is_beyond_limit( start, size, alloc->limit )) end = alloc->limit;
--    if (start >= end) return 0;
++
 +        if (intersect_end - intersect_start >= area->size)
 +        {
 +            alloc_start = ROUND_ADDR( intersect_end - area->size, align_mask );
@@ -467,7 +467,7 @@ index 83909f57d4a..4bce8f2f806 100644
  /***********************************************************************
   *           map_fixed_area
   *
-@@ -2019,6 +2058,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -2029,6 +2068,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
      void *ptr;
      NTSTATUS status;
  
@@ -475,9 +475,9 @@ index 83909f57d4a..4bce8f2f806 100644
 +
      if (alloc_type & MEM_REPLACE_PLACEHOLDER)
      {
-         if ((*view_ret = find_view( base, 0 )))
-@@ -2044,6 +2085,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
-         return STATUS_INVALID_PARAMETER;
+         struct file_view *view;
+@@ -2046,6 +2087,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+         return STATUS_SUCCESS;
      }
  
 +    if (!align_mask) align_mask = granularity_mask;
@@ -485,7 +485,7 @@ index 83909f57d4a..4bce8f2f806 100644
      if (base)
      {
          if (is_beyond_limit( base, size, address_space_limit ))
-@@ -2052,52 +2095,10 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -2056,52 +2099,10 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
          if (status != STATUS_SUCCESS) return status;
          ptr = base;
      }
@@ -540,7 +540,7 @@ index 83909f57d4a..4bce8f2f806 100644
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
      return status;
-@@ -2758,6 +2759,7 @@ static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_PTR z
+@@ -3050,6 +3051,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
  done:
      server_leave_uninterrupted_section( &virtual_mutex, &sigset );
      if (needs_close) close( unix_handle );
@@ -548,7 +548,7 @@ index 83909f57d4a..4bce8f2f806 100644
      return res;
  }
  
-@@ -2826,6 +2828,7 @@ void virtual_init(void)
+@@ -3118,6 +3120,7 @@ void virtual_init(void)
              if (preload_reserve_start)
                  address_space_start = min( address_space_start, preload_reserve_start );
          }
@@ -556,7 +556,7 @@ index 83909f57d4a..4bce8f2f806 100644
      }
  
      /* try to find space in a reserved area for the views and pages protection table */
-@@ -5579,6 +5582,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
+@@ -5842,6 +5845,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
          *ret = (ULONG_PTR)base;
          *size_ptr = size;
      }
@@ -565,5 +565,5 @@ index 83909f57d4a..4bce8f2f806 100644
  }
  
 -- 
-2.38.1
+2.40.1
 

patches/ntdll-ForceBottomUpAlloc/0004-ntdll-Exclude-natively-mapped-areas-from-free-areas-.patch

@@ -1,25 +1,35 @@
-From d29a79d8cca2220c838fbbea6ea81b9f73070ba5 Mon Sep 17 00:00:00 2001
+From bd1c2ee8168bc923e3040af04ea3bebc8c021ea5 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 2 Jun 2020 21:06:33 +0300
 Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
 
 ---
- dlls/ntdll/unix/virtual.c | 118 ++++++++++++++++++++++++++++++++------
- 1 file changed, 100 insertions(+), 18 deletions(-)
+ dlls/ntdll/unix/virtual.c | 126 ++++++++++++++++++++++++++++++++------
+ 1 file changed, 107 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 4bce8f2f806..3c1bf6edc30 100644
+index b189ded181b..00569e5e24c 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -125,6 +125,7 @@ struct file_view
+@@ -130,6 +130,7 @@ C_ASSERT( offsetof( struct file_view, entry ) == 0 );
  #define VPROT_SYSTEM     0x0200  /* system view (underlying mmap not under our control) */
- #define VPROT_PLACEHOLDER 0x0400
- #define VPROT_FROMPLACEHOLDER 0x0800
+ #define VPROT_PLACEHOLDER      0x0400
+ #define VPROT_FREE_PLACEHOLDER 0x0800
 +#define VPROT_NATIVE     0x1000
  
  /* Conversion from VPROT_* to Win32 flags */
  static const BYTE VIRTUAL_Win32Flags[16] =
-@@ -1119,7 +1120,9 @@ static void dump_view( struct file_view *view )
+@@ -184,6 +185,9 @@ static void *working_set_limit   = (void *)0x7fff0000;
+ 
+ static UINT64 *arm64ec_map;
+ 
++static const ptrdiff_t max_try_map_step = 0x40000000;
++static BOOL increase_try_map_step = TRUE;
++
+ struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
+ 
+ /* TEB allocation blocks */
+@@ -1164,7 +1168,9 @@ static void dump_view( struct file_view *view )
      BYTE prot = get_page_vprot( addr );
  
      TRACE( "View: %p - %p", addr, addr + view->size - 1 );
@@ -28,9 +38,9 @@ index 4bce8f2f806..3c1bf6edc30 100644
 +        TRACE(" (native)\n");
 +    else if (view->protect & VPROT_SYSTEM)
          TRACE( " (builtin image)\n" );
-     else if (view->protect & VPROT_PLACEHOLDER)
+     else if (view->protect & VPROT_FREE_PLACEHOLDER)
          TRACE( " (placeholder)\n" );
-@@ -1274,6 +1277,8 @@ struct alloc_area
+@@ -1283,6 +1289,8 @@ struct alloc_area
      int unix_prot;
      BOOL top_down;
      UINT_PTR align_mask;
@@ -39,7 +49,7 @@ index 4bce8f2f806..3c1bf6edc30 100644
  };
  
  /***********************************************************************
-@@ -1282,21 +1287,28 @@ struct alloc_area
+@@ -1291,27 +1299,35 @@ struct alloc_area
   * Try mmaping some expected free memory region, eventually stepping and
   * retrying inside it, and return where it actually succeeded, or NULL.
   */
@@ -73,7 +83,15 @@ index 4bce8f2f806..3c1bf6edc30 100644
          if ((step > 0 && (char *)end - (char *)start < step) ||
              (step < 0 && (char *)start - (char *)base < -step) ||
              step == 0)
-@@ -1797,9 +1809,9 @@ static int alloc_area_in_reserved_or_between_callback( void *start, SIZE_T size,
+             break;
+         start = (char *)start + step;
+-        step *= 2;
++        if (increase_try_map_step && llabs(step) < max_try_map_step)
++            step *= 2;
+     }
+ 
+     return NULL;
+@@ -1807,9 +1823,9 @@ static int alloc_area_in_reserved_or_between_callback( void *start, SIZE_T size,
          assert(intersect_start <= intersect_end);
          if (area->map_area_end - intersect_end >= area->size)
          {
@@ -86,7 +104,7 @@ index 4bce8f2f806..3c1bf6edc30 100644
                  return 1;
          }
  
-@@ -1838,8 +1850,8 @@ static int alloc_area_in_reserved_or_between_callback( void *start, SIZE_T size,
+@@ -1848,8 +1864,8 @@ static int alloc_area_in_reserved_or_between_callback( void *start, SIZE_T size,
          if (intersect_start - area->map_area_start >= area->size)
          {
              alloc_start = ROUND_ADDR( area->map_area_start + align_mask, align_mask );
@@ -97,7 +115,7 @@ index 4bce8f2f806..3c1bf6edc30 100644
                  return 1;
          }
  
-@@ -1900,8 +1912,7 @@ static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char
+@@ -1910,8 +1926,7 @@ static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char
          if (start >= area->map_area_end || start < area->map_area_start)
              return NULL;
  
@@ -107,7 +125,7 @@ index 4bce8f2f806..3c1bf6edc30 100644
      }
      else
      {
-@@ -1911,8 +1922,7 @@ static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char
+@@ -1921,8 +1936,7 @@ static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char
                  || area->map_area_end - start < area->size)
              return NULL;
  
@@ -117,15 +135,15 @@ index 4bce8f2f806..3c1bf6edc30 100644
      }
  }
  
-@@ -1922,6 +1932,7 @@ static void *alloc_free_area( void *limit, size_t size, BOOL top_down, int unix_
-     char *reserve_start, *reserve_end;
+@@ -1933,6 +1947,7 @@ static void *alloc_free_area( void *limit, size_t size, BOOL top_down, int unix_
      struct alloc_area area;
      char *base, *end;
-+    NTSTATUS status;
      int ranges_inc;
++    UINT status;
  
      TRACE("limit %p, size %p, top_down %#x.\n", limit, (void *)size, top_down);
-@@ -1991,7 +2002,58 @@ static void *alloc_free_area( void *limit, size_t size, BOOL top_down, int unix_
+ 
+@@ -2001,7 +2016,58 @@ static void *alloc_free_area( void *limit, size_t size, BOOL top_down, int unix_
          if ((area.result = alloc_free_area_in_range( &area, base, end )))
              break;
      }
@@ -177,7 +195,7 @@ index 4bce8f2f806..3c1bf6edc30 100644
 +            }
 +            if ((status = create_view( &next, native_mapped_start, native_mapped_end - native_mapped_start,
 +                    VPROT_SYSTEM | VPROT_NATIVE )))
-+                ERR("Could not cretae view for natively mapped area, status %#x.\n", status);
++                ERR("Could not create view for natively mapped area, status %#x.\n", status);
 +        }
 +    }
 +
@@ -185,7 +203,7 @@ index 4bce8f2f806..3c1bf6edc30 100644
  }
  
  /***********************************************************************
-@@ -2045,6 +2107,17 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot )
+@@ -2055,6 +2121,17 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot )
      return STATUS_SUCCESS;
  }
  
@@ -203,20 +221,22 @@ index 4bce8f2f806..3c1bf6edc30 100644
  /***********************************************************************
   *           map_view
   *
-@@ -2097,7 +2170,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -2114,7 +2191,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
      }
      else if (!(ptr = alloc_free_area( (void *)limit, size, top_down, get_unix_prot( vprot ), align_mask )))
      {
 -        return STATUS_NO_MEMORY;
-+        WARN("Allocation failed, clearing native views.\n");
++        WARN( "Allocation failed, clearing native views.\n" );
 +
 +        clear_native_views();
-+        if (!(ptr = alloc_free_area( (void *)limit, size, top_down, get_unix_prot( vprot ), align_mask )))
-+            return STATUS_NO_MEMORY;
++        if (!is_win64) increase_try_map_step = FALSE;
++        ptr = alloc_free_area( (void *)limit, size, top_down, get_unix_prot( vprot ), align_mask );
++        if (!is_win64) increase_try_map_step = TRUE;
++        if (!ptr) return STATUS_NO_MEMORY;
      }
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
-@@ -3835,7 +3912,12 @@ void virtual_set_force_exec( BOOL enable )
+@@ -4106,7 +4189,12 @@ void virtual_set_force_exec( BOOL enable )
          WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry )
          {
              /* file mappings are always accessible */
@@ -231,5 +251,5 @@ index 4bce8f2f806..3c1bf6edc30 100644
              mprotect_range( view->base, view->size, commit, 0 );
          }
 -- 
-2.38.1
+2.40.1