Release v9.22

Includes Release 1.14.

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/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch

@@ -1,4 +1,4 @@
-From 0c97689e30108869e0ffc5fb7a13edcb42de7450 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 ++++
@@ -41,7 +41,7 @@ Split off to decrease patch size.
  server/token.c      | 1 +
  server/window.c     | 1 +
  server/winstation.c | 2 ++
- 35 files changed, 70 insertions(+)
+ 35 files changed, 71 insertions(+)
 
 diff --git a/server/async.c b/server/async.c
 index 749c547af4f..2377c737e98 100644
@@ -100,10 +100,18 @@ index 91f159bc7c9..0df7fd2f18e 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 */
@@ -653,7 +661,7 @@ index dd28efd3a75..c7f34412317 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index cf69b3b53c3..4b537586e31 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 =

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/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch

@@ -1,211 +0,0 @@
-From d1f5c52e07bce357d3b471e839db2a6f7a72fa86 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 9b0f8f6bff2..747dfb0afa6 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"
- 
-@@ -4651,6 +4652,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;
-@@ -4734,6 +4808,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 0ed37ad390c..94610a82a65 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
- {
-@@ -603,6 +606,33 @@ static int base_address_compare( const void *key, const RTL_BALANCED_NODE *entry
-     return 0;
- }
- 
-+/*************************************************************************
-+ *      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
-  *
-@@ -1599,9 +1629,14 @@ 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);
-     if (rtl_rb_tree_put( &base_address_index_tree, wm->ldr.DllBase, &wm->ldr.BaseAddressIndexNode, base_address_compare ))
-         ERR( "rtl_rb_tree_put failed.\n" );
-+
-     /* 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))
-     {
-@@ -2299,6 +2334,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);
-             RtlRbRemoveNode( &base_address_index_tree, &wm->ldr.BaseAddressIndexNode );
- 
-             /* FIXME: there are several more dangling references
-@@ -3963,6 +3999,7 @@ static void free_modref( WINE_MODREF *wm )
- 
-     RemoveEntryList(&wm->ldr.InLoadOrderLinks);
-     RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
-+    RemoveEntryList(&wm->ldr.HashLinks);
-     RtlRbRemoveNode( &base_address_index_tree, &wm->ldr.BaseAddressIndexNode );
-     if (wm->ldr.InInitializationOrderLinks.Flink)
-         RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
-@@ -4384,6 +4421,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;
-@@ -4402,6 +4440,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
-

patches/ntdll-HashLinks/0002-ntdll-Use-HashLinks-when-searching-for-a-dll-using-t.patch

@@ -1,34 +0,0 @@
-From ddd05cd2289136f417a8de210aef68a076da8399 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:56:19 +0200
-Subject: [PATCH] ntdll: Use HashLinks when searching for a dll using the
- basename.
-
----
- dlls/ntdll/loader.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 3e275e8c409..7f4aa8eba06 100644
---- a/dlls/ntdll/loader.c
-+++ b/dlls/ntdll/loader.c
-@@ -543,13 +543,13 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
-     if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ))
-         return cached_modref;
- 
--    mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
-+    mark = &hash_table[hash_basename(name)];
-     for (entry = mark->Flink; entry != mark; entry = entry->Flink)
-     {
--        WINE_MODREF *mod = CONTAINING_RECORD(entry, WINE_MODREF, ldr.InLoadOrderLinks);
-+        WINE_MODREF *mod = CONTAINING_RECORD(entry, WINE_MODREF, ldr.HashLinks);
-         if (RtlEqualUnicodeString( &name_str, &mod->ldr.BaseDllName, TRUE ) && !mod->system)
-         {
--            cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
-+            cached_modref = CONTAINING_RECORD(&mod->ldr, WINE_MODREF, ldr);
-             return cached_modref;
-         }
-     }
--- 
-2.35.1
-

patches/ntdll-HashLinks/definition

@@ -1 +0,0 @@
-Fixes: Implement and use hash links when looking up LDR module

patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch

@@ -1,4 +1,4 @@
-From bdbc1c90697424373a5248cf6c2bda589785bd37 Mon Sep 17 00:00:00 2001
+From a6d2b52c9461723c39982237512d29de0154b5ff Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 20:56:49 -0700
 Subject: [PATCH] ntdll: Add support for creating reparse points.
@@ -13,10 +13,10 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  5 files changed, 451 insertions(+), 19 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d380c66ff40..4314be5553c 100644
+index 3bde1e448be..52537e7056c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2078,6 +2078,8 @@ AC_CHECK_FUNCS(\
+@@ -2081,6 +2081,8 @@ AC_CHECK_FUNCS(\
  	posix_fallocate \
  	prctl \
  	sched_yield \
@@ -39,7 +39,7 @@ index 37bd6c86e31..f9a15d28ed2 100644
  EXTRADLLFLAGS = -nodefaultlibs
  i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 7d3618a3804..148b6058cee 100644
+index 95bd1c37cac..25cac61317b 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -38,6 +38,7 @@
@@ -50,7 +50,7 @@ index 7d3618a3804..148b6058cee 100644
  
  #ifndef IO_COMPLETION_ALL_ACCESS
  #define IO_COMPLETION_ALL_ACCESS 0x001F0003
-@@ -5863,32 +5864,154 @@ static void test_mailslot_name(void)
+@@ -5906,32 +5907,154 @@ static void test_mailslot_name(void)
      CloseHandle( device );
  }
  
@@ -221,8 +221,8 @@ index 7d3618a3804..148b6058cee 100644
 +    RemoveDirectoryW(path);
  }
  
- START_TEST(file)
-@@ -5969,6 +6092,6 @@ START_TEST(file)
+ static void test_set_io_completion_ex(void)
+@@ -6071,6 +6194,6 @@ START_TEST(file)
      test_ioctl();
      test_query_ea();
      test_flush_buffers_file();
@@ -231,7 +231,7 @@ index 7d3618a3804..148b6058cee 100644
 +    test_mailslot_name();
  }
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index ca95dd347eb..ac4de149455 100644
+index 9da53339ff0..34121c7d08a 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
 @@ -36,6 +36,8 @@
@@ -243,7 +243,7 @@ index ca95dd347eb..ac4de149455 100644
  #include <limits.h>
  #include <unistd.h>
  #ifdef HAVE_MNTENT_H
-@@ -124,6 +126,7 @@
+@@ -121,6 +123,7 @@
  #include "wine/list.h"
  #include "wine/debug.h"
  #include "unix_private.h"
@@ -251,7 +251,7 @@ index ca95dd347eb..ac4de149455 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(file);
  WINE_DECLARE_DEBUG_CHANNEL(winediag);
-@@ -135,6 +138,12 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
+@@ -132,6 +135,12 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
  #undef EXT2_IOC_GETFLAGS
  #undef EXT4_CASEFOLD_FL
  
@@ -264,7 +264,7 @@ index ca95dd347eb..ac4de149455 100644
  #ifdef linux
  
  /* We want the real kernel dirent structure, not the libc one */
-@@ -246,6 +255,95 @@ static const BOOL is_case_sensitive = FALSE;
+@@ -243,6 +252,95 @@ static const BOOL is_case_sensitive = FALSE;
  static pthread_mutex_t dir_mutex = PTHREAD_MUTEX_INITIALIZER;
  static pthread_mutex_t mnt_mutex = PTHREAD_MUTEX_INITIALIZER;
  
@@ -360,7 +360,7 @@ index ca95dd347eb..ac4de149455 100644
  /* check if a given Unicode char is OK in a DOS short name */
  static inline BOOL is_invalid_dos_char( WCHAR ch )
  {
-@@ -1644,6 +1742,28 @@ static int parse_samba_dos_attrib_data( char *data, int len )
+@@ -1641,6 +1739,28 @@ static int parse_samba_dos_attrib_data( char *data, int len )
  }
  
  
@@ -389,7 +389,7 @@ index ca95dd347eb..ac4de149455 100644
  static BOOL fd_is_mount_point( int fd, const struct stat *st )
  {
      struct stat parent;
-@@ -3418,6 +3538,181 @@ done:
+@@ -3415,6 +3535,181 @@ done:
  }
  
  
@@ -571,7 +571,7 @@ index ca95dd347eb..ac4de149455 100644
  /******************************************************************************
   *           lookup_unix_name
   *
-@@ -6249,6 +6544,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
+@@ -6250,6 +6545,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
          break;
      }
  

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

@@ -1,18 +1,18 @@
-From 24c407828bf5606e25e2905dfb920556ec1347b8 Mon Sep 17 00:00:00 2001
+From 2cf5a014dcd6f85a1afa76ad8ca6c65f2c17db39 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 | 192 ++++++++++++++++++++++++++++++++
- 2 files changed, 193 insertions(+)
+ dlls/ntdll/unix/signal_x86_64.c | 195 ++++++++++++++++++++++++++++++++
+ 2 files changed, 196 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index bd655accac3..d581dbc1eae 100644
+index ef21a4313d4..db709285f79 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -420,6 +420,7 @@ AC_CHECK_HEADERS(\
+@@ -384,6 +384,7 @@ AC_CHECK_HEADERS(\
  	linux/ioctl.h \
  	linux/major.h \
  	linux/param.h \
@@ -21,7 +21,7 @@ index bd655accac3..d581dbc1eae 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 0c291633ac6..a28762915be 100644
+index 537e4e1f60e..58397374ea4 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
 @@ -27,6 +27,7 @@
@@ -56,7 +56,7 @@ index 0c291633ac6..a28762915be 100644
  #include "ntstatus.h"
  #define WIN32_NO_STATUS
  #include "windef.h"
-@@ -1783,6 +1794,186 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+@@ -1824,6 +1835,186 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
      return 0;
  }
  
@@ -243,14 +243,21 @@ index 0c291633ac6..a28762915be 100644
  
  /***********************************************************************
   *           handle_interrupt
-@@ -2460,6 +2651,7 @@ void signal_init_process(void)
+@@ -2560,10 +2751,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;
++
+ #ifdef __APPLE__
+     sig_act.sa_sigaction = sigsys_handler;
+     if (sigaction( SIGSYS, &sig_act, NULL ) == -1) goto error;
+ #endif
++
 +    install_bpf(&sig_act);
++
      return;
  
   error:
 -- 
-2.43.0
+2.45.2
 

patches/server-Signal_Thread/0001-server-Do-not-signal-thread-until-it-is-really-gone.patch

@@ -1,4 +1,4 @@
-From f649ffcd8f68f82be173367b66f3c505ff75bcc3 Mon Sep 17 00:00:00 2001
+From 222ae102097fd34e6ff52813d1c0a165c7165776 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 12 Nov 2018 18:10:32 +0200
 Subject: [PATCH] server: Do not signal violently terminated threads until they
@@ -27,10 +27,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
  2 files changed, 30 insertions(+), 3 deletions(-)
 
 diff --git a/server/thread.c b/server/thread.c
-index 55386192fe6..60cd4ee16a8 100644
+index f7e5e5fabe8..506adfc0a6f 100644
 --- a/server/thread.c
 +++ b/server/thread.c
-@@ -241,6 +241,7 @@ static inline void init_thread_structure( struct thread *thread )
+@@ -246,6 +246,7 @@ static inline void init_thread_structure( struct thread *thread )
      thread->token           = NULL;
      thread->desc            = NULL;
      thread->desc_len        = 0;
@@ -38,7 +38,7 @@ index 55386192fe6..60cd4ee16a8 100644
  
      thread->creation_time = current_time;
      thread->exit_time     = 0;
-@@ -431,6 +432,7 @@ static void destroy_thread( struct object *obj )
+@@ -450,6 +451,7 @@ static void destroy_thread( struct object *obj )
      list_remove( &thread->entry );
      cleanup_thread( thread );
      release_object( thread->process );
@@ -46,7 +46,7 @@ index 55386192fe6..60cd4ee16a8 100644
      if (thread->id) free_ptid( thread->id );
      if (thread->token) release_object( thread->token );
  }
-@@ -455,7 +457,7 @@ static struct object_type *thread_get_type( struct object *obj )
+@@ -467,7 +469,7 @@ static void dump_thread( struct object *obj, int verbose )
  static int thread_signaled( struct object *obj, struct wait_queue_entry *entry )
  {
      struct thread *mythread = (struct thread *)obj;
@@ -55,7 +55,7 @@ index 55386192fe6..60cd4ee16a8 100644
  }
  
  static unsigned int thread_map_access( struct object *obj, unsigned int access )
-@@ -1249,6 +1251,26 @@ int thread_get_inflight_fd( struct thread *thread, int client )
+@@ -1275,6 +1277,26 @@ int thread_get_inflight_fd( struct thread *thread, int client )
      return -1;
  }
  
@@ -82,7 +82,7 @@ index 55386192fe6..60cd4ee16a8 100644
  /* kill a thread on the spot */
  void kill_thread( struct thread *thread, int violent_death )
  {
-@@ -1268,8 +1290,12 @@ void kill_thread( struct thread *thread, int violent_death )
+@@ -1294,8 +1316,12 @@ void kill_thread( struct thread *thread, int violent_death )
      }
      kill_console_processes( thread, 0 );
      abandon_mutexes( thread );
@@ -98,17 +98,17 @@ index 55386192fe6..60cd4ee16a8 100644
      remove_process_thread( thread->process, thread );
      release_object( thread );
 diff --git a/server/thread.h b/server/thread.h
-index 184fa92d250..077ab0929ba 100644
+index a1bc5060bb9..edf2a825451 100644
 --- a/server/thread.h
 +++ b/server/thread.h
-@@ -90,6 +90,7 @@ struct thread
-     struct list            kernel_object; /* list of kernel object pointers */
+@@ -93,6 +93,7 @@ struct thread
      data_size_t            desc_len;      /* thread description length in bytes */
      WCHAR                 *desc;          /* thread description string */
+     struct completion_wait *completion_wait; /* completion port wait object the thread is associated with */
 +    struct timeout_user   *exit_poll;     /* poll if the thread/process has exited already */
  };
  
  extern struct thread *current;
 -- 
-2.29.2
+2.45.2
 

patches/user32-rawinput-mouse/0003-winex11-Add-support-for-absolute-position-in-RawMoti.patch

@@ -1,4 +1,4 @@
-From 8e45c14f92426d1a9610ef21f0f3223b7276b13f Mon Sep 17 00:00:00 2001
+From cd57704c5a232a8ed0beb3b951fb0b4a06d28b43 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Fri, 8 Mar 2024 11:15:57 +0100
 Subject: [PATCH] winex11: Add support for absolute position in RawMotion
@@ -9,7 +9,7 @@ Subject: [PATCH] winex11: Add support for absolute position in RawMotion
  1 file changed, 35 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
-index b596ec546b4..59fbd2bbe52 100644
+index 43df1408f39..6b0fb873fad 100644
 --- a/dlls/winex11.drv/mouse.c
 +++ b/dlls/winex11.drv/mouse.c
 @@ -30,6 +30,7 @@
@@ -52,7 +52,7 @@ index b596ec546b4..59fbd2bbe52 100644
  
      thread_data->x_valuator.value = 0;
      thread_data->y_valuator.value = 0;
-@@ -1669,6 +1680,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
+@@ -1667,6 +1678,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
  {
      struct x11drv_thread_data *thread_data = x11drv_thread_data();
      XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator;
@@ -60,11 +60,11 @@ index b596ec546b4..59fbd2bbe52 100644
      double x_value = 0, y_value = 0, x_scale, y_scale;
      const double *values = event->valuators.values;
      RECT virtual_rect;
-@@ -1679,7 +1691,15 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
+@@ -1677,7 +1689,15 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
      if (!xinput2_available) return FALSE;
      if (event->deviceid != thread_data->xinput2_pointer) return FALSE;
  
--    virtual_rect = NtUserGetVirtualScreenRect( MDT_DEFAULT );
+-    virtual_rect = NtUserGetVirtualScreenRect( MDT_RAW_DPI );
 +    if (x->mode == XIModeRelative && y->mode == XIModeRelative)
 +        input->mi.dwFlags &= ~absolute_flags;
 +    else if (x->mode == XIModeAbsolute && y->mode == XIModeAbsolute)
@@ -73,11 +73,11 @@ index b596ec546b4..59fbd2bbe52 100644
 +        FIXME( "Unsupported relative/absolute X/Y axis mismatch\n." );
 +
 +    if (input->mi.dwFlags & MOUSEEVENTF_VIRTUALDESK) SetRect( &virtual_rect, 0, 0, UINT16_MAX, UINT16_MAX );
-+    else virtual_rect = NtUserGetVirtualScreenRect( MDT_DEFAULT );
++    else virtual_rect = NtUserGetVirtualScreenRect( MDT_RAW_DPI );
  
      if (x->max <= x->min) x_scale = 1;
      else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min);
-@@ -1692,17 +1712,26 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
+@@ -1690,17 +1710,26 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
          if (i == x->number)
          {
              x_value = *values;

patches/user32-rawinput-mouse/0004-server-Add-send_hardware_message-flags-for-rawinput-.patch

@@ -1,4 +1,4 @@
-From 48124df7efbda048d841899cc9bde77a3684622b Mon Sep 17 00:00:00 2001
+From 2c353379e4e6da08174cc6bc7b0fd95f26c2d16e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Mon, 26 Aug 2019 14:37:20 +0200
 Subject: [PATCH] server: Add send_hardware_message flags for rawinput
@@ -6,15 +6,15 @@ Subject: [PATCH] server: Add send_hardware_message flags for rawinput
 
 ---
  include/ntuser.h    |  4 ++++
- server/protocol.def |  3 +--
- server/queue.c      | 20 ++++++++++++--------
- 3 files changed, 17 insertions(+), 10 deletions(-)
+ server/protocol.def |  5 ++---
+ server/queue.c      | 26 +++++++++++++++-----------
+ 3 files changed, 21 insertions(+), 14 deletions(-)
 
 diff --git a/include/ntuser.h b/include/ntuser.h
-index bd11567290f..c75e691b4ee 100644
+index 3d981927395..f20945f4122 100644
 --- a/include/ntuser.h
 +++ b/include/ntuser.h
-@@ -1480,6 +1480,10 @@ struct hid_packet
+@@ -1613,6 +1613,10 @@ struct hid_packet
  
  C_ASSERT(sizeof(struct hid_packet) == offsetof(struct hid_packet, data[0]));
  
@@ -26,19 +26,21 @@ index bd11567290f..c75e691b4ee 100644
  {
      UINT flags;
 diff --git a/server/protocol.def b/server/protocol.def
-index 222a283477a..320b87775b7 100644
+index ae53a65db64..1fcace0d131 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -2208,7 +2208,7 @@ enum message_type
+@@ -2262,8 +2262,8 @@ enum message_type
+ /* Send a hardware message to a thread queue */
  @REQ(send_hardware_message)
      user_handle_t   win;       /* window handle */
-     hw_input_t      input;     /* input data */
+-    union hw_input  input;     /* input data */
 -    unsigned int    flags;     /* flags (see below) */
++    union hw_input  input;     /* input data */
 +    unsigned int    flags;     /* flags (see ntuser.h) */
      VARARG(report,bytes);      /* HID report data */
  @REPLY
      int             wait;      /* do we need to wait for a reply? */
-@@ -2217,7 +2217,6 @@ enum message_type
+@@ -2272,7 +2272,6 @@ enum message_type
      int             new_x;     /* new cursor position */
      int             new_y;
  @END
@@ -47,19 +49,21 @@ index 222a283477a..320b87775b7 100644
  
  /* Get a message from the current queue */
 diff --git a/server/queue.c b/server/queue.c
-index 784443ce955..0db4faab193 100644
+index 94169a57db6..9695eceff28 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -2056,7 +2056,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
+@@ -2243,8 +2243,8 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
+ }
  
  /* queue a hardware message for a mouse event */
- static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
+-static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const union hw_input *input,
 -                                unsigned int origin, struct msg_queue *sender )
++static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const union hw_input *input,
 +                                unsigned int origin, struct msg_queue *sender, unsigned int send_flags )
  {
      const desktop_shm_t *desktop_shm = desktop->shared;
      struct hardware_msg_data *msg_data;
-@@ -2117,7 +2117,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+@@ -2305,7 +2305,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
          y = desktop_shm->cursor.y;
      }
  
@@ -68,7 +72,7 @@ index 784443ce955..0db4faab193 100644
      {
          memset( &raw_msg, 0, sizeof(raw_msg) );
          raw_msg.foreground = foreground;
-@@ -2132,6 +2132,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+@@ -2320,6 +2320,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
          release_object( foreground );
      }
  
@@ -77,11 +81,13 @@ index 784443ce955..0db4faab193 100644
      for (i = 0; i < ARRAY_SIZE( messages ); i++)
      {
          if (!messages[i]) continue;
-@@ -2162,14 +2164,14 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+@@ -2349,15 +2351,15 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+     return wait;
  }
  
- static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
+-static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const union hw_input *input,
 -                                   unsigned int origin, struct msg_queue *sender, int repeat );
++static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const union hw_input *input,
 +                                   unsigned int origin, struct msg_queue *sender, int repeat, unsigned int send_flags);
  
  static void key_repeat_timeout( void *private )
@@ -94,16 +100,18 @@ index 784443ce955..0db4faab193 100644
  }
  
  static void stop_key_repeat( struct desktop *desktop )
-@@ -2182,7 +2184,7 @@ static void stop_key_repeat( struct desktop *desktop )
+@@ -2369,8 +2371,8 @@ static void stop_key_repeat( struct desktop *desktop )
+ }
  
  /* queue a hardware message for a keyboard event */
- static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
+-static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const union hw_input *input,
 -                                   unsigned int origin, struct msg_queue *sender, int repeat )
++static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const union hw_input *input,
 +                                   unsigned int origin, struct msg_queue *sender, int repeat, unsigned int send_flags )
  {
      const desktop_shm_t *desktop_shm = desktop->shared;
      struct hw_msg_source source = { IMDT_KEYBOARD, origin };
-@@ -2305,7 +2307,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
+@@ -2493,7 +2495,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
          }
      }
  
@@ -112,7 +120,7 @@ index 784443ce955..0db4faab193 100644
      {
          struct rawinput_message raw_msg = {0};
          raw_msg.foreground = foreground;
-@@ -2320,6 +2322,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
+@@ -2508,6 +2510,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
          release_object( foreground );
      }
  
@@ -121,7 +129,7 @@ index 784443ce955..0db4faab193 100644
      if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0;
      msg_data = msg->data;
  
-@@ -3075,10 +3079,10 @@ DECL_HANDLER(send_hardware_message)
+@@ -3294,10 +3298,10 @@ DECL_HANDLER(send_hardware_message)
      switch (req->input.type)
      {
      case INPUT_MOUSE:
@@ -135,5 +143,5 @@ index 784443ce955..0db4faab193 100644
      case INPUT_HARDWARE:
          queue_custom_hardware_message( desktop, req->win, origin, &req->input );
 -- 
-2.43.0
+2.45.2
 

patches/user32-rawinput-mouse/0005-winex11-Keep-track-of-mouse-device-and-pointer-butto.patch

@@ -1,4 +1,4 @@
-From a0452d319eecec33d0e130e19e9d1993b52caa2f Mon Sep 17 00:00:00 2001
+From 14dc22e926e64a1ab824278ba245caabe7e1449b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Thu, 19 Dec 2019 22:34:44 +0100
 Subject: [PATCH] winex11: Keep track of mouse device and pointer button
@@ -17,10 +17,10 @@ Original patch by Andrew Eikum <aeikum@codeweavers.com>.
  5 files changed, 114 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d95ff178367..5d38e874089 100644
+index 51b453b9af4..7dcc220aecb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1194,6 +1194,7 @@ then
+@@ -1209,6 +1209,7 @@ then
  
      dnl *** All of the following tests require X11/Xlib.h
      AC_CHECK_HEADERS([X11/extensions/shape.h \
@@ -29,10 +29,10 @@ index d95ff178367..5d38e874089 100644
                        X11/extensions/XShm.h \
                        X11/extensions/Xfixes.h \
 diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
-index 23f07b851a7..130b7e516a2 100644
+index 7b7371ed696..fdca9d67e0b 100644
 --- a/dlls/winex11.drv/keyboard.c
 +++ b/dlls/winex11.drv/keyboard.c
-@@ -1838,11 +1838,7 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
+@@ -1820,11 +1820,7 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
      return TRUE;
  }
  
@@ -45,7 +45,7 @@ index 23f07b851a7..130b7e516a2 100644
  {
      HWND hwnd;
  
-@@ -1856,6 +1852,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
+@@ -1838,6 +1834,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
      return TRUE;
  }
  
@@ -71,7 +71,7 @@ index 23f07b851a7..130b7e516a2 100644
  /***********************************************************************
   *		VkKeyScanEx (X11DRV.@)
 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
-index d3c97468fdb..5a5ec51e370 100644
+index 501a8e5ebc2..ad8b86c1e61 100644
 --- a/dlls/winex11.drv/mouse.c
 +++ b/dlls/winex11.drv/mouse.c
 @@ -31,6 +31,9 @@
@@ -175,7 +175,7 @@ index d3c97468fdb..5a5ec51e370 100644
  #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
  /***********************************************************************
   *              update_relative_valuators
-@@ -1674,6 +1754,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
+@@ -1664,6 +1744,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
  
      if (event->deviceid != data->xinput2_pointer) return FALSE;
      update_relative_valuators( event->classes, event->num_classes );
@@ -184,7 +184,7 @@ index d3c97468fdb..5a5ec51e370 100644
      return TRUE;
  }
  
-@@ -1822,7 +1904,7 @@ static BOOL X11DRV_TouchEvent( HWND hwnd, XGenericEventCookie *xev )
+@@ -1812,7 +1894,7 @@ static BOOL X11DRV_TouchEvent( HWND hwnd, XGenericEventCookie *xev )
   */
  void x11drv_xinput2_load(void)
  {
@@ -193,7 +193,7 @@ index d3c97468fdb..5a5ec51e370 100644
      int event, error;
      void *libxi_handle = dlopen( SONAME_LIBXI, RTLD_NOW );
  
-@@ -1838,11 +1920,20 @@ void x11drv_xinput2_load(void)
+@@ -1828,11 +1910,20 @@ void x11drv_xinput2_load(void)
          return; \
      }
  
@@ -215,22 +215,22 @@ index d3c97468fdb..5a5ec51e370 100644
  
      xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error );
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 70ef0a112ac..a56eb8b0046 100644
+index 625e37eecc5..fbc7efc4ffa 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -682,6 +682,7 @@ extern void retry_grab_clipping_window(void);
+@@ -701,6 +701,7 @@ extern void reapply_cursor_clipping(void);
  extern void ungrab_clipping_window(void);
- extern void move_resize_window( HWND hwnd, int dir );
+ extern void move_resize_window( HWND hwnd, int dir, POINT pos );
  extern void X11DRV_InitKeyboard( Display *display );
 +extern void X11DRV_InitMouse( Display *display );
- extern BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*, XPointer), ULONG_PTR arg );
  extern BOOL X11DRV_ProcessEvents( DWORD mask );
  extern HWND *build_hwnd_list(void);
+ 
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index c9e0d43c9ce..930f3a1c088 100644
+index 7f05acccea6..40157645c53 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -680,6 +680,7 @@ static NTSTATUS x11drv_init( void *arg )
+@@ -672,6 +672,7 @@ static NTSTATUS x11drv_init( void *arg )
  
      XkbUseExtension( gdi_display, NULL, NULL );
      X11DRV_InitKeyboard( gdi_display );
@@ -239,5 +239,5 @@ index c9e0d43c9ce..930f3a1c088 100644
  
      init_user_driver();
 -- 
-2.43.0
+2.45.2