Updated odbc32-fixes patchset

Thanks Steve Fawcett.

patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch

@@ -1,15 +1,15 @@
-From 601da0ae0c6b22f37d20e6e0f10558093277eca9 Mon Sep 17 00:00:00 2001
+From 3dc4a148d7c91afea8f589f47daca82c5c27b7c1 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  branch name and version.
 
 ---
- dlls/ntdll/loader.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ dlls/ntdll/loader.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 5f84ca7e23b..fabf394fbe5 100644
+index 74eb1b7f500..95639558155 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -43,6 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index 5f84ca7e23b..fabf394fbe5 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3828,6 +3829,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3870,6 +3871,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index 5f84ca7e23b..fabf394fbe5 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -4322,6 +4324,9 @@ static void release_address_space(void)
+@@ -4366,6 +4368,9 @@ static void release_address_space(void)
   */
  void loader_init( CONTEXT *context, void **entry )
  {
@@ -38,13 +38,13 @@ index 5f84ca7e23b..fabf394fbe5 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie, port = 0;
-@@ -4407,7 +4412,18 @@ void loader_init( CONTEXT *context, void **entry )
+@@ -4455,6 +4460,20 @@ void loader_init( CONTEXT *context, void **entry )
          arm64ec_thread_init();
  #endif
          wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
 +        /* This hunk occasionally applies in the wrong place;
 +         * add a comment here to try to prevent that. */
-     }
++    }
 +    RtlInitUnicodeString( &staging_event_string, L"\\__wine_staging_warn_event" );
 +    InitializeObjectAttributes( &staging_event_attr, &staging_event_string, OBJ_OPENIF, NULL, NULL );
 +    if (NtCreateEvent( &staging_event, EVENT_ALL_ACCESS, &staging_event_attr, NotificationEvent, FALSE ) == STATUS_SUCCESS)
@@ -53,10 +53,12 @@ index 5f84ca7e23b..fabf394fbe5 100644
 +        FIXME_(winediag)("Please mention your exact version when filing bug reports on winehq.org.\n");
 +    }
 +    else
++    {
 +        WARN_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version());
++        NtClose( staging_event );
+     }
  
      NtCurrentTeb()->FlsSlots = fls_alloc_data();
- 
 -- 
-2.45.2
+2.47.2
 

patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,118 +0,0 @@
-From 71d1c176af87bdc48326d5883fbea608314ee0a4 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 11 Jan 2015 16:29:30 +0100
-Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
- texture to dds file.
-
----
- dlls/d3dx9_36/d3dx9_private.h |  2 ++
- dlls/d3dx9_36/surface.c       | 63 +++++++++++++++++++++++++++++++++++
- dlls/d3dx9_36/texture.c       |  5 +--
- 3 files changed, 66 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 6a9b3e12b7b..0c6374f35ca 100644
---- a/dlls/d3dx9_36/d3dx9_private.h
-+++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -316,6 +316,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
-         IDirect3DSurface9 **temp_surface, BOOL write);
- HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
-         IDirect3DSurface9 *temp_surface, BOOL update);
-+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
-+    const PALETTEENTRY *src_palette);
- HRESULT d3dx_pixels_init(const void *data, uint32_t row_pitch, uint32_t slice_pitch,
-         const PALETTEENTRY *palette, enum d3dx_pixel_format_id format, uint32_t left, uint32_t top, uint32_t right,
-         uint32_t bottom, uint32_t front, uint32_t back, struct d3dx_pixels *pixels);
-diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 9d2dc96a979..912a3e3c849 100644
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -628,6 +628,69 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
-     return D3D_OK;
- }
- 
-+static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex,
-+        int face, UINT level, struct IDirect3DSurface9 **surf)
-+{
-+    switch (type)
-+    {
-+        case D3DRTYPE_TEXTURE:
-+            return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf);
-+        case D3DRTYPE_CUBETEXTURE:
-+            return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf);
-+        default:
-+            ERR("Unexpected texture type\n");
-+            return E_NOTIMPL;
-+    }
-+}
-+
-+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette)
-+{
-+    HRESULT hr;
-+    D3DRESOURCETYPE type;
-+    UINT mip_levels;
-+    IDirect3DSurface9 *surface;
-+
-+    type = IDirect3DBaseTexture9_GetType(src_texture);
-+
-+    if ((type !=  D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE))
-+        return D3DERR_INVALIDCALL;
-+
-+    if (type == D3DRTYPE_CUBETEXTURE)
-+    {
-+        FIXME("Cube texture not supported yet\n");
-+        return E_NOTIMPL;
-+    }
-+    else if (type == D3DRTYPE_VOLUMETEXTURE)
-+    {
-+        FIXME("Volume texture not supported yet\n");
-+        return E_NOTIMPL;
-+    }
-+
-+    mip_levels = IDirect3DTexture9_GetLevelCount(src_texture);
-+
-+    if (mip_levels > 1)
-+    {
-+        FIXME("Mipmap not supported yet\n");
-+        return E_NOTIMPL;
-+    }
-+
-+    if (src_palette)
-+    {
-+        FIXME("Saving surfaces with palettized pixel formats not implemented yet\n");
-+        return E_NOTIMPL;
-+    }
-+
-+    hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface);
-+
-+    if (SUCCEEDED(hr))
-+    {
-+        hr = save_dds_surface_to_memory(dst_buffer, surface, NULL, NULL);
-+        IDirect3DSurface9_Release(surface);
-+    }
-+
-+    return hr;
-+}
-+
- static const uint8_t bmp_file_signature[] =       { 'B', 'M' };
- static const uint8_t jpg_file_signature[] =       { 0xff, 0xd8 };
- static const uint8_t png_file_signature[] =       { 0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a };
-diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index 719a2787445..3f76ec209f9 100644
---- a/dlls/d3dx9_36/texture.c
-+++ b/dlls/d3dx9_36/texture.c
-@@ -1866,10 +1866,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
-     if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
- 
-     if (file_format == D3DXIFF_DDS)
--    {
--        FIXME("DDS file format isn't supported yet\n");
--        return E_NOTIMPL;
--    }
-+        return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette);
- 
-     type = IDirect3DBaseTexture9_GetType(src_texture);
-     switch (type)
--- 
-2.47.2
-

patches/d3dx9_36-DDS/definition

@@ -1,2 +0,0 @@
-Fixes: [26898] Support for DDS file format in D3DXSaveTextureToFileInMemory
-Disabled: True

patches/d3dx9_SetRawValue/0001-d3dx9-Implement-d3dx_effect_SetRawValue.patch

@@ -1,182 +0,0 @@
-From ae80ae124a784078a9838a8aca4b3af308d645dd Mon Sep 17 00:00:00 2001
-From: Patrick Hibbs <hibbsncc1701@gmail.com>
-Date: Fri, 30 Sep 2022 17:58:15 -0400
-Subject: [PATCH] d3dx9: Implement d3dx_effect_SetRawValue
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46012
-
-Signed-off-by: Patrick Hibbs <hibbsncc1701@gmail.com>
----
- dlls/d3dx9_36/effect.c | 154 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 152 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index ea965ce789b..625af4af36b 100644
---- a/dlls/d3dx9_36/effect.c
-+++ b/dlls/d3dx9_36/effect.c
-@@ -4445,10 +4445,160 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic
- static HRESULT WINAPI d3dx_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data,
-         UINT byte_offset, UINT bytes)
- {
--    FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n",
-+    struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
-+    struct d3dx_parameter *param = (parameter == INVALID_HANDLE_VALUE) ? NULL : get_valid_parameter(effect, parameter);
-+    const unsigned int single_size = sizeof(DWORD);
-+    unsigned int x, index_offset, remaining_byte_offset, remaining_bytes;
-+    void *raw;
-+
-+    TRACE("iface %p, parameter %p, data %p, byte_offset %u, bytes %u.\n",
-             iface, parameter, data, byte_offset, bytes);
- 
--    return E_NOTIMPL;
-+    /* pendentic */
-+    index_offset = 0;
-+    remaining_byte_offset = 0;
-+
-+    /* BOOLs and Matries with a single value copy require sanitization of the
-+        byte_offset.
-+
-+        Specificly, matries with a single value copy only allow byte shifts that
-+        are not multiples of the value (DWORD) size. For multiples, we increment
-+        the index of the promoted data type, then add any remainder as a byte
-+        offset.
-+
-+        For BOOLs, due to their value sanitization, we only care about the
-+        index of their promoted data type. Unless it's a non value size matrix.
-+        In that case we do care about the byte offset.
-+    */
-+    if (byte_offset > 0 && (param->type == D3DXPT_BOOL ||
-+            (param->class == D3DXPC_MATRIX_COLUMNS ||
-+            param->class == D3DXPC_MATRIX_ROWS)))
-+    {
-+        remaining_byte_offset = byte_offset % single_size;
-+        if (remaining_byte_offset != 0)
-+            index_offset = byte_offset / single_size;
-+        else
-+            index_offset = byte_offset;
-+        if (param->type != D3DXPT_BOOL || (bytes != single_size &&
-+                (param->class == D3DXPC_MATRIX_COLUMNS ||
-+                param->class == D3DXPC_MATRIX_ROWS)))
-+        {
-+            index_offset = index_offset * single_size;
-+            if (param->type != D3DXPT_BOOL)
-+                index_offset = index_offset * single_size;
-+        }
-+    }
-+
-+    /* If parameter is bad, we are expected to throw C0000005. */
-+    switch (param->class)
-+    {
-+        case D3DXPC_STRUCT:
-+            break;
-+        case D3DXPC_OBJECT:
-+            raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (data && bytes)
-+            {
-+                if (((char*)raw)[0] != '\0')
-+                {
-+                    memset(raw, '\0', param->bytes);
-+                    return S_OK; /* This returns a false success. */
-+                }
-+                else
-+                {
-+                    return D3DERR_INVALIDCALL;
-+                }
-+            }
-+            break;
-+        case D3DXPC_SCALAR:
-+            raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (param->type == D3DXPT_BOOL)
-+                *(BOOL*)raw = *(BOOL*)data ? TRUE : FALSE;
-+            else
-+                memcpy((unsigned char*)raw + byte_offset, data, bytes);
-+            return S_OK;
-+            break;
-+        case D3DXPC_VECTOR:
-+            raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (param->type == D3DXPT_BOOL)
-+            {
-+                raw = (unsigned char*)raw + index_offset;
-+                *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE;
-+                memset((unsigned char*)raw + single_size, \
-+                        '\0', param->bytes - index_offset - single_size);
-+            }
-+            else
-+            {
-+                raw = (unsigned char*)raw + byte_offset;
-+                for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++)
-+                {
-+                    memcpy((unsigned char*)raw + (x * single_size), \
-+                            (unsigned char*)data + (x * single_size), \
-+                            single_size);
-+                }
-+            }
-+            return S_OK;
-+            break;
-+        case D3DXPC_MATRIX_COLUMNS:
-+        case D3DXPC_MATRIX_ROWS:
-+            raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (param->type == D3DXPT_BOOL)
-+            {
-+                if (bytes == single_size)
-+                {
-+                    raw = (unsigned char*)raw + index_offset;
-+                    for (x = 0; (x * single_size) < param->bytes - index_offset; x++)
-+                    {
-+                        remaining_bytes = param->bytes - index_offset - \
-+                                (x * single_size) - single_size;
-+                        *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE;
-+                        memset((unsigned char*)raw + single_size, \
-+                                '\0', (remaining_bytes > (single_size * 4) ? \
-+                                single_size * 4 : remaining_bytes));
-+                        raw = (unsigned char*)raw + (remaining_bytes > (single_size * 4) ? \
-+                                single_size * 4 : remaining_bytes);
-+                    }
-+                }
-+                else
-+                {
-+                    raw = (unsigned char*)raw + index_offset;
-+                    for (x = 0; (x * single_size) < param->bytes - index_offset; x++)
-+                    {
-+                        ((DWORD*)raw)[x] = ((DWORD*)data)[x] ? TRUE : FALSE;
-+                    }
-+                }
-+            }
-+            else
-+            {
-+                if (bytes == single_size)
-+                {
-+                    raw = (unsigned char*)raw + index_offset + remaining_byte_offset;
-+                    for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++)
-+                    {
-+                        memcpy((unsigned char*)raw + (x * single_size), \
-+                                (unsigned char*)data + (x * single_size), \
-+                                single_size);
-+                    }
-+                }
-+                else
-+                {
-+                    raw = (unsigned char*)raw + byte_offset;
-+                    for (x = 0; byte_offset + (x * single_size) < param->bytes &&
-+                            (x * single_size) < bytes; x++)
-+                    {
-+                        memcpy((unsigned char*)raw + (x * single_size), \
-+                                (unsigned char*)data + (x * single_size), \
-+                                single_size);
-+                    }
-+                }
-+            }
-+            return S_OK;
-+            break;
-+        default:
-+            FIXME("Unhandled param class %s.\n", debug_d3dxparameter_class(param->class));
-+            break;
-+    };
-+
-+    return D3DERR_INVALIDCALL;
- }
- #endif
- 
--- 
-2.43.0
-

patches/d3dx9_SetRawValue/definition

@@ -1,3 +0,0 @@
-Fixes: [46012] d3d9: Implement ID3DXEffect::SetRawValue
-
-# https://gitlab.winehq.org/wine/wine/-/merge_requests/979

patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch

@@ -1,4 +1,4 @@
-From 914fe97f7dc20348ec3e1a2e18bcefa9b7cab463 Mon Sep 17 00:00:00 2001
+From 16f5ebca082d65ca9abeddb857f30ef58f590ea3 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 18:51:40 -0500
 Subject: [PATCH] server: Add an object operation to grab the esync file
@@ -44,7 +44,7 @@ Split off to decrease patch size.
  35 files changed, 71 insertions(+)
 
 diff --git a/server/async.c b/server/async.c
-index 749c547af4f..2377c737e98 100644
+index d2d929c9709..9768a4932a6 100644
 --- a/server/async.c
 +++ b/server/async.c
 @@ -78,6 +78,7 @@ static const struct object_ops async_ops =
@@ -100,7 +100,7 @@ index 91f159bc7c9..0df7fd2f18e 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/completion.c b/server/completion.c
-index f9e68c523f1..9093132efac 100644
+index 99680ae0680..3d750154d1b 100644
 --- a/server/completion.c
 +++ b/server/completion.c
 @@ -92,6 +92,7 @@ static const struct object_ops completion_wait_ops =
@@ -120,10 +120,10 @@ index f9e68c523f1..9093132efac 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/console.c b/server/console.c
-index b64283baf4a..1cc9eea6a50 100644
+index de6f4e73e31..9bdba479e8c 100644
 --- a/server/console.c
 +++ b/server/console.c
-@@ -81,6 +81,7 @@ static const struct object_ops console_ops =
+@@ -84,6 +84,7 @@ static const struct object_ops console_ops =
      console_add_queue,                /* add_queue */
      remove_queue,                     /* remove_queue */
      console_signaled,                 /* signaled */
@@ -131,7 +131,7 @@ index b64283baf4a..1cc9eea6a50 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_get_fd,                   /* get_fd */
-@@ -158,6 +159,7 @@ static const struct object_ops console_server_ops =
+@@ -161,6 +162,7 @@ static const struct object_ops console_server_ops =
      add_queue,                        /* add_queue */
      remove_queue,                     /* remove_queue */
      console_server_signaled,          /* signaled */
@@ -139,15 +139,15 @@ index b64283baf4a..1cc9eea6a50 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_server_get_fd,            /* get_fd */
-@@ -227,6 +229,7 @@ static const struct object_ops screen_buffer_ops =
-     screen_buffer_add_queue,          /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -230,6 +232,7 @@ static const struct object_ops screen_buffer_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     screen_buffer_signaled,           /* signaled */
 +    NULL,                             /* get_esync_fd */
-     NULL,                             /* satisfied */
+     no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      screen_buffer_get_fd,             /* get_fd */
-@@ -276,6 +279,7 @@ static const struct object_ops console_device_ops =
+@@ -279,6 +282,7 @@ static const struct object_ops console_device_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -155,23 +155,23 @@ index b64283baf4a..1cc9eea6a50 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      no_get_fd,                        /* get_fd */
-@@ -313,6 +317,7 @@ static const struct object_ops console_input_ops =
-     console_input_add_queue,          /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -318,6 +322,7 @@ static const struct object_ops console_input_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     console_input_signaled,           /* signaled */
 +    NULL,                             /* get_esync_fd */
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_input_get_fd,             /* get_fd */
-@@ -370,6 +375,7 @@ static const struct object_ops console_output_ops =
-     console_output_add_queue,         /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -377,6 +382,7 @@ static const struct object_ops console_output_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     console_output_signaled,          /* signaled */
 +    NULL,                             /* get_esync_fd */
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_output_get_fd,            /* get_fd */
-@@ -428,6 +434,7 @@ static const struct object_ops console_connection_ops =
+@@ -435,6 +441,7 @@ static const struct object_ops console_connection_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -180,7 +180,7 @@ index b64283baf4a..1cc9eea6a50 100644
      no_signal,                        /* signal */
      console_connection_get_fd,        /* get_fd */
 diff --git a/server/debugger.c b/server/debugger.c
-index c59a0abea77..ca04d4c71ce 100644
+index 39a740e07e5..0c01ec1c0d3 100644
 --- a/server/debugger.c
 +++ b/server/debugger.c
 @@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops =
@@ -200,7 +200,7 @@ index c59a0abea77..ca04d4c71ce 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/device.c b/server/device.c
-index 436dac6bfe9..f730fa81afa 100644
+index 1f93cca437d..a0608aa6164 100644
 --- a/server/device.c
 +++ b/server/device.c
 @@ -66,6 +66,7 @@ static const struct object_ops irp_call_ops =
@@ -236,7 +236,7 @@ index 436dac6bfe9..f730fa81afa 100644
      no_signal,                        /* signal */
      device_file_get_fd,               /* get_fd */
 diff --git a/server/directory.c b/server/directory.c
-index b37ec969a9e..a6c0e292071 100644
+index fd689c561bc..2894f7669db 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -69,6 +69,7 @@ static const struct object_ops object_type_ops =
@@ -268,7 +268,7 @@ index 6a63c0dd5e9..f95dc5a391f 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/event.c b/server/event.c
-index f1b79b1b35e..c727bfdd1ba 100644
+index ad7c09acc99..16cea16e9c2 100644
 --- a/server/event.c
 +++ b/server/event.c
 @@ -72,6 +72,7 @@ static const struct object_ops event_ops =
@@ -288,7 +288,7 @@ index f1b79b1b35e..c727bfdd1ba 100644
      no_signal,                   /* signal */
      no_get_fd,                   /* get_fd */
 diff --git a/server/fd.c b/server/fd.c
-index 16328063df6..4ce78db5b33 100644
+index dde92beb664..b0c28e54360 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -172,6 +172,7 @@ static const struct object_ops fd_ops =
@@ -336,7 +336,7 @@ index 2a839968c25..cbef0c63383 100644
      no_signal,                    /* signal */
      file_get_fd,                  /* get_fd */
 diff --git a/server/handle.c b/server/handle.c
-index e65831b3b22..e6c5707556f 100644
+index 8968df73647..3d36af360c2 100644
 --- a/server/handle.c
 +++ b/server/handle.c
 @@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
@@ -348,7 +348,7 @@ index e65831b3b22..e6c5707556f 100644
      no_signal,                       /* signal */
      no_get_fd,                       /* get_fd */
 diff --git a/server/hook.c b/server/hook.c
-index c2d2823cd61..ab4d0e9dd31 100644
+index ffe7206369e..921aa8aba2e 100644
 --- a/server/hook.c
 +++ b/server/hook.c
 @@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops =
@@ -360,7 +360,7 @@ index c2d2823cd61..ab4d0e9dd31 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/mailslot.c b/server/mailslot.c
-index 61eceec94e2..92fe938d3b9 100644
+index c54281c2101..e4c24459f22 100644
 --- a/server/mailslot.c
 +++ b/server/mailslot.c
 @@ -81,6 +81,7 @@ static const struct object_ops mailslot_ops =
@@ -396,7 +396,7 @@ index 61eceec94e2..92fe938d3b9 100644
      no_signal,                              /* signal */
      mailslot_device_file_get_fd,            /* get_fd */
 diff --git a/server/mapping.c b/server/mapping.c
-index 2bf45780375..b84bb08a77b 100644
+index 247b28cf6f5..d8498b65054 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -67,6 +67,7 @@ static const struct object_ops ranges_ops =
@@ -436,7 +436,7 @@ index af0efe72132..4785a830e92 100644
      mutex_signal,              /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index dd8c14b30a9..5880b601d3a 100644
+index 6e4ae371a1b..0eebd68abe6 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
 @@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
@@ -480,7 +480,7 @@ index dd8c14b30a9..5880b601d3a 100644
      no_signal,                               /* signal */
      named_pipe_device_file_get_fd,           /* get_fd */
 diff --git a/server/object.c b/server/object.c
-index b1665fb5372..0a4d1bede06 100644
+index cd368ef724a..4d8fcc5a774 100644
 --- a/server/object.c
 +++ b/server/object.c
 @@ -108,6 +108,7 @@ static const struct object_ops apc_reserve_ops =
@@ -500,7 +500,7 @@ index b1665fb5372..0a4d1bede06 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/object.h b/server/object.h
-index 6222e3352ed..0a65d0e3892 100644
+index 1058f9bfb0a..4acf6f03572 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -78,6 +78,8 @@ struct object_ops
@@ -513,7 +513,7 @@ index 6222e3352ed..0a65d0e3892 100644
      void (*satisfied)(struct object *,struct wait_queue_entry *);
      /* signal an object */
 diff --git a/server/process.c b/server/process.c
-index 49f5c75005f..dc83a089655 100644
+index b161e3394ba..b3676936317 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -105,6 +105,7 @@ static const struct object_ops process_ops =
@@ -541,7 +541,7 @@ index 49f5c75005f..dc83a089655 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/queue.c b/server/queue.c
-index 984d466b66e..8a95055db40 100644
+index 2d23fb0def8..19486a745be 100644
 --- a/server/queue.c
 +++ b/server/queue.c
 @@ -165,6 +165,7 @@ static const struct object_ops msg_queue_ops =
@@ -561,7 +561,7 @@ index 984d466b66e..8a95055db40 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/registry.c b/server/registry.c
-index cc9a33fff1d..c19e92c9750 100644
+index c60c737feff..34c422dcc6f 100644
 --- a/server/registry.c
 +++ b/server/registry.c
 @@ -180,6 +180,7 @@ static const struct object_ops key_ops =
@@ -573,10 +573,10 @@ index cc9a33fff1d..c19e92c9750 100644
      no_signal,               /* signal */
      no_get_fd,               /* get_fd */
 diff --git a/server/request.c b/server/request.c
-index dabcea68309..832a33917b4 100644
+index 2254315b79e..f4f5e713935 100644
 --- a/server/request.c
 +++ b/server/request.c
-@@ -90,6 +90,7 @@ static const struct object_ops master_socket_ops =
+@@ -89,6 +89,7 @@ static const struct object_ops master_socket_ops =
      no_add_queue,                  /* add_queue */
      NULL,                          /* remove_queue */
      NULL,                          /* signaled */
@@ -621,10 +621,10 @@ index 19b76d44c16..55cd6aa037e 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/sock.c b/server/sock.c
-index d2ec882554f..44a4e3b7b15 100644
+index e064f867ff4..e9e81d9ecd0 100644
 --- a/server/sock.c
 +++ b/server/sock.c
-@@ -471,6 +471,7 @@ static const struct object_ops sock_ops =
+@@ -486,6 +486,7 @@ static const struct object_ops sock_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -632,7 +632,7 @@ index d2ec882554f..44a4e3b7b15 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      sock_get_fd,                  /* get_fd */
-@@ -3599,6 +3600,7 @@ static const struct object_ops ifchange_ops =
+@@ -3695,6 +3696,7 @@ static const struct object_ops ifchange_ops =
      no_add_queue,            /* add_queue */
      NULL,                    /* remove_queue */
      NULL,                    /* signaled */
@@ -640,7 +640,7 @@ index d2ec882554f..44a4e3b7b15 100644
      no_satisfied,            /* satisfied */
      no_signal,               /* signal */
      ifchange_get_fd,         /* get_fd */
-@@ -3820,6 +3822,7 @@ static const struct object_ops socket_device_ops =
+@@ -3916,6 +3918,7 @@ static const struct object_ops socket_device_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -649,7 +649,7 @@ index d2ec882554f..44a4e3b7b15 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/symlink.c b/server/symlink.c
-index dd28efd3a75..c7f34412317 100644
+index 74b60162c01..2dd9c6a798d 100644
 --- a/server/symlink.c
 +++ b/server/symlink.c
 @@ -71,6 +71,7 @@ static const struct object_ops symlink_ops =
@@ -661,10 +661,10 @@ index dd28efd3a75..c7f34412317 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index 506adfc0a6f..339cdfec1fa 100644
+index c7d1c6c55c8..ac000826599 100644
 --- a/server/thread.c
 +++ b/server/thread.c
-@@ -96,6 +96,7 @@ static const struct object_ops thread_apc_ops =
+@@ -106,6 +106,7 @@ static const struct object_ops thread_apc_ops =
      add_queue,                  /* add_queue */
      remove_queue,               /* remove_queue */
      thread_apc_signaled,        /* signaled */
@@ -672,7 +672,7 @@ index 506adfc0a6f..339cdfec1fa 100644
      no_satisfied,               /* satisfied */
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
-@@ -138,6 +139,7 @@ static const struct object_ops context_ops =
+@@ -148,6 +149,7 @@ static const struct object_ops context_ops =
      add_queue,                  /* add_queue */
      remove_queue,               /* remove_queue */
      context_signaled,           /* signaled */
@@ -680,7 +680,7 @@ index 506adfc0a6f..339cdfec1fa 100644
      no_satisfied,               /* satisfied */
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
-@@ -187,6 +189,7 @@ static const struct object_ops thread_ops =
+@@ -197,6 +199,7 @@ static const struct object_ops thread_ops =
      add_queue,                  /* add_queue */
      remove_queue,               /* remove_queue */
      thread_signaled,            /* signaled */
@@ -689,7 +689,7 @@ index 506adfc0a6f..339cdfec1fa 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/timer.c b/server/timer.c
-index 96dc9d00ca1..f59902d5607 100644
+index b0b6ec81535..883f30fa97e 100644
 --- a/server/timer.c
 +++ b/server/timer.c
 @@ -76,6 +76,7 @@ static const struct object_ops timer_ops =
@@ -701,7 +701,7 @@ index 96dc9d00ca1..f59902d5607 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/token.c b/server/token.c
-index 48ee1eca8fe..479596bdbfa 100644
+index 7e20c670a16..b638ed192cb 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -145,6 +145,7 @@ static const struct object_ops token_ops =
@@ -713,7 +713,7 @@ index 48ee1eca8fe..479596bdbfa 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/window.c b/server/window.c
-index 412592fbc71..94a70ce890f 100644
+index f7f9d5e517f..8c416d8c88f 100644
 --- a/server/window.c
 +++ b/server/window.c
 @@ -107,6 +107,7 @@ static const struct object_ops window_ops =
@@ -725,7 +725,7 @@ index 412592fbc71..94a70ce890f 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/winstation.c b/server/winstation.c
-index e5f4bfec357..50fe34aa9ce 100644
+index b3746090ccf..126b70d625a 100644
 --- a/server/winstation.c
 +++ b/server/winstation.c
 @@ -76,6 +76,7 @@ static const struct object_ops winstation_ops =
@@ -745,5 +745,5 @@ index e5f4bfec357..50fe34aa9ce 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 -- 
-2.45.2
+2.47.2
 

patches/msxml3-element_props/definition

@@ -0,0 +1,5 @@
+Fixes: msxml3: Correct regression when looping element properties.
+
+# PR https://gitlab.winehq.org/wine/wine/-/merge_requests/7529
+#
+

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

@@ -1,4 +1,4 @@
-From 33961353f1d7e0590c83927e632a6d43b2a81fa2 Mon Sep 17 00:00:00 2001
+From a955d4d49edc6bbd44ee168f42cd1773f4868533 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 75e6319c007..9ddd9a3a218 100644
+index 4b952b765d7..6a24eb0fa8e 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1306,6 +1306,7 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1382,6 +1382,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 75e6319c007..9ddd9a3a218 100644
  
      return NULL;
 -- 
-2.43.0
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From d853eba76fd849e21b5cb4ce0a3f113ba9beea87 Mon Sep 17 00:00:00 2001
+From c86b01cc0809af60b05bcc8ce66a6001cd4b993b 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 9ddd9a3a218..30d0df85fba 100644
+index 6a24eb0fa8e..a36c919d47f 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -210,7 +210,11 @@ static BYTE *pages_vprot;
+@@ -221,7 +221,11 @@ static BYTE *pages_vprot;
  #endif
  
  static struct file_view *view_block_start, *view_block_end, *next_free_view;
@@ -24,5 +24,5 @@ index 9ddd9a3a218..30d0df85fba 100644
  static void *preload_reserve_end;
  static BOOL force_exec_prot;  /* whether to force PROT_EXEC on all PROT_READ mmaps */
 -- 
-2.43.0
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From 4c246e61f0de05a8b80e7a5d5ff2edcd21036fec Mon Sep 17 00:00:00 2001
+From e5c4a6bd332d7d125e9db79fa29b14e55e3a1ee5 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.
@@ -12,14 +12,14 @@ are from higher memory than they expect.
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48175
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568
 ---
- dlls/ntdll/unix/virtual.c | 410 +++++++++++++++-----------------------
- 1 file changed, 164 insertions(+), 246 deletions(-)
+ dlls/ntdll/unix/virtual.c | 402 +++++++++++++++-----------------------
+ 1 file changed, 162 insertions(+), 240 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 1a3d527f186..ec72d692c3a 100644
+index a36c919d47f..2f682e70ec2 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1269,43 +1269,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
+@@ -1324,43 +1324,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
  }
  
  
@@ -71,7 +71,7 @@ index 1a3d527f186..ec72d692c3a 100644
  
  /***********************************************************************
   *           try_map_free_area
-@@ -1338,112 +1310,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1393,112 +1365,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
  }
  
  
@@ -184,7 +184,7 @@ index 1a3d527f186..ec72d692c3a 100644
  /***********************************************************************
   *           remove_reserved_area
   *
-@@ -1553,8 +1419,7 @@ static void free_view( struct file_view *view )
+@@ -1613,8 +1479,7 @@ static void free_view( struct file_view *view )
   */
  static void unregister_view( struct file_view *view )
  {
@@ -194,7 +194,7 @@ index 1a3d527f186..ec72d692c3a 100644
      wine_rb_remove( &views_tree, &view->entry );
  }
  
-@@ -1582,8 +1447,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
+@@ -1642,8 +1507,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 );
@@ -204,7 +204,7 @@ index 1a3d527f186..ec72d692c3a 100644
  }
  
  
-@@ -1855,89 +1719,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
+@@ -1919,89 +1783,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
      return ptr;
  }
  
@@ -362,8 +362,8 @@ index 1a3d527f186..ec72d692c3a 100644
 -
 -            if (start >= limit_high) continue;
 -            if (end <= limit_low) return NULL;
--            if (start < limit_low) start = limit_low;
--            if (end > limit_high) end = limit_high;
+-            if (start < limit_low) start = (void *)ROUND_SIZE( 0, limit_low, host_page_mask );
+-            if (end > limit_high) end = ROUND_ADDR( limit_high, host_page_mask );
 -            ptr = find_reserved_free_area_outside_preloader( start, end, size, top_down, align_mask );
 -            if (ptr) break;
 -        }
@@ -396,8 +396,8 @@ index 1a3d527f186..ec72d692c3a 100644
 +
 +        TRACE("range %p-%p.\n", base, end);
 +
-+        if (base < limit_low) base = limit_low;
-+        if (end > limit_high) end = limit_high;
++        if (base < limit_low) base = (void *)ROUND_SIZE( 0, limit_low, host_page_mask );
++        if (end > limit_high) end = ROUND_ADDR( limit_high, host_page_mask );
 +        if (base > end || end - base < size) continue;
 +
 +        if (reserve_end >= base)
@@ -407,8 +407,8 @@ index 1a3d527f186..ec72d692c3a 100644
 -
 -            if (start >= limit_high) return NULL;
 -            if (end <= limit_low) continue;
--            if (start < limit_low) start = limit_low;
--            if (end > limit_high) end = limit_high;
+-            if (start < limit_low) start = (void *)ROUND_SIZE( 0, limit_low, host_page_mask );
+-            if (end > limit_high) end = ROUND_ADDR( limit_high, host_page_mask );
 -            ptr = find_reserved_free_area_outside_preloader( start, end, size, top_down, align_mask );
 -            if (ptr) break;
 +            if (reserve_end >= end)
@@ -442,31 +442,24 @@ index 1a3d527f186..ec72d692c3a 100644
  }
  
  /***********************************************************************
-@@ -2041,48 +1992,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
-     }
-     else
-     {
--        void *start = address_space_start;
--        void *end = min( user_space_limit, host_addr_space_limit );
--        size_t view_size, unmap_size;
+@@ -2112,43 +2063,12 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+         void *start = address_space_start;
+         void *end = min( user_space_limit, host_addr_space_limit );
+         size_t host_size = ROUND_SIZE( 0, size, host_page_mask );
+-        size_t unmap_size, view_size = host_size + align_mask + 1;
 -
-+        limit_high = limit_high ? min( limit_high + 1, (UINT_PTR)user_space_limit) : (UINT_PTR)user_space_limit;
-+        if (limit_low < (ULONG_PTR)address_space_start) limit_low = (ULONG_PTR)address_space_start;
-         if (!align_mask) align_mask = granularity_mask;
--        view_size = size + align_mask + 1;
--
--        if (limit_low && (void *)limit_low > start) start = (void *)limit_low;
--        if (limit_high && (void *)limit_high < end) end = (char *)limit_high + 1;
--
--        if ((ptr = map_reserved_area( start, end, size, top_down, get_unix_prot(vprot), align_mask )))
+         if (limit_low && (void *)limit_low > start) start = (void *)limit_low;
+         if (limit_high && (void *)limit_high < end) end = (char *)limit_high + 1;
+ 
+-        if ((ptr = map_reserved_area( start, end, host_size, top_down, get_unix_prot(vprot), align_mask )))
 -        {
 -            TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size );
 -            goto done;
 -        }
- 
+-
 -        if (start > address_space_start || end < host_addr_space_limit || top_down)
 -        {
--            if (!(ptr = map_free_area( start, end, size, top_down, get_unix_prot(vprot), align_mask )))
+-            if (!(ptr = map_free_area( start, end, host_size, top_down, get_unix_prot(vprot), align_mask )))
 -                return STATUS_NO_MEMORY;
 -            TRACE( "got mem with map_free_area %p-%p\n", ptr, (char *)ptr + size );
 -            goto done;
@@ -487,15 +480,15 @@ index 1a3d527f186..ec72d692c3a 100644
 -            unmap_size = unmap_area_above_user_limit( ptr, view_size );
 -            if (unmap_size) munmap( ptr, unmap_size );
 -        }
--        ptr = unmap_extra_space( ptr, view_size, size, align_mask );
-+        if (!(ptr = alloc_free_area( (void *)limit_low, (void *)limit_high, size, top_down, get_unix_prot( vprot ), align_mask )))
+-        ptr = unmap_extra_space( ptr, view_size, host_size, align_mask );
++        if (!(ptr = alloc_free_area( start, end, host_size, top_down, get_unix_prot( vprot ), align_mask )))
 +            return STATUS_NO_MEMORY;
      }
 -done:
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
      return status;
-@@ -3275,6 +3191,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
+@@ -3413,6 +3333,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 );
@@ -503,7 +496,7 @@ index 1a3d527f186..ec72d692c3a 100644
      return res;
  }
  
-@@ -6394,6 +6311,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
+@@ -6624,6 +6545,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
          *ret = (ULONG_PTR)base;
          *size_ptr = size;
      }
@@ -512,5 +505,5 @@ index 1a3d527f186..ec72d692c3a 100644
  }
  
 -- 
-2.45.2
+2.49.0
 

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

@@ -1,17 +1,17 @@
-From 844ba5e56a7231f65b65cabf06fe44ee49876aa0 Mon Sep 17 00:00:00 2001
+From 09d76a4049ee4cc8bce4ffafc349da326fc058e0 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Fri, 1 Dec 2023 14:55:20 -0600
 Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
 
 ---
- dlls/ntdll/unix/virtual.c | 106 ++++++++++++++++++++++++++++++++++----
- 1 file changed, 97 insertions(+), 9 deletions(-)
+ dlls/ntdll/unix/virtual.c | 105 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 96 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index ec72d692c3a..30d43afc076 100644
+index 2f682e70ec2..6170363f0a0 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -127,6 +127,7 @@ struct file_view
+@@ -135,6 +135,7 @@ struct file_view
  #define VPROT_SYSTEM           0x0200  /* system view (underlying mmap not under our control) */
  #define VPROT_PLACEHOLDER      0x0400
  #define VPROT_FREE_PLACEHOLDER 0x0800
@@ -19,7 +19,7 @@ index ec72d692c3a..30d43afc076 100644
  
  /* Conversion from VPROT_* to Win32 flags */
  static const BYTE VIRTUAL_Win32Flags[16] =
-@@ -175,6 +176,8 @@ static void *working_set_limit   = (void *)0x7fff0000;
+@@ -191,6 +192,8 @@ static void *working_set_limit   = (void *)0x7fff0000;
  static void *host_addr_space_limit;  /* top of the host virtual address space */
  
  static struct file_view *arm64ec_view;
@@ -28,7 +28,7 @@ index ec72d692c3a..30d43afc076 100644
  
  ULONG_PTR user_space_wow_limit = 0;
  struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
-@@ -1157,7 +1160,9 @@ static void dump_view( struct file_view *view )
+@@ -1212,7 +1215,9 @@ static void dump_view( struct file_view *view )
      BYTE prot = get_page_vprot( addr );
  
      TRACE( "View: %p - %p", addr, addr + view->size - 1 );
@@ -39,7 +39,7 @@ index ec72d692c3a..30d43afc076 100644
          TRACE( " (builtin image)\n" );
      else if (view->protect & VPROT_FREE_PLACEHOLDER)
          TRACE( " (placeholder)\n" );
-@@ -1277,6 +1282,8 @@ struct alloc_area
+@@ -1332,6 +1337,8 @@ struct alloc_area
      int unix_prot;
      BOOL top_down;
      UINT_PTR align_mask;
@@ -48,7 +48,7 @@ index ec72d692c3a..30d43afc076 100644
  };
  
  /***********************************************************************
-@@ -1285,9 +1292,14 @@ struct alloc_area
+@@ -1340,9 +1347,13 @@ struct alloc_area
   * Try mmaping some expected free memory region, eventually stepping and
   * retrying inside it, and return where it actually succeeded, or NULL.
   */
@@ -60,12 +60,11 @@ index ec72d692c3a..30d43afc076 100644
 +    size_t abs_step = step > 0 ? step : -step;
 +    size_t size = area->size;
 +    int unix_prot = area->unix_prot;
-+    void *ptr;
 +
      while (start && base <= start && (char*)start + size <= (char*)end)
      {
          if (anon_mmap_tryfixed( start, size, unix_prot, 0 ) != MAP_FAILED) return start;
-@@ -1298,12 +1310,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1353,12 +1364,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
                   strerror(errno), start, (char *)start + size, unix_prot );
              return NULL;
          }
@@ -86,7 +85,7 @@ index ec72d692c3a..30d43afc076 100644
      }
  
      return NULL;
-@@ -1727,11 +1746,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
+@@ -1791,11 +1809,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
      {
          if (end - start < area->size) return NULL;
          alloc_start = ROUND_ADDR( end - area->size, area->align_mask );
@@ -100,7 +99,7 @@ index ec72d692c3a..30d43afc076 100644
  }
  
  static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char *end )
-@@ -1821,9 +1840,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
+@@ -1885,9 +1903,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
      struct range_entry *range, *ranges_start, *ranges_end;
      char *reserve_start, *reserve_end;
      struct alloc_area area;
@@ -112,7 +111,7 @@ index ec72d692c3a..30d43afc076 100644
  
      TRACE("limit %p-%p, size %p, top_down %#x.\n", limit_low, limit_high, (void *)size, top_down);
  
-@@ -1888,6 +1908,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
+@@ -1952,6 +1971,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
          if ((result = alloc_free_area_in_range( &area, base, end )))
              break;
      }
@@ -163,7 +162,7 @@ index ec72d692c3a..30d43afc076 100644
      return result;
  }
  
-@@ -1947,6 +2011,17 @@ failed:
+@@ -2012,6 +2075,17 @@ failed:
      return status;
  }
  
@@ -181,10 +180,10 @@ index ec72d692c3a..30d43afc076 100644
  /***********************************************************************
   *           map_view
   *
-@@ -1997,7 +2072,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
-         if (!align_mask) align_mask = granularity_mask;
+@@ -2067,7 +2141,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+         if (limit_high && (void *)limit_high < end) end = (char *)limit_high + 1;
  
-         if (!(ptr = alloc_free_area( (void *)limit_low, (void *)limit_high, size, top_down, get_unix_prot( vprot ), align_mask )))
+         if (!(ptr = alloc_free_area( start, end, host_size, top_down, get_unix_prot( vprot ), align_mask )))
 -            return STATUS_NO_MEMORY;
 +        {
 +            WARN("Allocation failed, clearing native views.\n");
@@ -198,7 +197,7 @@ index ec72d692c3a..30d43afc076 100644
      }
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
-@@ -4346,7 +4429,12 @@ void virtual_set_force_exec( BOOL enable )
+@@ -4503,7 +4585,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 */
@@ -213,5 +212,5 @@ index ec72d692c3a..30d43afc076 100644
              mprotect_range( view->base, view->size, commit, 0 );
          }
 -- 
-2.45.2
+2.49.0
 

patches/ntdll-Junction_Points/0007-kernelbase-Add-support-for-deleting-reparse-points-w.patch

@@ -1,7 +1,8 @@
-From 03c96b5a2e215a7aa7d8c74ca3fbb5794fdcc95f Mon Sep 17 00:00:00 2001
+From afd4ad0f6725f49daaa0fe2351c98faa6a57519a Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Sat, 6 Feb 2021 12:52:51 -0700
-Subject: kernelbase: Add support for deleting reparse points with DeleteFile.
+Subject: [PATCH] kernelbase: Add support for deleting reparse points with
+ DeleteFile.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
@@ -10,11 +11,11 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
-index 6214f549406..17c25eb5858 100644
+index 36b43d345d6..b7d16410d75 100644
 --- a/dlls/kernelbase/file.c
 +++ b/dlls/kernelbase/file.c
-@@ -993,7 +993,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileW( LPCWSTR path )
- 
+@@ -1002,7 +1002,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileW( LPCWSTR path )
+     InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL );
      status = NtCreateFile(&hFile, SYNCHRONIZE | DELETE, &attr, &io, NULL, 0,
  			  FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 -			  FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0);
@@ -24,10 +25,10 @@ index 6214f549406..17c25eb5858 100644
  
      RtlFreeUnicodeString( &nameW );
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index f3aad01ee93..4e3f0f04a3e 100644
+index d4833d84906..598fdc77830 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5367,7 +5367,7 @@ static void test_reparse_points(void)
+@@ -6007,7 +6007,7 @@ static void test_reparse_points(void)
      REPARSE_GUID_DATA_BUFFER guid_buffer;
      static const WCHAR dotW[] = {'.',0};
      REPARSE_DATA_BUFFER *buffer = NULL;
@@ -36,7 +37,7 @@ index f3aad01ee93..4e3f0f04a3e 100644
      IO_STATUS_BLOCK iosb;
      UNICODE_STRING nameW;
      HANDLE handle;
-@@ -5532,7 +5532,14 @@ static void test_reparse_points(void)
+@@ -6172,7 +6172,14 @@ static void test_reparse_points(void)
      bret = DeviceIoControl(handle, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0);
      ok(bret, "Failed to create junction point! (0x%lx)\n", GetLastError());
      CloseHandle(handle);
@@ -53,5 +54,5 @@ index f3aad01ee93..4e3f0f04a3e 100644
  cleanup:
      /* Cleanup */
 -- 
-2.17.1
+2.47.2
 

patches/ntdll-Junction_Points/0009-kernelbase-Add-support-for-moving-reparse-points-wit.patch

@@ -1,4 +1,4 @@
-From 762d7992e4a328d9fd94e3960c98951ead0e1a0a Mon Sep 17 00:00:00 2001
+From a34c3f550b16e84f907c637514f0645456420d65 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Sat, 6 Feb 2021 12:46:30 -0700
 Subject: [PATCH] kernelbase: Add support for moving reparse points with
@@ -13,11 +13,11 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  4 files changed, 36 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
-index abec5367512..d7c3797d4a9 100644
+index b7d16410d75..dccae6cb565 100644
 --- a/dlls/kernelbase/file.c
 +++ b/dlls/kernelbase/file.c
-@@ -2580,7 +2580,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH MoveFileWithProgressW( const WCHAR *source, const
- 
+@@ -2514,7 +2514,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH MoveFileWithProgressW( const WCHAR *source, const
+     InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL );
      status = NtOpenFile( &source_handle, DELETE | SYNCHRONIZE, &attr, &io,
                           FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 -                         FILE_SYNCHRONOUS_IO_NONALERT );
@@ -26,10 +26,10 @@ index abec5367512..d7c3797d4a9 100644
      if (!set_ntstatus( status )) goto error;
  
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index a25b6820291..70b10c56ea0 100644
+index 8b561e162e8..7b6e2776947 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5666,7 +5666,8 @@ static INT build_reparse_buffer(const WCHAR *filename, ULONG tag, ULONG flags,
+@@ -6021,7 +6021,8 @@ static INT build_reparse_buffer(const WCHAR *filename, ULONG tag, ULONG flags,
  
  static void test_reparse_points(void)
  {
@@ -39,7 +39,7 @@ index a25b6820291..70b10c56ea0 100644
      static const WCHAR reparseW[] = {'\\','r','e','p','a','r','s','e',0};
      static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0};
      static const WCHAR parentW[] = {'\\','.','.','\\',0};
-@@ -6037,6 +6038,15 @@ static void test_reparse_points(void)
+@@ -6392,6 +6393,15 @@ static void test_reparse_points(void)
                                                       wine_dbgstr_w(dest), wine_dbgstr_w(rel_target));
      CloseHandle(handle);
  
@@ -56,10 +56,10 @@ index a25b6820291..70b10c56ea0 100644
      /* Cleanup */
      pRtlFreeUnicodeString(&nameW);
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 1b35463e069..d2e57f5a127 100644
+index d3045c6c936..49afb57b2b6 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -5395,8 +5395,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
+@@ -5556,8 +5556,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
          {
              FILE_RENAME_INFORMATION *info = ptr;
              unsigned int flags;
@@ -70,7 +70,7 @@ index 1b35463e069..d2e57f5a127 100644
              char *unix_name;
  
              if (class == FileRenameInformation)
-@@ -5413,6 +5415,19 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
+@@ -5574,6 +5576,19 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
              InitializeObjectAttributes( &attr, &name_str, OBJ_CASE_INSENSITIVE, info->RootDirectory, NULL );
              get_redirect( &attr, &redir );
  
@@ -90,7 +90,7 @@ index 1b35463e069..d2e57f5a127 100644
              status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF );
              if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)
              {
-@@ -5429,9 +5444,14 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
+@@ -5590,9 +5605,14 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
                  }
                  SERVER_END_REQ;
  
@@ -106,10 +106,10 @@ index 1b35463e069..d2e57f5a127 100644
          else status = STATUS_INVALID_PARAMETER_3;
          break;
 diff --git a/server/fd.c b/server/fd.c
-index b0cbf28d543..5f1b4ac3114 100644
+index dd6a61c557d..dde92beb664 100644
 --- a/server/fd.c
 +++ b/server/fd.c
-@@ -2695,7 +2695,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
+@@ -2724,7 +2724,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
          goto failed;
      }
  
@@ -118,7 +118,7 @@ index b0cbf28d543..5f1b4ac3114 100644
      {
          if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev)
          {
-@@ -2711,7 +2711,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
+@@ -2740,7 +2740,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
          }
  
          /* can't replace directories or special files */
@@ -127,7 +127,7 @@ index b0cbf28d543..5f1b4ac3114 100644
          {
              set_error( STATUS_ACCESS_DENIED );
              goto failed;
-@@ -2769,6 +2769,8 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
+@@ -2806,6 +2806,8 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
      fd->nt_name = dup_nt_name( root, nt_name, &fd->nt_namelen );
      free( fd->unix_name );
      fd->closed->unix_name = fd->unix_name = realpath( name, NULL );
@@ -137,5 +137,5 @@ index b0cbf28d543..5f1b4ac3114 100644
      if (!fd->unix_name)
          set_error( STATUS_NO_MEMORY );
 -- 
-2.42.0
+2.47.2
 

patches/ntdll-Junction_Points/0011-ntdll-Follow-reparse-points-during-path-resolution.patch

@@ -1,4 +1,4 @@
-From beaeb1935534ce99aa19b8009184b07bd602a24c Mon Sep 17 00:00:00 2001
+From 4f26d71abf2447b5e0c6d7b6e878cf6b6c578558 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Sat, 3 Sep 2022 11:23:31 -0600
 Subject: [PATCH] ntdll: Follow reparse points during path resolution.
@@ -6,14 +6,14 @@ Subject: [PATCH] ntdll: Follow reparse points during path resolution.
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
  dlls/ntdll/tests/file.c |  11 ++-
- dlls/ntdll/unix/file.c  | 189 +++++++++++++++++++++++++++++++++++-----
- 2 files changed, 177 insertions(+), 23 deletions(-)
+ dlls/ntdll/unix/file.c  | 196 +++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 184 insertions(+), 23 deletions(-)
 
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 390768f557d..a0b84849490 100644
+index 39b98af7efa..80b967f5469 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5381,7 +5381,7 @@ static INT build_reparse_buffer(const WCHAR *filename, ULONG tag, ULONG flags,
+@@ -6082,7 +6082,7 @@ static INT build_reparse_buffer(const WCHAR *filename, ULONG tag, ULONG flags,
  
  static void test_reparse_points(void)
  {
@@ -22,7 +22,7 @@ index 390768f557d..a0b84849490 100644
      static const WCHAR new_reparseW[] = {'\\','n','e','w','_','r','e','p','a','r','s','e',0};
      static const WCHAR reparseW[] = {'\\','r','e','p','a','r','s','e',0};
      static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0};
-@@ -5768,11 +5768,20 @@ static void test_reparse_points(void)
+@@ -6469,11 +6469,20 @@ static void test_reparse_points(void)
      bret = CopyFileW(reparse_path, new_path, TRUE);
      ok(!bret, "Reparse points cannot be copied.\n");
  
@@ -44,10 +44,10 @@ index 390768f557d..a0b84849490 100644
      ok(bret, "Failed to remove temporary reparse point directory!\n");
      bret = RemoveDirectoryW(target_path);
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 9211c6964a6..e90670ffc71 100644
+index 49afb57b2b6..26e412d28f1 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -3548,6 +3548,35 @@ done:
+@@ -3725,6 +3725,35 @@ done:
  }
  
  
@@ -83,7 +83,7 @@ index 9211c6964a6..e90670ffc71 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.
-@@ -3724,16 +3753,14 @@ cleanup:
+@@ -3901,16 +3930,14 @@ cleanup:
  
  
  /*
@@ -102,7 +102,7 @@ index 9211c6964a6..e90670ffc71 100644
      char *encoded = NULL;
      int link_dir_fd = -1;
      NTSTATUS status;
-@@ -3741,9 +3768,6 @@ NTSTATUS get_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG *si
+@@ -3918,9 +3945,6 @@ NTSTATUS get_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG *si
      int depth;
      char *p;
  
@@ -112,7 +112,7 @@ index 9211c6964a6..e90670ffc71 100644
      ret = readlink( unix_name, link_path, sizeof(link_path) );
      if (ret < 0)
      {
-@@ -3843,12 +3867,76 @@ NTSTATUS get_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG *si
+@@ -4020,12 +4044,76 @@ NTSTATUS get_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer, ULONG *si
  
  cleanup:
      if (link_dir_fd != -1) close( link_dir_fd );
@@ -190,7 +190,7 @@ index 9211c6964a6..e90670ffc71 100644
  /*
   * Retrieve the unix name corresponding to a file handle, remove that symlink, and then recreate
   * a directory at the location of the old filename.
-@@ -3942,15 +4030,25 @@ cleanup:
+@@ -4119,15 +4207,24 @@ cleanup:
  }
  
  
@@ -207,18 +207,16 @@ index 9211c6964a6..e90670ffc71 100644
   *
   * Helper for nt_to_unix_file_name
   */
--static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer, int unix_len, int pos,
--                                  UINT disposition, BOOL is_unix )
-+static NTSTATUS lookup_unix_name( FILE_OBJECT *fileobj, const WCHAR *name, int name_len,
-+                                  char **buffer, int unix_len, int pos, UINT disposition,
-+                                  BOOL is_unix )
+-static NTSTATUS lookup_unix_name( int root_fd, const WCHAR *name, int name_len, char **buffer, int unix_len,
++static NTSTATUS lookup_unix_name( FILE_OBJECT *fileobj, int root_fd, const WCHAR *name, int name_len, char **buffer, int unix_len,
+                                   int pos, UINT disposition, BOOL is_unix )
  {
      static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, '/', 0 };
 +    const WCHAR *fullname = fileobj->FileName.Buffer;
      NTSTATUS status;
      int ret;
      struct stat st;
-@@ -4007,6 +4105,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
+@@ -4184,6 +4281,8 @@ static NTSTATUS lookup_unix_name( int root_fd, const WCHAR *name, int name_len,
      while (name_len)
      {
          const WCHAR *end, *next;
@@ -227,9 +225,9 @@ index 9211c6964a6..e90670ffc71 100644
  
          end = name;
          while (end < name + name_len && *end != '\\') end++;
-@@ -4026,8 +4126,31 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
+@@ -4203,8 +4302,31 @@ static NTSTATUS lookup_unix_name( int root_fd, const WCHAR *name, int name_len,
  
-         status = find_file_in_dir( unix_name, pos, name, end - name, is_unix );
+         status = find_file_in_dir( root_fd, unix_name, pos, name, end - name, is_unix );
  
 +        /* follow reparse point and restart from there (if applicable) */
 +        if (name_len && find_reparse_target( unix_name, fullname, name - fullname, &target, &target_len ) == STATUS_REPARSE)
@@ -260,7 +258,7 @@ index 9211c6964a6..e90670ffc71 100644
          {
              if (status == STATUS_OBJECT_NAME_NOT_FOUND)
              {
-@@ -4066,12 +4189,12 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
+@@ -4243,12 +4365,12 @@ static NTSTATUS lookup_unix_name( int root_fd, const WCHAR *name, int name_len,
  /******************************************************************************
   *           nt_to_unix_file_name_no_root
   */
@@ -275,16 +273,16 @@ index 9211c6964a6..e90670ffc71 100644
      NTSTATUS status = STATUS_SUCCESS;
      const WCHAR *name;
      struct stat st;
-@@ -4161,7 +4284,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char
+@@ -4338,7 +4460,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char
      name += prefix_len;
      name_len -= prefix_len;
  
--    status = lookup_unix_name( name, name_len, &unix_name, unix_len, pos, disposition, is_unix );
-+    status = lookup_unix_name( fileobj, name, name_len, &unix_name, unix_len, pos, disposition, is_unix );
+-    status = lookup_unix_name( AT_FDCWD, name, name_len, &unix_name, unix_len, pos, disposition, is_unix );
++    status = lookup_unix_name( fileobj, AT_FDCWD, name, name_len, &unix_name, unix_len, pos, disposition, is_unix );
      if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)
      {
          TRACE( "%s -> %s\n", debugstr_us(nameW), debugstr_a(unix_name) );
-@@ -4169,7 +4292,8 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char
+@@ -4346,7 +4468,8 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char
      }
      else
      {
@@ -294,13 +292,14 @@ index 9211c6964a6..e90670ffc71 100644
          free( unix_name );
      }
      return status;
-@@ -4187,18 +4311,30 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char
+@@ -4364,18 +4487,30 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char
   */
  NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, UINT disposition )
  {
 +    HANDLE rootdir = attr->RootDirectory;
      enum server_fd_type type;
-     int old_cwd, root_fd, needs_close;
+-    int root_fd, needs_close;
++    int old_cwd, root_fd, needs_close;
 +    int reparse_count = 0;
 +    FILE_OBJECT fileobj;
      const WCHAR *name;
@@ -329,7 +328,7 @@ index 9211c6964a6..e90670ffc71 100644
  
      if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER;
  
-@@ -4206,7 +4342,7 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U
+@@ -4383,7 +4518,7 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U
      if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY;
      unix_name[0] = '.';
  
@@ -338,17 +337,25 @@ index 9211c6964a6..e90670ffc71 100644
      {
          if (type != FD_TYPE_DIR)
          {
-@@ -4218,7 +4354,8 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U
-             mutex_lock( &dir_mutex );
-             if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1)
-             {
--                status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE );
-+                status = lookup_unix_name( &fileobj, name, name_len, &unix_name, unix_len, 1,
+@@ -4392,7 +4527,16 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U
+         }
+         else
+         {
+-            status = lookup_unix_name( root_fd, name, name_len, &unix_name, unix_len, 1, disposition, FALSE );
++            mutex_lock( &dir_mutex );
++            if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1)
++            {
++                status = lookup_unix_name( &fileobj, root_fd, name, name_len, &unix_name, unix_len, 1,
 +                                           disposition, FALSE );
-                 if (fchdir( old_cwd ) == -1) chdir( "/" );
-             }
-             else status = errno_to_status( errno );
-@@ -4231,14 +4368,22 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U
++                if (fchdir( old_cwd ) == -1) chdir( "/" );
++            }
++            else status = errno_to_status( errno );
++            mutex_unlock( &dir_mutex );
++            if (old_cwd != -1) close( old_cwd );
+             if (needs_close) close( root_fd );
+         }
+     }
+@@ -4400,14 +4544,22 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U
  
      if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)
      {
@@ -373,5 +380,5 @@ index 9211c6964a6..e90670ffc71 100644
  }
  
 -- 
-2.35.1
+2.47.2
 

patches/ntdll-Junction_Points/0016-ntdll-Find-dangling-symlinks-quickly.patch

@@ -1,38 +0,0 @@
-From a6b3f7507ade04bcd9338a0936a2b1bfa8696fc1 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Wed, 1 May 2019 17:48:51 -0600
-Subject: ntdll: Find dangling symlinks quickly.
-
-This is also necessary on systems (such as MacOS) that support
-case-insensitive lookups of files.
-
-Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
----
- dlls/ntdll/unix/file.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index caa454c024f..b26b239574b 100644
---- a/dlls/ntdll/unix/file.c
-+++ b/dlls/ntdll/unix/file.c
-@@ -2904,7 +2904,7 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i
-     if (ret >= 0 && ret <= MAX_DIR_ENTRY_LEN)
-     {
-         unix_name[pos + ret] = 0;
--        if (!stat( unix_name, &st )) return STATUS_SUCCESS;
-+        if (!lstat( unix_name, &st )) return STATUS_SUCCESS;
-     }
-     if (check_case) goto not_found;  /* we want an exact match */
- 
-@@ -4228,7 +4228,7 @@ static NTSTATUS lookup_unix_name( FILE_OBJECT *fileobj, const WCHAR *name, int n
-         char *p;
-         unix_name[pos + 1 + ret] = 0;
-         for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/';
--        if (!stat( unix_name, &st ))
-+        if (!lstat( unix_name, &st ))
-         {
-             if (disposition == FILE_CREATE) return STATUS_OBJECT_NAME_COLLISION;
-             return STATUS_SUCCESS;
--- 
-2.17.1
-

patches/ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch

@@ -194,7 +194,7 @@ index 2c261e0f57d..562440f4f8b 100644
 +
 +    TRACE( "(%s %s %ld): stub\n", debugstr_w(link), debugstr_w(target), flags );
 +
-+    is_relative = (RtlDetermineDosPathNameType_U( target ) == RELATIVE_PATH);
++    is_relative = (RtlDetermineDosPathNameType_U( target ) == RtlPathTypeRelative);
 +    is_dir = (flags & SYMBOLIC_LINK_FLAG_DIRECTORY);
 +    if (is_dir && !CreateDirectoryW( link, NULL ))
 +        return FALSE;

patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch

@@ -1,18 +1,18 @@
-From 2cf5a014dcd6f85a1afa76ad8ca6c65f2c17db39 Mon Sep 17 00:00:00 2001
+From e941585d942942f7b97b73ae24b9a0a486a855e4 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 14 Jul 2020 15:00:34 +0300
 Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
 
 ---
  configure.ac                    |   1 +
- dlls/ntdll/unix/signal_x86_64.c | 195 ++++++++++++++++++++++++++++++++
- 2 files changed, 196 insertions(+)
+ dlls/ntdll/unix/signal_x86_64.c | 203 ++++++++++++++++++++++++++++++++
+ 2 files changed, 204 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index ef21a4313d4..db709285f79 100644
+index 8192c067e4c..d4abbdb3f37 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -384,6 +384,7 @@ AC_CHECK_HEADERS(\
+@@ -391,6 +391,7 @@ AC_CHECK_HEADERS(\
  	linux/ioctl.h \
  	linux/major.h \
  	linux/param.h \
@@ -21,7 +21,7 @@ index ef21a4313d4..db709285f79 100644
  	linux/types.h \
  	linux/ucdrom.h \
 diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
-index 537e4e1f60e..58397374ea4 100644
+index fb5259d8714..93020158d0b 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
 @@ -27,6 +27,7 @@
@@ -41,8 +41,8 @@ index 537e4e1f60e..58397374ea4 100644
  #include <unistd.h>
  #ifdef HAVE_MACHINE_SYSARCH_H
  # include <machine/sysarch.h>
-@@ -65,6 +68,14 @@
- # include <mach/mach.h>
+@@ -73,6 +76,14 @@
+ extern void _thread_set_tsd_base(uint64_t);
  #endif
  
 +#if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_PRCTL_H)
@@ -56,7 +56,7 @@ index 537e4e1f60e..58397374ea4 100644
  #include "ntstatus.h"
  #define WIN32_NO_STATUS
  #include "windef.h"
-@@ -1824,6 +1835,186 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+@@ -1857,6 +1868,194 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
      return 0;
  }
  
@@ -146,14 +146,22 @@ index 537e4e1f60e..58397374ea4 100644
 +
 +    static struct sock_filter filter[] =
 +    {
-+        BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer) + 4),
-+        /* Native libs are loaded at high addresses. */
-+        BPF_JUMP(BPF_JMP | BPF_JGT | BPF_K, NATIVE_SYSCALL_ADDRESS_START >> 32, 0, 1),
-+        BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
 +        /* Allow i386. */
 +        BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, arch)),
 +        BPF_JUMP (BPF_JMP | BPF_JEQ | BPF_K, AUDIT_ARCH_X86_64, 1, 0),
 +        BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
++        /* Native libs are loaded at high addresses. */
++        BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer) + 4),
++        BPF_JUMP(BPF_JMP | BPF_JGT | BPF_K, NATIVE_SYSCALL_ADDRESS_START >> 32, 0, 8),
++        /* High addresses may be top-down allocations, trap those */
++        BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0x7fff, 1, 0),
++        BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
++        BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer)),
++        BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0xfe000000, 1, 0),
++        BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
++        BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0xffff0000, 0, 1),
++        BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
++        BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_TRAP),
 +        /* Allow wine64-preloader */
 +        BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer)),
 +        BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0x7d400000, 1, 0),
@@ -243,7 +251,7 @@ index 537e4e1f60e..58397374ea4 100644
  
  /***********************************************************************
   *           handle_interrupt
-@@ -2560,10 +2751,14 @@ void signal_init_process(void)
+@@ -2567,10 +2766,14 @@ void signal_init_process(void)
      if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error;
@@ -259,5 +267,5 @@ index 537e4e1f60e..58397374ea4 100644
  
   error:
 -- 
-2.45.2
+2.47.2
 

patches/odbc32-fixes/0013-odbc32-SQLGetData-support-ODBC-v2.0.patch

@@ -1,4 +1,4 @@
-From 2d897946980e67f742b9f39f5f548cf0e2340510 Mon Sep 17 00:00:00 2001
+From f16a96be2b219f8e7733a36dc147f5247b618870 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 17 Jul 2024 21:55:20 +1000
 Subject: [PATCH] odbc32: SQLGetData support ODBC v2.0
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: SQLGetData support ODBC v2.0
  1 file changed, 24 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 3b3b198eaa8..c2748cd33d7 100644
+index c16c9a6da69..18d3df1007f 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2450,11 +2450,35 @@ static SQLRETURN get_data_unix( struct statement *stmt, SQLUSMALLINT column, SQL
+@@ -2468,11 +2468,35 @@ static SQLRETURN get_data_unix( struct statement *stmt, SQLUSMALLINT column, SQL
      return ret;
  }
  
@@ -31,7 +31,7 @@ index 3b3b198eaa8..c2748cd33d7 100644
      if (stmt->hdr.win32_funcs->SQLGetData)
 +    {
 +        struct environment *env = (struct environment *)find_object_type(SQL_HANDLE_ENV, stmt->hdr.parent);
-+        if (env && env->attr_version == SQL_OV_ODBC2)
++        if (env && env->driver_ver == SQL_OV_ODBC2)
 +        {
 +            if (type == SQL_C_TYPE_TIME)
 +                type = SQL_C_TIME;
@@ -48,5 +48,5 @@ index 3b3b198eaa8..c2748cd33d7 100644
  }
  
 -- 
-2.45.2
+2.47.2
 

patches/odbc32-fixes/0014-odbc32-SQLColAttributesW-support-ODBC-v2.0.patch

@@ -1,26 +1,27 @@
-From 6b7448e5ebdc0b16f3af606a62e2ca465f3ae026 Mon Sep 17 00:00:00 2001
+From 5874cf0a309a0ecfa97206b8b15734485920c325 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 17 Jul 2024 22:03:03 +1000
 Subject: [PATCH] odbc32: SQLColAttributesW support ODBC v2.0
 
 ---
- dlls/odbc32/proxyodbc.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
+ dlls/odbc32/proxyodbc.c | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 71c853013fd..b5c0edb119e 100644
+index 18d3df1007f..8d51ad37176 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6195,6 +6195,8 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6256,6 +6256,9 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
                                          SQLPOINTER char_attr, SQLSMALLINT buflen, SQLSMALLINT *retlen,
                                          SQLLEN *num_attr )
  {
++    struct environment *env;
 +    SQLRETURN ret = SQL_ERROR;
 +
      if (stmt->hdr.win32_funcs->SQLColAttributeW)
          return stmt->hdr.win32_funcs->SQLColAttributeW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
                                                         retlen, num_attr );
-@@ -6237,11 +6239,23 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6315,11 +6318,23 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
              return SQL_ERROR;
          }
  
@@ -28,9 +29,9 @@ index 71c853013fd..b5c0edb119e 100644
 +        ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
                                                           retlen, num_attr );
 +        /* Convert back for ODBC2 drivers */
++        env = (struct environment *)find_object_type(SQL_HANDLE_ENV, stmt->hdr.parent);
 +        if (SQL_SUCCEEDED(ret) && num_attr && field_id == SQL_COLUMN_TYPE &&
-+                ((struct environment*)(stmt->hdr.parent))->attr_version == SQL_OV_ODBC2 &&
-+                ((struct environment*)(stmt->hdr.parent))->driver_ver == SQL_OV_ODBC2)
++                env && env->attr_version == SQL_OV_ODBC3 && env->driver_ver == SQL_OV_ODBC2)
 +        {
 +            if (*num_attr == SQL_TIME)
 +                *num_attr = SQL_TYPE_TIME;
@@ -47,5 +48,5 @@ index 71c853013fd..b5c0edb119e 100644
  
  /*************************************************************************
 -- 
-2.43.0
+2.47.2