Release v10.0-rc2

Includes Release 1.14.

patches/d3dx9_36-BumpLuminance/0002-d3dx9_36-Add-format-description-for-X8L8V8U8-for-for.patch

@@ -1,24 +0,0 @@
-From 170a6d9df910f617585791df31aa72b79622ed0b Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Mon, 16 May 2016 13:20:39 +0200
-Subject: d3dx9_36: Add format description for X8L8V8U8 for format conversions.
-
----
- dlls/d3dx9_36/util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c
-index d8cd43a..12b9c2c 100644
---- a/dlls/d3dx9_36/util.c
-+++ b/dlls/d3dx9_36/util.c
-@@ -90,6 +90,7 @@ static const struct pixel_format_desc formats[] =
-     {D3DFMT_G32R32F,       { 0, 32, 32,  0}, { 0,  0, 32,  0},  8, 1, 1,  8, FORMAT_ARGBF,   NULL,         NULL      },
-     {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96,  0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF,   NULL,         NULL      },
-     {D3DFMT_P8,            { 8,  8,  8,  8}, { 0,  0,  0,  0},  1, 1, 1,  1, FORMAT_INDEX,   NULL,         index_to_rgba},
-+    {D3DFMT_X8L8V8U8,      { 0,  8,  8,  8}, { 0,  0,  8, 16},  4, 1, 1,  4, FORMAT_ARGB,    NULL,         NULL      },
-     /* marks last element */
-     {D3DFMT_UNKNOWN,       { 0,  0,  0,  0}, { 0,  0,  0,  0},  0, 1, 1,  0, FORMAT_UNKNOWN, NULL,         NULL      },
- };
--- 
-2.8.0
-

patches/d3dx9_36-BumpLuminance/definition

@@ -1 +0,0 @@
-Fixes: Recognize bump luminance X8L8V8U8 when loading dds file

patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch

@@ -1,371 +0,0 @@
-From 3eb7b781849135fefeece9ca257ca9673b1545fd Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 16 Jul 2017 18:13:31 +0200
-Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
-
----
- dlls/d3dx9_24/d3dx9_24.spec |  2 +-
- dlls/d3dx9_25/d3dx9_25.spec |  2 +-
- dlls/d3dx9_26/d3dx9_26.spec |  2 +-
- dlls/d3dx9_27/d3dx9_27.spec |  2 +-
- dlls/d3dx9_28/d3dx9_28.spec |  2 +-
- dlls/d3dx9_29/d3dx9_29.spec |  2 +-
- dlls/d3dx9_30/d3dx9_30.spec |  2 +-
- dlls/d3dx9_31/d3dx9_31.spec |  2 +-
- dlls/d3dx9_32/d3dx9_32.spec |  2 +-
- dlls/d3dx9_33/d3dx9_33.spec |  2 +-
- dlls/d3dx9_34/d3dx9_34.spec |  2 +-
- dlls/d3dx9_35/d3dx9_35.spec |  2 +-
- dlls/d3dx9_36/d3dx9_36.spec |  2 +-
- dlls/d3dx9_36/mesh.c        | 27 +++++++++++++++++++++++++++
- dlls/d3dx9_36/tests/mesh.c  | 22 ++++++++++++++++++++++
- dlls/d3dx9_37/d3dx9_37.spec |  2 +-
- dlls/d3dx9_38/d3dx9_38.spec |  2 +-
- dlls/d3dx9_39/d3dx9_39.spec |  2 +-
- dlls/d3dx9_40/d3dx9_40.spec |  2 +-
- dlls/d3dx9_41/d3dx9_41.spec |  2 +-
- dlls/d3dx9_42/d3dx9_42.spec |  2 +-
- dlls/d3dx9_43/d3dx9_43.spec |  2 +-
- 22 files changed, 69 insertions(+), 20 deletions(-)
-
-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index 0ca8777efe6..9b52c2bf307 100644
---- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -226,7 +226,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index a5449810a43..fc75dfd9c04 100644
---- a/dlls/d3dx9_25/d3dx9_25.spec
-+++ b/dlls/d3dx9_25/d3dx9_25.spec
-@@ -226,7 +226,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index 9e1200442f4..85d9fc5332e 100644
---- a/dlls/d3dx9_26/d3dx9_26.spec
-+++ b/dlls/d3dx9_26/d3dx9_26.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index 9e1200442f4..85d9fc5332e 100644
---- a/dlls/d3dx9_27/d3dx9_27.spec
-+++ b/dlls/d3dx9_27/d3dx9_27.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index b316a23baf1..62673ccd7af 100644
---- a/dlls/d3dx9_28/d3dx9_28.spec
-+++ b/dlls/d3dx9_28/d3dx9_28.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index b316a23baf1..62673ccd7af 100644
---- a/dlls/d3dx9_29/d3dx9_29.spec
-+++ b/dlls/d3dx9_29/d3dx9_29.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index e00fa547862..2c7575d88fc 100644
---- a/dlls/d3dx9_30/d3dx9_30.spec
-+++ b/dlls/d3dx9_30/d3dx9_30.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index d308939ef67..a41eb3e9af2 100644
---- a/dlls/d3dx9_31/d3dx9_31.spec
-+++ b/dlls/d3dx9_31/d3dx9_31.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_32/d3dx9_32.spec
-+++ b/dlls/d3dx9_32/d3dx9_32.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_33/d3dx9_33.spec
-+++ b/dlls/d3dx9_33/d3dx9_33.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_34/d3dx9_34.spec
-+++ b/dlls/d3dx9_34/d3dx9_34.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_35/d3dx9_35.spec
-+++ b/dlls/d3dx9_35/d3dx9_35.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_36/d3dx9_36.spec
-+++ b/dlls/d3dx9_36/d3dx9_36.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 6294ce624fe..12cb7eb7258 100644
---- a/dlls/d3dx9_36/mesh.c
-+++ b/dlls/d3dx9_36/mesh.c
-@@ -7184,6 +7184,33 @@ cleanup:
-     return hr;
- }
- 
-+
-+/*************************************************************************
-+ * D3DXOptimizeVertices    (D3DX9_36.@)
-+ */
-+HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces,
-+        UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap)
-+{
-+    UINT i;
-+
-+    FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n",
-+            indices, num_faces, num_vertices, indices_are_32bit, vertex_remap);
-+
-+    if (!vertex_remap)
-+    {
-+        WARN("vertex remap pointer is NULL.\n");
-+        return D3DERR_INVALIDCALL;
-+    }
-+
-+    for (i = 0; i < num_vertices; i++)
-+    {
-+        vertex_remap[i] = i;
-+    }
-+
-+    return D3D_OK;
-+}
-+
-+
- /*************************************************************************
-  * D3DXOptimizeFaces    (D3DX9_36.@)
-  *
-diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index f437a83cbd8..c5faae520c9 100644
---- a/dlls/d3dx9_36/tests/mesh.c
-+++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -10403,6 +10403,27 @@ cleanup:
-     free_test_context(test_context);
- }
- 
-+static void test_optimize_vertices(void)
-+{
-+    HRESULT hr;
-+    DWORD vertex_remap[3];
-+    const DWORD indices[] = {0, 1, 2};
-+    const UINT num_faces = 1;
-+    const UINT num_vertices = 3;
-+
-+    hr = D3DXOptimizeVertices(indices, num_faces,
-+                              num_vertices, FALSE,
-+                              vertex_remap);
-+    ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %lx, expected D3D_OK.\n", hr);
-+
-+    /* vertex_remap must not be NULL */
-+    hr = D3DXOptimizeVertices(indices, num_faces,
-+                              num_vertices, FALSE,
-+                              NULL);
-+    ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap "
-+            "pointer. Got %lx, expected D3DERR_INVALIDCALL.\n", hr);
-+}
-+
- static void test_optimize_faces(void)
- {
-     HRESULT hr;
-@@ -11291,6 +11312,7 @@ START_TEST(mesh)
-     test_weld_vertices();
-     test_clone_mesh();
-     test_valid_mesh();
-+    test_optimize_vertices();
-     test_optimize_faces();
-     test_compute_normals();
-     test_D3DXFrameFind();
-diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_37/d3dx9_37.spec
-+++ b/dlls/d3dx9_37/d3dx9_37.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_38/d3dx9_38.spec
-+++ b/dlls/d3dx9_38/d3dx9_38.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_39/d3dx9_39.spec
-+++ b/dlls/d3dx9_39/d3dx9_39.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_40/d3dx9_40.spec
-+++ b/dlls/d3dx9_40/d3dx9_40.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_41/d3dx9_41.spec
-+++ b/dlls/d3dx9_41/d3dx9_41.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index 2f2ac5fd619..7cfc439f84b 100644
---- a/dlls/d3dx9_42/d3dx9_42.spec
-+++ b/dlls/d3dx9_42/d3dx9_42.spec
-@@ -222,7 +222,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index 2f2ac5fd619..7cfc439f84b 100644
---- a/dlls/d3dx9_43/d3dx9_43.spec
-+++ b/dlls/d3dx9_43/d3dx9_43.spec
-@@ -222,7 +222,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
--- 
-2.14.2
-

patches/d3dx9_36-D3DXOptimizeVertices/definition

@@ -1 +0,0 @@
-Fixes: [47776] Timeshift needs D3DXOptimizeVertices()

patches/dmime_segment_getaudiopath/0001-dmime-Semi-implement-IDirectMusicSegment-GetAudioPat.patch

@@ -0,0 +1,158 @@
+From 79617ce168284934b09313f454e911394ec5eed8 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 1 Nov 2024 17:59:51 +1100
+Subject: [PATCH] dmime: Semi implement
+ IDirectMusicSegment::GetAudioPathConfig.
+
+---
+ dlls/dmime/audiopath.c | 97 +++++++++++++++++++++++-------------------
+ dlls/dmime/segment.c   |  6 +++
+ 2 files changed, 59 insertions(+), 44 deletions(-)
+
+diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
+index 3389f965b8f..501eecf234c 100644
+--- a/dlls/dmime/audiopath.c
++++ b/dlls/dmime/audiopath.c
+@@ -649,18 +649,21 @@ HRESULT path_config_get_audio_path_params(IUnknown *iface, WAVEFORMATEX *format,
+ {
+     struct audio_path_config *This = impl_from_IUnknown(iface);
+     struct list *first_port_config, *first_pchannel_to_buffer;
+-    struct audio_path_port_config *port_config;
+-    struct audio_path_pchannel_to_buffer *pchannel_to_buffer;
++    struct audio_path_port_config *port_config = NULL;
++    struct audio_path_pchannel_to_buffer *pchannel_to_buffer = NULL;
+     GUID *guids;
+ 
+     first_port_config = list_head(&This->port_config_entries);
+-    if (list_next(&This->port_config_entries, first_port_config))
+-        FIXME("Only one port config supported. %p -> %p\n", first_port_config, list_next(&This->port_config_entries, first_port_config));
+-    port_config = LIST_ENTRY(first_port_config, struct audio_path_port_config, entry);
+-    first_pchannel_to_buffer = list_head(&port_config->pchannel_to_buffer_entries);
+-    if (list_next(&port_config->pchannel_to_buffer_entries, first_pchannel_to_buffer))
+-        FIXME("Only one pchannel to buffer entry supported.\n");
+-    pchannel_to_buffer = LIST_ENTRY(first_pchannel_to_buffer, struct audio_path_pchannel_to_buffer, entry);
++    if (first_port_config)
++    {
++        if (list_next(&This->port_config_entries, first_port_config))
++            FIXME("Only one port config supported. %p -> %p\n", first_port_config, list_next(&This->port_config_entries, first_port_config));
++        port_config = LIST_ENTRY(first_port_config, struct audio_path_port_config, entry);
++        first_pchannel_to_buffer = list_head(&port_config->pchannel_to_buffer_entries);
++        if (list_next(&port_config->pchannel_to_buffer_entries, first_pchannel_to_buffer))
++            FIXME("Only one pchannel to buffer entry supported.\n");
++        pchannel_to_buffer = LIST_ENTRY(first_pchannel_to_buffer, struct audio_path_pchannel_to_buffer, entry);
++    }
+ 
+     /* Secondary buffer description */
+     memset(format, 0, sizeof(*format));
+@@ -680,50 +683,56 @@ HRESULT path_config_get_audio_path_params(IUnknown *iface, WAVEFORMATEX *format,
+     desc->lpwfxFormat = format;
+     desc->guid3DAlgorithm = GUID_NULL;
+ 
+-    guids = pchannel_to_buffer->guids;
+-    if (pchannel_to_buffer->header.dwBufferCount == 2)
++    if (pchannel_to_buffer)
+     {
+-        if ((!IsEqualGUID(&guids[0], &GUID_Buffer_Reverb) && !IsEqualGUID(&guids[0], &GUID_Buffer_Stereo)) ||
+-                (!IsEqualGUID(&guids[1], &GUID_Buffer_Reverb) && !IsEqualGUID(&guids[1], &GUID_Buffer_Stereo)) ||
+-                IsEqualGUID(&guids[0], &guids[1]))
+-            FIXME("Only a stereo plus reverb buffer is supported\n");
+-        else
++        guids = pchannel_to_buffer->guids;
++        if (pchannel_to_buffer->header.dwBufferCount == 2)
+         {
+-            desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
+-            format->nChannels = 2;
+-            format->nBlockAlign *= 2;
+-            format->nAvgBytesPerSec *= 2;
++            if ((!IsEqualGUID(&guids[0], &GUID_Buffer_Reverb) && !IsEqualGUID(&guids[0], &GUID_Buffer_Stereo)) ||
++                    (!IsEqualGUID(&guids[1], &GUID_Buffer_Reverb) && !IsEqualGUID(&guids[1], &GUID_Buffer_Stereo)) ||
++                    IsEqualGUID(&guids[0], &guids[1]))
++                FIXME("Only a stereo plus reverb buffer is supported\n");
++            else
++            {
++                desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
++                format->nChannels = 2;
++                format->nBlockAlign *= 2;
++                format->nAvgBytesPerSec *= 2;
++            }
+         }
+-    }
+-    else if (pchannel_to_buffer->header.dwBufferCount == 1)
+-    {
+-        if (IsEqualGUID(guids, &GUID_Buffer_Stereo))
++        else if (pchannel_to_buffer->header.dwBufferCount == 1)
+         {
+-            desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
+-            format->nChannels = 2;
+-            format->nBlockAlign *= 2;
+-            format->nAvgBytesPerSec *= 2;
++            if (IsEqualGUID(guids, &GUID_Buffer_Stereo))
++            {
++                desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
++                format->nChannels = 2;
++                format->nBlockAlign *= 2;
++                format->nAvgBytesPerSec *= 2;
++            }
++            else if (IsEqualGUID(guids, &GUID_Buffer_3D_Dry))
++                desc->dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE;
++            else if (IsEqualGUID(guids, &GUID_Buffer_Mono))
++                desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
++            else
++                FIXME("Unsupported buffer guid %s\n", debugstr_dmguid(guids));
+         }
+-        else if (IsEqualGUID(guids, &GUID_Buffer_3D_Dry))
+-            desc->dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE;
+-        else if (IsEqualGUID(guids, &GUID_Buffer_Mono))
+-            desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
+         else
+-            FIXME("Unsupported buffer guid %s\n", debugstr_dmguid(guids));
++            FIXME("Multiple buffers not supported\n");
+     }
+-    else
+-        FIXME("Multiple buffers not supported\n");
+ 
+-    *params = port_config->params;
+-    if (!(params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS))
+-    {
+-        params->dwValidParams |= DMUS_PORTPARAMS_CHANNELGROUPS;
+-        params->dwChannelGroups = (port_config->header.dwPChannelCount + 15) / 16;
+-    }
+-    if (!(params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS))
++    if (port_config)
+     {
+-        params->dwValidParams |= DMUS_PORTPARAMS_AUDIOCHANNELS;
+-        params->dwAudioChannels = format->nChannels;
++        *params = port_config->params;
++        if (!(params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS))
++        {
++            params->dwValidParams |= DMUS_PORTPARAMS_CHANNELGROUPS;
++            params->dwChannelGroups = (port_config->header.dwPChannelCount + 15) / 16;
++        }
++        if (!(params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS))
++        {
++            params->dwValidParams |= DMUS_PORTPARAMS_AUDIOCHANNELS;
++            params->dwAudioChannels = format->nChannels;
++        }
+     }
+     return S_OK;
+ }
+diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
+index b96f0e2e401..36860b7c762 100644
+--- a/dlls/dmime/segment.c
++++ b/dlls/dmime/segment.c
+@@ -516,6 +516,12 @@ static HRESULT WINAPI segment_GetAudioPathConfig(IDirectMusicSegment8 *iface, IU
+ {
+     struct segment *This = impl_from_IDirectMusicSegment8(iface);
+     FIXME("(%p, %p): stub\n", This, ppAudioPathConfig);
++
++    if (!ppAudioPathConfig)
++        return E_POINTER;
++
++    create_dmaudiopath_config(&IID_IUnknown, (void**)ppAudioPathConfig);
++
+     return S_OK;
+ }
+ 
+-- 
+2.45.2
+

patches/dmime_segment_getaudiopath/definition

@@ -0,0 +1 @@
+Fixes: [56699] dmime: Semi-Implement IDirectMusicSegment8::GetAudioPathConfig

patches/dmscript_enum_routine/0001-dmscript-IDirectMusicScript-EnumRoutine-return-S_FAL.patch

@@ -0,0 +1,27 @@
+From 59bed5259de3329ab2332c9c03f99126acdba4a4 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 1 Nov 2024 19:39:11 +1100
+Subject: [PATCH] dmscript: IDirectMusicScript::EnumRoutine return S_FALSE by
+ default
+
+https://bugs.winehq.org/show_bug.cgi?id=55982
+---
+ dlls/dmscript/script.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
+index 01d4bcd0290..278405a322a 100644
+--- a/dlls/dmscript/script.c
++++ b/dlls/dmscript/script.c
+@@ -171,7 +171,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *ifa
+ {
+   IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface);
+   FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName);
+-  return S_OK;
++  return S_FALSE;
+ }
+ 
+ static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *iface, DWORD dwIndex,
+-- 
+2.45.2
+

patches/dmscript_enum_routine/definition

@@ -0,0 +1 @@
+Fixes: [55982] dmscript: IDirectMusicScript::EnumRoutine return S_FALSE by default

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From 3b9e832890ad710eecf08f7901d708cfebb3520c Mon Sep 17 00:00:00 2001
+From 6c64a33f908b9fade24fe11d89533a70fdce352f Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 10:44:49 -0500
 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -7,15 +7,15 @@ We use ppoll() instead of poll() for the better time granularity.
 
 Although perhaps we shouldn't since the server doesn't do this.
 ---
- configure.ac        | 8 ++++++++
- include/config.h.in | 9 +++++++++
- 2 files changed, 17 insertions(+)
+ configure.ac        |  8 ++++++++
+ include/config.h.in | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4314be5553c..920d8343925 100644
+index eb7f8223b51..388ac14dc8a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -407,6 +407,7 @@ AC_CHECK_HEADERS(\
+@@ -411,6 +411,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -23,17 +23,17 @@ index 4314be5553c..920d8343925 100644
  	sys/extattr.h \
  	sys/filio.h \
  	sys/ipc.h \
-@@ -2076,6 +2077,7 @@ AC_CHECK_FUNCS(\
+@@ -2079,6 +2080,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
 +	ppoll \
  	prctl \
+ 	sched_getcpu \
  	sched_yield \
- 	renameat \
-@@ -2100,6 +2102,12 @@ case $host_os in
-     ;;
- esac
+@@ -2100,6 +2102,12 @@ AC_SEARCH_LIBS(clock_gettime, rt,
+                 test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
+ LIBS=$ac_save_LIBS
  
 +ac_save_LIBS=$LIBS
 +AC_SEARCH_LIBS(shm_open, rt,
@@ -45,30 +45,32 @@ index 4314be5553c..920d8343925 100644
                  AC_LINK_IFELSE([AC_LANG_PROGRAM(
  [[#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no]))
 diff --git a/include/config.h.in b/include/config.h.in
-index 096ecdf94ec..303fb7f2b69 100644
+index 6033d8674f3..563b63a92df 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -312,6 +312,9 @@
- /* Define to 1 if you have the `posix_fallocate' function. */
+@@ -321,6 +321,9 @@
+ /* Define to 1 if you have the 'posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
 +/* Define to 1 if you have the `ppoll' function. */
 +#undef HAVE_PPOLL
 +
- /* Define to 1 if you have the `prctl' function. */
+ /* Define to 1 if you have the 'prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -369,6 +372,9 @@
- /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
+@@ -381,7 +384,10 @@
+ /* Define to 1 if 'interface_id' is a member of 'sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
+-/* Define to 1 if 'si_fd' is a member of 'siginfo_t'. */
 +/* Define to 1 if you have the `shm_open' function. */
 +#undef HAVE_SHM_OPEN
 +
- /* Define to 1 if `si_fd' is a member of `siginfo_t'. */
++/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
  #undef HAVE_SIGINFO_T_SI_FD
  
-@@ -498,6 +504,9 @@
+ /* Define to 1 if you have the 'sigprocmask' function. */
+@@ -510,6 +516,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  

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

@@ -1,4 +1,4 @@
-From e222dd363cf419eecb0d5c97390b60de15f37951 Mon Sep 17 00:00:00 2001
+From 914fe97f7dc20348ec3e1a2e18bcefa9b7cab463 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
@@ -10,7 +10,7 @@ Split off to decrease patch size.
  server/atom.c       | 1 +
  server/change.c     | 1 +
  server/clipboard.c  | 1 +
- server/completion.c | 1 +
+ server/completion.c | 2 ++
  server/console.c    | 7 +++++++
  server/debugger.c   | 2 ++
  server/device.c     | 4 ++++
@@ -25,6 +25,7 @@ Split off to decrease patch size.
  server/mapping.c    | 3 +++
  server/mutex.c      | 1 +
  server/named_pipe.c | 5 +++++
+ server/object.c     | 2 ++
  server/object.h     | 2 ++
  server/process.c    | 3 +++
  server/queue.c      | 2 ++
@@ -40,13 +41,13 @@ Split off to decrease patch size.
  server/token.c      | 1 +
  server/window.c     | 1 +
  server/winstation.c | 2 ++
- 34 files changed, 68 insertions(+)
+ 35 files changed, 71 insertions(+)
 
 diff --git a/server/async.c b/server/async.c
-index 9cb251df5ce..337bba8631b 100644
+index 749c547af4f..2377c737e98 100644
 --- a/server/async.c
 +++ b/server/async.c
-@@ -77,6 +77,7 @@ static const struct object_ops async_ops =
+@@ -78,6 +78,7 @@ static const struct object_ops async_ops =
      add_queue,                 /* add_queue */
      remove_queue,              /* remove_queue */
      async_signaled,            /* signaled */
@@ -54,7 +55,7 @@ index 9cb251df5ce..337bba8631b 100644
      async_satisfied,           /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -676,6 +677,7 @@ static const struct object_ops iosb_ops =
+@@ -698,6 +699,7 @@ static const struct object_ops iosb_ops =
      no_add_queue,             /* add_queue */
      NULL,                     /* remove_queue */
      NULL,                     /* signaled */
@@ -75,7 +76,7 @@ index ff0799f5880..d9824de8eac 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/change.c b/server/change.c
-index 7a806abc017..e080511bb23 100644
+index f42ce066340..d0a90a99261 100644
 --- a/server/change.c
 +++ b/server/change.c
 @@ -112,6 +112,7 @@ static const struct object_ops dir_ops =
@@ -87,7 +88,7 @@ index 7a806abc017..e080511bb23 100644
      no_signal,                /* signal */
      dir_get_fd,               /* get_fd */
 diff --git a/server/clipboard.c b/server/clipboard.c
-index 8118a467dd8..8b265f2dcea 100644
+index 91f159bc7c9..0df7fd2f18e 100644
 --- a/server/clipboard.c
 +++ b/server/clipboard.c
 @@ -76,6 +76,7 @@ static const struct object_ops clipboard_ops =
@@ -99,10 +100,18 @@ index 8118a467dd8..8b265f2dcea 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/completion.c b/server/completion.c
-index 6933195e72d..3d4be86a212 100644
+index f9e68c523f1..9093132efac 100644
 --- a/server/completion.c
 +++ b/server/completion.c
-@@ -75,6 +75,7 @@ static const struct object_ops completion_ops =
+@@ -92,6 +92,7 @@ static const struct object_ops completion_wait_ops =
+     add_queue,                      /* add_queue */
+     remove_queue,                   /* remove_queue */
+     completion_wait_signaled,       /* signaled */
++    NULL,                           /* get_esync_fd */
+     completion_wait_satisfied,      /* satisfied */
+     no_signal,                      /* signal */
+     no_get_fd,                      /* get_fd */
+@@ -166,6 +167,7 @@ static const struct object_ops completion_ops =
      add_queue,                 /* add_queue */
      remove_queue,              /* remove_queue */
      completion_signaled,       /* signaled */
@@ -171,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 48adb244b09..d85a2000684 100644
+index c59a0abea77..ca04d4c71ce 100644
 --- a/server/debugger.c
 +++ b/server/debugger.c
 @@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops =
@@ -227,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 23d7eb0a2b7..bc161b9ab7e 100644
+index b37ec969a9e..a6c0e292071 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -69,6 +69,7 @@ static const struct object_ops object_type_ops =
@@ -279,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 74ad95fd4d1..4ce498ec0ef 100644
+index 16328063df6..4ce78db5b33 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -172,6 +172,7 @@ static const struct object_ops fd_ops =
@@ -315,7 +324,7 @@ index 74ad95fd4d1..4ce498ec0ef 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/file.c b/server/file.c
-index b4f99ddc93b..1b4efb04bc5 100644
+index 2a839968c25..cbef0c63383 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -94,6 +94,7 @@ static const struct object_ops file_ops =
@@ -327,7 +336,7 @@ index b4f99ddc93b..1b4efb04bc5 100644
      no_signal,                    /* signal */
      file_get_fd,                  /* get_fd */
 diff --git a/server/handle.c b/server/handle.c
-index 0595fdb403b..d41c7e86454 100644
+index e65831b3b22..e6c5707556f 100644
 --- a/server/handle.c
 +++ b/server/handle.c
 @@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
@@ -339,10 +348,10 @@ index 0595fdb403b..d41c7e86454 100644
      no_signal,                       /* signal */
      no_get_fd,                       /* get_fd */
 diff --git a/server/hook.c b/server/hook.c
-index 5abdf39ad37..da351d6791f 100644
+index c2d2823cd61..ab4d0e9dd31 100644
 --- a/server/hook.c
 +++ b/server/hook.c
-@@ -80,6 +80,7 @@ static const struct object_ops hook_table_ops =
+@@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops =
      no_add_queue,                 /* add_queue */
      NULL,                         /* remove_queue */
      NULL,                         /* signaled */
@@ -351,10 +360,10 @@ index 5abdf39ad37..da351d6791f 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/mailslot.c b/server/mailslot.c
-index 2d8697ec9bd..4cf9b73f784 100644
+index 61eceec94e2..92fe938d3b9 100644
 --- a/server/mailslot.c
 +++ b/server/mailslot.c
-@@ -74,6 +74,7 @@ static const struct object_ops mailslot_ops =
+@@ -81,6 +81,7 @@ static const struct object_ops mailslot_ops =
      add_queue,                 /* add_queue */
      remove_queue,              /* remove_queue */
      default_fd_signaled,       /* signaled */
@@ -362,7 +371,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      no_satisfied,              /* satisfied */
      no_signal,                 /* signal */
      mailslot_get_fd,           /* get_fd */
-@@ -133,6 +134,7 @@ static const struct object_ops mail_writer_ops =
+@@ -142,6 +143,7 @@ static const struct object_ops mail_writer_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -370,7 +379,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      NULL,                       /* satisfied */
      no_signal,                  /* signal */
      mail_writer_get_fd,         /* get_fd */
-@@ -196,6 +198,7 @@ static const struct object_ops mailslot_device_ops =
+@@ -207,6 +209,7 @@ static const struct object_ops mailslot_device_ops =
      no_add_queue,                   /* add_queue */
      NULL,                           /* remove_queue */
      NULL,                           /* signaled */
@@ -378,7 +387,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      no_satisfied,                   /* satisfied */
      no_signal,                      /* signal */
      no_get_fd,                      /* get_fd */
-@@ -226,6 +229,7 @@ static const struct object_ops mailslot_device_file_ops =
+@@ -237,6 +240,7 @@ static const struct object_ops mailslot_device_file_ops =
      add_queue,                              /* add_queue */
      remove_queue,                           /* remove_queue */
      default_fd_signaled,                    /* signaled */
@@ -387,7 +396,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      no_signal,                              /* signal */
      mailslot_device_file_get_fd,            /* get_fd */
 diff --git a/server/mapping.c b/server/mapping.c
-index 2d0a0b783e2..1acfb032bfd 100644
+index 2bf45780375..b84bb08a77b 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -67,6 +67,7 @@ static const struct object_ops ranges_ops =
@@ -427,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 f3404a33c3b..f28cb14cb45 100644
+index dd8c14b30a9..5880b601d3a 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
 @@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
@@ -470,8 +479,28 @@ index f3404a33c3b..f28cb14cb45 100644
      no_satisfied,                            /* satisfied */
      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
+--- a/server/object.c
++++ b/server/object.c
+@@ -108,6 +108,7 @@ static const struct object_ops apc_reserve_ops =
+     no_add_queue,               /* add_queue */
+     NULL,                       /* remove_queue */
+     NULL,                       /* signaled */
++    NULL,                       /* get_esync_fd */
+     no_satisfied,               /* satisfied */
+     no_signal,                  /* signal */
+     no_get_fd,                  /* get_fd */
+@@ -132,6 +133,7 @@ static const struct object_ops completion_reserve_ops =
+     no_add_queue,              /* add_queue */
+     NULL,                      /* remove_queue */
+     NULL,                      /* signaled */
++    NULL,                      /* get_esync_fd */
+     no_satisfied,              /* satisfied */
+     no_signal,                 /* signal */
+     no_get_fd,                 /* get_fd */
 diff --git a/server/object.h b/server/object.h
-index dfdd691601f..711af54b579 100644
+index 6222e3352ed..0a65d0e3892 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -78,6 +78,8 @@ struct object_ops
@@ -484,7 +513,7 @@ index dfdd691601f..711af54b579 100644
      void (*satisfied)(struct object *,struct wait_queue_entry *);
      /* signal an object */
 diff --git a/server/process.c b/server/process.c
-index a0d5ea64d97..777bf7c2fe2 100644
+index 49f5c75005f..dc83a089655 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -105,6 +105,7 @@ static const struct object_ops process_ops =
@@ -512,10 +541,10 @@ index a0d5ea64d97..777bf7c2fe2 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/queue.c b/server/queue.c
-index 348fdac3214..2cd8949a252 100644
+index 984d466b66e..8a95055db40 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -174,6 +174,7 @@ static const struct object_ops msg_queue_ops =
+@@ -165,6 +165,7 @@ static const struct object_ops msg_queue_ops =
      msg_queue_add_queue,       /* add_queue */
      msg_queue_remove_queue,    /* remove_queue */
      msg_queue_signaled,        /* signaled */
@@ -523,7 +552,7 @@ index 348fdac3214..2cd8949a252 100644
      msg_queue_satisfied,       /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -211,6 +212,7 @@ static const struct object_ops thread_input_ops =
+@@ -202,6 +203,7 @@ static const struct object_ops thread_input_ops =
      no_add_queue,                 /* add_queue */
      NULL,                         /* remove_queue */
      NULL,                         /* signaled */
@@ -532,7 +561,7 @@ index 348fdac3214..2cd8949a252 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/registry.c b/server/registry.c
-index 629d67c832f..d6b39b99b22 100644
+index cc9a33fff1d..c19e92c9750 100644
 --- a/server/registry.c
 +++ b/server/registry.c
 @@ -180,6 +180,7 @@ static const struct object_ops key_ops =
@@ -544,7 +573,7 @@ index 629d67c832f..d6b39b99b22 100644
      no_signal,               /* signal */
      no_get_fd,               /* get_fd */
 diff --git a/server/request.c b/server/request.c
-index 7021741c765..ca83fdbd2af 100644
+index dabcea68309..832a33917b4 100644
 --- a/server/request.c
 +++ b/server/request.c
 @@ -90,6 +90,7 @@ static const struct object_ops master_socket_ops =
@@ -568,10 +597,10 @@ index 53b42a886df..e3889f24601 100644
      semaphore_signal,              /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/serial.c b/server/serial.c
-index d665eb7fa35..11e204e4419 100644
+index 209f2e9174e..0d49a996c2a 100644
 --- a/server/serial.c
 +++ b/server/serial.c
-@@ -85,6 +85,7 @@ static const struct object_ops serial_ops =
+@@ -91,6 +91,7 @@ static const struct object_ops serial_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -592,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 52175b08987..77b41716cd1 100644
+index d2ec882554f..44a4e3b7b15 100644
 --- a/server/sock.c
 +++ b/server/sock.c
-@@ -451,6 +451,7 @@ static const struct object_ops sock_ops =
+@@ -471,6 +471,7 @@ static const struct object_ops sock_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -603,7 +632,7 @@ index 52175b08987..77b41716cd1 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      sock_get_fd,                  /* get_fd */
-@@ -3481,6 +3482,7 @@ static const struct object_ops ifchange_ops =
+@@ -3599,6 +3600,7 @@ static const struct object_ops ifchange_ops =
      no_add_queue,            /* add_queue */
      NULL,                    /* remove_queue */
      NULL,                    /* signaled */
@@ -611,7 +640,7 @@ index 52175b08987..77b41716cd1 100644
      no_satisfied,            /* satisfied */
      no_signal,               /* signal */
      ifchange_get_fd,         /* get_fd */
-@@ -3702,6 +3704,7 @@ static const struct object_ops socket_device_ops =
+@@ -3820,6 +3822,7 @@ static const struct object_ops socket_device_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -620,7 +649,7 @@ index 52175b08987..77b41716cd1 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/symlink.c b/server/symlink.c
-index 27d48e2f994..8cb24b4ff6e 100644
+index dd28efd3a75..c7f34412317 100644
 --- a/server/symlink.c
 +++ b/server/symlink.c
 @@ -71,6 +71,7 @@ static const struct object_ops symlink_ops =
@@ -632,7 +661,7 @@ index 27d48e2f994..8cb24b4ff6e 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index 0d5bdcf21d9..9dc38d4cce9 100644
+index 506adfc0a6f..339cdfec1fa 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -96,6 +96,7 @@ static const struct object_ops thread_apc_ops =
@@ -672,10 +701,10 @@ index 96dc9d00ca1..f59902d5607 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/token.c b/server/token.c
-index 4df8d2e0c6e..8b4d2f0c1b1 100644
+index 48ee1eca8fe..479596bdbfa 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -143,6 +143,7 @@ static const struct object_ops token_ops =
+@@ -145,6 +145,7 @@ static const struct object_ops token_ops =
      no_add_queue,              /* add_queue */
      NULL,                      /* remove_queue */
      NULL,                      /* signaled */
@@ -684,7 +713,7 @@ index 4df8d2e0c6e..8b4d2f0c1b1 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/window.c b/server/window.c
-index 242e93f303a..3aa7ad4ad79 100644
+index 412592fbc71..94a70ce890f 100644
 --- a/server/window.c
 +++ b/server/window.c
 @@ -107,6 +107,7 @@ static const struct object_ops window_ops =
@@ -696,7 +725,7 @@ index 242e93f303a..3aa7ad4ad79 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/winstation.c b/server/winstation.c
-index 5903497d61e..7692fbe3ed2 100644
+index e5f4bfec357..50fe34aa9ce 100644
 --- a/server/winstation.c
 +++ b/server/winstation.c
 @@ -76,6 +76,7 @@ static const struct object_ops winstation_ops =
@@ -716,5 +745,5 @@ index 5903497d61e..7692fbe3ed2 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 -- 
-2.42.0
+2.45.2
 

patches/eventfd_synchronization/0013-server-Create-eventfd-file-descriptors-for-process-o.patch

@@ -1,4 +1,4 @@
-From a43255ead53a49837e7995ab4de0afa8e05e6334 Mon Sep 17 00:00:00 2001
+From ce164f9c292bc93ad50055bdb0a786e8a8770afa Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 15:11:12 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for process objects.
@@ -49,7 +49,7 @@ index 00f9e638d83..8522d8a69ae 100644
  void esync_init(void);
 +int esync_create_fd( int initval, int flags );
 diff --git a/server/process.c b/server/process.c
-index 031c0fece13..eb073551b57 100644
+index 3c5a58b7b03..30555d516c8 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -63,6 +63,7 @@
@@ -77,7 +77,7 @@ index 031c0fece13..eb073551b57 100644
      no_satisfied,                /* satisfied */
      no_signal,                   /* signal */
      no_get_fd,                   /* get_fd */
-@@ -688,6 +690,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
+@@ -689,6 +691,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
      process->rawinput_kbd    = NULL;
      memset( &process->image_info, 0, sizeof(process->image_info) );
      list_init( &process->rawinput_entry );
@@ -85,7 +85,7 @@ index 031c0fece13..eb073551b57 100644
      list_init( &process->kernel_object );
      list_init( &process->thread_list );
      list_init( &process->locks );
-@@ -738,6 +741,9 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
+@@ -739,6 +742,9 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
      if (!process->handles || !process->token) goto error;
      process->session_id = token_get_session_id( process->token );
  
@@ -95,7 +95,7 @@ index 031c0fece13..eb073551b57 100644
      set_fd_events( process->msg_fd, POLLIN );  /* start listening to events */
      return process;
  
-@@ -786,6 +792,7 @@ static void process_destroy( struct object *obj )
+@@ -787,6 +793,7 @@ static void process_destroy( struct object *obj )
      free( process->rawinput_devices );
      free( process->dir_cache );
      free( process->image );
@@ -103,7 +103,7 @@ index 031c0fece13..eb073551b57 100644
  }
  
  /* dump a process on stdout for debugging purposes */
-@@ -803,6 +810,13 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry
+@@ -804,6 +811,13 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry
      return !process->running_threads;
  }
  
@@ -118,17 +118,17 @@ index 031c0fece13..eb073551b57 100644
  {
      access = default_map_access( obj, access );
 diff --git a/server/process.h b/server/process.h
-index 1e73e9d47dc..bedd8bb4586 100644
+index 96814ab7cf8..ec74ba0490a 100644
 --- a/server/process.h
 +++ b/server/process.h
 @@ -86,6 +86,7 @@ struct process
      struct list          rawinput_entry;  /* entry in the rawinput process list */
      struct list          kernel_object;   /* list of kernel object pointers */
-     pe_image_info_t      image_info;      /* main exe image info */
+     struct pe_image_info image_info;      /* main exe image info */
 +    int                  esync_fd;        /* esync file descriptor (signaled on exit) */
  };
  
  /* process functions */
 -- 
-2.43.0
+2.45.2
 

patches/eventfd_synchronization/0014-ntdll-server-Implement-waiting-on-server-bound-objec.patch

@@ -1,4 +1,4 @@
-From 7476e7b2e8680352cf2e1de7552ae58e11ff7869 Mon Sep 17 00:00:00 2001
+From 0ef3de9bd3b51a1e37c50fd75ceb3db6ea24abd0 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 15:19:37 -0500
 Subject: [PATCH] ntdll, server: Implement waiting on server-bound objects.
@@ -16,14 +16,15 @@ With this patch we break waiting on svcctl.exe.
  dlls/ntdll/unix/esync.c | 84 ++++++++++++++++++++++++++++++++++++++---
  server/esync.c          | 16 ++++++++
  server/esync.h          |  1 +
+ server/named_pipe.c     |  1 +
  server/thread.c         |  4 ++
- 4 files changed, 99 insertions(+), 6 deletions(-)
+ 5 files changed, 100 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 4f993689e0d..6fd195df759 100644
+index 65ef70acd36..b0168f5cde5 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -199,6 +199,72 @@ static struct esync *get_cached_object( HANDLE handle )
+@@ -193,6 +193,72 @@ static struct esync *get_cached_object( HANDLE handle )
      return &esync_list[entry][idx];
  }
  
@@ -96,7 +97,7 @@ index 4f993689e0d..6fd195df759 100644
  NTSTATUS esync_close( HANDLE handle )
  {
      UINT_PTR entry, idx = handle_to_index( handle, &entry );
-@@ -278,10 +344,11 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
+@@ -272,10 +338,11 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
      struct semaphore *semaphore;
      uint64_t count64 = count;
      ULONG current;
@@ -109,7 +110,7 @@ index 4f993689e0d..6fd195df759 100644
      semaphore = obj->shm;
  
      do
-@@ -320,10 +387,11 @@ NTSTATUS esync_set_event( HANDLE handle )
+@@ -314,10 +381,11 @@ NTSTATUS esync_set_event( HANDLE handle )
  {
      static const uint64_t value = 1;
      struct esync *obj;
@@ -122,7 +123,7 @@ index 4f993689e0d..6fd195df759 100644
  
      if (write( obj->fd, &value, sizeof(value) ) == -1)
          ERR("write: %s\n", strerror(errno));
-@@ -335,10 +403,11 @@ NTSTATUS esync_reset_event( HANDLE handle )
+@@ -329,10 +397,11 @@ NTSTATUS esync_reset_event( HANDLE handle )
  {
      uint64_t value;
      struct esync *obj;
@@ -135,7 +136,7 @@ index 4f993689e0d..6fd195df759 100644
  
      if (read( obj->fd, &value, sizeof(value) ) == -1 && errno != EWOULDBLOCK && errno != EAGAIN)
          ERR("read: %s\n", strerror(errno));
-@@ -427,10 +496,13 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -421,10 +490,13 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
  
      for (i = 0; i < count; i++)
      {
@@ -151,7 +152,7 @@ index 4f993689e0d..6fd195df759 100644
      }
  
      if (has_esync && has_server)
-@@ -483,7 +555,7 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -477,7 +549,7 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
                          int64_t value;
                          ssize_t size;
  
@@ -161,10 +162,10 @@ index 4f993689e0d..6fd195df759 100644
                              /* Don't grab the object, just check if it's signaled. */
                              if (fds[i].revents & POLLIN)
 diff --git a/server/esync.c b/server/esync.c
-index e18b76bff5b..2b9307267f9 100644
+index 44214e5fe02..60e98936455 100644
 --- a/server/esync.c
 +++ b/server/esync.c
-@@ -315,6 +315,22 @@ int esync_create_fd( int initval, int flags )
+@@ -313,6 +313,22 @@ int esync_create_fd( int initval, int flags )
  #endif
  }
  
@@ -188,19 +189,31 @@ index e18b76bff5b..2b9307267f9 100644
  {
      struct esync *esync;
 diff --git a/server/esync.h b/server/esync.h
-index 6a0a367124d..1e12560ddd6 100644
+index 8522d8a69ae..1241e6d9f1a 100644
 --- a/server/esync.h
 +++ b/server/esync.h
-@@ -21,3 +21,4 @@
+@@ -23,3 +23,4 @@
  extern int do_esync(void);
  void esync_init(void);
  int esync_create_fd( int initval, int flags );
 +void esync_wake_up( struct object *obj );
+diff --git a/server/named_pipe.c b/server/named_pipe.c
+index 68fa8953cca..1535c5188ec 100644
+--- a/server/named_pipe.c
++++ b/server/named_pipe.c
+@@ -344,6 +344,7 @@ static const struct object_ops named_pipe_dir_ops =
+     add_queue,                               /* add_queue */
+     remove_queue,                            /* remove_queue */
+     default_fd_signaled,                     /* signaled */
++    NULL,                                    /* get_esync_fd */
+     no_satisfied,                            /* satisfied */
+     no_signal,                               /* signal */
+     named_pipe_dir_get_fd,                   /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index 1e6f60182df..0413e889c7d 100644
+index 339cdfec1fa..4262b841fca 100644
 --- a/server/thread.c
 +++ b/server/thread.c
-@@ -51,6 +51,7 @@
+@@ -50,6 +50,7 @@
  #include "request.h"
  #include "user.h"
  #include "security.h"
@@ -208,7 +221,7 @@ index 1e6f60182df..0413e889c7d 100644
  
  
  /* thread queues */
-@@ -1053,6 +1054,9 @@ void wake_up( struct object *obj, int max )
+@@ -1073,6 +1074,9 @@ void wake_up( struct object *obj, int max )
      struct list *ptr;
      int ret;
  
@@ -219,5 +232,5 @@ index 1e6f60182df..0413e889c7d 100644
      {
          struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry );
 -- 
-2.30.2
+2.45.2
 

patches/eventfd_synchronization/0028-ntdll-Implement-NtSignalAndWaitForSingleObject.patch

@@ -1,4 +1,4 @@
-From 622de4743d9585d895bb560b4c8ac6ab01aff23f Mon Sep 17 00:00:00 2001
+From 631ec6bff81bb2e3389d0c2030364dea91719bf6 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:52:39 -0500
 Subject: [PATCH] ntdll: Implement NtSignalAndWaitForSingleObject().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtSignalAndWaitForSingleObject().
  3 files changed, 33 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 9e980643a6e..db70e5075d1 100644
+index 6d07d8057a1..ca0ffd2b8b1 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -842,6 +842,34 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -844,6 +844,34 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
      return ret;
  }
  
@@ -62,11 +62,11 @@ index 8eaa79a5823..88a6d5c8975 100644
  
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 20391617e40..12ed44f7a8e 100644
+index 943ba6c0da9..51fca406a4c 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -1531,6 +1531,9 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait,
-     select_op_t select_op;
+@@ -1636,6 +1636,9 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait,
+     union select_op select_op;
      UINT flags = SELECT_INTERRUPTIBLE;
  
 +    if (do_esync())
@@ -76,5 +76,5 @@ index 20391617e40..12ed44f7a8e 100644
  
      if (alertable) flags |= SELECT_ALERTABLE;
 -- 
-2.42.0
+2.45.2
 

patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch

@@ -1,119 +0,0 @@
-From dc2aaa6a25ebccc30c7903fa68235d5971f8d6b8 Mon Sep 17 00:00:00 2001
-From: Daniel Wendt <daniel.wendt@linux.com>
-Date: Fri, 15 Nov 2013 12:52:37 +0100
-Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
- problem
-
-Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=34579
----
- dlls/win32u/dibdrv/graphics.c | 80 +++++++++++++++++++++++++++++++++++
- 1 file changed, 80 insertions(+)
-
-diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
-index 410f29e8f19..3a6f8184009 100644
---- a/dlls/win32u/dibdrv/graphics.c
-+++ b/dlls/win32u/dibdrv/graphics.c
-@@ -310,6 +310,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
-     return pos - count;
- }
- 
-+/*
-+ Check if matrix has uniform scale and shear and contains a rotation.
-+*/
-+static BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform )
-+{
-+    return xform->eM21 != 0 && xform->eM11 == xform->eM22 && -xform->eM21 == xform->eM12;
-+}
-+
-+/*
-+ Decompose rotation and translation from matrix xform.
-+
-+ If parameter rotation_and_translation is != NULL, save rotation and translation into it.
-+
-+ Note: The current implementation only works on matrixes with uniform scale and shear,
-+       which has to be checked by a call to xform_has_rotate_and_uniform_scale_and_shear().
-+       Hints how to get unique values for non-uniform matrixes are welcome.
-+*/
-+static BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation )
-+{
-+    XFORM inverse_matrix_scale;
-+    XFORM origin_matrix = *xform;
-+    double determinant = 0;
-+
-+    /* xform = xfrom-transposed * xform */
-+    xform->eM11 = sqrt( xform->eM11 * xform->eM11 + xform->eM21 * xform->eM21 );
-+    xform->eM22 = sqrt( xform->eM12 * xform->eM12 + xform->eM22 * xform->eM22 );
-+    xform->eM12 = 0;
-+    xform->eM21 = 0;
-+    xform->eDx = 0;
-+    xform->eDy = 0;
-+
-+    if ( rotation_and_translation == NULL )
-+        return TRUE;
-+
-+    if ( xform->eM11 == 0 || xform->eM22 == 0 )
-+        return FALSE;
-+
-+    determinant = xform->eM11 * xform->eM22;
-+
-+    inverse_matrix_scale.eM11 = xform->eM22 / determinant;
-+    inverse_matrix_scale.eM12 = 0;
-+    inverse_matrix_scale.eM21 = 0;
-+    inverse_matrix_scale.eM22 = xform->eM11 / determinant;
-+
-+    /* calculate the rotation matrix */
-+    rotation_and_translation->eM11 = inverse_matrix_scale.eM11 * origin_matrix.eM11;
-+    rotation_and_translation->eM12 = inverse_matrix_scale.eM11 * origin_matrix.eM12;
-+    rotation_and_translation->eM21 = inverse_matrix_scale.eM22 * origin_matrix.eM12 * -1;
-+    rotation_and_translation->eM22 = inverse_matrix_scale.eM22 * origin_matrix.eM22;
-+    rotation_and_translation->eDx = origin_matrix.eDx;
-+    rotation_and_translation->eDy = origin_matrix.eDy;
-+    return TRUE;
-+}
-+
- /* backend for arc functions; extra_lines is -1 for ArcTo, 0 for Arc, 1 for Chord, 2 for Pie */
- static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                       INT start_x, INT start_y, INT end_x, INT end_y, INT extra_lines )
-@@ -322,6 +376,22 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-     BOOL ret = TRUE;
-     HRGN outline = 0, interior = 0;
- 
-+    BOOL exclude_rotation = FALSE;
-+    XFORM old;
-+    XFORM rotation_and_translation;
-+    if (dc->attr->graphics_mode == GM_ADVANCED)
-+    {
-+        XFORM xf;
-+        NtGdiGetTransform( pdev->dev.hdc, 0x203, &old );
-+        xf = old;
-+        if (xform_has_rotate_and_uniform_scale_and_shear( &xf ) &&
-+            xform_decompose_rotation_and_translation( &xf, &rotation_and_translation ))
-+        {
-+            NtGdiModifyWorldTransform( pdev->dev.hdc, &xf, MWT_SET );
-+            exclude_rotation = TRUE;
-+        }
-+    }
-+
-     if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
- 
-     width = rect.right - rect.left;
-@@ -355,6 +425,16 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-         points[count].y = rect.top + height / 2;
-         count++;
-     }
-+
-+    if (exclude_rotation == TRUE)
-+    {
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &rotation_and_translation, MWT_SET );
-+        /* apply rotation and translation to calculated points */
-+        NtGdiTransformPoints( dev->hdc, points, points, count, NtGdiLPtoDP );
-+        /* restore origin matrix */
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &old, MWT_SET );
-+    }
-+
-     if (count < 2)
-     {
-         free( points );
--- 
-2.33.0
-

patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch

@@ -1,110 +0,0 @@
-From fdc9d34400af31765d20ca7b070e53d7eec710e4 Mon Sep 17 00:00:00 2001
-From: Daniel Wendt <daniel.wendt@linux.com>
-Date: Tue, 10 Dec 2013 14:55:32 +0100
-Subject: [PATCH] gdi32: fix for rotated ellipse
-
-Bug: http://bugs.winehq.org/show_bug.cgi?id=35331
----
- dlls/win32u/dibdrv/graphics.c | 63 ++++++++++++++++++++++++-----------
- 1 file changed, 44 insertions(+), 19 deletions(-)
-
-diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
-index 21d2eabbc9e..1eeea1d68ea 100644
---- a/dlls/win32u/dibdrv/graphics.c
-+++ b/dlls/win32u/dibdrv/graphics.c
-@@ -1531,10 +1531,28 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-     DC *dc = get_physdev_dc( dev );
-     RECT rect;
-     POINT pt[2], *points;
--    int i, end, count;
-+    int i, end;
-+    ULONG count;
-     BOOL ret = TRUE;
-     HRGN outline = 0, interior = 0;
- 
-+    BOOL exclude_rotation_translation = FALSE;
-+    XFORM old;
-+    XFORM rotation_and_translation;
-+
-+    if (dc->attr->graphics_mode == GM_ADVANCED)
-+    {
-+        XFORM xf;
-+        NtGdiGetTransform( pdev->dev.hdc, 0x203, &old );
-+        xf = old;
-+        if (xform_has_rotate_and_uniform_scale_and_shear( &xf ) &&
-+            xform_decompose_rotation_and_translation( &xf, &rotation_and_translation ))
-+        {
-+            NtGdiModifyWorldTransform( pdev->dev.hdc, &xf, MWT_SET );
-+            exclude_rotation_translation = TRUE;
-+        }
-+    }
-+
-     if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
- 
-     pt[0].x = pt[0].y = 0;
-@@ -1555,23 +1573,6 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-         return FALSE;
-     }
- 
--    if (pdev->brush.style != BS_NULL &&
--        !(interior = NtGdiCreateRoundRectRgn( rect.left, rect.top, rect.right + 1, rect.bottom + 1,
--                                              ellipse_width, ellipse_height )))
--    {
--        free( points );
--        if (outline) NtGdiDeleteObjectApp( outline );
--        return FALSE;
--    }
--
--    /* if not using a region, paint the interior first so the outline can overlap it */
--    if (interior && !outline)
--    {
--        ret = brush_region( pdev, interior );
--        NtGdiDeleteObjectApp( interior );
--        interior = 0;
--    }
--
-     count = ellipse_first_quadrant( ellipse_width, ellipse_height, points );
- 
-     if (dc->attr->arc_direction == AD_CLOCKWISE)
-@@ -1615,13 +1616,37 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-     }
-     count = end + 1;
- 
-+    if (exclude_rotation_translation == TRUE)
-+    {
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &rotation_and_translation, MWT_SET );
-+        /* apply rotation and translation to calculated points */
-+        NtGdiTransformPoints( dev->hdc, points, points, count, NtGdiLPtoDP );
-+        /* restore origin matrix */
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &old, MWT_SET );
-+    }
-+
-+    if (pdev->brush.style != BS_NULL &&
-+        !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, &count, 1, NtGdiPolyPolygonRgn ))))
-+    {
-+        free( points );
-+        if (outline) NtGdiDeleteObjectApp( outline );
-+            return FALSE;
-+    }
-+
-+    /* if not using a region, paint the interior first so the outline can overlap it */
-+    if (interior && !outline)
-+    {
-+        ret = brush_region( pdev, interior );
-+        NtGdiDeleteObjectApp( interior );
-+        interior = 0;
-+    }
-+
-     reset_dash_origin( pdev );
-     pdev->pen_lines( pdev, count, points, TRUE, outline );
-     add_pen_lines_bounds( pdev, count, points, outline );
- 
-     if (interior)
-     {
--        NtGdiCombineRgn( interior, interior, outline, RGN_DIFF );
-         ret = brush_region( pdev, interior );
-         NtGdiDeleteObjectApp( interior );
-     }
--- 
-2.43.0
-

patches/gdi32-rotation/definition

@@ -1,2 +0,0 @@
-Fixes: [34579] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing problem
-Fixes: [35331] gdi32: fix for rotated ellipse

patches/kernel32-Debugger/0001-kernel32-Always-start-debugger-on-WinSta0.patch

@@ -1,24 +1,24 @@
-From b617701d440a9b5210762503cf441e9fcb3132e1 Mon Sep 17 00:00:00 2001
+From 4dfa7d8a06e20d9888398298e03c20fac89a9fdf Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 13 Jan 2017 01:59:13 +0100
-Subject: kernel32: Always start debugger on WinSta0.
+Subject: [PATCH] kernel32: Always start debugger on WinSta0.
 
 ---
  dlls/kernelbase/debug.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
-index 016c21109..0681f726b 100644
+index cbefc0c8733..b37faaa0003 100644
 --- a/dlls/kernelbase/debug.c
 +++ b/dlls/kernelbase/debug.c
-@@ -640,6 +640,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
+@@ -625,6 +625,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
      TRACE( "Starting debugger %s\n", debugstr_w(cmdline) );
      memset( &startup, 0, sizeof(startup) );
      startup.cb = sizeof(startup);
 +    startup.lpDesktop = (WCHAR*)L"WinSta0";
      startup.dwFlags = STARTF_USESHOWWINDOW;
      startup.wShowWindow = SW_SHOWNORMAL;
-     ret = CreateProcessW( NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info );
+     ret = CreateProcessW( NULL, cmdline, NULL, NULL, TRUE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &startup, &info );
 -- 
-2.23.0
+2.45.2
 

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

@@ -1,4 +1,4 @@
-From 8f9e309dc4b3e9c7328c86cc4993b9359f0e6839 Mon Sep 17 00:00:00 2001
+From 4c246e61f0de05a8b80e7a5d5ff2edcd21036fec 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, 164 insertions(+), 246 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index cd1655d41b2..c0537375ab8 100644
+index 1a3d527f186..ec72d692c3a 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1241,43 +1241,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
+@@ -1269,43 +1269,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
  }
  
  
@@ -71,7 +71,7 @@ index cd1655d41b2..c0537375ab8 100644
  
  /***********************************************************************
   *           try_map_free_area
-@@ -1312,112 +1284,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1338,112 +1310,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
  }
  
  
@@ -184,7 +184,7 @@ index cd1655d41b2..c0537375ab8 100644
  /***********************************************************************
   *           remove_reserved_area
   *
-@@ -1527,8 +1393,7 @@ static void free_view( struct file_view *view )
+@@ -1553,8 +1419,7 @@ static void free_view( struct file_view *view )
   */
  static void unregister_view( struct file_view *view )
  {
@@ -194,7 +194,7 @@ index cd1655d41b2..c0537375ab8 100644
      wine_rb_remove( &views_tree, &view->entry );
  }
  
-@@ -1556,8 +1421,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
+@@ -1582,8 +1447,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 cd1655d41b2..c0537375ab8 100644
  }
  
  
-@@ -1830,89 +1694,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
+@@ -1855,89 +1719,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
      return ptr;
  }
  
@@ -343,7 +343,7 @@ index cd1655d41b2..c0537375ab8 100644
 +static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BOOL top_down, int unix_prot, UINT_PTR align_mask )
  {
 -    void *ptr = NULL;
--    struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry );
+-    struct reserved_area *area;
 +    struct range_entry *range, *ranges_start, *ranges_end;
 +    char *reserve_start, *reserve_end;
 +    struct alloc_area area;
@@ -442,7 +442,7 @@ index cd1655d41b2..c0537375ab8 100644
  }
  
  /***********************************************************************
-@@ -2016,48 +1967,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -2041,48 +1992,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
      }
      else
      {
@@ -495,7 +495,7 @@ index cd1655d41b2..c0537375ab8 100644
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
      return status;
-@@ -3236,6 +3152,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
+@@ -3275,6 +3191,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 +503,7 @@ index cd1655d41b2..c0537375ab8 100644
      return res;
  }
  
-@@ -6143,6 +6060,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
+@@ -6394,6 +6311,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
          *ret = (ULONG_PTR)base;
          *size_ptr = size;
      }
@@ -512,5 +512,5 @@ index cd1655d41b2..c0537375ab8 100644
  }
  
 -- 
-2.43.0
+2.45.2
 

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

@@ -1,14 +1,14 @@
-From d13a3f4498ddc7f10a1d435edb5c59b71dca1efc Mon Sep 17 00:00:00 2001
+From 844ba5e56a7231f65b65cabf06fe44ee49876aa0 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 | 104 ++++++++++++++++++++++++++++++++++----
- 1 file changed, 95 insertions(+), 9 deletions(-)
+ dlls/ntdll/unix/virtual.c | 106 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 97 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index c0537375ab8..b4d7f6a580d 100644
+index ec72d692c3a..30d43afc076 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
 @@ -127,6 +127,7 @@ struct file_view
@@ -28,7 +28,7 @@ index c0537375ab8..b4d7f6a580d 100644
  
  ULONG_PTR user_space_wow_limit = 0;
  struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
-@@ -1129,7 +1132,9 @@ static void dump_view( struct file_view *view )
+@@ -1157,7 +1160,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 c0537375ab8..b4d7f6a580d 100644
          TRACE( " (builtin image)\n" );
      else if (view->protect & VPROT_FREE_PLACEHOLDER)
          TRACE( " (placeholder)\n" );
-@@ -1249,6 +1254,8 @@ struct alloc_area
+@@ -1277,6 +1282,8 @@ struct alloc_area
      int unix_prot;
      BOOL top_down;
      UINT_PTR align_mask;
@@ -48,7 +48,7 @@ index c0537375ab8..b4d7f6a580d 100644
  };
  
  /***********************************************************************
-@@ -1257,9 +1264,12 @@ struct alloc_area
+@@ -1285,9 +1292,14 @@ 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,10 +60,12 @@ index c0537375ab8..b4d7f6a580d 100644
 +    size_t abs_step = step > 0 ? step : -step;
 +    size_t size = area->size;
 +    int unix_prot = area->unix_prot;
-     void *ptr;
- 
++    void *ptr;
++
      while (start && base <= start && (char*)start + size <= (char*)end)
-@@ -1272,12 +1282,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+     {
+         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,
                   strerror(errno), start, (char *)start + size, unix_prot );
              return NULL;
          }
@@ -84,7 +86,7 @@ index c0537375ab8..b4d7f6a580d 100644
      }
  
      return NULL;
-@@ -1702,11 +1719,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
+@@ -1727,11 +1746,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 );
@@ -98,7 +100,7 @@ index c0537375ab8..b4d7f6a580d 100644
  }
  
  static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char *end )
-@@ -1796,9 +1813,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
+@@ -1821,9 +1840,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;
@@ -110,7 +112,7 @@ index c0537375ab8..b4d7f6a580d 100644
  
      TRACE("limit %p-%p, size %p, top_down %#x.\n", limit_low, limit_high, (void *)size, top_down);
  
-@@ -1863,6 +1881,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
+@@ -1888,6 +1908,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;
      }
@@ -161,7 +163,7 @@ index c0537375ab8..b4d7f6a580d 100644
      return result;
  }
  
-@@ -1922,6 +1984,17 @@ failed:
+@@ -1947,6 +2011,17 @@ failed:
      return status;
  }
  
@@ -179,7 +181,7 @@ index c0537375ab8..b4d7f6a580d 100644
  /***********************************************************************
   *           map_view
   *
-@@ -1972,7 +2045,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -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;
  
          if (!(ptr = alloc_free_area( (void *)limit_low, (void *)limit_high, size, top_down, get_unix_prot( vprot ), align_mask )))
@@ -196,7 +198,7 @@ index c0537375ab8..b4d7f6a580d 100644
      }
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
-@@ -4287,7 +4368,12 @@ void virtual_set_force_exec( BOOL enable )
+@@ -4346,7 +4429,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 */
@@ -211,5 +213,5 @@ index c0537375ab8..b4d7f6a580d 100644
              mprotect_range( view->base, view->size, commit, 0 );
          }
 -- 
-2.43.0
+2.45.2
 

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

@@ -1,209 +0,0 @@
-From ee26472916e2196456c0c59fb8ca04ee362f148a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 3 Apr 2017 05:30:27 +0200
-Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
-
----
- dlls/kernel32/tests/loader.c | 75 ++++++++++++++++++++++++++++++++++++
- dlls/ntdll/loader.c          | 42 ++++++++++++++++++++
- 2 files changed, 117 insertions(+)
-
-diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
-index 8b332e479e6..08cb3d3f8ce 100644
---- a/dlls/kernel32/tests/loader.c
-+++ b/dlls/kernel32/tests/loader.c
-@@ -28,6 +28,7 @@
- #include "winbase.h"
- #include "winternl.h"
- #include "winnls.h"
-+#include "winuser.h"
- #include "wine/test.h"
- #include "delayloadhandler.h"
- 
-@@ -4641,6 +4642,79 @@ static void test_Wow64Transition(void)
-             debugstr_wn(name->SectionFileName.Buffer, name->SectionFileName.Length / sizeof(WCHAR)));
- }
- 
-+static inline WCHAR toupperW(WCHAR c)
-+{
-+    WCHAR tmp = c;
-+    CharUpperBuffW(&tmp, 1);
-+    return tmp;
-+}
-+
-+static ULONG hash_basename(const WCHAR *basename)
-+{
-+    WORD version = MAKEWORD(NtCurrentTeb()->Peb->OSMinorVersion,
-+                            NtCurrentTeb()->Peb->OSMajorVersion);
-+    ULONG hash = 0;
-+
-+    if (version >= 0x0602)
-+    {
-+        for (; *basename; basename++)
-+            hash = hash * 65599 + toupperW(*basename);
-+    }
-+    else if (version == 0x0601)
-+    {
-+        for (; *basename; basename++)
-+            hash = hash + 65599 * toupperW(*basename);
-+    }
-+    else
-+        hash = toupperW(basename[0]) - 'A';
-+
-+    return hash & 31;
-+}
-+
-+static void test_HashLinks(void)
-+{
-+    static WCHAR ntdllW[] = {'n','t','d','l','l','.','d','l','l',0};
-+    static WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
-+
-+    LIST_ENTRY *hash_map, *entry, *mark;
-+    LDR_DATA_TABLE_ENTRY *module;
-+    BOOL found;
-+
-+    entry = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
-+    entry = entry->Flink;
-+
-+    module = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks);
-+    entry = module->HashLinks.Blink;
-+
-+    hash_map = entry - hash_basename(module->BaseDllName.Buffer);
-+
-+    mark = &hash_map[hash_basename(ntdllW)];
-+    found = FALSE;
-+    for (entry = mark->Flink; entry != mark; entry = entry->Flink)
-+    {
-+        module = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, HashLinks);
-+        if (!lstrcmpiW(module->BaseDllName.Buffer, ntdllW))
-+        {
-+            found = TRUE;
-+            break;
-+        }
-+    }
-+    ok(found, "Could not find ntdll\n");
-+
-+    mark = &hash_map[hash_basename(kernel32W)];
-+    found = FALSE;
-+    for (entry = mark->Flink; entry != mark; entry = entry->Flink)
-+    {
-+        module = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, HashLinks);
-+        if (!lstrcmpiW(module->BaseDllName.Buffer, kernel32W))
-+        {
-+            found = TRUE;
-+            break;
-+        }
-+    }
-+    ok(found, "Could not find kernel32\n");
-+}
-+
- START_TEST(loader)
- {
-     int argc;
-@@ -4723,6 +4797,7 @@ START_TEST(loader)
-     test_InMemoryOrderModuleList();
-     test_LoadPackagedLibrary();
-     test_wow64_redirection();
-+    test_HashLinks();
-     test_dll_file( "ntdll.dll" );
-     test_dll_file( "kernel32.dll" );
-     test_dll_file( "advapi32.dll" );
-diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 5f84ca7e23b..4da48a82d74 100644
---- a/dlls/ntdll/loader.c
-+++ b/dlls/ntdll/loader.c
-@@ -128,6 +128,9 @@ struct file_id
-     BYTE ObjectId[16];
- };
- 
-+#define HASH_MAP_SIZE 32
-+static LIST_ENTRY hash_table[HASH_MAP_SIZE];
-+
- /* internal representation of loaded modules */
- typedef struct _wine_modref
- {
-@@ -556,6 +559,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
-     }
- }
- 
-+/*************************************************************************
-+ *      hash_basename
-+ *
-+ * Calculates the bucket index of a dll using the basename.
-+ */
-+static ULONG hash_basename(const WCHAR *basename)
-+{
-+    WORD version = MAKEWORD(NtCurrentTeb()->Peb->OSMinorVersion,
-+                            NtCurrentTeb()->Peb->OSMajorVersion);
-+    ULONG hash = 0;
-+
-+    if (version >= 0x0602)
-+    {
-+        for (; *basename; basename++)
-+            hash = hash * 65599 + towupper(*basename);
-+    }
-+    else if (version == 0x0601)
-+    {
-+        for (; *basename; basename++)
-+            hash = hash + 65599 * towupper(*basename);
-+    }
-+    else
-+        hash = towupper(basename[0]) - 'A';
-+
-+    return hash & (HASH_MAP_SIZE-1);
-+}
-+
- /*************************************************************************
-  *		get_modref
-  *
-@@ -1557,7 +1587,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
-                    &wm->ldr.InLoadOrderLinks);
-     InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
-                    &wm->ldr.InMemoryOrderLinks);
-+    InsertTailList(&hash_table[hash_basename(wm->ldr.BaseDllName.Buffer)],
-+                   &wm->ldr.HashLinks);
-+
-     /* wait until init is called for inserting into InInitializationOrderModuleList */
-+    wm->ldr.InInitializationOrderLinks.Flink = NULL;
-+    wm->ldr.InInitializationOrderLinks.Blink = NULL;
- 
-     if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
-     {
-@@ -2253,6 +2288,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
-             /* the module has only be inserted in the load & memory order lists */
-             RemoveEntryList(&wm->ldr.InLoadOrderLinks);
-             RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
-+            RemoveEntryList(&wm->ldr.HashLinks);
- 
-             /* FIXME: there are several more dangling references
-              * left. Including dlls loaded by this dll before the
-@@ -3916,6 +3952,7 @@ static void free_modref( WINE_MODREF *wm )
- 
-     RemoveEntryList(&wm->ldr.InLoadOrderLinks);
-     RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
-+    RemoveEntryList(&wm->ldr.HashLinks);
-     if (wm->ldr.InInitializationOrderLinks.Flink)
-         RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
- 
-@@ -4336,6 +4373,7 @@ void loader_init( CONTEXT *context, void **entry )
-         ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" );
-         WINE_MODREF *kernel32;
-         PEB *peb = NtCurrentTeb()->Peb;
-+        unsigned int i;
- 
-         peb->LdrData            = &ldr;
-         peb->FastPebLock        = &peb_lock;
-@@ -4354,6 +4392,10 @@ void loader_init( CONTEXT *context, void **entry )
-         if (!(tls_dirs = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, tls_module_count * sizeof(*tls_dirs) )))
-             NtTerminateProcess( GetCurrentProcess(), STATUS_NO_MEMORY );
- 
-+        /* initialize hash table */
-+        for (i = 0; i < HASH_MAP_SIZE; i++)
-+            InitializeListHead( &hash_table[i] );
-+
-         init_user_process_params();
-         load_global_options();
-         version_init();
--- 
-2.45.2
-