Release v10.3

Patch 0001 was implemented upstream by ee4ad2a0a460cf9737c7d0d6057b57528e8ea912.

.github/workflows/macOS.yml

@@ -20,7 +20,6 @@ jobs:
                         bison \
                         gphoto2 \
                         gstreamer \
-                        gcenx/wine/libinotify-kqueue \
                         mingw-w64 \
                         molten-vk \
                         sdl2
@@ -44,10 +43,11 @@ jobs:
           cd wine
           $GITHUB_WORKSPACE/staging/patchinstall.py DESTDIR=. --all
 
-      - name: Configure wine64
+      - name: Configure wine
         env:
-          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
-          # Avoid weird linker errors with Xcode 10 and later
+          # We need to tell the linker to add brew & Xquarts to the rpath stack.
+          LDFLAGS: "-Wl,-rpath,/usr/local/lib -Wl,-rpath,/opt/X11/lib"
+          # Use an older deployment target to avoid new dyld behaviors.
           MACOSX_DEPLOYMENT_TARGET: "10.14"
         run: |
           cd $GITHUB_WORKSPACE/wine

patches/d2d1_ID2D1GeometryGroup/0001-d2d1-Add-tests-for-drawing-ID2D1GeometryGroup.patch

@@ -0,0 +1,267 @@
+From e4d55d451648b67c9269241efce8eee63faf70a4 Mon Sep 17 00:00:00 2001
+From: Philipp Knechtges <philipp-dev@knechtges.com>
+Date: Fri, 13 Sep 2024 11:16:44 +0200
+Subject: [PATCH] d2d1: Add tests for drawing ID2D1GeometryGroup
+
+The functionality to draw ID2D1GeometryGroup is currently missing.
+Nothing is drawn. This causes the blank pages in the bug below.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139
+---
+ dlls/d2d1/tests/d2d1.c | 219 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 219 insertions(+)
+
+diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
+index 40bcf5079b8..41b36ef0dd5 100644
+--- a/dlls/d2d1/tests/d2d1.c
++++ b/dlls/d2d1/tests/d2d1.c
+@@ -7061,6 +7061,7 @@ static void test_gradient(BOOL d3d11)
+ static void test_draw_geometry(BOOL d3d11)
+ {
+     ID2D1TransformedGeometry *transformed_geometry[4];
++    ID2D1GeometryGroup *geometry_group;
+     ID2D1RectangleGeometry *rect_geometry[2];
+     D2D1_POINT_2F point = {0.0f, 0.0f};
+     D2D1_ROUNDED_RECT rounded_rect;
+@@ -7970,6 +7971,117 @@ static void test_draw_geometry(BOOL d3d11)
+     hr = ID2D1PathGeometry_Open(geometry, &sink);
+     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ 
++    set_point(&point, -0.402914f, 0.915514f);
++    ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
++    quadratic_to(sink, -0.310379f,  0.882571f, -0.116057f,  0.824000f);
++    quadratic_to(sink,  0.008350f,  0.693614f, -0.052343f,  0.448886f);
++    quadratic_to(sink, -0.154236f,  0.246072f, -0.279229f,  0.025343f);
++    quadratic_to(sink, -0.370064f, -0.588586f, -0.383029f, -0.924114f);
++    quadratic_to(sink, -0.295479f, -0.958764f, -0.017086f, -0.988400f);
++    quadratic_to(sink,  0.208836f, -0.954157f,  0.272200f, -0.924114f);
++    quadratic_to(sink,  0.295614f, -0.569071f,  0.230143f,  0.022886f);
++    quadratic_to(sink,  0.101664f,  0.220643f,  0.012057f,  0.451571f);
++    quadratic_to(sink, -0.028764f,  0.709014f,  0.104029f,  0.833943f);
++    quadratic_to(sink,  0.319414f,  0.913057f,  0.403229f,  0.942628f);
++    quadratic_to(sink,  0.317721f,  1.023450f, -0.017086f,  1.021771f);
++    quadratic_to(sink, -0.310843f,  1.007472f, -0.402914f,  0.915514f);
++    ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
++
++    hr = ID2D1GeometrySink_Close(sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometrySink_Release(sink);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 40.0f, 160.0f);
++    scale_matrix(&matrix, 20.0f, 80.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 160.0f, 640.0f);
++    scale_matrix(&matrix, 40.0f, 160.0f);
++    rotate_matrix(&matrix, M_PI / -5.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1PathGeometry_Release(geometry);
++
++    set_matrix_identity(&matrix);
++    scale_matrix(&matrix, 0.5f, 1.0f);
++    translate_matrix(&matrix, -80.0f, 0.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    rotate_matrix(&matrix, M_PI / 2.0f);
++    translate_matrix(&matrix, 80.0f, -320.0f);
++    scale_matrix(&matrix, 2.0f, 0.25f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_WINDING,
++            (ID2D1Geometry**) &transformed_geometry, 4, &geometry_group);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1TransformedGeometry_Release(transformed_geometry[3]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[2]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[1]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[0]);
++
++    ID2D1RenderTarget_BeginDraw(rt);
++    ID2D1RenderTarget_Clear(rt, &color);
++    ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry_group, (ID2D1Brush *)brush, 10.0f, NULL);
++    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometryGroup_Release(geometry_group);
++
++    match = compare_figure(&ctx,   0,   0, 160, 160, 0xff652e89, 256,
++            "iTANiwEagQEkeSp0LnIWAhZyFAYUchQGFHIUBhRyFAYUchQGFHIUBhRyFAYUchQGFHIUBhRyFAYU"
++            "cxQFFHMUBRRzFAUUcxQFFHMUBRRzFAUUcxQFFHMUBRRzFAUUcxQFFHQUBBR0FAQUdBQDFHUUAxR1"
++            "FAMUdRQDFHUUAxR1FQIUdhQCFHYUAhR2FAIUdhQCFHYUAhR2FAIUdhQBFHgoeCh4KHkmeiZ7JHwk"
++            "fSJ+In8ggAEfggEeggEdhAEchQEbhQEahwEZhwEYiQEXiQEWigEWigEWigEWiwEViwEViwEViwEV"
++            "igEXiQEXiQEXiQEYhwEZhgEbgwEefyR5KXQvbxgEGG4VBxhtMnAudCp6IoMBGOMu");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160,   0, 320, 160, 0xff652e89, 512,
++            "xpcBB7QCEqkCG6ACJJgCLI8CNYcCHgMc/gEeDBr4AR4UGPIBHR0W7AEdIxbmAR0pFt8BHTAV2gEd"
++            "MBrWARwuIdMBGiwi1gEYKiPZARYoJNwBFiQk4AEWHyWxAQQvFhsltgEKKBYWJrwBECBOwQEXF0rI"
++            "ARwOSM4Ba9UBYeABRf0BOIoCMZECLJYCKJoCJ5wCJp0CJJ8CIqICH6QCHagCGa4CFLoCB/yUAQAA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx,   0, 160, 160, 320, 0xff652e89, 512,
++            "yWQBnQEEmQEHlgELkwENkAEQjgETiwEVigEXhwEZhgEahQEcgwEdggEfgAEgfyF+I30jfCR8JXom"
++            "eid4KHgodxQCFHYUAhR1FAMUdBUEFHMUBRRyFQUUchQHFHEUBxRwFAgUcBQJFG4UChRuFAoUbRUL"
++            "FGwUDBRsFAwUbBQNFGwUDBRsFAwUbRQMFGwUDBRsFAwUbRQLFWwUDBRtFAsUbRQLFG0VCxRtFAsU"
++            "bRQLFG4UCxRtFAsUbhQKFG4UCxRuFAoUbhQKFG4VCRRvFAoUbhQKFG8UCRRvFAoUbxQJFG8UCRRw"
++            "FAgVbxQJFHAUCBRwFAgUcBUIFHAUCBRwFAgUcRQHFHEUBxRyFAYUchQGFHMUBRRzFAUUdBQEFHQU"
++            "BBR1FAQUdBQEFHUUAxR1FAMUdhQCFHYUAhR2FQEUdxQBFHcpeCh4KHkneSd6JnoneiZ7JXwkfSN+"
++            "In8hgAEggQEfgwEdhAEdhAEchQEbhgEahwEZiAEYGAFwGBYCcRcUBHEXEgZyFhEHchcOCXMWDAtz"
++            "FgsMdBYIDnQWBhB1FgQQdhYCEnYqdyl3KXcpeCd5J3kneSd5JnomeyR8JHwkfCN9I30ifiF/IX4h"
++            "fyF/IH8ggAEgfyCAASCAAR+AAR+BAR6CAR6BAR6CAR2CAR2DARyEARuEARuFARqGARmGARiKARSR"
++            "AQqhYwAA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160, 160, 320, 320, 0xff652e89, 1024,
++            "ytABA7gCCbICD60CFKkCF6cCGqMCHqACIZ0CJJoCJpgCKZUCFgIUkgIWBBWPAhYHFI4CFQoUjAIV"
++            "DBSKAhUNFYgCFQ8UhwIVERSFAhUTFIMCFRQVgQIUFxSAAhQZFP4BFBoV/AEUHBT7ARQeFPkBFB8V"
++            "9wEUIRT2ARQjFPQBFSMV8gEVJRTxARUnFPABFCgV7gEUKhTtARQsFOwBFCwV7AEULBTsARUsFOwB"
++            "FSsV7AEULBTtARQsFO0BFCsU7QEVKxTtARUqFe0BFSoU7gEUKxTuARQqFe4BFCoU7wEUKhTuARUp"
++            "FO8BFSkU7wEVKBXvARUoFPABFCkU8AEUKBTxARQoFPEBFCcV8QEUJxTxARUnFPEBFSYU8gEVJhTy"
++            "ARUlFfIBFSUU8wEUJRXzARQlFPQBFCUU9AEUJBT1ARQkFPUBFCMU9gEUIhT2ARUhFPcBFSAU+AEV"
++            "HxT5ARUeFPoBFR4U+gEVHRT7ARUcFPwBFRsU/QEVGhT+ARUZFP8BFBkUgAIUGBSBAhQXFIICFBcU"
++            "ggIUFhSDAhQVFIQCFBQUhQIUExSGAhQSFIcCFBIUhwIUERSIAhUPFIkCFg0UigIXCxSNAhYJFI8C"
++            "FggUkAIXBRSSAhcDFJQCFwEUlgIrlwIpmgImnAIkngIjnwIhoQIfowIepAIcpgIbpgIaqAIZqAIZ"
++            "qAIYKwP7ARgnBf0BGCMI/QEZHgz+ARgbD/8BGBcSgAIYEhaAAhoNGIICGggcgwIaBB+DAjyEAjyF"
++            "AjqGAjmIAjiIAiECFIkCFAIIBBSKAhQNFIsCFAwUjAIUCxSNAhQKFI4CFAkUjwIUBxWQAhQGFZEC"
++            "FAUVkQIUBRWRAhQFFZECFQMVkwIUAxWTAhQDFZMCFAIVlAIVARWVAiqVAimWAimWAiiYAiaZAiaZ"
++            "AiWaAiScAiKdAiGeAh+hAhyjAhmuAg3GxgEA");
++    ok(match, "Figure does not match.\n");
++
++    hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    hr = ID2D1PathGeometry_Open(geometry, &sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
+     set_point(&point, 20.0f, 80.0f);
+     ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
+     quadratic_to(sink, 20.0f, 160.0f,  60.0f, 160.0f);
+@@ -8011,6 +8123,7 @@ static void test_draw_geometry(BOOL d3d11)
+ static void test_fill_geometry(BOOL d3d11)
+ {
+     ID2D1TransformedGeometry *transformed_geometry[4];
++    ID2D1GeometryGroup *geometry_group;
+     ID2D1RectangleGeometry *rect_geometry[2];
+     D2D1_POINT_2F point = {0.0f, 0.0f};
+     D2D1_ROUNDED_RECT rounded_rect;
+@@ -8728,6 +8841,112 @@ static void test_fill_geometry(BOOL d3d11)
+     hr = ID2D1PathGeometry_Open(geometry, &sink);
+     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ 
++    set_point(&point, -0.402914f, 0.915514f);
++    ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
++    quadratic_to(sink, -0.310379f,  0.882571f, -0.116057f,  0.824000f);
++    quadratic_to(sink,  0.008350f,  0.693614f, -0.052343f,  0.448886f);
++    quadratic_to(sink, -0.154236f,  0.246072f, -0.279229f,  0.025343f);
++    quadratic_to(sink, -0.370064f, -0.588586f, -0.383029f, -0.924114f);
++    quadratic_to(sink, -0.295479f, -0.958764f, -0.017086f, -0.988400f);
++    quadratic_to(sink,  0.208836f, -0.954157f,  0.272200f, -0.924114f);
++    quadratic_to(sink,  0.295614f, -0.569071f,  0.230143f,  0.022886f);
++    quadratic_to(sink,  0.101664f,  0.220643f,  0.012057f,  0.451571f);
++    quadratic_to(sink, -0.028764f,  0.709014f,  0.104029f,  0.833943f);
++    quadratic_to(sink,  0.319414f,  0.913057f,  0.403229f,  0.942628f);
++    quadratic_to(sink,  0.317721f,  1.023450f, -0.017086f,  1.021771f);
++    quadratic_to(sink, -0.310843f,  1.007472f, -0.402914f,  0.915514f);
++    ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
++
++    hr = ID2D1GeometrySink_Close(sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometrySink_Release(sink);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 40.0f, 160.0f);
++    scale_matrix(&matrix, 20.0f, 80.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 160.0f, 640.0f);
++    scale_matrix(&matrix, 40.0f, 160.0f);
++    rotate_matrix(&matrix, M_PI / -5.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1PathGeometry_Release(geometry);
++
++    set_matrix_identity(&matrix);
++    scale_matrix(&matrix, 0.5f, 1.0f);
++    translate_matrix(&matrix, -80.0f, 0.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    rotate_matrix(&matrix, M_PI / 2.0f);
++    translate_matrix(&matrix, 80.0f, -320.0f);
++    scale_matrix(&matrix, 2.0f, 0.25f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_WINDING,
++            (ID2D1Geometry**) &transformed_geometry, 4, &geometry_group);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1TransformedGeometry_Release(transformed_geometry[3]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[2]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[1]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[0]);
++
++    ID2D1RenderTarget_BeginDraw(rt);
++    ID2D1RenderTarget_Clear(rt, &color);
++    ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry_group, (ID2D1Brush *)brush, NULL);
++    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometryGroup_Release(geometry_group);
++
++    match = compare_figure(&ctx,   0,   0, 160, 160, 0xff652e89, 32,
++            "zzIBlwEOjQEXiAEahgEahgEahgEahgEahgEahgEahgEahgEahgEahgEahwEZhwEZhwEZhwEZhwEZ"
++            "hwEZhwEZhwEZhwEZhwEZiAEYiAEYiAEXiQEXiQEXiQEXiQEXiQEXigEWigEWigEWigEWigEWigEW"
++            "igEVjAEUjAEUjAEUjQESjgESjwEQkAEQkQEOkgENlAEMlAELlgEKlwEImAEImQEHmQEGmwEFmwEE"
++            "nQEDnQECngECngECngECnwEBnwEBnwEBnwEBngEDnQEDnQEDnQEEmwEFmgEHmQEHlwELkQERjAEX"
++            "hgEdhAEfgwEchwEWjwEMqTEA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160,   0, 320, 160, 0xff652e89, 32,
++            "h58BBrUCD6wCGKQCIJsCKZMCMIwCNoUCPf8BQ/kBSPQBTu0BTu4BTfEBSfUBRfkBQf0BPYECOYUC"
++            "NIoCMI4CK+UBAS0W/AEHIweQAgsZBpcCEAwIngIepAIZqQIWrAITsAIRswIOtQIMuAIJuwIHwAIB"
++            "ypwB");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx,   0, 160, 160, 320, 0xff652e89, 32,
++            "wW4DnAEEmwEFmgEHmAEIlwEKlQELlAEMkwEOkQEPkAEQkAERjgESjgESjQEUjAEUiwEWigEWiQEX"
++            "iQEYhwEZhwEZhgEbhQEbhAEchAEdggEeggEeggEfgAEggAEggAEhgAEggAEggQEggAEggAEggQEf"
++            "gQEggQEfgQEfggEfgQEfgQEfggEfgQEfggEeggEfggEeggEeggEegwEeggEegwEdgwEegwEdgwEd"
++            "hAEchAEdhAEchAEchAEdhAEchAEchQEbhQEbhgEahgEahwEZhwEZiAEYiAEYiQEYiAEYiQEXiQEX"
++            "igEWigEWiwEViwEVjAEUjAEUjAEUjQETjQETjgESjgETjgESjwERkAEQkgEOkwENlAEMlQELlgEK"
++            "lwEJmAEJmAEImQEHmgEGmwEFnAEEnQEEnQEDnQEDngECngEDngECngECnwECngECnwECngECngED"
++            "ngECEgGLAQMQAosBAw4EjAEDCwWNAQQJBo0BBQYIjQEHAgqNARKOARKPARCQARCQARCQAQ+RAQ6S"
++            "AQ6SAQ2TAQ2SAQ2TAQ2TAQyTAQyUAQyTAQyUAQuVAQuUAQuVAQqWAQmWAQqWAQmXAQiXAQiYAQeY"
++            "AQeZAQWbAQSDZwAA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160, 160, 320, 320, 0xff652e89, 32,
++            "g90BBLkCCLYCC7ICDrACEa0CFKoCF6cCGqQCHKMCHqECIJ8CIpwCJJsCJpkCKJcCKZYCK5QCLZIC"
++            "L5ACMI8CMo0CNIsCNYoCN4gCOYcCOYYCO4QCPYICPoECQIACQYACQIECQIACQIECQIECQIECP4IC"
++            "P4ICP4ECP4ICP4ICPoMCPoMCPoMCPYQCPYMCPYQCPYQCPYQCPIUCPIUCPIUCO4YCO4YCOoYCO4YC"
++            "OocCOocCOocCOYgCOYgCOIkCOIkCN4oCNosCNYwCNI0CM44CMo4CM44CMo8CMZACMJECL5ICLpMC"
++            "LZQCLJUCK5YCK5YCKpcCKZgCKJkCJ5oCJpsCJpsCJZwCJJ4CIqACIKICH6MCHaUCG6cCGakCF6wC"
++            "Fa0CE68CEbECD7MCDrQCDLYCCrgCCbkCB7sCBrsCBbwCBbwCBL0CBL0CBL0CBL0CA70CBL0CBL0C"
++            "BLwCBSUBlgIFIQSXAgYbCJcCBxcKmQIIEQ6ZAgoMEJoCDQUTnAIknAIjnQIingIhnwIgoAIfoQIe"
++            "ogIdowIcpAIbpQIapQIZpgIZpgIZpwIYpwIXqAIXqAIXqQIVqgIVqgIUqwITrQISrQIRrgIQsAIO"
++            "sQIMswILtQIIhs4B");
++    ok(match, "Figure does not match.\n");
++
++    hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    hr = ID2D1PathGeometry_Open(geometry, &sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
+     set_point(&point, -0.402914f, 0.915514f);
+     ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
+     quadratic_to(sink, -0.310379f,  0.882571f, -0.116057f,  0.824000f);
+-- 
+2.45.2
+

patches/d2d1_ID2D1GeometryGroup/0002-d2d1-Implement-drawing-for-ID2D1GeometryGroup.patch

@@ -0,0 +1,279 @@
+From be0fbef50483da8fe3fd0c4b74469d15a5c9f1ea Mon Sep 17 00:00:00 2001
+From: Philipp Knechtges <philipp-dev@knechtges.com>
+Date: Fri, 13 Sep 2024 16:37:31 +0200
+Subject: [PATCH] d2d1: Implement drawing for ID2D1GeometryGroup
+
+Drawing of ID2D1GeometryGroup was so far unimplemented and resulted in
+blank drawing buffers. This partially fixes the rendering issues mentioned
+in the bug below.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139
+---
+ dlls/d2d1/geometry.c | 236 ++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 235 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
+index 3da3ad2e65b..93925408077 100644
+--- a/dlls/d2d1/geometry.c
++++ b/dlls/d2d1/geometry.c
+@@ -5497,8 +5497,13 @@ static const struct ID2D1GeometryGroupVtbl d2d_geometry_group_vtbl =
+ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
+         D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, unsigned int geometry_count)
+ {
+-    unsigned int i;
++    unsigned int i, j;
++    struct d2d_geometry *other_geom;
++    D2D_MATRIX_3X2_F g, gplain;
++    size_t f_vertex_count, f_face_count, f_bezier_vertex_count, f_arc_vertex_count;
++    size_t o_vertex_count, o_face_count, o_bezier_count, o_bezier_face_count, o_arc_count, o_arc_face_count;
+ 
++    FIXME("Ignoring fill_mode=%#x!\n", fill_mode);
+     d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_geometry_group_vtbl);
+ 
+     if (!(geometry->u.group.src_geometries = calloc(geometry_count, sizeof(*geometries))))
+@@ -5507,13 +5512,242 @@ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *fac
+         return E_OUTOFMEMORY;
+     }
+ 
++    geometry->fill.vertex_count = 0;
++    geometry->fill.face_count = 0;
++    geometry->fill.bezier_vertex_count = 0;
++    geometry->fill.arc_vertex_count = 0;
++    geometry->outline.vertex_count = 0;
++    geometry->outline.face_count = 0;
++    geometry->outline.bezier_count = 0;
++    geometry->outline.bezier_face_count = 0;
++    geometry->outline.arc_count = 0;
++    geometry->outline.arc_face_count = 0;
+     for (i = 0; i < geometry_count; ++i)
+     {
+         ID2D1Geometry_AddRef(geometry->u.group.src_geometries[i] = geometries[i]);
++        other_geom = unsafe_impl_from_ID2D1Geometry(geometries[i]);
++        geometry->fill.vertex_count += other_geom->fill.vertex_count;
++        geometry->fill.face_count += other_geom->fill.face_count;
++        geometry->fill.bezier_vertex_count += other_geom->fill.bezier_vertex_count;
++        geometry->fill.arc_vertex_count += other_geom->fill.arc_vertex_count;
++        geometry->outline.vertex_count += other_geom->outline.vertex_count;
++        geometry->outline.face_count += other_geom->outline.face_count;
++        geometry->outline.bezier_count += other_geom->outline.bezier_count;
++        geometry->outline.bezier_face_count += other_geom->outline.bezier_face_count;
++        geometry->outline.arc_count += other_geom->outline.arc_count;
++        geometry->outline.arc_face_count += other_geom->outline.arc_face_count;
+     }
+     geometry->u.group.geometry_count = geometry_count;
+     geometry->u.group.fill_mode = fill_mode;
+ 
++    if (!(geometry->fill.vertices = calloc(geometry->fill.vertex_count, sizeof(D2D1_POINT_2F))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    if (!(geometry->fill.faces = calloc(geometry->fill.face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->fill.faces_size = geometry->fill.face_count;
++    if (!(geometry->fill.bezier_vertices = calloc(geometry->fill.bezier_vertex_count, sizeof(struct d2d_curve_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->fill.bezier_vertices_size = geometry->fill.bezier_vertex_count;
++    if (!(geometry->fill.arc_vertices = calloc(geometry->fill.arc_vertex_count, sizeof(struct d2d_curve_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->fill.arc_vertices_size = geometry->fill.arc_vertex_count;
++    if (!(geometry->outline.vertices = calloc(geometry->outline.vertex_count, sizeof(struct d2d_outline_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.vertices_size = geometry->outline.vertex_count;
++    if (!(geometry->outline.faces = calloc(geometry->outline.face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.faces_size = geometry->outline.face_count;
++    if (!(geometry->outline.beziers = calloc(geometry->outline.bezier_count, sizeof(struct d2d_curve_outline_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.beziers_size = geometry->outline.bezier_count;
++    if (!(geometry->outline.bezier_faces = calloc(geometry->outline.bezier_face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.bezier_faces_size = geometry->outline.bezier_face_count;
++    if (!(geometry->outline.arcs = calloc(geometry->outline.arc_count, sizeof(struct d2d_curve_outline_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.arcs_size = geometry->outline.arc_count;
++    if (!(geometry->outline.arc_faces = calloc(geometry->outline.arc_face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.arc_faces_size = geometry->outline.arc_face_count;
++
++    f_vertex_count = 0;
++    f_face_count = 0;
++    f_bezier_vertex_count = 0;
++    f_arc_vertex_count = 0;
++    o_vertex_count = 0;
++    o_face_count = 0;
++    o_bezier_count = 0;
++    o_bezier_face_count = 0;
++    o_arc_count = 0;
++    o_arc_face_count = 0;
++    for (i = 0; i < geometry_count; ++i)
++    {
++        other_geom = unsafe_impl_from_ID2D1Geometry(geometries[i]);
++        g = other_geom->transform;
++        gplain = g;
++        gplain.dx = 0.0f;
++        gplain.dy = 0.0f;
++
++        for (j = 0; j < other_geom->fill.vertex_count; ++j) {
++            d2d_point_transform(&geometry->fill.vertices[j+f_vertex_count], &g,
++                    other_geom->fill.vertices[j].x, other_geom->fill.vertices[j].y);
++        }
++        for (j = 0; j < other_geom->fill.face_count; ++j) {
++            geometry->fill.faces[f_face_count+j].v[0] = other_geom->fill.faces[j].v[0]
++                + (UINT16) f_vertex_count;
++            geometry->fill.faces[f_face_count+j].v[1] = other_geom->fill.faces[j].v[1]
++                + (UINT16) f_vertex_count;
++            geometry->fill.faces[f_face_count+j].v[2] = other_geom->fill.faces[j].v[2]
++                + (UINT16) f_vertex_count;
++        }
++        f_vertex_count += other_geom->fill.vertex_count;
++        f_face_count += other_geom->fill.face_count;
++
++        for (j = 0; j < other_geom->fill.bezier_vertex_count; ++j) {
++            d2d_point_transform(&geometry->fill.bezier_vertices[j+f_bezier_vertex_count].position,
++                    &g, other_geom->fill.bezier_vertices[j].position.x,
++                    other_geom->fill.bezier_vertices[j].position.y);
++            geometry->fill.bezier_vertices[j+f_bezier_vertex_count].texcoord
++                = other_geom->fill.bezier_vertices[j].texcoord;
++        }
++        f_bezier_vertex_count += other_geom->fill.bezier_vertex_count;
++
++        for (j = 0; j < other_geom->fill.arc_vertex_count; ++j) {
++            d2d_point_transform(&geometry->fill.arc_vertices[j+f_arc_vertex_count].position,
++                    &g, other_geom->fill.arc_vertices[j].position.x,
++                    other_geom->fill.arc_vertices[j].position.y);
++            geometry->fill.arc_vertices[j+f_arc_vertex_count].texcoord
++                = other_geom->fill.arc_vertices[j].texcoord;
++
++        }
++        f_arc_vertex_count += other_geom->fill.arc_vertex_count;
++
++        for (j = 0; j < other_geom->outline.vertex_count; ++j) {
++            d2d_point_transform(&geometry->outline.vertices[j+o_vertex_count].position, &g,
++                    other_geom->outline.vertices[j].position.x, other_geom->outline.vertices[j].position.y);
++            d2d_point_transform(&geometry->outline.vertices[j+o_vertex_count].prev, &gplain,
++                    other_geom->outline.vertices[j].prev.x, other_geom->outline.vertices[j].prev.y);
++            d2d_point_normalise(&geometry->outline.vertices[j+o_vertex_count].prev);
++            d2d_point_transform(&geometry->outline.vertices[j+o_vertex_count].next, &gplain,
++                    other_geom->outline.vertices[j].next.x, other_geom->outline.vertices[j].next.y);
++            d2d_point_normalise(&geometry->outline.vertices[j+o_vertex_count].next);
++        }
++        for (j = 0; j < other_geom->outline.face_count; ++j) {
++            geometry->outline.faces[o_face_count+j].v[0] = other_geom->outline.faces[j].v[0]
++                + (UINT16) o_vertex_count;
++            geometry->outline.faces[o_face_count+j].v[1] = other_geom->outline.faces[j].v[1]
++                + (UINT16) o_vertex_count;
++            geometry->outline.faces[o_face_count+j].v[2] = other_geom->outline.faces[j].v[2]
++                + (UINT16) o_vertex_count;
++        }
++        o_vertex_count += other_geom->outline.vertex_count;
++        o_face_count += other_geom->outline.face_count;
++
++        for (j = 0; j < other_geom->outline.bezier_count; ++j) {
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].position, &g,
++                    other_geom->outline.beziers[j].position.x, other_geom->outline.beziers[j].position.y);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].prev, &gplain,
++                    other_geom->outline.beziers[j].prev.x, other_geom->outline.beziers[j].prev.y);
++            d2d_point_normalise(&geometry->outline.beziers[j+o_bezier_count].prev);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].next, &gplain,
++                    other_geom->outline.beziers[j].next.x, other_geom->outline.beziers[j].next.y);
++            d2d_point_normalise(&geometry->outline.beziers[j+o_bezier_count].next);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].p0, &g,
++                    other_geom->outline.beziers[j].p0.x, other_geom->outline.beziers[j].p0.y);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].p1, &g,
++                    other_geom->outline.beziers[j].p1.x, other_geom->outline.beziers[j].p1.y);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].p2, &g,
++                    other_geom->outline.beziers[j].p2.x, other_geom->outline.beziers[j].p2.y);
++        }
++        for (j = 0; j < other_geom->outline.bezier_face_count; ++j) {
++            geometry->outline.bezier_faces[o_bezier_face_count+j].v[0]
++                = other_geom->outline.bezier_faces[j].v[0] + (UINT16) o_bezier_count;
++            geometry->outline.bezier_faces[o_bezier_face_count+j].v[1]
++                = other_geom->outline.bezier_faces[j].v[1] + (UINT16) o_bezier_count;
++            geometry->outline.bezier_faces[o_bezier_face_count+j].v[2]
++                = other_geom->outline.bezier_faces[j].v[2] + (UINT16) o_bezier_count;
++        }
++        o_bezier_count += other_geom->outline.bezier_count;
++        o_bezier_face_count += other_geom->outline.bezier_face_count;
++
++        for (j = 0; j < other_geom->outline.arc_count; ++j) {
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].position, &g,
++                    other_geom->outline.arcs[j].position.x, other_geom->outline.arcs[j].position.y);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].prev, &gplain,
++                    other_geom->outline.arcs[j].prev.x, other_geom->outline.arcs[j].prev.y);
++            d2d_point_normalise(&geometry->outline.arcs[j+o_arc_count].prev);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].next, &gplain,
++                    other_geom->outline.arcs[j].next.x, other_geom->outline.arcs[j].next.y);
++            d2d_point_normalise(&geometry->outline.arcs[j+o_arc_count].next);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].p0, &g,
++                    other_geom->outline.arcs[j].p0.x, other_geom->outline.arcs[j].p0.y);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].p1, &g,
++                    other_geom->outline.arcs[j].p1.x, other_geom->outline.arcs[j].p1.y);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].p2, &g,
++                    other_geom->outline.arcs[j].p2.x, other_geom->outline.arcs[j].p2.y);
++        }
++        for (j = 0; j < other_geom->outline.arc_face_count; ++j) {
++            geometry->outline.arc_faces[o_arc_face_count+j].v[0]
++                = other_geom->outline.arc_faces[j].v[0] + (UINT16) o_arc_count;
++            geometry->outline.arc_faces[o_arc_face_count+j].v[1]
++                = other_geom->outline.arc_faces[j].v[1] + (UINT16) o_arc_count;
++            geometry->outline.arc_faces[o_arc_face_count+j].v[2]
++                = other_geom->outline.arc_faces[j].v[2] + (UINT16) o_arc_count;
++        }
++        o_arc_count += other_geom->outline.arc_count;
++        o_arc_face_count += other_geom->outline.arc_face_count;
++    }
++
+     return S_OK;
+ }
+ 
+-- 
+2.45.2
+

patches/d2d1_ID2D1GeometryGroup/definition

@@ -0,0 +1,3 @@
+Fixes: [51139] d2d1: Implement drawing of ID2D1GeometryGroup
+
+# MR https://gitlab.winehq.org/wine/wine/-/merge_requests/6492

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/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch

@@ -1,32 +0,0 @@
-From 5d9d9cbdb4043848aa5ebdd8a1349d9c876650e3 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 11 Jan 2015 16:18:03 +0100
-Subject: [PATCH] d3dx9_36: Add support for FOURCC surface to
- save_dds_surface_to_memory.
-
----
- dlls/d3dx9_36/surface.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 26809a47e18..db334ee83f1 100644
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -433,6 +433,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
-         }
-     }
- 
-+    /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */
-+    if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN)
-+    {
-+        pixel_format->flags |= DDS_PF_FOURCC;
-+        pixel_format->fourcc = d3dformat;
-+        return D3D_OK;
-+    }
-+
-     WARN("Unknown pixel format %#x.\n", d3dformat);
-     return E_NOTIMPL;
- }
--- 
-2.35.1
-

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

@@ -1,4 +1,4 @@
-From 96af775034dae1c0b133b315c45b7172090d3498 Mon Sep 17 00:00:00 2001
+From 71d1c176af87bdc48326d5883fbea608314ee0a4 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:29:30 +0100
 Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
@@ -11,23 +11,23 @@ Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
  3 files changed, 66 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 34a9f6eec7f..878dff3fc01 100644
+index 6a9b3e12b7b..0c6374f35ca 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -178,6 +178,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
+@@ -316,6 +316,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
          IDirect3DSurface9 **temp_surface, BOOL write);
  HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
          IDirect3DSurface9 *temp_surface, BOOL update);
 +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
 +    const PALETTEENTRY *src_palette);
  HRESULT d3dx_pixels_init(const void *data, uint32_t row_pitch, uint32_t slice_pitch,
-         const PALETTEENTRY *palette, D3DFORMAT format, uint32_t left, uint32_t top, uint32_t right, uint32_t bottom,
-         uint32_t front, uint32_t back, struct d3dx_pixels *pixels);
+         const PALETTEENTRY *palette, enum d3dx_pixel_format_id format, uint32_t left, uint32_t top, uint32_t right,
+         uint32_t bottom, uint32_t front, uint32_t back, struct d3dx_pixels *pixels);
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 31bce97bbab..212d452c654 100644
+index 9d2dc96a979..912a3e3c849 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -574,6 +574,69 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
+@@ -628,6 +628,69 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
      return D3D_OK;
  }
  
@@ -87,21 +87,21 @@ index 31bce97bbab..212d452c654 100644
 +
 +    if (SUCCEEDED(hr))
 +    {
-+        hr = save_dds_surface_to_memory(dst_buffer, surface, NULL);
++        hr = save_dds_surface_to_memory(dst_buffer, surface, NULL, NULL);
 +        IDirect3DSurface9_Release(surface);
 +    }
 +
 +    return hr;
 +}
 +
- HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data,
-     const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info)
- {
+ static const uint8_t bmp_file_signature[] =       { 'B', 'M' };
+ static const uint8_t jpg_file_signature[] =       { 0xff, 0xd8 };
+ static const uint8_t png_file_signature[] =       { 0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a };
 diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index b42c9db3f2d..d84bac25cfe 100644
+index 719a2787445..3f76ec209f9 100644
 --- a/dlls/d3dx9_36/texture.c
 +++ b/dlls/d3dx9_36/texture.c
-@@ -1847,10 +1847,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
+@@ -1866,10 +1866,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
      if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
  
      if (file_format == D3DXIFF_DDS)
@@ -114,5 +114,5 @@ index b42c9db3f2d..d84bac25cfe 100644
      type = IDirect3DBaseTexture9_GetType(src_texture);
      switch (type)
 -- 
-2.45.2
+2.47.2
 

patches/d3dx9_36-Filter_Warnings/0001-d3dx9_36-Filter-out-D3DCompile-warning-messages-that.patch

@@ -1,87 +0,0 @@
-From d258e0c4428f3d5b7c0b6f4b31058d8710244dd7 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Wed, 14 Aug 2013 09:31:31 +0200
-Subject: d3dx9_36: Filter out D3DCompile warning messages that are not present
- with D3DCompileShader. (try 4)
-
-This patch fixes vertex processing issue of bug 33770.
-
-The problem comes from the fact that even if the call succeeds,
-the game interprets a non null error_messages pointer as an error.
-
-By calling D3DCompile we use a newer version of the compiler which is more
-strict and generates the following warning.
-  - warning X3206: 'dot': implicit truncation of vector type
-  - warning X3206: implicit truncation of vector type
-  - warning X3206: 'mul': implicit truncation of vector type
-D3DCompileShader does not generate such warnings.
-
-These is confirmed in the DX SDK release note:
-New Warning X3206: Implicit Truncation of Vector Type
-Beginning in the August 2009 release of the DirectX SDK, the compiler will warn
-when an implicit truncation of a vector type occurs.
-
-The warnings cannot be disable so this patch filters out these strings in D3DCompileShader
-and reset the error messages pointer if the resulting buffer is empty.
-
-Try 2:
-  - only filter out lines containing "X3206:" in case d3dcompiler_43 has localization
-
-Try 3:
-  - use move in place instead of copying the buffer
-
-Try 4:
-  - filter simplification by Sebastian and remove 'mul' testing left-out in search string
----
- dlls/d3dx9_36/shader.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index 5ea3d13..646d3dc 100644
---- a/dlls/d3dx9_36/shader.c
-+++ b/dlls/d3dx9_36/shader.c
-@@ -450,6 +450,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO
-         }
-     }
- 
-+    /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */
-+    if (SUCCEEDED(hr) && error_msgs && *error_msgs)
-+    {
-+        char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs);
-+        DWORD size     = ID3DXBuffer_GetBufferSize(*error_msgs);
-+
-+        /* Ensure messages are null terminated for safe processing */
-+        if (size) messages[size - 1] = 0;
-+
-+        while (size > 1)
-+        {
-+            char *prev, *next;
-+
-+            /* Warning has the form "warning X3206: ... implicit truncation of vector type"
-+               but we only search for "X3206:" in case d3dcompiler_43 has localization */
-+            prev = next = strstr(messages, "X3206:");
-+            if (!prev) break;
-+
-+            /* get pointer to beginning and end of current line */
-+            while (prev > messages && *(prev - 1) != '\n') prev--;
-+            while (next < messages + size - 1 && *next != '\n') next++;
-+            if (next < messages + size - 1 && *next == '\n') next++;
-+
-+            memmove(prev, next, messages + size - next);
-+            size -= (next - prev);
-+        }
-+
-+        /* Only return a buffer if the resulting string is not empty as some apps depend on that */
-+        if (size <= 1)
-+        {
-+            ID3DXBuffer_Release(*error_msgs);
-+            *error_msgs = NULL;
-+        }
-+    }
-+
-     return hr;
- }
- 
--- 
-2.1.2
-

patches/d3dx9_36-Filter_Warnings/definition

@@ -1 +0,0 @@
-Fixes: [33770] D3DCompileShader should filter specific warning messages

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 6dbedd8d7aebe117b013c61f9549848f13619f0e 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().
@@ -12,10 +12,10 @@ Although perhaps we shouldn't since the server doesn't do this.
  2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 67775f9cd15..c03d4c3688b 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,15 +23,15 @@ index 67775f9cd15..c03d4c3688b 100644
  	sys/extattr.h \
  	sys/filio.h \
  	sys/ipc.h \
-@@ -2067,6 +2068,7 @@ AC_CHECK_FUNCS(\
+@@ -2079,6 +2080,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
 +	ppoll \
  	prctl \
+ 	sched_getcpu \
  	sched_yield \
- 	renameat \
-@@ -2087,6 +2089,12 @@ AC_SEARCH_LIBS(clock_gettime, rt,
+@@ -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
  
@@ -45,10 +45,10 @@ index 67775f9cd15..c03d4c3688b 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 1c3d4c4d62b..e9686e04a2a 100644
+index 6033d8674f3..563b63a92df 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -318,6 +318,9 @@
+@@ -321,6 +321,9 @@
  /* Define to 1 if you have the 'posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -58,7 +58,7 @@ index 1c3d4c4d62b..e9686e04a2a 100644
  /* Define to 1 if you have the 'prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -375,7 +378,10 @@
+@@ -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
  
@@ -70,7 +70,7 @@ index 1c3d4c4d62b..e9686e04a2a 100644
  #undef HAVE_SIGINFO_T_SI_FD
  
  /* Define to 1 if you have the 'sigprocmask' function. */
-@@ -504,6 +510,9 @@
+@@ -510,6 +516,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  

patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch

@@ -1,4 +1,4 @@
-From 9b9b36ccc66866ba142ce1f0d12190025ac2e7f7 Mon Sep 17 00:00:00 2001
+From da832ae3626406e9aee5f9f78bce01f2a0d49691 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Thu, 7 Jun 2018 20:09:59 -0500
 Subject: [PATCH] server: Create server objects for eventfd-based
@@ -9,13 +9,13 @@ Subject: [PATCH] server: Create server objects for eventfd-based
  server/esync.c      | 318 ++++++++++++++++++++++++++++++++++++++++++++
  server/esync.h      |  24 ++++
  server/main.c       |   4 +
- server/protocol.def |  25 +++-
- 5 files changed, 371 insertions(+), 1 deletion(-)
+ server/protocol.def |  24 ++++
+ 5 files changed, 371 insertions(+)
  create mode 100644 server/esync.c
  create mode 100644 server/esync.h
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index ae502dbf17d..b164193ef20 100644
+index 7e571ac2ba6..9632c4e694f 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
 @@ -11,6 +11,7 @@ SOURCES = \
@@ -381,7 +381,7 @@ index 00000000000..00f9e638d83
 +extern int do_esync(void);
 +void esync_init(void);
 diff --git a/server/main.c b/server/main.c
-index ddda5f4e86e..5062d0999fa 100644
+index e014ec535ff..052667b4c6b 100644
 --- a/server/main.c
 +++ b/server/main.c
 @@ -34,6 +34,7 @@
@@ -401,20 +401,12 @@ index ddda5f4e86e..5062d0999fa 100644
 +
      if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() );
      set_current_time();
-     init_scheduler();
+     init_signals();
 diff --git a/server/protocol.def b/server/protocol.def
-index e86d3414247..03bc0aeb11e 100644
+index fa4ca4aaa9e..a9ee996a8ab 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3867,7 +3867,6 @@ struct handle_info
-     obj_handle_t handle;       /* process handle */
- @END
- 
--
- /* Iterate thread list for process */
- @REQ(get_next_thread)
-     obj_handle_t process;      /* process handle */
-@@ -3879,6 +3878,29 @@ struct handle_info
+@@ -4080,6 +4080,29 @@ struct handle_info
      obj_handle_t handle;       /* next thread handle */
  @END
  
@@ -444,11 +436,11 @@ index e86d3414247..03bc0aeb11e 100644
  
  /* Setup keyboard auto-repeat */
  @REQ(set_keyboard_repeat)
-@@ -3888,3 +3910,4 @@ struct handle_info
+@@ -4089,3 +4112,4 @@ struct handle_info
  @REPLY
      int enable;                /* previous state of auto-repeat enable */
  @END
 +
 -- 
-2.43.0
+2.47.2
 

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