From c0b74b7b593b29c02184711d19cc526149058e2f Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Mon, 16 Oct 2023 16:54:57 -0300
Subject: [PATCH 001/389] mlang/tests: Test for GetGlobalFontLinkObject.

(cherry picked from commit 6360992deaf60bd486c1e1f6f11492a6b4ec9aaa)
---
 dlls/mlang/tests/mlang.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index ee5ef5af738..99664a0e556 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -2295,6 +2295,11 @@ static void test_GetGlobalFontLinkObject(void)
 {
     HRESULT ret;
     void *unknown;
+    LONG refcount;
+    IMLangFontLink2 *IMLFL2;
+    IMLangFontLink *IMLFL;
+    IMLangCodePages *IMLCP;
+    IMultiLanguage *IML;
 
     ret = GetGlobalFontLinkObject(NULL);
     ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret);
@@ -2305,7 +2310,26 @@ todo_wine {
     ok(ret == S_OK, "expected S_OK got %#lx\n", ret);
     ok(unknown != NULL && unknown != (void *)0xdeadbeef,
        "GetGlobalFontLinkObject() returned %p\n", unknown);
+    if (unknown == (void *)0xdeadbeef || !unknown) return;
     }
+
+    ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink2, (void**)&IMLFL2);
+    ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret);
+
+    ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage, (void**)&IML);
+    ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret);
+
+    ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL);
+    ok(ret == S_OK, "expected S_OK got %#lx\n", ret);
+    IMLangFontLink_Release(IMLFL);
+
+    ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangCodePages, (void**)&IMLCP);
+    ok(ret == S_OK, "expected S_OK got %#lx\n", ret);
+    IMLangCodePages_Release(IMLCP);
+
+
+    refcount = IUnknown_Release((IUnknown*)unknown);
+    ok(refcount == 1, "Got refcount %ld\n", refcount);
 }
 
 static void test_IMLangConvertCharset(IMultiLanguage *ml)
@@ -2778,6 +2802,8 @@ START_TEST(mlang)
     if (!init_function_ptrs())
         return;
 
+    test_GetGlobalFontLinkObject();
+
     CoInitialize(NULL);
     test_Rfc1766ToLcid();
     test_LcidToRfc1766();
@@ -2785,8 +2811,6 @@ START_TEST(mlang)
     test_ConvertINetUnicodeToMultiByte();
     test_JapaneseConversion();
 
-    test_GetGlobalFontLinkObject();
-
     trace("IMultiLanguage\n");
     ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
                            &IID_IMultiLanguage, (void **)&iML);

From da13d9699b3c63c077b4ba1e6c9324410089c36f Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Mon, 16 Oct 2023 17:12:56 -0300
Subject: [PATCH 002/389] mlang: Implement GetGlobalFontLinkObject.

(cherry picked from commit 829307455833e5182b93be7dd9b26529f1f136d2)
---
 dlls/mlang/mlang.c       | 21 +++++++++++++++++++--
 dlls/mlang/tests/mlang.c |  8 ++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index f424c87b860..55e6f6edaa5 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -44,6 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang);
 
 #include "initguid.h"
 
+static INIT_ONCE font_link_global_init_once = INIT_ONCE_STATIC_INIT;
+static IUnknown *font_link_global = NULL;
+
 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj);
 static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj);
 static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum);
@@ -3882,11 +3885,25 @@ HRESULT WINAPI DllCanUnloadNow(void)
     return dll_count == 0 ? S_OK : S_FALSE;
 }
 
+static BOOL WINAPI allocate_font_link_cb(PINIT_ONCE init_once, PVOID args, PVOID *context)
+{
+    return SUCCEEDED(MultiLanguage_create(NULL, (void**)&font_link_global));
+}
+
 HRESULT WINAPI GetGlobalFontLinkObject(void **unknown)
 {
+    TRACE("%p\n", unknown);
+
     if (!unknown) return E_INVALIDARG;
 
-    FIXME("%p: stub\n", unknown);
+    if (!InitOnceExecuteOnce(&font_link_global_init_once, allocate_font_link_cb, NULL, NULL))
+    {
+        ERR("Failed to create global font link object.\n");
+        return E_FAIL;
+    }
 
-    return S_FALSE;
+    IUnknown_AddRef(font_link_global);
+    *unknown = font_link_global;
+
+    return S_OK;
 }
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 99664a0e556..4ab4b579245 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -2306,18 +2306,18 @@ static void test_GetGlobalFontLinkObject(void)
 
     unknown = (void *)0xdeadbeef;
     ret = GetGlobalFontLinkObject(&unknown);
-todo_wine {
     ok(ret == S_OK, "expected S_OK got %#lx\n", ret);
     ok(unknown != NULL && unknown != (void *)0xdeadbeef,
        "GetGlobalFontLinkObject() returned %p\n", unknown);
     if (unknown == (void *)0xdeadbeef || !unknown) return;
-    }
 
     ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink2, (void**)&IMLFL2);
-    ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret);
+    todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret);
+    if (ret == S_OK) IMLangFontLink2_Release(IMLFL2);
 
     ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage, (void**)&IML);
-    ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret);
+    todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret);
+    if (ret == S_OK) IMultiLanguage_Release(IML);
 
     ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL);
     ok(ret == S_OK, "expected S_OK got %#lx\n", ret);

From de86bec53124f4ddd67036fd796c96e6ac358957 Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 28 Nov 2023 16:51:18 -0300
Subject: [PATCH 003/389] mlang/tests: Test codepages priority bug in
 GetStrCodepages.

(cherry picked from commit bc6231481119a244e7d3de29089878b8fbcecbf9)
---
 dlls/mlang/tests/mlang.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 4ab4b579245..f8e37565115 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1324,6 +1324,14 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
     ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages);
     ok(processed == 2, "expected 2, got %ld\n", processed);
 
+    dwCmpCodePages = FS_JISJAPAN;
+    dwCodePages = 0;
+    processed = 0;
+    ret = IMLangFontLink_GetStrCodePages(iMLFL, L"\uff90a", 2, FS_LATIN1, &dwCodePages, &processed);
+    ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret);
+    ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages);
+    todo_wine ok(processed == 1, "expected 1, got %ld\n", processed);
+
     dwCodePages = 0xffff;
     processed = -1;
     ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);

From c3e3bfe83abf2c4625c15ad7af099e0450758f3a Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 28 Nov 2023 17:29:21 -0300
Subject: [PATCH 004/389] mlang: Fix bug with codepage priority in
 GetStrCodePages.

(cherry picked from commit b549ae11fbbe02564417e4029baa789bffe9d5aa)
---
 dlls/mlang/mlang.c       | 9 +++------
 dlls/mlang/tests/mlang.c | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 55e6f6edaa5..c7e7f360f0b 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -3336,23 +3336,20 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface,
 
     for (i = 0; i < src_len; i++)
     {
-        DWORD cp, next_cp = 0;
+        DWORD cp = 0;
         HRESULT ret;
 
         ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp);
-        if (i + 1 < src_len)
-            ret = IMLangFontLink2_GetCharCodePages(iface, src[i + 1], &next_cp);
         if (ret != S_OK) return E_FAIL;
 
         if (!cps) cps = cp;
-        else if ((cps & cp) != 0) cps &= cp;
+        else if ((cps & cp) != 0 &&
+                 !((priority_cp & cps) ^ (priority_cp & cp))) cps &= cp;
         else
         {
             i--;
             break;
         }
-
-        if ((priority_cp & cps) && !(priority_cp & next_cp)) break;
     }
 
     if (codepages) *codepages = cps;
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index f8e37565115..6bb973dc285 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1330,7 +1330,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
     ret = IMLangFontLink_GetStrCodePages(iMLFL, L"\uff90a", 2, FS_LATIN1, &dwCodePages, &processed);
     ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret);
     ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages);
-    todo_wine ok(processed == 1, "expected 1, got %ld\n", processed);
+    ok(processed == 1, "expected 1, got %ld\n", processed);
 
     dwCodePages = 0xffff;
     processed = -1;

From e8babc9c97f8d5d7ea41c52e10bd6a8e0a2aa976 Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 30 Jan 2024 20:43:22 -0300
Subject: [PATCH 005/389] gdiplus: Replace HDC with GpGraphics in parameters.

(cherry picked from commit 1454ffe7ddf01226aacec07836d4afa62fecd3fa)
---
 dlls/gdiplus/gdiplus_private.h |  4 ++--
 dlls/gdiplus/graphics.c        | 36 ++++++++++++++++------------------
 dlls/gdiplus/graphicspath.c    |  8 ++++----
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 6f7e72124c2..a72731d79ac 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -606,13 +606,13 @@ static inline const void *buffer_read(struct memory_buffer *mbuf, INT size)
     return NULL;
 }
 
-typedef GpStatus (*gdip_format_string_callback)(HDC hdc,
+typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data);
 
-GpStatus gdip_format_string(HDC hdc,
+GpStatus gdip_format_string(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data);
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 36ff473a6af..8480c45930b 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5161,7 +5161,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w
     return GdipIsVisibleRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, result);
 }
 
-GpStatus gdip_format_string(HDC hdc,
+GpStatus gdip_format_string(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data)
@@ -5243,7 +5243,7 @@ GpStatus gdip_format_string(HDC hdc,
     halign = format->align;
 
     while(sum < length){
-        GetTextExtentExPointW(hdc, stringdup + sum, length - sum,
+        GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum,
                               nwidth, &fit, NULL, &size);
         fitcpy = fit;
 
@@ -5292,7 +5292,7 @@ GpStatus gdip_format_string(HDC hdc,
         else
             lineend = fit;
 
-        GetTextExtentExPointW(hdc, stringdup + sum, lineend,
+        GetTextExtentExPointW(graphics->hdc, stringdup + sum, lineend,
                               nwidth, &j, NULL, &size);
 
         bounds.Width = size.cx;
@@ -5326,7 +5326,7 @@ GpStatus gdip_format_string(HDC hdc,
             if (hotkeyprefix_offsets[hotkeyprefix_end_pos] >= sum + lineend)
                 break;
 
-        stat = callback(hdc, stringdup, sum, lineend,
+        stat = callback(graphics, stringdup, sum, lineend,
             font, rect, format, lineno, &bounds,
             &hotkeyprefix_offsets[hotkeyprefix_pos],
             hotkeyprefix_end_pos-hotkeyprefix_pos, user_data);
@@ -5392,7 +5392,7 @@ struct measure_ranges_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_ranges_callback(HDC hdc,
+static GpStatus measure_ranges_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
@@ -5414,11 +5414,11 @@ static GpStatus measure_ranges_callback(HDC hdc,
             range_rect.Y = bounds->Y / args->rel_height;
             range_rect.Height = bounds->Height / args->rel_height;
 
-            GetTextExtentExPointW(hdc, string + index, range_start - index,
+            GetTextExtentExPointW(graphics->hdc, string + index, range_start - index,
                                   INT_MAX, NULL, NULL, &range_size);
             range_rect.X = (bounds->X + range_size.cx) / args->rel_width;
 
-            GetTextExtentExPointW(hdc, string + index, range_end - index,
+            GetTextExtentExPointW(graphics->hdc, string + index, range_end - index,
                                   INT_MAX, NULL, NULL, &range_size);
             range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X;
 
@@ -5496,7 +5496,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
 
     gdi_transform_acquire(graphics);
 
-    stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat,
+    stat = gdip_format_string(graphics, string, length, font, &scaled_rect, stringFormat,
         (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5517,7 +5517,7 @@ struct measure_string_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_string_callback(HDC hdc,
+static GpStatus measure_string_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
@@ -5619,7 +5619,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
 
     gdi_transform_acquire(graphics);
 
-    gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
         measure_string_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5640,12 +5640,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
 }
 
 struct draw_string_args {
-    GpGraphics *graphics;
     GDIPCONST GpBrush *brush;
     REAL x, y, rel_width, rel_height, ascent;
 };
 
-static GpStatus draw_string_callback(HDC hdc,
+static GpStatus draw_string_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
@@ -5658,7 +5657,7 @@ static GpStatus draw_string_callback(HDC hdc,
     position.X = args->x + bounds->X / args->rel_width;
     position.Y = args->y + bounds->Y / args->rel_height + args->ascent;
 
-    stat = draw_driver_string(args->graphics, &string[index], length, font, format,
+    stat = draw_driver_string(graphics, &string[index], length, font, format,
         args->brush, &position,
         DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
 
@@ -5668,7 +5667,7 @@ static GpStatus draw_string_callback(HDC hdc,
         REAL underline_y, underline_height;
         int i;
 
-        GetOutlineTextMetricsW(hdc, sizeof(otm), &otm);
+        GetOutlineTextMetricsW(graphics->hdc, sizeof(otm), &otm);
 
         underline_height = otm.otmsUnderscoreSize / args->rel_height;
         underline_y = position.Y - otm.otmsUnderscorePosition / args->rel_height - underline_height / 2;
@@ -5679,13 +5678,13 @@ static GpStatus draw_string_callback(HDC hdc,
             SIZE text_size;
             INT ofs = underlined_indexes[i] - index;
 
-            GetTextExtentExPointW(hdc, string + index, ofs, INT_MAX, NULL, NULL, &text_size);
+            GetTextExtentExPointW(graphics->hdc, string + index, ofs, INT_MAX, NULL, NULL, &text_size);
             start_x = text_size.cx / args->rel_width;
 
-            GetTextExtentExPointW(hdc, string + index, ofs+1, INT_MAX, NULL, NULL, &text_size);
+            GetTextExtentExPointW(graphics->hdc, string + index, ofs+1, INT_MAX, NULL, NULL, &text_size);
             end_x = text_size.cx / args->rel_width;
 
-            GdipFillRectangle(args->graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
+            GdipFillRectangle(graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
         }
     }
 
@@ -5783,7 +5782,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
     get_font_hfont(graphics, font, format, &gdifont, NULL, NULL);
     SelectObject(hdc, gdifont);
 
-    args.graphics = graphics;
     args.brush = brush;
 
     args.x = rect->X;
@@ -5797,7 +5795,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
     GetTextMetricsW(hdc, &textmetric);
     args.ascent = textmetric.tmAscent / rel_height;
 
-    gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
         draw_string_callback, &args);
 
     gdi_transform_release(graphics);
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 24c2888cfe8..391ba72de98 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -949,7 +949,7 @@ struct format_string_args
     float ascent;
 };
 
-static GpStatus format_string_callback(HDC dc,
+static GpStatus format_string_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
@@ -975,7 +975,7 @@ static GpStatus format_string_callback(HDC dc,
         TTPOLYGONHEADER *ph = NULL, *origph;
         char *start;
         DWORD len, ofs = 0;
-        len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
+        len = GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
         if (len == GDI_ERROR)
         {
             status = GenericError;
@@ -989,7 +989,7 @@ static GpStatus format_string_callback(HDC dc,
             status = OutOfMemory;
             break;
         }
-        GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, len, start, &identity);
+        GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, len, start, &identity);
 
         ofs = 0;
         while (ofs < len)
@@ -1117,7 +1117,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     args.maxY = 0;
     args.scale = emSize / native_height;
     args.ascent = textmetric.tmAscent * args.scale;
-    status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect,
+    status = gdip_format_string(graphics, string, length, NULL, &scaled_layout_rect,
                                 format, TRUE, format_string_callback, &args);
 
     DeleteDC(dc);

From 9de31d499e4a8fb84b91829fb41dcbb394ece51c Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Mon, 11 Dec 2023 10:03:32 -0300
Subject: [PATCH 006/389] gdiplus/tests: Add interactive test for font linking.

(cherry picked from commit d68a9d1213c7f80bf1a24f1a4db64cd3d34858b1)
---
 dlls/gdiplus/tests/graphics.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index d71bc78c2ae..18fe1078e76 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -2305,10 +2305,29 @@ static void test_GdipDrawString(void)
     }
     expect(Ok, status);
 
-    status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush);
+    status = GdipCreateStringFormat(0,0,&format);
     expect(Ok, status);
 
-    status = GdipCreateStringFormat(0,0,&format);
+    if (winetest_interactive)
+    {
+        status = GdipCreateSolidFill(0xFF000000, (GpSolidFill**)&brush);
+        expect(Ok, status);
+        rect.X = 0;
+        rect.Y = 0;
+        rect.Width = 0;
+        rect.Height = 14;
+        GdipRotateWorldTransform(graphics, 45, MatrixOrderPrepend);
+        GdipScaleWorldTransform(graphics, 2, 2, MatrixOrderPrepend);
+        GdipGraphicsClear(graphics, 0xFFFFFFFF);
+        status = GdipDrawString(graphics, L"\u8336Hola\u8336", 6, fnt, &rect, format, brush);
+        expect(Ok, status);
+        RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); /* FIXME: In Windows this test works without this line. */
+        Sleep(4000);
+        GdipDeleteBrush(brush);
+        GdipResetWorldTransform(graphics);
+    }
+
+    status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush);
     expect(Ok, status);
 
     rect.X = 0;

From 8957802e3608cc95ccdab853811aa507595f739f Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 14 Nov 2023 19:22:25 -0300
Subject: [PATCH 007/389] gdiplus: Implement font linking for gdiplus.

(cherry picked from commit ba4681e776c0c1cef9b5b2610dc67f634999d095)
---
 dlls/gdiplus/Makefile.in       |   2 +-
 dlls/gdiplus/gdiplus_private.h |  16 +++-
 dlls/gdiplus/graphics.c        | 159 +++++++++++++++++++++++++++++----
 dlls/gdiplus/graphicspath.c    |   2 +-
 4 files changed, 158 insertions(+), 21 deletions(-)

diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index 382033be901..76474f2e086 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = gdiplus.dll
 IMPORTLIB = gdiplus
-IMPORTS   = uuid shlwapi ole32 oleaut32 user32 gdi32
+IMPORTS   = uuid shlwapi ole32 oleaut32 user32 gdi32 mlang
 DELAYIMPORTS = windowscodecs
 
 SOURCES = \
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index a72731d79ac..2b5dbee43e9 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -606,8 +606,22 @@ static inline const void *buffer_read(struct memory_buffer *mbuf, INT size)
     return NULL;
 }
 
+/* Represents a string section and the font it should use. */
+struct gdip_font_link_section {
+    struct list entry;
+    DWORD start; /* The starting index of the string where the font applies. */
+    DWORD end; /* The end index of the string. */
+    GpFont *font;
+};
+
+struct gdip_font_link_info {
+    GDIPCONST GpFont *base_font;
+    struct list sections;
+};
+
+
 typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
+    GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *sections,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data);
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 8480c45930b..707fa55cfda 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -34,6 +34,7 @@
 #include "winreg.h"
 #include "shlwapi.h"
 
+#include "mlang.h"
 #include "gdiplus.h"
 #include "gdiplus_private.h"
 #include "wine/debug.h"
@@ -5161,6 +5162,110 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w
     return GdipIsVisibleRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, result);
 }
 
+/* Populates gdip_font_link_info struct based on the base_font and input string */
+static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font,
+                                    struct gdip_font_link_info *font_link_info)
+{
+    IUnknown *unk;
+    IMLangFontLink *iMLFL;
+    GpFont *gpfont;
+    HFONT map_hfont, hfont, old_font;
+    LONG processed, progress = 0;
+    struct gdip_font_link_section *section;
+    DWORD font_codepages, string_codepages;
+
+    list_init(&font_link_info->sections);
+    font_link_info->base_font = base_font;
+
+    GetGlobalFontLinkObject((void**)&unk);
+    IUnknown_QueryInterface(unk, &IID_IMLangFontLink, (void**)&iMLFL);
+    IUnknown_Release(unk);
+
+    get_font_hfont(graphics, base_font, NULL, &hfont, NULL, NULL);
+    IMLangFontLink_GetFontCodePages(iMLFL, graphics->hdc, hfont, &font_codepages);
+
+    while (progress < length)
+    {
+        section = calloc(1, sizeof(*section));
+        section->start = progress;
+        IMLangFontLink_GetStrCodePages(iMLFL, &string[progress], length - progress,
+                                        font_codepages, &string_codepages, &processed);
+
+        if (font_codepages & string_codepages)
+        {
+            section->font = (GpFont *)base_font;
+        }
+        else
+        {
+            IMLangFontLink_MapFont(iMLFL, graphics->hdc, string_codepages, hfont, &map_hfont);
+            old_font = SelectObject(graphics->hdc, map_hfont);
+            GdipCreateFontFromDC(graphics->hdc, &gpfont);
+            SelectObject(graphics->hdc, old_font);
+            IMLangFontLink_ReleaseFont(iMLFL, map_hfont);
+            section->font = gpfont;
+        }
+
+        section->end = section->start + processed;
+        list_add_tail(&font_link_info->sections, &section->entry);
+        progress += processed;
+    }
+
+    DeleteObject(hfont);
+    IMLangFontLink_Release(iMLFL);
+}
+
+static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, LPCWSTR string,
+                                            INT index, int length, int max_ext, LPINT fit, SIZE *size)
+{
+    DWORD to_measure_length;
+    HFONT hfont, oldhfont;
+    SIZE sizeaux = { 0 };
+    int i = index, fitaux = 0;
+    struct gdip_font_link_section *section;
+
+    size->cx = 0;
+    size->cy = 0;
+
+    if (fit)
+        *fit = 0;
+
+    LIST_FOR_EACH_ENTRY(section, &font_link_info->sections, struct gdip_font_link_section, entry)
+    {
+        if (i >= section->end) continue;
+
+        to_measure_length = min(length - (i - index), section->end - i);
+
+        get_font_hfont(graphics, section->font, NULL, &hfont, NULL, NULL);
+        oldhfont = SelectObject(graphics->hdc, hfont);
+        GetTextExtentExPointW(graphics->hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
+        SelectObject(graphics->hdc, oldhfont);
+        DeleteObject(hfont);
+
+        max_ext -= sizeaux.cx;
+        if (fit)
+            *fit += fitaux;
+        size->cx += sizeaux.cx;
+        size->cy = max(size->cy, sizeaux.cy);
+
+        i += to_measure_length;
+        if ((i - index) >= length || fitaux < to_measure_length) break;
+    }
+}
+
+static void release_font_link_info(struct gdip_font_link_info *font_link_info)
+{
+    struct list *entry;
+
+    while ((entry = list_head(&font_link_info->sections)))
+    {
+        struct gdip_font_link_section *section = LIST_ENTRY(entry, struct gdip_font_link_section, entry);
+        list_remove(entry);
+        if (section->font != font_link_info->base_font)
+            GdipDeleteFont(section->font);
+        free(section);
+    }
+}
+
 GpStatus gdip_format_string(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
@@ -5177,6 +5282,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
     INT *hotkeyprefix_offsets=NULL;
     INT hotkeyprefix_count=0;
     INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0;
+    struct gdip_font_link_info font_link_info = { 0 };
     BOOL seen_prefix = FALSE, unixstyle_newline = TRUE;
 
     if(length == -1) length = lstrlenW(string);
@@ -5242,9 +5348,10 @@ GpStatus gdip_format_string(GpGraphics *graphics,
 
     halign = format->align;
 
+    generate_font_link_info(graphics, stringdup, length, font, &font_link_info);
+
     while(sum < length){
-        GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum,
-                              nwidth, &fit, NULL, &size);
+        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size);
         fitcpy = fit;
 
         if(fit == 0)
@@ -5292,8 +5399,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
         else
             lineend = fit;
 
-        GetTextExtentExPointW(graphics->hdc, stringdup + sum, lineend,
-                              nwidth, &j, NULL, &size);
+        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size);
 
         bounds.Width = size.cx;
 
@@ -5327,7 +5433,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
                 break;
 
         stat = callback(graphics, stringdup, sum, lineend,
-            font, rect, format, lineno, &bounds,
+            &font_link_info, rect, format, lineno, &bounds,
             &hotkeyprefix_offsets[hotkeyprefix_pos],
             hotkeyprefix_end_pos-hotkeyprefix_pos, user_data);
 
@@ -5358,6 +5464,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
             break;
     }
 
+    release_font_link_info(&font_link_info);
     free(stringdup);
     free(hotkeyprefix_offsets);
 
@@ -5393,7 +5500,8 @@ struct measure_ranges_args {
 };
 
 static GpStatus measure_ranges_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
+    GDIPCONST WCHAR *string, INT index, INT length,
+    struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data)
@@ -5414,12 +5522,10 @@ static GpStatus measure_ranges_callback(GpGraphics *graphics,
             range_rect.Y = bounds->Y / args->rel_height;
             range_rect.Height = bounds->Height / args->rel_height;
 
-            GetTextExtentExPointW(graphics->hdc, string + index, range_start - index,
-                                  INT_MAX, NULL, NULL, &range_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_start - index, INT_MAX, NULL, &range_size);
             range_rect.X = (bounds->X + range_size.cx) / args->rel_width;
 
-            GetTextExtentExPointW(graphics->hdc, string + index, range_end - index,
-                                  INT_MAX, NULL, NULL, &range_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_end - index, INT_MAX, NULL, &range_size);
             range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X;
 
             stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion);
@@ -5518,7 +5624,8 @@ struct measure_string_args {
 };
 
 static GpStatus measure_string_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
+    GDIPCONST WCHAR *string, INT index, INT length,
+    struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data)
@@ -5645,21 +5752,37 @@ struct draw_string_args {
 };
 
 static GpStatus draw_string_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
+    GDIPCONST WCHAR *string, INT index, INT length,
+    struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data)
 {
     struct draw_string_args *args = user_data;
+    int i = index;
     PointF position;
-    GpStatus stat;
+    SIZE size;
+    DWORD to_draw_length;
+    struct gdip_font_link_section *section;
+    GpStatus stat = Ok;
 
     position.X = args->x + bounds->X / args->rel_width;
     position.Y = args->y + bounds->Y / args->rel_height + args->ascent;
 
-    stat = draw_driver_string(graphics, &string[index], length, font, format,
-        args->brush, &position,
-        DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
+    LIST_FOR_EACH_ENTRY(section, &font_link_info->sections, struct gdip_font_link_section, entry)
+    {
+        if (i >= section->end) continue;
+
+        to_draw_length = min(length - (i - index), section->end - i);
+        TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == font_link_info->base_font ? "base font" : "map");
+        font_link_get_text_extent_point(font_link_info, graphics, string, i, to_draw_length, 0, NULL, &size);
+        stat = draw_driver_string(graphics, &string[i], to_draw_length,
+            section->font, format, args->brush, &position,
+            DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
+        position.X += size.cx / args->rel_width;
+        i += to_draw_length;
+        if (stat != Ok || (i - index) >= length) break;
+    }
 
     if (stat == Ok && underlined_index_count)
     {
@@ -5678,10 +5801,10 @@ static GpStatus draw_string_callback(GpGraphics *graphics,
             SIZE text_size;
             INT ofs = underlined_indexes[i] - index;
 
-            GetTextExtentExPointW(graphics->hdc, string + index, ofs, INT_MAX, NULL, NULL, &text_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs, INT_MAX, NULL, &text_size);
             start_x = text_size.cx / args->rel_width;
 
-            GetTextExtentExPointW(graphics->hdc, string + index, ofs+1, INT_MAX, NULL, NULL, &text_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs+1, INT_MAX, NULL, &text_size);
             end_x = text_size.cx / args->rel_width;
 
             GdipFillRectangle(graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 391ba72de98..20e0787de16 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -950,7 +950,7 @@ struct format_string_args
 };
 
 static GpStatus format_string_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
+    GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *priv)

From 8e385eab40be58ec6d13e4b0057141ee71faa1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 11:31:22 +0100
Subject: [PATCH 008/389] include: Add HEAACWAVEINFO and HEAACWAVEFORMAT
 definitions.

(cherry picked from commit 681d20146226132c2ed18ae7ecb53003e6ffcf44)
---
 dlls/winegstreamer/mfplat.c | 18 +-----------------
 include/mmreg.h             | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index aae1b63de5d..c386ce492d1 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -25,6 +25,7 @@
 #include "initguid.h"
 #include "d3d9types.h"
 #include "mfapi.h"
+#include "mmreg.h"
 
 #include "wine/debug.h"
 #include "wine/list.h"
@@ -642,23 +643,6 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub
 
 static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
 {
-    /* Audio specific config is stored at after HEAACWAVEINFO in MF_MT_USER_DATA
-     * https://docs.microsoft.com/en-us/windows/win32/api/mmreg/ns-mmreg-heaacwaveformat
-     */
-    typedef struct
-    {
-        WORD wPayloadType;
-        WORD wAudioProfileLevelIndication;
-        WORD wStructType;
-        WORD wReserved1;
-        DWORD dwReserved2;
-    } HEAACWAVEINFO;
-    typedef struct
-    {
-        HEAACWAVEINFO wfInfo;
-        BYTE pbAudioSpecificConfig[1];
-    } HEAACWAVEFORMAT;
-
     BYTE buffer[64];
     HEAACWAVEFORMAT *user_data = (HEAACWAVEFORMAT *)buffer;
     UINT32 codec_data_size;
diff --git a/include/mmreg.h b/include/mmreg.h
index 1b19e1f068f..a8b0056064e 100644
--- a/include/mmreg.h
+++ b/include/mmreg.h
@@ -645,6 +645,22 @@ typedef struct mpeg1waveformat_tag {
 typedef MPEG1WAVEFORMAT *PMPEG1WAVEFORMAT,
 	*NPMPEG1WAVEFORMAT, *LPMPEG1WAVEFORMAT;
 
+typedef struct heaacwaveinfo_tag
+{
+    WAVEFORMATEX wfx;
+    WORD wPayloadType;
+    WORD wAudioProfileLevelIndication;
+    WORD wStructType;
+    WORD wReserved1;
+    DWORD dwReserved2;
+} HEAACWAVEINFO, *PHEAACWAVEINFO;
+
+typedef struct heaacwaveformat_tag
+{
+    HEAACWAVEINFO wfInfo;
+    BYTE pbAudioSpecificConfig[1];
+} HEAACWAVEFORMAT, *PHEAACWAVEFORMAT;
+
 #define	ACM_MPEG_LAYER1		0x0001
 #define	ACM_MPEG_LAYER2		0x0002
 #define	ACM_MPEG_LAYER3		0x0004

From d072d00a9e9eee2f5ce679ef679a2ec112e9caa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 11:26:57 +0100
Subject: [PATCH 009/389] mfplat/tests: Test MFInitMediaTypeFromWaveFormatEx
 wrt MF_MT_FIXED_SIZE_SAMPLES.

(cherry picked from commit 2155817a3646329699069a4be4905b2685f987ba)
---
 dlls/mfplat/tests/mfplat.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index c7ee087bb93..86096f7222b 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -6953,6 +6953,11 @@ static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *for
     }
     else
         ok(FAILED(hr), "Unexpected ALL_SAMPLES_INDEPENDENT.\n");
+
+    hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_FIXED_SIZE_SAMPLES, &value);
+    ok(FAILED(hr), "Unexpected FIXED_SIZE_SAMPLES.\n");
+    hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_COMPRESSED, &value);
+    ok(FAILED(hr), "Unexpected COMPRESSED.\n");
 }
 
 static void test_MFInitMediaTypeFromWaveFormatEx(void)

From 3fa8eaf6f7ebcbad78eb6ef5739ec3230a613319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 11:43:33 +0100
Subject: [PATCH 010/389] mfplat/tests: Add MFInitMediaTypeFromWaveFormatEx
 tests with HEAACWAVEFORMAT.

(cherry picked from commit aa648beec8b6f24fbec2b9b7e3ed2dd59b7fc70a)
---
 dlls/mfplat/tests/mfplat.c | 45 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 86096f7222b..db47aaa2f1c 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -6991,11 +6991,13 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
         { WAVE_FORMAT_WMASPDIF },
     };
 
-    UINT8 buff[MPEGLAYER3_WFX_EXTRA_BYTES];
+    UINT8 buff[1024];
     WAVEFORMATEXTENSIBLE waveformatext;
     MPEGLAYER3WAVEFORMAT mp3format;
+    HEAACWAVEFORMAT aacformat;
     IMFMediaType *mediatype;
     unsigned int i, size;
+    UINT32 value;
     HRESULT hr;
 
     hr = MFCreateMediaType(&mediatype);
@@ -7048,6 +7050,47 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
     ok(size == mp3format.wfx.cbSize, "Unexpected size %u.\n", size);
     ok(!memcmp(buff, (WAVEFORMATEX *)&mp3format + 1, size), "Unexpected user data.\n");
 
+    /* HEAACWAVEFORMAT */
+    aacformat.wfInfo.wfx.wFormatTag = WAVE_FORMAT_MPEG_HEAAC;
+    aacformat.wfInfo.wfx.nChannels = 2;
+    aacformat.wfInfo.wfx.nSamplesPerSec = 44100;
+    aacformat.wfInfo.wfx.nAvgBytesPerSec = 16000;
+    aacformat.wfInfo.wfx.nBlockAlign = 1;
+    aacformat.wfInfo.wfx.wBitsPerSample = 0;
+    aacformat.wfInfo.wPayloadType = 2;
+    aacformat.wfInfo.wAudioProfileLevelIndication = 1;
+    aacformat.pbAudioSpecificConfig[0] = 0xcd;
+
+    /* test with invalid format size */
+    aacformat.wfInfo.wfx.cbSize = sizeof(aacformat) - 2 - sizeof(WAVEFORMATEX);
+    hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&aacformat, sizeof(aacformat) - 2);
+    todo_wine
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
+
+    aacformat.wfInfo.wfx.cbSize = sizeof(aacformat) - sizeof(WAVEFORMATEX);
+    hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&aacformat, sizeof(aacformat));
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    validate_media_type(mediatype, &aacformat.wfInfo.wfx);
+
+    value = 0xdeadbeef;
+    hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, &value);
+    todo_wine
+    ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
+    todo_wine
+    ok(value == aacformat.wfInfo.wAudioProfileLevelIndication, "Unexpected AAC_AUDIO_PROFILE_LEVEL_INDICATION %u.\n", value);
+    value = 0xdeadbeef;
+    hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AAC_PAYLOAD_TYPE, &value);
+    todo_wine
+    ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
+    todo_wine
+    ok(value == aacformat.wfInfo.wPayloadType, "Unexpected AAC_PAYLOAD_TYPE %u.\n", value);
+
+    hr = IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, buff, sizeof(buff), &size);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(size == aacformat.wfInfo.wfx.cbSize, "Unexpected size %u.\n", size);
+    ok(!memcmp(buff, (WAVEFORMATEX *)&aacformat + 1, size), "Unexpected user data.\n");
+
     IMFMediaType_Release(mediatype);
 }
 

From e8bbfd14647265cf79db1c570d9da365fcf0175d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 14:28:10 +0100
Subject: [PATCH 011/389] mfplat/tests: Test
 MFWaveFormatExConvertFlag_ForceExtensible with HEAACWAVEFORMAT.

(cherry picked from commit 96346d24c1ceac83ea6e5436314403aa81563e99)
---
 dlls/mfplat/tests/mfplat.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index db47aaa2f1c..a7d2146b8b6 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -6994,6 +6994,7 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
     UINT8 buff[1024];
     WAVEFORMATEXTENSIBLE waveformatext;
     MPEGLAYER3WAVEFORMAT mp3format;
+    WAVEFORMATEXTENSIBLE *format;
     HEAACWAVEFORMAT aacformat;
     IMFMediaType *mediatype;
     unsigned int i, size;
@@ -7091,6 +7092,40 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
     ok(size == aacformat.wfInfo.wfx.cbSize, "Unexpected size %u.\n", size);
     ok(!memcmp(buff, (WAVEFORMATEX *)&aacformat + 1, size), "Unexpected user data.\n");
 
+    hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format, &size, MFWaveFormatExConvertFlag_ForceExtensible);
+    todo_wine
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "got wFormatTag %#x\n", format->Format.wFormatTag);
+        ok(format->Format.cbSize == aacformat.wfInfo.wfx.cbSize + sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX),
+                "got cbSize %u\n", format->Format.cbSize);
+        ok(IsEqualGUID(&format->SubFormat, &MFAudioFormat_AAC), "got SubFormat %s\n", debugstr_guid(&format->SubFormat));
+        ok(format->dwChannelMask == 3, "got dwChannelMask %#lx\n", format->dwChannelMask);
+        ok(format->Samples.wSamplesPerBlock == 0, "got wSamplesPerBlock %u\n", format->Samples.wSamplesPerBlock);
+        ok(!memcmp(format + 1, &aacformat.wfInfo.wfx + 1, aacformat.wfInfo.wfx.cbSize), "Unexpected user data.\n");
+        CoTaskMemFree(format);
+    }
+
+    /* test with invalid format size */
+    aacformat.wfInfo.wfx.cbSize = 1;
+    hr = IMFMediaType_SetBlob(mediatype, &MF_MT_USER_DATA, buff, aacformat.wfInfo.wfx.cbSize);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format, &size, MFWaveFormatExConvertFlag_ForceExtensible);
+    todo_wine
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "got wFormatTag %#x\n", format->Format.wFormatTag);
+        ok(format->Format.cbSize == aacformat.wfInfo.wfx.cbSize + sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX),
+                "got cbSize %u\n", format->Format.cbSize);
+        ok(IsEqualGUID(&format->SubFormat, &MFAudioFormat_AAC), "got SubFormat %s\n", debugstr_guid(&format->SubFormat));
+        ok(format->dwChannelMask == 3, "got dwChannelMask %#lx\n", format->dwChannelMask);
+        ok(format->Samples.wSamplesPerBlock == 0, "got wSamplesPerBlock %u\n", format->Samples.wSamplesPerBlock);
+        ok(!memcmp(format + 1, &aacformat.wfInfo.wfx + 1, aacformat.wfInfo.wfx.cbSize), "Unexpected user data.\n");
+        CoTaskMemFree(format);
+    }
+
     IMFMediaType_Release(mediatype);
 }
 

From f67042c7b9cf447091b71e0e59526594deff42f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 11:51:35 +0100
Subject: [PATCH 012/389] mfplat: Support AAC format attributes in
 MFInitMediaTypeFromWaveFormatEx.

(cherry picked from commit 1939bfff9ff402c009bf72d1522aac050c469484)
---
 dlls/mfplat/mediatype.c    | 9 +++++++++
 dlls/mfplat/tests/mfplat.c | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index c73c92be642..8b96880c865 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -3126,6 +3126,15 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA
         mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr);
     }
 
+    if (IsEqualGUID(&subtype, &MFAudioFormat_AAC))
+    {
+        HEAACWAVEINFO *info = CONTAINING_RECORD(format, HEAACWAVEINFO, wfx);
+        if (format->cbSize < sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX))
+            return E_INVALIDARG;
+        mediatype_set_uint32(mediatype, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, info->wAudioProfileLevelIndication, &hr);
+        mediatype_set_uint32(mediatype, &MF_MT_AAC_PAYLOAD_TYPE, info->wPayloadType, &hr);
+    }
+
     if (format->cbSize && format->wFormatTag != WAVE_FORMAT_EXTENSIBLE)
         mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr);
 
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index a7d2146b8b6..0c1e6b55321 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -7065,7 +7065,6 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
     /* test with invalid format size */
     aacformat.wfInfo.wfx.cbSize = sizeof(aacformat) - 2 - sizeof(WAVEFORMATEX);
     hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&aacformat, sizeof(aacformat) - 2);
-    todo_wine
     ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     aacformat.wfInfo.wfx.cbSize = sizeof(aacformat) - sizeof(WAVEFORMATEX);
@@ -7076,15 +7075,11 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
 
     value = 0xdeadbeef;
     hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, &value);
-    todo_wine
     ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
-    todo_wine
     ok(value == aacformat.wfInfo.wAudioProfileLevelIndication, "Unexpected AAC_AUDIO_PROFILE_LEVEL_INDICATION %u.\n", value);
     value = 0xdeadbeef;
     hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AAC_PAYLOAD_TYPE, &value);
-    todo_wine
     ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
-    todo_wine
     ok(value == aacformat.wfInfo.wPayloadType, "Unexpected AAC_PAYLOAD_TYPE %u.\n", value);
 
     hr = IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, buff, sizeof(buff), &size);

From d2587d2b85d909b3d60d6a18b2805c0d900a05c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 12:15:17 +0100
Subject: [PATCH 013/389] mfplat: Support compressed WAVEFORMATEX in
 MFCreateWaveFormatExFromMFMediaType.

(cherry picked from commit a634c30f00c5cf51b9499a0781f517fc0d2d835f)
---
 dlls/mfplat/mediatype.c    | 50 ++++++++++++++++++--------------------
 dlls/mfplat/tests/mfplat.c | 40 ++++++++++++------------------
 2 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index 8b96880c865..a159ae4b56f 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -2965,10 +2965,10 @@ HRESULT WINAPI MFUnwrapMediaType(IMFMediaType *wrapper, IMFMediaType **ret)
 HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVEFORMATEX **ret_format,
         UINT32 *size, UINT32 flags)
 {
-    WAVEFORMATEXTENSIBLE *format_ext = NULL;
+    UINT32 value, extra_size = 0, user_size;
     WAVEFORMATEX *format;
     GUID major, subtype;
-    UINT32 value;
+    void *user_data;
     HRESULT hr;
 
     TRACE("%p, %p, %p, %#x.\n", mediatype, ret_format, size, flags);
@@ -2982,36 +2982,24 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE
     if (!IsEqualGUID(&major, &MFMediaType_Audio))
         return E_INVALIDARG;
 
-    if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float))
+    if (FAILED(hr = IMFMediaType_GetBlobSize(mediatype, &MF_MT_USER_DATA, &user_size)))
     {
-        FIXME("Unsupported audio format %s.\n", debugstr_guid(&subtype));
-        return E_NOTIMPL;
+        if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float))
+            return hr;
+        user_size = 0;
     }
 
-    /* FIXME: probably WAVE_FORMAT_MPEG/WAVE_FORMAT_MPEGLAYER3 should be handled separately. */
     if (flags == MFWaveFormatExConvertFlag_ForceExtensible)
-    {
-        format_ext = CoTaskMemAlloc(sizeof(*format_ext));
-        *size = sizeof(*format_ext);
-        format = (WAVEFORMATEX *)format_ext;
-    }
-    else
-    {
-        format = CoTaskMemAlloc(sizeof(*format));
-        *size = sizeof(*format);
-    }
+        extra_size = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(*format);
 
-    if (!format)
+    *size = sizeof(*format) + user_size + extra_size;
+    if (!(format = CoTaskMemAlloc(*size)))
         return E_OUTOFMEMORY;
 
     memset(format, 0, *size);
-
-    if (format_ext)
-        format->wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-    else if (IsEqualGUID(&subtype, &MFAudioFormat_Float))
-        format->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
-    else
-        format->wFormatTag = WAVE_FORMAT_PCM;
+    format->wFormatTag = subtype.Data1;
+    format->cbSize = user_size + extra_size;
+    user_data = format + 1;
 
     if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value)))
         format->nChannels = value;
@@ -3023,18 +3011,26 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE
         format->nBlockAlign = value;
     if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value)))
         format->wBitsPerSample = value;
-    if (format_ext)
+
+    if (flags == MFWaveFormatExConvertFlag_ForceExtensible)
     {
-        format->cbSize = sizeof(*format_ext) - sizeof(*format);
+        WAVEFORMATEXTENSIBLE *format_ext = CONTAINING_RECORD(format, WAVEFORMATEXTENSIBLE, Format);
+
+        format_ext->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+        format_ext->SubFormat = subtype;
+        user_data = format_ext + 1;
 
         if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value)))
             format_ext->Samples.wSamplesPerBlock = value;
 
         if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &value)))
             format_ext->dwChannelMask = value;
-        memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat));
+        else if (format_ext->Format.nChannels < ARRAY_SIZE(default_channel_mask))
+            format_ext->dwChannelMask = default_channel_mask[format_ext->Format.nChannels];
     }
 
+    IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, user_data, user_size, NULL);
+
     *ret_format = format;
 
     return S_OK;
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 0c1e6b55321..f785df89b32 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -7088,38 +7088,30 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void)
     ok(!memcmp(buff, (WAVEFORMATEX *)&aacformat + 1, size), "Unexpected user data.\n");
 
     hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format, &size, MFWaveFormatExConvertFlag_ForceExtensible);
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-    {
-        ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "got wFormatTag %#x\n", format->Format.wFormatTag);
-        ok(format->Format.cbSize == aacformat.wfInfo.wfx.cbSize + sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX),
-                "got cbSize %u\n", format->Format.cbSize);
-        ok(IsEqualGUID(&format->SubFormat, &MFAudioFormat_AAC), "got SubFormat %s\n", debugstr_guid(&format->SubFormat));
-        ok(format->dwChannelMask == 3, "got dwChannelMask %#lx\n", format->dwChannelMask);
-        ok(format->Samples.wSamplesPerBlock == 0, "got wSamplesPerBlock %u\n", format->Samples.wSamplesPerBlock);
-        ok(!memcmp(format + 1, &aacformat.wfInfo.wfx + 1, aacformat.wfInfo.wfx.cbSize), "Unexpected user data.\n");
-        CoTaskMemFree(format);
-    }
+    ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "got wFormatTag %#x\n", format->Format.wFormatTag);
+    ok(format->Format.cbSize == aacformat.wfInfo.wfx.cbSize + sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX),
+            "got cbSize %u\n", format->Format.cbSize);
+    ok(IsEqualGUID(&format->SubFormat, &MFAudioFormat_AAC), "got SubFormat %s\n", debugstr_guid(&format->SubFormat));
+    ok(format->dwChannelMask == 3, "got dwChannelMask %#lx\n", format->dwChannelMask);
+    ok(format->Samples.wSamplesPerBlock == 0, "got wSamplesPerBlock %u\n", format->Samples.wSamplesPerBlock);
+    ok(!memcmp(format + 1, &aacformat.wfInfo.wfx + 1, aacformat.wfInfo.wfx.cbSize), "Unexpected user data.\n");
+    CoTaskMemFree(format);
 
     /* test with invalid format size */
     aacformat.wfInfo.wfx.cbSize = 1;
     hr = IMFMediaType_SetBlob(mediatype, &MF_MT_USER_DATA, buff, aacformat.wfInfo.wfx.cbSize);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format, &size, MFWaveFormatExConvertFlag_ForceExtensible);
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-    {
-        ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "got wFormatTag %#x\n", format->Format.wFormatTag);
-        ok(format->Format.cbSize == aacformat.wfInfo.wfx.cbSize + sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX),
-                "got cbSize %u\n", format->Format.cbSize);
-        ok(IsEqualGUID(&format->SubFormat, &MFAudioFormat_AAC), "got SubFormat %s\n", debugstr_guid(&format->SubFormat));
-        ok(format->dwChannelMask == 3, "got dwChannelMask %#lx\n", format->dwChannelMask);
-        ok(format->Samples.wSamplesPerBlock == 0, "got wSamplesPerBlock %u\n", format->Samples.wSamplesPerBlock);
-        ok(!memcmp(format + 1, &aacformat.wfInfo.wfx + 1, aacformat.wfInfo.wfx.cbSize), "Unexpected user data.\n");
-        CoTaskMemFree(format);
-    }
+    ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "got wFormatTag %#x\n", format->Format.wFormatTag);
+    ok(format->Format.cbSize == aacformat.wfInfo.wfx.cbSize + sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX),
+            "got cbSize %u\n", format->Format.cbSize);
+    ok(IsEqualGUID(&format->SubFormat, &MFAudioFormat_AAC), "got SubFormat %s\n", debugstr_guid(&format->SubFormat));
+    ok(format->dwChannelMask == 3, "got dwChannelMask %#lx\n", format->dwChannelMask);
+    ok(format->Samples.wSamplesPerBlock == 0, "got wSamplesPerBlock %u\n", format->Samples.wSamplesPerBlock);
+    ok(!memcmp(format + 1, &aacformat.wfInfo.wfx + 1, aacformat.wfInfo.wfx.cbSize), "Unexpected user data.\n");
+    CoTaskMemFree(format);
 
     IMFMediaType_Release(mediatype);
 }

From 4653d4613c8ac6403a00df441324e9cd3c5fabcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 08:52:36 +0100
Subject: [PATCH 014/389] winegstreamer: Fix reading MF_MT_USER_DATA into
 HEAACWAVEFORMAT.

Fixes 681d20146226132c2ed18ae7ecb53003e6ffcf44. The winegstreamer
private declaration of HEAACWAVEINFO previously didn't include the
WAVEFORMATEX member as it should.

(cherry picked from commit 42c96b9c8fb0c4bcc912e365733b564f3faf5f7c)
---
 dlls/winegstreamer/mfplat.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index c386ce492d1..4372678fe0e 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -643,12 +643,14 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub
 
 static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
 {
-    BYTE buffer[64];
-    HEAACWAVEFORMAT *user_data = (HEAACWAVEFORMAT *)buffer;
+    BYTE buffer[sizeof(HEAACWAVEFORMAT) + 64];
+    HEAACWAVEFORMAT *wfx = (HEAACWAVEFORMAT *)buffer;
     UINT32 codec_data_size;
     BOOL raw_aac;
 
-    if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, buffer, sizeof(buffer), &codec_data_size)))
+    wfx->wfInfo.wfx.cbSize = sizeof(buffer) - sizeof(wfx->wfInfo.wfx);
+    if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, (BYTE *)(&wfx->wfInfo.wfx + 1),
+            wfx->wfInfo.wfx.cbSize, &codec_data_size)))
     {
         FIXME("Codec data is not set.\n");
         return;
@@ -656,16 +658,16 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUI
 
     raw_aac = IsEqualGUID(subtype, &MFAudioFormat_RAW_AAC);
     if (!raw_aac)
-        codec_data_size -= min(codec_data_size, offsetof(HEAACWAVEFORMAT, pbAudioSpecificConfig));
+        codec_data_size -= min(codec_data_size, sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX));
     if (codec_data_size > sizeof(format->u.audio_mpeg4.codec_data))
     {
         FIXME("Codec data needs %u bytes.\n", codec_data_size);
         return;
     }
     if (raw_aac)
-        memcpy(format->u.audio_mpeg4.codec_data, buffer, codec_data_size);
+        memcpy(format->u.audio_mpeg4.codec_data, (BYTE *)(&wfx->wfInfo.wfx + 1), codec_data_size);
     else
-        memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size);
+        memcpy(format->u.audio_mpeg4.codec_data, wfx->pbAudioSpecificConfig, codec_data_size);
 
     format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG4;
 

From dc4d6b2322fbb8fde110801f4757f220277101f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 16 Nov 2023 11:59:50 +0100
Subject: [PATCH 015/389] winegstreamer: Use MFCreateAudioMediaType in the AAC
 decoder.

(cherry picked from commit c65703eac726f41b64ee58fb45fbdc9bbd83f5d7)
---
 dlls/winegstreamer/aac_decoder.c | 203 ++++++++++---------------------
 1 file changed, 66 insertions(+), 137 deletions(-)

diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c
index dfab7a8b0c0..811313b6fe4 100644
--- a/dlls/winegstreamer/aac_decoder.c
+++ b/dlls/winegstreamer/aac_decoder.c
@@ -32,22 +32,26 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
-static struct
+static HEAACWAVEINFO aac_decoder_input_types[] =
 {
-    const GUID *const guid;
-    UINT32 payload_type;
-} aac_decoder_input_types[] =
-{
-    {&MFAudioFormat_AAC, 0},
-    {&MFAudioFormat_RAW_AAC, -1},
-    {&MFAudioFormat_AAC, 1},
-    {&MFAudioFormat_AAC, 3},
-    {&MFAudioFormat_ADTS, -1},
+#define MAKE_HEAACWAVEINFO(format, payload) \
+    {.wfx = {.wFormatTag = format, .nChannels = 6, .nSamplesPerSec = 48000, .nAvgBytesPerSec = 1152000, \
+             .nBlockAlign = 24, .wBitsPerSample = 32, .cbSize = sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX)}, \
+     .wPayloadType = payload}
+
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 0),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_RAW_AAC1, 0),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 1),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 3),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_ADTS_AAC, 0),
+
+#undef MAKE_HEAACWAVEINFO
 };
-static const GUID *const aac_decoder_output_types[] =
+
+static WAVEFORMATEXTENSIBLE const aac_decoder_output_types[] =
 {
-    &MFAudioFormat_PCM,
-    &MFAudioFormat_Float,
+    {.Format = {.wFormatTag = WAVE_FORMAT_IEEE_FLOAT, .wBitsPerSample = 32, .nSamplesPerSec = 48000, .nChannels = 2}},
+    {.Format = {.wFormatTag = WAVE_FORMAT_PCM, .wBitsPerSample = 16, .nSamplesPerSec = 48000, .nChannels = 2}},
 };
 
 static const UINT32 default_channel_mask[7] =
@@ -234,79 +238,41 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea
 static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
-    IMFMediaType *media_type;
-    const GUID *subtype;
-    HRESULT hr;
-
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
+    *type = NULL;
     if (id)
         return MF_E_INVALIDSTREAMNUMBER;
-
-    *type = NULL;
     if (index >= ARRAY_SIZE(aac_decoder_input_types))
         return MF_E_NO_MORE_TYPES;
-    subtype = aac_decoder_input_types[index].guid;
-
-    if (FAILED(hr = MFCreateMediaType(&media_type)))
-        return hr;
-
-    if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, subtype)))
-        goto done;
-
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, 6)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, 24)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 1152000)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1)))
-        goto done;
-    if (IsEqualGUID(subtype, &MFAudioFormat_AAC))
-    {
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 0)))
-            goto done;
-        if (aac_decoder_input_types[index].payload_type != -1
-                && FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AAC_PAYLOAD_TYPE,
-                aac_decoder_input_types[index].payload_type)))
-            goto done;
-    }
-
-done:
-    if (SUCCEEDED(hr))
-        IMFMediaType_AddRef((*type = media_type));
-
-    IMFMediaType_Release(media_type);
-    return hr;
+    return MFCreateAudioMediaType(&aac_decoder_input_types[index].wfx, (IMFAudioMediaType **)type);
 }
 
 static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
-    UINT32 channel_count, sample_size, sample_rate, block_alignment;
     struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    UINT32 channel_count, sample_rate;
+    WAVEFORMATEXTENSIBLE wfx = {{0}};
     IMFMediaType *media_type;
-    const GUID *output_type;
     HRESULT hr;
 
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
+    *type = NULL;
+
     if (id)
         return MF_E_INVALIDSTREAMNUMBER;
     if (!decoder->input_type)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
-    *type = NULL;
+    wfx = aac_decoder_output_types[index % ARRAY_SIZE(aac_decoder_output_types)];
 
     if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_NUM_CHANNELS, &channel_count))
             || !channel_count)
-        channel_count = 2;
+        channel_count = wfx.Format.nChannels;
+    if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &sample_rate)))
+        sample_rate = wfx.Format.nSamplesPerSec;
 
     if (channel_count >= ARRAY_SIZE(default_channel_mask))
         return MF_E_INVALIDMEDIATYPE;
@@ -321,54 +287,24 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
 
     if (index >= ARRAY_SIZE(aac_decoder_output_types))
         return MF_E_NO_MORE_TYPES;
-    index = ARRAY_SIZE(aac_decoder_output_types) - index - 1;
-    output_type = aac_decoder_output_types[index];
 
-    if (FAILED(hr = MFCreateMediaType(&media_type)))
-        return hr;
+    wfx.Format.nChannels = channel_count;
+    wfx.Format.nSamplesPerSec = sample_rate;
+    wfx.Format.nBlockAlign = wfx.Format.wBitsPerSample * wfx.Format.nChannels / 8;
+    wfx.Format.nAvgBytesPerSec = wfx.Format.nSamplesPerSec * wfx.Format.nBlockAlign;
 
-    if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, output_type)))
-        goto done;
-
-    if (IsEqualGUID(output_type, &MFAudioFormat_Float))
-        sample_size = 32;
-    else if (IsEqualGUID(output_type, &MFAudioFormat_PCM))
-        sample_size = 16;
-    else
+    if (wfx.Format.nChannels >= 3)
     {
-        FIXME("Subtype %s not implemented!\n", debugstr_guid(output_type));
-        hr = E_NOTIMPL;
-        goto done;
+        wfx.SubFormat = MFAudioFormat_Base;
+        wfx.SubFormat.Data1 = wfx.Format.wFormatTag;
+        wfx.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+        wfx.dwChannelMask = default_channel_mask[wfx.Format.nChannels];
     }
 
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, sample_size)))
-        goto done;
-
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, channel_count)))
-        goto done;
-
-    if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &sample_rate)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, sample_rate)))
-        goto done;
-
-    block_alignment = sample_size * channel_count / 8;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, block_alignment)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, sample_rate * block_alignment)))
-        goto done;
-
-    if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1)))
-        goto done;
+    if (FAILED(hr = MFCreateAudioMediaType(&wfx.Format, (IMFAudioMediaType **)&media_type)))
+        return hr;
     if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1)))
         goto done;
-    if (channel_count < 3 && FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1)))
-        goto done;
-    if (channel_count >= 3 && FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_CHANNEL_MASK,
-            default_channel_mask[channel_count])))
-        goto done;
 
 done:
     if (SUCCEEDED(hr))
@@ -378,12 +314,22 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
     return hr;
 }
 
+static BOOL matches_format(const WAVEFORMATEXTENSIBLE *a, const WAVEFORMATEXTENSIBLE *b)
+{
+    if (a->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && b->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+        return IsEqualGUID(&a->SubFormat, &b->SubFormat);
+    if (a->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+        return a->SubFormat.Data1 == b->Format.wFormatTag;
+    if (b->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+        return b->SubFormat.Data1 == a->Format.wFormatTag;
+    return a->Format.wFormatTag == b->Format.wFormatTag;
+}
+
 static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
     struct aac_decoder *decoder = impl_from_IMFTransform(iface);
-    MF_ATTRIBUTE_TYPE item_type;
-    UINT32 channel_count;
-    GUID major, subtype;
+    WAVEFORMATEXTENSIBLE *format, wfx;
+    UINT32 size;
     HRESULT hr;
     ULONG i;
 
@@ -392,28 +338,19 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
     if (id)
         return MF_E_INVALIDSTREAMNUMBER;
 
-    if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)))
-        return E_INVALIDARG;
-
-    if (!IsEqualGUID(&major, &MFMediaType_Audio)
-            || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-        return MF_E_INVALIDMEDIATYPE;
+    if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(type, (WAVEFORMATEX **)&format, &size,
+            MFWaveFormatExConvertFlag_ForceExtensible)))
+        return hr;
+    wfx = *format;
+    CoTaskMemFree(format);
 
     for (i = 0; i < ARRAY_SIZE(aac_decoder_input_types); ++i)
-        if (IsEqualGUID(&subtype, aac_decoder_input_types[i].guid))
+        if (matches_format((WAVEFORMATEXTENSIBLE *)&aac_decoder_input_types[i], &wfx))
             break;
     if (i == ARRAY_SIZE(aac_decoder_input_types))
         return MF_E_INVALIDMEDIATYPE;
 
-    if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channel_count))
-            && channel_count >= ARRAY_SIZE(default_channel_mask))
-        return MF_E_INVALIDMEDIATYPE;
-
-    if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &item_type))
-            || item_type != MF_ATTRIBUTE_UINT32)
-        return MF_E_INVALIDMEDIATYPE;
-    if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_USER_DATA, &item_type))
-            || item_type != MF_ATTRIBUTE_BLOB)
+    if (wfx.Format.nChannels >= ARRAY_SIZE(default_channel_mask) || !wfx.Format.nSamplesPerSec || !wfx.Format.cbSize)
         return MF_E_INVALIDMEDIATYPE;
     if (flags & MFT_SET_TYPE_TEST_ONLY)
         return S_OK;
@@ -433,8 +370,8 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
 static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
     struct aac_decoder *decoder = impl_from_IMFTransform(iface);
-    MF_ATTRIBUTE_TYPE item_type;
-    GUID major, subtype;
+    WAVEFORMATEXTENSIBLE *format, wfx;
+    UINT32 size;
     HRESULT hr;
     ULONG i;
 
@@ -445,27 +382,19 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
     if (!decoder->input_type)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
-    if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major))
-            || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
+    if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(type, (WAVEFORMATEX **)&format, &size,
+            MFWaveFormatExConvertFlag_ForceExtensible)))
         return hr;
-
-    if (!IsEqualGUID(&major, &MFMediaType_Audio))
-        return MF_E_INVALIDMEDIATYPE;
+    wfx = *format;
+    CoTaskMemFree(format);
 
     for (i = 0; i < ARRAY_SIZE(aac_decoder_output_types); ++i)
-        if (IsEqualGUID(&subtype, aac_decoder_output_types[i]))
+        if (matches_format(&aac_decoder_output_types[i], &wfx))
             break;
     if (i == ARRAY_SIZE(aac_decoder_output_types))
         return MF_E_INVALIDMEDIATYPE;
 
-    if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &item_type))
-            || item_type != MF_ATTRIBUTE_UINT32)
-        return MF_E_INVALIDMEDIATYPE;
-    if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_NUM_CHANNELS, &item_type))
-            || item_type != MF_ATTRIBUTE_UINT32)
-        return MF_E_INVALIDMEDIATYPE;
-    if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &item_type))
-            || item_type != MF_ATTRIBUTE_UINT32)
+    if (!wfx.Format.wBitsPerSample || !wfx.Format.nChannels || !wfx.Format.nSamplesPerSec)
         return MF_E_INVALIDMEDIATYPE;
     if (flags & MFT_SET_TYPE_TEST_ONLY)
         return S_OK;

From 26322a76874541295c669bf22783145ab6141b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 17 Nov 2023 11:20:54 +0100
Subject: [PATCH 016/389] winegstreamer: Use an array for the audio decoder
 input types.

(cherry picked from commit 68f8b53d69453eace97ce02eb68dfd88d351a27a)
---
 dlls/winegstreamer/aac_decoder.c | 58 +++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c
index 811313b6fe4..c0bc57f278e 100644
--- a/dlls/winegstreamer/aac_decoder.c
+++ b/dlls/winegstreamer/aac_decoder.c
@@ -32,21 +32,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
-static HEAACWAVEINFO aac_decoder_input_types[] =
-{
-#define MAKE_HEAACWAVEINFO(format, payload) \
-    {.wfx = {.wFormatTag = format, .nChannels = 6, .nSamplesPerSec = 48000, .nAvgBytesPerSec = 1152000, \
-             .nBlockAlign = 24, .wBitsPerSample = 32, .cbSize = sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX)}, \
-     .wPayloadType = payload}
-
-    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 0),
-    MAKE_HEAACWAVEINFO(WAVE_FORMAT_RAW_AAC1, 0),
-    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 1),
-    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 3),
-    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_ADTS_AAC, 0),
-
-#undef MAKE_HEAACWAVEINFO
-};
+#define NEXT_WAVEFORMATEXTENSIBLE(format) (WAVEFORMATEXTENSIBLE *)((BYTE *)(&(format)->Format + 1) + (format)->Format.cbSize)
 
 static WAVEFORMATEXTENSIBLE const aac_decoder_output_types[] =
 {
@@ -69,6 +55,10 @@ struct aac_decoder
 {
     IMFTransform IMFTransform_iface;
     LONG refcount;
+
+    UINT input_type_count;
+    WAVEFORMATEXTENSIBLE *input_types;
+
     IMFMediaType *input_type;
     IMFMediaType *output_type;
 
@@ -238,14 +228,18 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea
 static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
+    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    const WAVEFORMATEXTENSIBLE *format = decoder->input_types;
+    UINT count = decoder->input_type_count;
+
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
     *type = NULL;
     if (id)
         return MF_E_INVALIDSTREAMNUMBER;
-    if (index >= ARRAY_SIZE(aac_decoder_input_types))
-        return MF_E_NO_MORE_TYPES;
-    return MFCreateAudioMediaType(&aac_decoder_input_types[index].wfx, (IMFAudioMediaType **)type);
+    for (format = decoder->input_types; index > 0 && count > 0; index--, count--)
+        format = NEXT_WAVEFORMATEXTENSIBLE(format);
+    return count ? MFCreateAudioMediaType(&format->Format, (IMFAudioMediaType **)type) : MF_E_NO_MORE_TYPES;
 }
 
 static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
@@ -328,10 +322,9 @@ static BOOL matches_format(const WAVEFORMATEXTENSIBLE *a, const WAVEFORMATEXTENS
 static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
     struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    UINT32 size, count = decoder->input_type_count;
     WAVEFORMATEXTENSIBLE *format, wfx;
-    UINT32 size;
     HRESULT hr;
-    ULONG i;
 
     TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags);
 
@@ -344,10 +337,9 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
     wfx = *format;
     CoTaskMemFree(format);
 
-    for (i = 0; i < ARRAY_SIZE(aac_decoder_input_types); ++i)
-        if (matches_format((WAVEFORMATEXTENSIBLE *)&aac_decoder_input_types[i], &wfx))
-            break;
-    if (i == ARRAY_SIZE(aac_decoder_input_types))
+    for (format = decoder->input_types; count > 0 && !matches_format(format, &wfx); count--)
+        format = NEXT_WAVEFORMATEXTENSIBLE(format);
+    if (!count)
         return MF_E_INVALIDMEDIATYPE;
 
     if (wfx.Format.nChannels >= ARRAY_SIZE(default_channel_mask) || !wfx.Format.nSamplesPerSec || !wfx.Format.cbSize)
@@ -574,6 +566,22 @@ static const IMFTransformVtbl transform_vtbl =
     transform_ProcessOutput,
 };
 
+static HEAACWAVEINFO aac_decoder_input_types[] =
+{
+#define MAKE_HEAACWAVEINFO(format, payload) \
+    {.wfx = {.wFormatTag = format, .nChannels = 6, .nSamplesPerSec = 48000, .nAvgBytesPerSec = 1152000, \
+             .nBlockAlign = 24, .wBitsPerSample = 32, .cbSize = sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX)}, \
+     .wPayloadType = payload}
+
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 0),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_RAW_AAC1, 0),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 1),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_HEAAC, 3),
+    MAKE_HEAACWAVEINFO(WAVE_FORMAT_MPEG_ADTS_AAC, 0),
+
+#undef MAKE_HEAACWAVEINFO
+};
+
 HRESULT aac_decoder_create(REFIID riid, void **ret)
 {
     static const struct wg_format output_format =
@@ -604,6 +612,8 @@ HRESULT aac_decoder_create(REFIID riid, void **ret)
 
     if (!(decoder = calloc(1, sizeof(*decoder))))
         return E_OUTOFMEMORY;
+    decoder->input_types = (WAVEFORMATEXTENSIBLE *)aac_decoder_input_types;
+    decoder->input_type_count = ARRAY_SIZE(aac_decoder_input_types);
 
     if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue)))
     {

From d1dbd2bf0892ee8665906a77210618321f92e8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 24 Jan 2024 14:00:43 +0100
Subject: [PATCH 017/389] mf/tests: Check inserted topology loader transforms
 explicitly.

(cherry picked from commit 56b1f8021048621d0354dac302d694500df1062e)
---
 dlls/mf/tests/mf.c | 180 ++++++++++++++++++++++++++++++---------------
 1 file changed, 120 insertions(+), 60 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 3dd0d9b076d..f5a7821f0f8 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -2983,8 +2983,6 @@ static IMFSampleGrabberSinkCallback *create_test_grabber_callback(void)
 
 enum loader_test_flags
 {
-    LOADER_EXPECTED_DECODER = 0x1,
-    LOADER_EXPECTED_CONVERTER = 0x2,
     LOADER_TODO = 0x4,
     LOADER_NEEDS_VIDEO_PROCESSOR = 0x8,
     LOADER_SET_ENUMERATE_SOURCE_TYPES = 0x10,
@@ -3066,6 +3064,18 @@ static void test_topology_loader(void)
         ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 1),
         ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 8),
     };
+    static const media_type_desc audio_float_44100_stereo =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio),
+        ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float),
+        ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2),
+        ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 2 * 4),
+        ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100),
+        ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 2 * 4 * 44100),
+        ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 4 * 8),
+        ATTR_UINT32(MF_MT_AUDIO_CHANNEL_MASK, 3),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
+    };
     static const media_type_desc video_i420_1280 =
     {
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
@@ -3089,6 +3099,25 @@ static void test_topology_loader(void)
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
         ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
     };
+    static const media_type_desc video_h264_1280 =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 1280, 720),
+    };
+    static const media_type_desc video_nv12_1280 =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12),
+        ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 1280, 720),
+        ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1),
+        ATTR_UINT32(MF_MT_SAMPLE_SIZE, 1280 * 720 * 3 / 2),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
+        ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 1280),
+        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 7),
+    };
     static const media_type_desc video_dummy =
     {
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
@@ -3099,10 +3128,13 @@ static void test_topology_loader(void)
         const media_type_desc *input_type;
         const media_type_desc *output_type;
         const media_type_desc *current_input;
+        const media_type_desc *decoded_type;
         MF_CONNECT_METHOD source_method;
         MF_CONNECT_METHOD sink_method;
         HRESULT expected_result;
         unsigned int flags;
+        GUID decoder_class;
+        GUID converter_class;
     }
     loader_tests[] =
     {
@@ -3167,27 +3199,24 @@ static void test_topology_loader(void)
         {
             /* PCM -> PCM, different enumerated bps, no current type, sink allow converter */
             .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_CONVERTER, .source_method = MF_CONNECT_DIRECT,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CResamplerMediaObject,
         },
         {
             /* PCM -> PCM, different enumerated bps, same current type, sink allow converter, force enumerate */
             .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_CONVERTER, .source_method = -1,
             .current_input = &audio_pcm_48000,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_CONVERTER | LOADER_SET_ENUMERATE_SOURCE_TYPES,
+            .expected_result = S_OK, .converter_class = CLSID_CResamplerMediaObject,
+            .flags = LOADER_SET_ENUMERATE_SOURCE_TYPES,
         },
         {
             /* PCM -> PCM, different enumerated bps, no current type, sink allow decoder */
             .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = MF_CONNECT_DIRECT,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CResamplerMediaObject,
         },
         {
             /* PCM -> PCM, different enumerated bps, no current type, default methods */
             .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = -1, .source_method = -1,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CResamplerMediaObject,
         },
         {
             /* PCM -> PCM, different enumerated bps, no current type, source allow converter */
@@ -3198,14 +3227,14 @@ static void test_topology_loader(void)
         {
             /* Float -> PCM, refuse input type, add converter */
             .input_type = &audio_float_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
-            .expected_result = MF_E_NO_MORE_TYPES,
-            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER,
+            .expected_result = MF_E_NO_MORE_TYPES, .converter_class = CLSID_CResamplerMediaObject,
+            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT,
         },
         {
             /* Float -> PCM, refuse input type, add converter, allow resampler output type */
             .input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
-            .expected_result = S_OK,
-            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CResamplerMediaObject,
+            .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT,
         },
 
         {
@@ -3232,34 +3261,39 @@ static void test_topology_loader(void)
             /* MP3 -> PCM */
             .input_type = &audio_mp3_44100, .output_type = &audio_pcm_44100, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = -1,
             .current_input = &audio_mp3_44100,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_DECODER | LOADER_TODO,
+            .expected_result = S_OK, .decoder_class = CLSID_CMP3DecMediaObject,
+            .flags = LOADER_TODO,
         },
         {
             /* MP3 -> PCM, need both decoder and converter */
             .input_type = &audio_mp3_44100, .output_type = &audio_float_48000, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = -1,
-            .current_input = &audio_mp3_44100,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_DECODER | LOADER_EXPECTED_CONVERTER | LOADER_TODO,
+            .current_input = &audio_mp3_44100, .decoded_type = &audio_float_44100_stereo,
+            .expected_result = S_OK, .decoder_class = CLSID_CMP3DecMediaObject, .converter_class = CLSID_CResamplerMediaObject,
+            .flags = LOADER_TODO,
         },
 
         {
             /* I420 -> RGB32, Color Convert media type */
             .input_type = &video_i420_1280, .output_type = &video_color_convert_1280_rgb32, .sink_method = -1, .source_method = -1,
-            .expected_result = MF_E_TOPO_CODEC_NOT_FOUND,
-            .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER,
+            .expected_result = MF_E_TOPO_CODEC_NOT_FOUND, .converter_class = CLSID_CColorConvertDMO,
+            .flags = LOADER_NEEDS_VIDEO_PROCESSOR,
         },
         {
             /* I420 -> RGB32, Video Processor media type */
             .input_type = &video_i420_1280, .output_type = &video_video_processor_1280_rgb32, .sink_method = -1, .source_method = -1,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CColorConvertDMO,
         },
         {
             /* I420 -> RGB32, Video Processor media type without frame size */
             .input_type = &video_i420_1280, .output_type = &video_video_processor_rgb32, .sink_method = -1, .source_method = -1,
-            .expected_result = S_OK,
-            .flags = LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CColorConvertDMO,
+        },
+        {
+            /* H264 -> RGB32, Video Processor media type */
+            .input_type = &video_h264_1280, .output_type = &video_video_processor_1280_rgb32, .sink_method = -1, .source_method = -1,
+            .decoded_type = &video_nv12_1280,
+            .expected_result = S_OK, .decoder_class = CLSID_CMSH264DecoderMFT, .converter_class = CLSID_CColorConvertDMO,
+            .flags = LOADER_TODO,
         },
         {
             /* RGB32 -> Any Video, no current output type */
@@ -3270,14 +3304,14 @@ static void test_topology_loader(void)
         {
             /* RGB32 -> Any Video, no current output type, refuse input type */
             .input_type = &video_i420_1280, .output_type = &video_dummy, .sink_method = -1, .source_method = -1,
-            .expected_result = S_OK,
-            .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CColorConvertDMO,
+            .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT,
         },
         {
             /* RGB32 -> Any Video, no current output type, refuse input type */
             .input_type = &video_i420_1280, .output_type = &video_video_processor_rgb32, .sink_method = -1, .source_method = -1,
-            .expected_result = S_OK,
-            .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_SET_MEDIA_TYPES | LOADER_EXPECTED_CONVERTER,
+            .expected_result = S_OK, .converter_class = CLSID_CColorConvertDMO,
+            .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_SET_MEDIA_TYPES,
         },
     };
 
@@ -3536,14 +3570,14 @@ todo_wine {
             ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value);
 }
             count = 2;
-            if (test->flags & LOADER_EXPECTED_DECODER)
+            if (!IsEqualGUID(&test->decoder_class, &GUID_NULL))
                 count++;
-            if (test->flags & LOADER_EXPECTED_CONVERTER)
+            if (!IsEqualGUID(&test->converter_class, &GUID_NULL))
                 count++;
 
             hr = IMFTopology_GetNodeCount(full_topology, &node_count);
             ok(hr == S_OK, "Failed to get node count, hr %#lx.\n", hr);
-            todo_wine_if(test->flags & LOADER_EXPECTED_DECODER)
+            todo_wine_if(!IsEqualGUID(&test->decoder_class, &GUID_NULL))
             ok(node_count == count, "Unexpected node count %u.\n", node_count);
 
             hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id);
@@ -3558,29 +3592,31 @@ todo_wine {
             hr = IMFTopology_GetNodeByID(full_topology, node_id, &sink_node2);
             ok(hr == S_OK, "Failed to get sink in resolved topology, hr %#lx.\n", hr);
 
-            if (test->flags & (LOADER_EXPECTED_DECODER | LOADER_EXPECTED_CONVERTER))
+            if (!IsEqualGUID(&test->decoder_class, &GUID_NULL))
             {
+                GUID class_id;
+
                 hr = IMFTopologyNode_GetOutput(src_node2, 0, &mft_node, &index);
-                ok(hr == S_OK, "Failed to get transform node in resolved topology, hr %#lx.\n", hr);
+                ok(hr == S_OK, "Failed to get decoder in resolved topology, hr %#lx.\n", hr);
                 ok(!index, "Unexpected stream index %lu.\n", index);
 
                 hr = IMFTopologyNode_GetNodeType(mft_node, &node_type);
                 ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#lx.\n", hr);
                 ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u.\n", node_type);
 
-                hr = IMFTopologyNode_GetObject(mft_node, &node_object);
-                ok(hr == S_OK, "Failed to get object of transform node, hr %#lx.\n", hr);
-
-                if (test->flags & LOADER_EXPECTED_DECODER)
-                {
-                    value = 0;
-                    hr = IMFTopologyNode_GetUINT32(mft_node, &MF_TOPONODE_DECODER, &value);
-                    ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
-                    ok(value == 1, "Unexpected value.\n");
-                }
+                value = 0;
+                hr = IMFTopologyNode_GetUINT32(mft_node, &MF_TOPONODE_DECODER, &value);
+                ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
+                ok(value == 1, "Unexpected value.\n");
 
-                hr = IMFTopologyNode_GetItem(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, NULL);
+                class_id = GUID_NULL;
+                hr = IMFTopologyNode_GetGUID(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, &class_id);
                 ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
+                ok(IsEqualGUID(&class_id, &test->decoder_class), "got MF_TOPONODE_TRANSFORM_OBJECTID %s.\n", debugstr_guid(&class_id));
+
+                hr = IMFTopologyNode_GetObject(mft_node, &node_object);
+                ok(hr == S_OK, "Failed to get object of transform node, hr %#lx.\n", hr);
+                IMFTopologyNode_Release(mft_node);
 
                 hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform);
                 ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#lx.\n", hr);
@@ -3588,51 +3624,75 @@ todo_wine {
 
                 hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
-
                 hr = IMFMediaType_Compare(input_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
                 ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
                 ok(ret, "Input type of first transform doesn't match source node type.\n");
+                IMFMediaType_Release(media_type);
 
-                IMFTopologyNode_Release(mft_node);
+                hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+                ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
+                if (IsEqualGUID(&test->converter_class, &GUID_NULL))
+                {
+                    hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
+                    ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
+                    ok(ret, "Output type of first transform doesn't match sink node type.\n");
+                }
+                else if (test->decoded_type)
+                {
+                    check_media_type(media_type, *test->decoded_type, -1);
+                }
                 IMFMediaType_Release(media_type);
+
                 IMFTransform_Release(transform);
+            }
+
+            if (!IsEqualGUID(&test->converter_class, &GUID_NULL))
+            {
+                GUID class_id;
 
                 hr = IMFTopologyNode_GetInput(sink_node2, 0, &mft_node, &index);
-                ok(hr == S_OK, "Failed to get transform node in resolved topology, hr %#lx.\n", hr);
+                ok(hr == S_OK, "Failed to get decoder in resolved topology, hr %#lx.\n", hr);
                 ok(!index, "Unexpected stream index %lu.\n", index);
 
                 hr = IMFTopologyNode_GetNodeType(mft_node, &node_type);
                 ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#lx.\n", hr);
                 ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u.\n", node_type);
 
-                hr = IMFTopologyNode_GetItem(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, NULL);
+                class_id = GUID_NULL;
+                hr = IMFTopologyNode_GetGUID(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, &class_id);
                 ok(hr == S_OK, "Failed to get attribute, hr %#lx.\n", hr);
+                todo_wine_if(IsEqualGUID(&test->converter_class, &CLSID_CColorConvertDMO))
+                ok(IsEqualGUID(&class_id, &test->converter_class), "got MF_TOPONODE_TRANSFORM_OBJECTID %s.\n", debugstr_guid(&class_id));
 
                 hr = IMFTopologyNode_GetObject(mft_node, &node_object);
                 ok(hr == S_OK, "Failed to get object of transform node, hr %#lx.\n", hr);
+                IMFTopologyNode_Release(mft_node);
 
-                hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void**) &transform);
+                hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform);
                 ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#lx.\n", hr);
                 IUnknown_Release(node_object);
 
-                hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
-                ok(hr == S_OK, "Failed to get transform output type, hr %#lx.\n", hr);
-                hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
-                ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
-                ok(ret, "Output type of last transform doesn't match sink node type.\n");
-                IMFMediaType_Release(media_type);
-
                 hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
-                if ((test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) != (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER))
+                if (IsEqualGUID(&test->decoder_class, &GUID_NULL))
                 {
                     hr = IMFMediaType_Compare(input_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
                     ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
-                    ok(ret, "Input type of transform doesn't match source node type.\n");
+                    ok(ret, "Input type of last transform doesn't match source node type.\n");
+                }
+                else if (test->decoded_type)
+                {
+                    check_media_type(media_type, *test->decoded_type, -1);
                 }
                 IMFMediaType_Release(media_type);
 
-                IMFTopologyNode_Release(mft_node);
+                hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+                ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
+                hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
+                ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
+                ok(ret, "Output type of last transform doesn't match sink node type.\n");
+                IMFMediaType_Release(media_type);
+
                 IMFTransform_Release(transform);
             }
 

From 27990334b826dcd745f2adc57353312cc5a40348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 7 Jun 2023 11:35:17 +0200
Subject: [PATCH 018/389] mf/topology_loader: Use a local variable for the
 indirect connection method.

Instead of modifying the method_mask parameter, in case we need to retry
with another transform.

(cherry picked from commit 0dab1ffdf945fc28badb106cffb8f7fb88e9c930)
---
 dlls/mf/topology_loader.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index def7c28089c..c0d7b8ad8c9 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -296,6 +296,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
     {
         struct topology_branch down_branch = {.up.node = node, .down = branch->down};
         struct topology_branch up_branch = {.up = branch->up, .down.node = node};
+        MF_CONNECT_METHOD method = method_mask;
 
         if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform)))
             continue;
@@ -313,12 +314,12 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
             if (SUCCEEDED(hr))
                 hr = IMFTransform_SetOutputType(transform, 0, down_type, 0);
             if (SUCCEEDED(hr))
-                method_mask = MF_CONNECT_DIRECT;
+                method = MF_CONNECT_DIRECT;
         }
         IMFTransform_Release(transform);
 
         if (SUCCEEDED(hr))
-            hr = topology_branch_connect(topology, method_mask, &down_branch, !down_type);
+            hr = topology_branch_connect(topology, method, &down_branch, !down_type);
         if (SUCCEEDED(hr))
             hr = IMFTopology_AddNode(topology, node);
         if (SUCCEEDED(hr))

From fdf5ac03b61297d68e19777dca7ddf462b90b704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 19 Jan 2024 12:09:11 +0100
Subject: [PATCH 019/389] mf/topology_loader: Ignore SetOutputType errors when
 doing indirect connect.

It only succeeds with converters, or if a decoder can directly output
the downstream media type.

If it fails we may have to add a converter after the decoder, and we
will call topology_branch_connect on the downstream branch for that.

(cherry picked from commit 2a185126caf6c1d94763ecae4a13c63de9e680f2)
---
 dlls/mf/tests/mf.c        | 15 +++++++++++++--
 dlls/mf/topology_loader.c |  7 ++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index f5a7821f0f8..bcfb0e3dbcf 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3293,7 +3293,6 @@ static void test_topology_loader(void)
             .input_type = &video_h264_1280, .output_type = &video_video_processor_1280_rgb32, .sink_method = -1, .source_method = -1,
             .decoded_type = &video_nv12_1280,
             .expected_result = S_OK, .decoder_class = CLSID_CMSH264DecoderMFT, .converter_class = CLSID_CColorConvertDMO,
-            .flags = LOADER_TODO,
         },
         {
             /* RGB32 -> Any Video, no current output type */
@@ -3577,7 +3576,7 @@ todo_wine {
 
             hr = IMFTopology_GetNodeCount(full_topology, &node_count);
             ok(hr == S_OK, "Failed to get node count, hr %#lx.\n", hr);
-            todo_wine_if(!IsEqualGUID(&test->decoder_class, &GUID_NULL))
+            todo_wine_if(IsEqualGUID(&test->decoder_class, &CLSID_CMP3DecMediaObject))
             ok(node_count == count, "Unexpected node count %u.\n", node_count);
 
             hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id);
@@ -3623,14 +3622,21 @@ todo_wine {
                 IUnknown_Release(node_object);
 
                 hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+                todo_wine
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
+                if (hr == S_OK)
+                {
                 hr = IMFMediaType_Compare(input_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
                 ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
                 ok(ret, "Input type of first transform doesn't match source node type.\n");
                 IMFMediaType_Release(media_type);
+                }
 
                 hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+                todo_wine
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
+                if (hr == S_OK)
+                {
                 if (IsEqualGUID(&test->converter_class, &GUID_NULL))
                 {
                     hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
@@ -3642,6 +3648,7 @@ todo_wine {
                     check_media_type(media_type, *test->decoded_type, -1);
                 }
                 IMFMediaType_Release(media_type);
+                }
 
                 IMFTransform_Release(transform);
             }
@@ -3702,13 +3709,17 @@ todo_wine {
             hr = IMFTopology_SetUINT32(full_topology, &IID_IMFTopology, 123);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
             hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL);
+            todo_wine_if(IsEqualGUID(&test->decoder_class, &CLSID_MSH264DecoderMFT))
             ok(hr == S_OK, "Failed to resolve topology, hr %#lx.\n", hr);
+            if (hr == S_OK)
+            {
             ok(full_topology != topology2, "Unexpected instance.\n");
             hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
             ref = IMFTopology_Release(topology2);
             ok(ref == 0, "Release returned %ld\n", ref);
+            }
             ref = IMFTopology_Release(full_topology);
             ok(ref == 0, "Release returned %ld\n", ref);
         }
diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index c0d7b8ad8c9..2356c703937 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -309,11 +309,8 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
         hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type);
         if (down_type)
         {
-            if (SUCCEEDED(hr))
-                hr = topology_branch_fill_media_type(up_type, down_type);
-            if (SUCCEEDED(hr))
-                hr = IMFTransform_SetOutputType(transform, 0, down_type, 0);
-            if (SUCCEEDED(hr))
+            if (SUCCEEDED(topology_branch_fill_media_type(up_type, down_type))
+                    && SUCCEEDED(IMFTransform_SetOutputType(transform, 0, down_type, 0)))
                 method = MF_CONNECT_DIRECT;
         }
         IMFTransform_Release(transform);

From 0642219b753ffa447308c64771faf63726154ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 19 Jan 2024 12:09:11 +0100
Subject: [PATCH 020/389] mf/topology_loader: Initialize transform output type
 before adding converter.

Otherwise the next topology_branch_connect call will fail when it will
try to lookup the upstream element media type.

(cherry picked from commit d95d1132302a9e5556668147c32e1191b5fd6ab4)
---
 dlls/mf/tests/mf.c        | 4 ----
 dlls/mf/topology_loader.c | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index bcfb0e3dbcf..16e4300c3c8 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3633,10 +3633,7 @@ todo_wine {
                 }
 
                 hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
-                todo_wine
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
-                if (hr == S_OK)
-                {
                 if (IsEqualGUID(&test->converter_class, &GUID_NULL))
                 {
                     hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
@@ -3648,7 +3645,6 @@ todo_wine {
                     check_media_type(media_type, *test->decoded_type, -1);
                 }
                 IMFMediaType_Release(media_type);
-                }
 
                 IMFTransform_Release(transform);
             }
diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index 2356c703937..386d6978e6c 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -297,6 +297,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
         struct topology_branch down_branch = {.up.node = node, .down = branch->down};
         struct topology_branch up_branch = {.up = branch->up, .down.node = node};
         MF_CONNECT_METHOD method = method_mask;
+        IMFMediaType *media_type;
 
         if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform)))
             continue;
@@ -315,6 +316,14 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
         }
         IMFTransform_Release(transform);
 
+        if (SUCCEEDED(hr) && method != MF_CONNECT_DIRECT
+                && SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type)))
+        {
+            if (SUCCEEDED(topology_branch_fill_media_type(up_type, media_type)))
+                IMFTransform_SetOutputType(transform, 0, media_type, 0);
+            IMFMediaType_Release(media_type);
+        }
+
         if (SUCCEEDED(hr))
             hr = topology_branch_connect(topology, method, &down_branch, !down_type);
         if (SUCCEEDED(hr))

From ce520565d50c007ff5c6c50c32cd372b5b946db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 24 Jan 2024 15:27:25 +0100
Subject: [PATCH 021/389] mf/topology_loader: Try to connect transform nodes
 with their current types first.

And only if that fails try again by enumerating types.

(cherry picked from commit 2d88c5771611ad43767d19dc5b4fe990ec252304)
---
 dlls/mf/tests/mf.c        | 4 ----
 dlls/mf/topology_loader.c | 7 +++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 16e4300c3c8..3f51e563624 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3705,17 +3705,13 @@ todo_wine {
             hr = IMFTopology_SetUINT32(full_topology, &IID_IMFTopology, 123);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
             hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL);
-            todo_wine_if(IsEqualGUID(&test->decoder_class, &CLSID_MSH264DecoderMFT))
             ok(hr == S_OK, "Failed to resolve topology, hr %#lx.\n", hr);
-            if (hr == S_OK)
-            {
             ok(full_topology != topology2, "Unexpected instance.\n");
             hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
             ref = IMFTopology_Release(topology2);
             ok(ref == 0, "Release returned %ld\n", ref);
-            }
             ref = IMFTopology_Release(full_topology);
             ok(ref == 0, "Release returned %ld\n", ref);
         }
diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index 386d6978e6c..a56fb3e3909 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -528,8 +528,11 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte
         else if (FAILED(hr = topology_branch_clone_nodes(context, branch)))
             WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch));
         else
-            hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER,
-                    branch, enumerate_source_types || node_type == MF_TOPOLOGY_TRANSFORM_NODE);
+        {
+            hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, branch, enumerate_source_types);
+            if (hr == MF_E_INVALIDMEDIATYPE && !enumerate_source_types && node_type == MF_TOPOLOGY_TRANSFORM_NODE)
+                hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, branch, TRUE);
+        }
 
         topology_branch_destroy(branch);
         if (FAILED(hr))

From 78d0ae995154ebaeda45a5f378bd0ab300c8be29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 24 Jan 2024 14:47:55 +0100
Subject: [PATCH 022/389] winegstreamer: Implement H264 decoder
 GetInputCurrentType.

(cherry picked from commit 6aca31f1a1662ec9a2ab720c31ea981f31af4d7f)
---
 dlls/mf/tests/mf.c                |  4 ----
 dlls/mf/tests/transform.c         |  2 +-
 dlls/winegstreamer/h264_decoder.c | 16 +++++++++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 3f51e563624..0a34329bd75 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3622,15 +3622,11 @@ todo_wine {
                 IUnknown_Release(node_object);
 
                 hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
-                todo_wine
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
-                if (hr == S_OK)
-                {
                 hr = IMFMediaType_Compare(input_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
                 ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr);
                 ok(ret, "Input type of first transform doesn't match source node type.\n");
                 IMFMediaType_Release(media_type);
-                }
 
                 hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
                 ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index f9e6b3b45cd..06e638bea16 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -4262,7 +4262,7 @@ static void test_h264_decoder(void)
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, TRUE, FALSE);
+    check_mft_get_input_current_type_(transform, expect_input_type_desc, FALSE, TRUE);
 
     check_mft_get_input_stream_info(transform, S_OK, &input_info);
     check_mft_get_output_stream_info(transform, S_OK, &output_info);
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 5a098c6e467..958bf9a9982 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -580,8 +580,18 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
 
 static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
 {
-    FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type);
-    return E_NOTIMPL;
+    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    HRESULT hr;
+
+    TRACE("iface %p, id %#lx, type %p\n", iface, id, type);
+
+    if (!decoder->input_type)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (FAILED(hr = MFCreateMediaType(type)))
+        return hr;
+
+    return IMFMediaType_CopyAllItems(decoder->input_type, (IMFAttributes *)*type);
 }
 
 static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
@@ -589,7 +599,7 @@ static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD
     struct h264_decoder *decoder = impl_from_IMFTransform(iface);
     HRESULT hr;
 
-    FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type);
+    TRACE("iface %p, id %#lx, type %p\n", iface, id, type);
 
     if (!decoder->output_type)
         return MF_E_TRANSFORM_TYPE_NOT_SET;

From f63b1af7e9978eb74810dbfb0d152c617ea41138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 24 Jan 2024 19:29:15 +0100
Subject: [PATCH 023/389] winegstreamer: Ask GStreamer to stop messing with
 signal handlers.

(cherry picked from commit 02921e4900b5b377a4b4b0cddbb7c2b7419cee9e)
---
 dlls/winegstreamer/unixlib.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c
index 53c1328c0ab..4ac667350d0 100644
--- a/dlls/winegstreamer/unixlib.c
+++ b/dlls/winegstreamer/unixlib.c
@@ -273,6 +273,11 @@ NTSTATUS wg_init_gstreamer(void *arg)
         setenv("GST_REGISTRY_1_0", gst_reg, 1);
     }
 
+    /* GStreamer installs a temporary SEGV handler when it loads plugins
+     * to initialize its registry calling exit(-1) when any fault is caught.
+     * We need to make sure any signal reaches our signal handlers to catch
+     * and handle them, or eventually propagate the exceptions to the user.
+     */
     gst_segtrap_set_enabled(false);
 
     if (!gst_init_check(&argc, &argv, &err))

From f08b4370f3146fa401f5965fbf6af884df87b47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 17:05:11 +0100
Subject: [PATCH 024/389] winegstreamer: Trace wg_transform input and output
 caps.

(cherry picked from commit 6dae92cfb916847f7cf1160e74d1c97553d3bced)
---
 dlls/winegstreamer/wg_transform.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 1f6bdb103d6..d429890cb59 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -328,6 +328,8 @@ NTSTATUS wg_transform_create(void *args)
     if (!transform->my_src)
         goto out;
 
+    GST_INFO("transform %p input caps %"GST_PTR_FORMAT, transform, src_caps);
+
     gst_pad_set_element_private(transform->my_src, transform);
     gst_pad_set_query_function(transform->my_src, transform_src_query_cb);
 
@@ -340,6 +342,8 @@ NTSTATUS wg_transform_create(void *args)
     if (!transform->my_sink)
         goto out;
 
+    GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, transform->output_caps);
+
     gst_pad_set_element_private(transform->my_sink, transform);
     gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb);
     gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb);
@@ -537,6 +541,8 @@ NTSTATUS wg_transform_set_output_format(void *args)
     }
     transform->output_format = *format;
 
+    GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, caps);
+
     if (gst_caps_is_always_compatible(transform->output_caps, caps))
     {
         gst_caps_unref(caps);
@@ -827,6 +833,8 @@ NTSTATUS wg_transform_read_data(void *args)
     {
         GST_MINI_OBJECT_FLAG_UNSET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED);
 
+        GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, output_caps);
+
         if (format)
         {
             gsize plane_align = transform->attrs.output_plane_align;

From a1982d726ae2aacbdadf0a740b748220b45f0499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 17:16:10 +0100
Subject: [PATCH 025/389] winegstreamer: Handle allocation query in a separate
 helper.

(cherry picked from commit ec759079a58599da90a23c83e879e33b74a4b7cf)
---
 dlls/winegstreamer/wg_transform.c | 114 ++++++++++++++++--------------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index d429890cb59..baa0b963348 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -125,74 +125,78 @@ static gboolean transform_src_query_cb(GstPad *pad, GstObject *parent, GstQuery
     }
 }
 
-static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
+static gboolean transform_sink_query_allocation(struct wg_transform *transform, GstQuery *query)
 {
-    struct wg_transform *transform = gst_pad_get_element_private(pad);
+    gsize plane_align = transform->attrs.output_plane_align;
+    GstStructure *config, *params;
+    GstVideoAlignment align;
+    gboolean needs_pool;
+    GstBufferPool *pool;
+    GstVideoInfo info;
+    GstCaps *caps;
 
-    GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type));
+    gst_query_parse_allocation(query, &caps, &needs_pool);
+    if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool)
+        return false;
 
-    switch (query->type)
-    {
-        case GST_QUERY_ALLOCATION:
-        {
-            gsize plane_align = transform->attrs.output_plane_align;
-            GstStructure *config, *params;
-            GstVideoAlignment align;
-            gboolean needs_pool;
-            GstBufferPool *pool;
-            GstVideoInfo info;
-            GstCaps *caps;
+    if (!gst_video_info_from_caps(&info, caps)
+            || !(pool = gst_video_buffer_pool_new()))
+        return false;
 
-            gst_query_parse_allocation(query, &caps, &needs_pool);
-            if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool)
-                break;
+    align_video_info_planes(plane_align, &info, &align);
 
-            if (!gst_video_info_from_caps(&info, caps)
-                    || !(pool = gst_video_buffer_pool_new()))
-                break;
+    if ((params = gst_structure_new("video-meta",
+            "padding-top", G_TYPE_UINT, align.padding_top,
+            "padding-bottom", G_TYPE_UINT, align.padding_bottom,
+            "padding-left", G_TYPE_UINT, align.padding_left,
+            "padding-right", G_TYPE_UINT, align.padding_right,
+            NULL)))
+    {
+        gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, params);
+        gst_structure_free(params);
+    }
+
+    if (!(config = gst_buffer_pool_get_config(pool)))
+        GST_ERROR("Failed to get pool %p config.", pool);
+    else
+    {
+        gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+        gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+        gst_buffer_pool_config_set_video_alignment(config, &align);
 
-            align_video_info_planes(plane_align, &info, &align);
+        gst_buffer_pool_config_set_params(config, caps,
+                info.size, 0, 0);
+        gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL);
+        if (!gst_buffer_pool_set_config(pool, config))
+            GST_ERROR("Failed to set pool %p config.", pool);
+    }
 
-            if ((params = gst_structure_new("video-meta",
-                    "padding-top", G_TYPE_UINT, align.padding_top,
-                    "padding-bottom", G_TYPE_UINT, align.padding_bottom,
-                    "padding-left", G_TYPE_UINT, align.padding_left,
-                    "padding-right", G_TYPE_UINT, align.padding_right,
-                    NULL)))
-            {
-                gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, params);
-                gst_structure_free(params);
-            }
+    /* Prevent pool reconfiguration, we don't want another alignment. */
+    if (!gst_buffer_pool_set_active(pool, true))
+        GST_ERROR("Pool %p failed to activate.", pool);
 
-            if (!(config = gst_buffer_pool_get_config(pool)))
-                GST_ERROR("Failed to get pool %p config.", pool);
-            else
-            {
-                gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META);
-                gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
-                gst_buffer_pool_config_set_video_alignment(config, &align);
-
-                gst_buffer_pool_config_set_params(config, caps,
-                        info.size, 0, 0);
-                gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL);
-                if (!gst_buffer_pool_set_config(pool, config))
-                    GST_ERROR("Failed to set pool %p config.", pool);
-            }
+    gst_query_add_allocation_pool(query, pool, info.size, 0, 0);
+    gst_query_add_allocation_param(query, transform->allocator, NULL);
 
-            /* Prevent pool reconfiguration, we don't want another alignment. */
-            if (!gst_buffer_pool_set_active(pool, true))
-                GST_ERROR("Pool %p failed to activate.", pool);
+    GST_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.",
+            pool, info.size, transform->allocator, query);
 
-            gst_query_add_allocation_pool(query, pool, info.size, 0, 0);
-            gst_query_add_allocation_param(query, transform->allocator, NULL);
+    g_object_unref(pool);
+    return true;
+}
 
-            GST_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.",
-                    pool, info.size, transform->allocator, query);
+static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
+{
+    struct wg_transform *transform = gst_pad_get_element_private(pad);
 
-            g_object_unref(pool);
-            return true;
-        }
+    GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type));
 
+    switch (query->type)
+    {
+        case GST_QUERY_ALLOCATION:
+            if (transform_sink_query_allocation(transform, query))
+                return true;
+            break;
         case GST_QUERY_CAPS:
         {
             GstCaps *caps, *filter, *temp;

From fe825407e9f0b70119ac00807c9a42c30f3a8619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 17:17:25 +0100
Subject: [PATCH 026/389] winegstreamer: Handle sink caps query in a separate
 helper.

(cherry picked from commit f39156ee6a0950cb71fabd4f50a768510f7e2366)
---
 dlls/winegstreamer/wg_transform.c | 48 +++++++++++++++++--------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index baa0b963348..7553c96053f 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -185,6 +185,30 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
     return true;
 }
 
+static gboolean transform_sink_query_caps(struct wg_transform *transform, GstQuery *query)
+{
+    GstCaps *caps, *filter, *temp;
+
+    GST_LOG("transform %p, query %"GST_PTR_FORMAT, transform, query);
+
+    gst_query_parse_caps(query, &filter);
+    if (!(caps = wg_format_to_caps(&transform->output_format)))
+        return false;
+
+    if (filter)
+    {
+        temp = gst_caps_intersect(caps, filter);
+        gst_caps_unref(caps);
+        caps = temp;
+    }
+
+    GST_INFO("Returning caps %" GST_PTR_FORMAT, caps);
+
+    gst_query_set_caps_result(query, caps);
+    gst_caps_unref(caps);
+    return true;
+}
+
 static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
 {
     struct wg_transform *transform = gst_pad_get_element_private(pad);
@@ -198,27 +222,9 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
                 return true;
             break;
         case GST_QUERY_CAPS:
-        {
-            GstCaps *caps, *filter, *temp;
-
-            gst_query_parse_caps(query, &filter);
-            if (!(caps = wg_format_to_caps(&transform->output_format)))
-                break;
-
-            if (filter)
-            {
-                temp = gst_caps_intersect(caps, filter);
-                gst_caps_unref(caps);
-                caps = temp;
-            }
-
-            GST_INFO("Returning caps %" GST_PTR_FORMAT, caps);
-
-            gst_query_set_caps_result(query, caps);
-            gst_caps_unref(caps);
-            return true;
-        }
-
+            if (transform_sink_query_caps(transform, query))
+                return true;
+            break;
         default:
             GST_WARNING("Ignoring \"%s\" query.", gst_query_type_get_name(query->type));
             break;

From 00a6df870b68fe561cb229a168da4139299871f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 17:20:07 +0100
Subject: [PATCH 027/389] winegstreamer: Handle sink event caps in a separate
 helper.

(cherry picked from commit 4f349d442a14b0cec0bdd25ac8d0ddfcd3a1e71e)
---
 dlls/winegstreamer/wg_transform.c | 35 +++++++++++++++++--------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 7553c96053f..e27db5c4bbe 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -233,6 +233,19 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
     return gst_pad_query_default(pad, parent, query);
 }
 
+static void transform_sink_event_caps(struct wg_transform *transform, GstEvent *event)
+{
+    GstCaps *caps;
+
+    gst_event_parse_caps(event, &caps);
+
+    transform->output_caps_changed = transform->output_caps_changed
+            || !gst_caps_is_always_compatible(transform->output_caps, caps);
+
+    gst_caps_unref(transform->output_caps);
+    transform->output_caps = gst_caps_ref(caps);
+}
+
 static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
 {
     struct wg_transform *transform = gst_pad_get_element_private(pad);
@@ -241,22 +254,12 @@ static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent
 
     switch (event->type)
     {
-        case GST_EVENT_CAPS:
-        {
-            GstCaps *caps;
-
-            gst_event_parse_caps(event, &caps);
-
-            transform->output_caps_changed = transform->output_caps_changed
-                    || !gst_caps_is_always_compatible(transform->output_caps, caps);
-
-            gst_caps_unref(transform->output_caps);
-            transform->output_caps = gst_caps_ref(caps);
-            break;
-        }
-        default:
-            GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event));
-            break;
+    case GST_EVENT_CAPS:
+        transform_sink_event_caps(transform, event);
+        break;
+    default:
+        GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event));
+        break;
     }
 
     gst_event_unref(event);

From b0774143b07611184e55e73b09c09a1116d3c5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 17:24:49 +0100
Subject: [PATCH 028/389] winegstreamer: Use GST_PTR_FORMAT to trace GStreamer
 objects.

(cherry picked from commit 62955f22295e69539f14d808adf179afd9583e5a)
---
 dlls/winegstreamer/wg_transform.c | 53 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index e27db5c4bbe..10541c012e4 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -87,7 +87,7 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst
     struct wg_transform *transform = gst_pad_get_element_private(pad);
     GstSample *sample;
 
-    GST_LOG("transform %p, buffer %p.", transform, buffer);
+    GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, buffer);
 
     if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, NULL)))
     {
@@ -107,7 +107,7 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst
 
 static gboolean transform_src_query_latency(struct wg_transform *transform, GstQuery *query)
 {
-    GST_LOG("transform %p, query %p", transform, query);
+    GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query);
     gst_query_set_latency(query, transform->attrs.low_latency, 0, 0);
     return true;
 }
@@ -121,6 +121,7 @@ static gboolean transform_src_query_cb(GstPad *pad, GstObject *parent, GstQuery
     case GST_QUERY_LATENCY:
         return transform_src_query_latency(transform, query);
     default:
+        GST_TRACE("transform %p, ignoring %"GST_PTR_FORMAT, transform, query);
         return gst_pad_query_default(pad, parent, query);
     }
 }
@@ -135,6 +136,8 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
     GstVideoInfo info;
     GstCaps *caps;
 
+    GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query);
+
     gst_query_parse_allocation(query, &caps, &needs_pool);
     if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool)
         return false;
@@ -157,7 +160,7 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
     }
 
     if (!(config = gst_buffer_pool_get_config(pool)))
-        GST_ERROR("Failed to get pool %p config.", pool);
+        GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool);
     else
     {
         gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META);
@@ -168,17 +171,17 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
                 info.size, 0, 0);
         gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL);
         if (!gst_buffer_pool_set_config(pool, config))
-            GST_ERROR("Failed to set pool %p config.", pool);
+            GST_ERROR("Failed to set %"GST_PTR_FORMAT" config.", pool);
     }
 
     /* Prevent pool reconfiguration, we don't want another alignment. */
     if (!gst_buffer_pool_set_active(pool, true))
-        GST_ERROR("Pool %p failed to activate.", pool);
+        GST_ERROR("%"GST_PTR_FORMAT" failed to activate.", pool);
 
     gst_query_add_allocation_pool(query, pool, info.size, 0, 0);
     gst_query_add_allocation_param(query, transform->allocator, NULL);
 
-    GST_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.",
+    GST_INFO("Proposing %"GST_PTR_FORMAT", buffer size %#zx, %"GST_PTR_FORMAT", for %"GST_PTR_FORMAT,
             pool, info.size, transform->allocator, query);
 
     g_object_unref(pool);
@@ -189,7 +192,7 @@ static gboolean transform_sink_query_caps(struct wg_transform *transform, GstQue
 {
     GstCaps *caps, *filter, *temp;
 
-    GST_LOG("transform %p, query %"GST_PTR_FORMAT, transform, query);
+    GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query);
 
     gst_query_parse_caps(query, &filter);
     if (!(caps = wg_format_to_caps(&transform->output_format)))
@@ -213,23 +216,21 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
 {
     struct wg_transform *transform = gst_pad_get_element_private(pad);
 
-    GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type));
-
     switch (query->type)
     {
-        case GST_QUERY_ALLOCATION:
-            if (transform_sink_query_allocation(transform, query))
-                return true;
-            break;
-        case GST_QUERY_CAPS:
-            if (transform_sink_query_caps(transform, query))
-                return true;
-            break;
-        default:
-            GST_WARNING("Ignoring \"%s\" query.", gst_query_type_get_name(query->type));
-            break;
+    case GST_QUERY_ALLOCATION:
+        if (transform_sink_query_allocation(transform, query))
+            return true;
+        break;
+    case GST_QUERY_CAPS:
+        if (transform_sink_query_caps(transform, query))
+            return true;
+        break;
+    default:
+        break;
     }
 
+    GST_TRACE("transform %p, ignoring %"GST_PTR_FORMAT, transform, query);
     return gst_pad_query_default(pad, parent, query);
 }
 
@@ -237,6 +238,8 @@ static void transform_sink_event_caps(struct wg_transform *transform, GstEvent *
 {
     GstCaps *caps;
 
+    GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, event);
+
     gst_event_parse_caps(event, &caps);
 
     transform->output_caps_changed = transform->output_caps_changed
@@ -250,15 +253,13 @@ static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent
 {
     struct wg_transform *transform = gst_pad_get_element_private(pad);
 
-    GST_LOG("transform %p, type \"%s\".", transform, GST_EVENT_TYPE_NAME(event));
-
     switch (event->type)
     {
     case GST_EVENT_CAPS:
         transform_sink_event_caps(transform, event);
         break;
     default:
-        GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event));
+        GST_TRACE("transform %p, ignoring %"GST_PTR_FORMAT, transform, event);
         break;
     }
 
@@ -633,7 +634,7 @@ NTSTATUS wg_transform_push_data(void *args)
     else
     {
         InterlockedIncrement(&sample->refcount);
-        GST_INFO("Wrapped %u/%u bytes from sample %p to buffer %p", sample->size, sample->max_size, sample, buffer);
+        GST_INFO("Wrapped %u/%u bytes from sample %p to %"GST_PTR_FORMAT, sample->size, sample->max_size, sample, buffer);
     }
 
     if (sample->flags & WG_SAMPLE_FLAG_HAS_PTS)
@@ -740,7 +741,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi
 
     if (!gst_buffer_map(buffer, &info, GST_MAP_READ))
     {
-        GST_ERROR("Failed to map buffer %p", buffer);
+        GST_ERROR("Failed to map buffer %"GST_PTR_FORMAT, buffer);
         sample->size = 0;
         return STATUS_UNSUCCESSFUL;
     }
@@ -757,7 +758,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi
 
     if (status)
     {
-        GST_ERROR("Failed to copy buffer %p", buffer);
+        GST_ERROR("Failed to copy buffer %"GST_PTR_FORMAT, buffer);
         sample->size = 0;
         return status;
     }

From 370f34c98105c594e669c076935488d0ac00ff35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 19:25:03 +0100
Subject: [PATCH 029/389] winegstreamer: Ignore wg_transform input / output
 video format fps.

Decoders might output some fps information and encoders might input fps,
but otherwise is unnecessary and may prevent compatible caps matching.

(cherry picked from commit 98b8ab9b88b77e2f8f0c51adb681094191a0be1b)
---
 dlls/winegstreamer/h264_decoder.c  |  4 ---
 dlls/winegstreamer/video_decoder.c |  6 -----
 dlls/winegstreamer/wg_transform.c  | 39 +++++++++++++++++++++++++-----
 dlls/winegstreamer/wmv_decoder.c   | 12 ---------
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 958bf9a9982..ae4d46d40a2 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -111,8 +111,6 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
      */
     output_format.u.video.width = 0;
     output_format.u.video.height = 0;
-    output_format.u.video.fps_d = 0;
-    output_format.u.video.fps_n = 0;
 
     if (SUCCEEDED(IMFAttributes_GetUINT32(decoder->attributes, &MF_LOW_LATENCY, &low_latency)))
         attrs.low_latency = !!low_latency;
@@ -558,8 +556,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
          */
         output_format.u.video.width = 0;
         output_format.u.video.height = 0;
-        output_format.u.video.fps_d = 0;
-        output_format.u.video.fps_n = 0;
 
         if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN
                 || !wg_transform_set_output_format(decoder->wg_transform, &output_format))
diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 2faab78faf2..f24c25e03f2 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -84,9 +84,6 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder)
     if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
         return MF_E_INVALIDMEDIATYPE;
 
-    output_format.u.video.fps_d = 0;
-    output_format.u.video.fps_n = 0;
-
     if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs)))
     {
         ERR("Failed to create transform with input major_type %u.\n", input_format.major_type);
@@ -311,9 +308,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
     {
         mf_media_type_to_wg_format(decoder->output_type, &output_format);
 
-        output_format.u.video.fps_d = 0;
-        output_format.u.video.fps_n = 0;
-
         if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN
             || !wg_transform_set_output_format(decoder->wg_transform, &output_format))
         {
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 10541c012e4..a1f5dc5971b 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -188,6 +188,16 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform,
     return true;
 }
 
+static GstCaps *transform_format_to_caps(struct wg_transform *transform, const struct wg_format *format)
+{
+    struct wg_format copy = *format;
+
+    if (format->major_type == WG_MAJOR_TYPE_VIDEO)
+        copy.u.video.fps_n = copy.u.video.fps_d = 0;
+
+    return wg_format_to_caps(&copy);
+}
+
 static gboolean transform_sink_query_caps(struct wg_transform *transform, GstQuery *query)
 {
     GstCaps *caps, *filter, *temp;
@@ -195,7 +205,7 @@ static gboolean transform_sink_query_caps(struct wg_transform *transform, GstQue
     GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query);
 
     gst_query_parse_caps(query, &filter);
-    if (!(caps = wg_format_to_caps(&transform->output_format)))
+    if (!(caps = transform_format_to_caps(transform, &transform->output_format)))
         return false;
 
     if (filter)
@@ -234,6 +244,23 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
     return gst_pad_query_default(pad, parent, query);
 }
 
+static gboolean transform_output_caps_is_compatible(struct wg_transform *transform, GstCaps *caps)
+{
+    GstCaps *copy = gst_caps_copy(caps);
+    gboolean ret;
+    gsize i;
+
+    for (i = 0; i < gst_caps_get_size(copy); ++i)
+    {
+        GstStructure *structure = gst_caps_get_structure(copy, i);
+        gst_structure_remove_fields(structure, "framerate", NULL);
+    }
+
+    ret = gst_caps_is_always_compatible(transform->output_caps, copy);
+    gst_caps_unref(copy);
+    return ret;
+}
+
 static void transform_sink_event_caps(struct wg_transform *transform, GstEvent *event)
 {
     GstCaps *caps;
@@ -243,7 +270,7 @@ static void transform_sink_event_caps(struct wg_transform *transform, GstEvent *
     gst_event_parse_caps(event, &caps);
 
     transform->output_caps_changed = transform->output_caps_changed
-            || !gst_caps_is_always_compatible(transform->output_caps, caps);
+            || !transform_output_caps_is_compatible(transform, caps);
 
     gst_caps_unref(transform->output_caps);
     transform->output_caps = gst_caps_ref(caps);
@@ -333,7 +360,7 @@ NTSTATUS wg_transform_create(void *args)
     transform->attrs = *params->attrs;
     transform->output_format = output_format;
 
-    if (!(src_caps = wg_format_to_caps(&input_format)))
+    if (!(src_caps = transform_format_to_caps(transform, &input_format)))
         goto out;
     if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps)))
         goto out;
@@ -347,7 +374,7 @@ NTSTATUS wg_transform_create(void *args)
     gst_pad_set_element_private(transform->my_src, transform);
     gst_pad_set_query_function(transform->my_src, transform_src_query_cb);
 
-    if (!(transform->output_caps = wg_format_to_caps(&output_format)))
+    if (!(transform->output_caps = transform_format_to_caps(transform, &output_format)))
         goto out;
     if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, transform->output_caps)))
         goto out;
@@ -548,7 +575,7 @@ NTSTATUS wg_transform_set_output_format(void *args)
     GstSample *sample;
     GstCaps *caps;
 
-    if (!(caps = wg_format_to_caps(format)))
+    if (!(caps = transform_format_to_caps(transform, format)))
     {
         GST_ERROR("Failed to convert format %p to caps.", format);
         return STATUS_UNSUCCESSFUL;
@@ -557,7 +584,7 @@ NTSTATUS wg_transform_set_output_format(void *args)
 
     GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, caps);
 
-    if (gst_caps_is_always_compatible(transform->output_caps, caps))
+    if (transform_output_caps_is_compatible(transform, caps))
     {
         gst_caps_unref(caps);
         return STATUS_SUCCESS;
diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c
index 48940573f08..edd6c744e94 100644
--- a/dlls/winegstreamer/wmv_decoder.c
+++ b/dlls/winegstreamer/wmv_decoder.c
@@ -511,16 +511,6 @@ static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index
 
     if (!amt_to_wg_format((const AM_MEDIA_TYPE *)type, &wg_format))
         return DMO_E_TYPE_NOT_ACCEPTED;
-    if (wg_format.major_type == WG_MAJOR_TYPE_VIDEO_WMV)
-    {
-        wg_format.u.video_wmv.fps_n = 0;
-        wg_format.u.video_wmv.fps_d = 0;
-    }
-    else if (wg_format.major_type == WG_MAJOR_TYPE_VIDEO)
-    {
-        wg_format.u.video.fps_n = 0;
-        wg_format.u.video.fps_d = 0;
-    }
 
     if (flags & DMO_SET_TYPEF_TEST_ONLY)
         return S_OK;
@@ -578,8 +568,6 @@ static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD inde
     if (!amt_to_wg_format((const AM_MEDIA_TYPE *)type, &wg_format))
         return DMO_E_TYPE_NOT_ACCEPTED;
     assert(wg_format.major_type == WG_MAJOR_TYPE_VIDEO);
-    wg_format.u.video.fps_n = 0;
-    wg_format.u.video.fps_d = 0;
 
     if (flags & DMO_SET_TYPEF_TEST_ONLY)
         return S_OK;

From 6e060bb31516f5c84b43a20f208472f30e2a06cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 30 Jan 2024 20:21:45 +0100
Subject: [PATCH 030/389] winegstreamer: Allow wg_transform size changes with
 an explicit attribute.

(cherry picked from commit 6979a9f059d7390e64f7de50d424e8d4363575c8)
---
 dlls/winegstreamer/h264_decoder.c | 13 +------------
 dlls/winegstreamer/unixlib.h      |  1 +
 dlls/winegstreamer/wg_transform.c |  4 ++++
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index ae4d46d40a2..aff9e73d051 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -89,6 +89,7 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
     {
         .output_plane_align = 15,
         .input_queue_length = 15,
+        .allow_size_change = TRUE,
     };
     struct wg_format input_format;
     struct wg_format output_format;
@@ -106,12 +107,6 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
     if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
         return MF_E_INVALIDMEDIATYPE;
 
-    /* Don't force any specific size, H264 streams already have the metadata for it
-     * and will generate a MF_E_TRANSFORM_STREAM_CHANGE result later.
-     */
-    output_format.u.video.width = 0;
-    output_format.u.video.height = 0;
-
     if (SUCCEEDED(IMFAttributes_GetUINT32(decoder->attributes, &MF_LOW_LATENCY, &low_latency)))
         attrs.low_latency = !!low_latency;
 
@@ -551,12 +546,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
         struct wg_format output_format;
         mf_media_type_to_wg_format(decoder->output_type, &output_format);
 
-        /* Don't force any specific size, H264 streams already have the metadata for it
-         * and will generate a MF_E_TRANSFORM_STREAM_CHANGE result later.
-         */
-        output_format.u.video.width = 0;
-        output_format.u.video.height = 0;
-
         if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN
                 || !wg_transform_set_output_format(decoder->wg_transform, &output_format))
         {
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 2045f3b65ff..e7dcb23ab2b 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -344,6 +344,7 @@ struct wg_transform_attrs
 {
     UINT32 output_plane_align;
     UINT32 input_queue_length;
+    BOOL allow_size_change;
     BOOL low_latency;
 };
 
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index a1f5dc5971b..557d7024246 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -193,7 +193,11 @@ static GstCaps *transform_format_to_caps(struct wg_transform *transform, const s
     struct wg_format copy = *format;
 
     if (format->major_type == WG_MAJOR_TYPE_VIDEO)
+    {
+        if (transform->attrs.allow_size_change)
+            copy.u.video.width = copy.u.video.height = 0;
         copy.u.video.fps_n = copy.u.video.fps_d = 0;
+    }
 
     return wg_format_to_caps(&copy);
 }

From db22f40dbb21d1b1841b002a0bb34dd759b6852a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 29 Jan 2024 13:13:43 +0100
Subject: [PATCH 031/389] mf/tests: Report more transform current type
 mismatches.

(cherry picked from commit 5a12be3a9af038382559831fef764d69ff6b07b0)
---
 dlls/mf/tests/transform.c | 86 ++++++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 06e638bea16..977e819cdf8 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -709,8 +709,8 @@ static void check_mft_set_input_type(IMFTransform *transform, const struct attri
     IMFMediaType_Release(media_type);
 }
 
-#define check_mft_get_input_current_type(a, b) check_mft_get_input_current_type_(a, b, FALSE, FALSE)
-static void check_mft_get_input_current_type_(IMFTransform *transform, const struct attribute_desc *attributes,
+#define check_mft_get_input_current_type(a, b) check_mft_get_input_current_type_(__LINE__, a, b, FALSE, FALSE)
+static void check_mft_get_input_current_type_(int line, IMFTransform *transform, const struct attribute_desc *attributes,
         BOOL todo_current, BOOL todo_compare)
 {
     HRESULT hr, expect_hr = attributes ? S_OK : MF_E_TRANSFORM_TYPE_NOT_SET;
@@ -719,19 +719,21 @@ static void check_mft_get_input_current_type_(IMFTransform *transform, const str
 
     hr = IMFTransform_GetInputCurrentType(transform, 0, &current_type);
     todo_wine_if(todo_current)
-    ok(hr == expect_hr, "GetInputCurrentType returned hr %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == expect_hr, "GetInputCurrentType returned hr %#lx.\n", hr);
     if (FAILED(hr))
         return;
 
     hr = MFCreateMediaType(&media_type);
-    ok(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr);
     init_media_type(media_type, attributes, -1);
 
     hr = IMFMediaType_Compare(current_type, (IMFAttributes *)media_type,
             MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result);
-    ok(hr == S_OK, "Compare returned hr %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == S_OK, "Compare returned hr %#lx.\n", hr);
     todo_wine_if(todo_compare)
-    ok(result, "got result %u.\n", !!result);
+    ok_(__FILE__, line)(result, "got result %u.\n", !!result);
+
+    check_attributes_(__FILE__, line, (IMFAttributes *)current_type, attributes, -1);
 
     IMFMediaType_Release(media_type);
     IMFMediaType_Release(current_type);
@@ -785,24 +787,31 @@ static void check_mft_set_output_type(IMFTransform *transform, const struct attr
     IMFMediaType_Release(media_type);
 }
 
-#define check_mft_get_output_current_type(a, b) check_mft_get_output_current_type_(a, b, FALSE)
-static void check_mft_get_output_current_type_(IMFTransform *transform, const struct attribute_desc *attributes,
-        BOOL todo_current)
+#define check_mft_get_output_current_type(a, b) check_mft_get_output_current_type_(__LINE__, a, b, FALSE, FALSE)
+static void check_mft_get_output_current_type_(int line, IMFTransform *transform, const struct attribute_desc *attributes,
+        BOOL todo_current, BOOL todo_compare)
 {
     HRESULT hr, expect_hr = attributes ? S_OK : MF_E_TRANSFORM_TYPE_NOT_SET;
     IMFMediaType *media_type, *current_type;
+    BOOL result;
 
     hr = IMFTransform_GetOutputCurrentType(transform, 0, &current_type);
     todo_wine_if(todo_current)
-    ok(hr == expect_hr, "GetOutputCurrentType returned hr %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == expect_hr, "GetOutputCurrentType returned hr %#lx.\n", hr);
     if (FAILED(hr))
         return;
 
     hr = MFCreateMediaType(&media_type);
-    ok(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr);
     init_media_type(media_type, attributes, -1);
 
-    check_attributes((IMFAttributes *)current_type, attributes, -1);
+    hr = IMFMediaType_Compare(current_type, (IMFAttributes *)media_type,
+            MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result);
+    ok_(__FILE__, line)(hr == S_OK, "Compare returned hr %#lx.\n", hr);
+    todo_wine_if(todo_compare)
+    ok_(__FILE__, line)(result, "got result %u.\n", !!result);
+
+    check_attributes_(__FILE__, line, (IMFAttributes *)current_type, attributes, -1);
 
     IMFMediaType_Release(media_type);
     IMFMediaType_Release(current_type);
@@ -3191,11 +3200,11 @@ static void test_wma_decoder(void)
 
     /* setting output media type first doesn't work */
     check_mft_set_output_type(transform, output_type_desc, MF_E_TRANSFORM_TYPE_NOT_SET);
-    check_mft_get_output_current_type_(transform, NULL, TRUE);
+    check_mft_get_output_current_type_(__LINE__, transform, NULL, TRUE, FALSE);
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, TRUE, FALSE);
+    check_mft_get_input_current_type_(__LINE__, transform, expect_input_type_desc, TRUE, FALSE);
 
     check_mft_get_input_stream_info(transform, MF_E_TRANSFORM_TYPE_NOT_SET, NULL);
     check_mft_get_output_stream_info(transform, MF_E_TRANSFORM_TYPE_NOT_SET, NULL);
@@ -3217,7 +3226,7 @@ static void test_wma_decoder(void)
 
     check_mft_set_output_type_required(transform, output_type_desc);
     check_mft_set_output_type(transform, output_type_desc, S_OK);
-    check_mft_get_output_current_type_(transform, expect_output_type_desc, TRUE);
+    check_mft_get_output_current_type_(__LINE__, transform, expect_output_type_desc, TRUE, FALSE);
 
     check_mft_get_input_stream_info(transform, S_OK, &input_info);
     check_mft_get_output_stream_info(transform, S_OK, &output_info);
@@ -3828,6 +3837,7 @@ static void test_h264_encoder(void)
         ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001),
         ATTR_UINT32(MF_MT_AVG_BITRATE, 193540),
         ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header)),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive),
         {0},
     };
     static const MFT_OUTPUT_STREAM_INFO expect_output_info = {.cbSize = 0x8000};
@@ -4019,11 +4029,11 @@ static void test_h264_decoder(void)
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
         ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264),
         ATTR_RATIO(MF_MT_FRAME_SIZE, input_width, input_height),
-        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 0),
-        ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 0),
-        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 0),
-        ATTR_UINT32(MF_MT_AVG_BIT_ERROR_RATE, 0),
-        ATTR_UINT32(MF_MT_COMPRESSED, 1),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_AVG_BIT_ERROR_RATE, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_COMPRESSED, 1, .todo = TRUE),
         {0},
     };
     const struct attribute_desc expect_output_type_desc[] =
@@ -4262,7 +4272,7 @@ static void test_h264_decoder(void)
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, FALSE, TRUE);
+    check_mft_get_input_current_type_(__LINE__, transform, expect_input_type_desc, FALSE, TRUE);
 
     check_mft_get_input_stream_info(transform, S_OK, &input_info);
     check_mft_get_output_stream_info(transform, S_OK, &output_info);
@@ -4284,7 +4294,7 @@ static void test_h264_decoder(void)
 
     check_mft_set_output_type_required(transform, output_type_desc);
     check_mft_set_output_type(transform, output_type_desc, S_OK);
-    check_mft_get_output_current_type_(transform, expect_output_type_desc, FALSE);
+    check_mft_get_output_current_type_(__LINE__, transform, expect_output_type_desc, FALSE, TRUE);
 
     /* check that the output media type we've selected don't change the enumeration */
 
@@ -4382,7 +4392,7 @@ static void test_h264_decoder(void)
     ok(i == 5, "%lu output media types\n", i);
 
     /* current output type is still the one we selected */
-    check_mft_get_output_current_type_(transform, expect_output_type_desc, FALSE);
+    check_mft_get_output_current_type_(__LINE__, transform, expect_output_type_desc, FALSE, TRUE);
 
     hr = MFCreateCollection(&output_samples);
     ok(hr == S_OK, "MFCreateCollection returned %#lx\n", hr);
@@ -4412,7 +4422,7 @@ static void test_h264_decoder(void)
     ret = IMFMediaType_Release(media_type);
     ok(ret == 1, "Release returned %lu\n", ret);
 
-    check_mft_get_output_current_type_(transform, expect_new_output_type_desc, FALSE);
+    check_mft_get_output_current_type_(__LINE__, transform, expect_new_output_type_desc, FALSE, TRUE);
 
     output_sample = create_sample(NULL, actual_width * actual_height * 2);
     hr = check_mft_process_output(transform, output_sample, &output_status);
@@ -4810,8 +4820,8 @@ static void test_audio_convert(void)
         ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050),
         ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8),
         ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 22050 * 8),
-        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
-        ATTR_UINT32(MF_MT_AUDIO_CHANNEL_MASK, 3),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_AUDIO_CHANNEL_MASK, 3, .todo = TRUE),
         {0},
     };
     const struct attribute_desc expect_output_type_desc[] =
@@ -4939,7 +4949,7 @@ static void test_audio_convert(void)
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, FALSE, TRUE);
+    check_mft_get_input_current_type_(__LINE__, transform, expect_input_type_desc, FALSE, TRUE);
 
     check_mft_get_input_stream_info(transform, MF_E_TRANSFORM_TYPE_NOT_SET, NULL);
     check_mft_get_output_stream_info(transform, MF_E_TRANSFORM_TYPE_NOT_SET, NULL);
@@ -4961,7 +4971,7 @@ static void test_audio_convert(void)
 
     check_mft_set_output_type_required(transform, output_type_desc);
     check_mft_set_output_type(transform, output_type_desc, S_OK);
-    check_mft_get_output_current_type_(transform, expect_output_type_desc, FALSE);
+    check_mft_get_output_current_type_(__LINE__, transform, expect_output_type_desc, FALSE, TRUE);
 
     check_mft_get_input_stream_info(transform, S_OK, &input_info);
     check_mft_get_output_stream_info(transform, S_OK, &output_info);
@@ -5414,11 +5424,11 @@ static void test_wmv_encoder(void)
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, FALSE, TRUE);
+    check_mft_get_input_current_type_(__LINE__, transform, expect_input_type_desc, FALSE, TRUE);
 
     check_mft_set_output_type_required(transform, output_type_desc);
     check_mft_set_output_type(transform, output_type_desc, S_OK);
-    check_mft_get_output_current_type_(transform, expect_output_type_desc, FALSE);
+    check_mft_get_output_current_type_(__LINE__, transform, expect_output_type_desc, FALSE, FALSE);
 
     check_mft_get_input_stream_info(transform, S_OK, &expect_input_info);
     check_mft_get_output_stream_info(transform, S_OK, &expect_output_info);
@@ -5975,7 +5985,7 @@ static void test_wmv_decoder(void)
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, FALSE, TRUE);
+    check_mft_get_input_current_type_(__LINE__, transform, expect_input_type_desc, FALSE, TRUE);
 
     i = -1;
     while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, ++i, &media_type)))
@@ -5998,7 +6008,7 @@ static void test_wmv_decoder(void)
 
         check_mft_set_output_type_required(transform, transform_tests[j].output_type_desc);
         check_mft_set_output_type(transform, transform_tests[j].output_type_desc, S_OK);
-        check_mft_get_output_current_type_(transform, transform_tests[j].expect_output_type_desc, FALSE);
+        check_mft_get_output_current_type_(__LINE__, transform, transform_tests[j].expect_output_type_desc, FALSE, FALSE);
 
         check_mft_get_input_stream_info(transform, S_OK, transform_tests[j].expect_input_info);
         check_mft_get_output_stream_info(transform, S_OK, transform_tests[j].expect_output_info);
@@ -6914,10 +6924,10 @@ static void test_color_convert(void)
         ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16),
         ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height),
         ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width),
-        ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2),
-        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
-        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1),
-        ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1),
+        ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo = TRUE),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1, .todo = TRUE),
+        ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1, .todo = TRUE),
         {0},
     };
     const struct attribute_desc expect_output_type_desc[] =
@@ -7077,14 +7087,14 @@ static void test_color_convert(void)
 
     check_mft_set_input_type_required(transform, input_type_desc);
     check_mft_set_input_type(transform, input_type_desc);
-    check_mft_get_input_current_type_(transform, expect_input_type_desc, FALSE, TRUE);
+    check_mft_get_input_current_type_(__LINE__, transform, expect_input_type_desc, FALSE, TRUE);
 
     for (i = 0; i < ARRAY_SIZE(color_conversion_tests); i++)
     {
         winetest_push_context("color conversion #%lu", i);
         check_mft_set_output_type_required(transform, color_conversion_tests[i].output_type_desc);
         check_mft_set_output_type(transform, color_conversion_tests[i].output_type_desc, S_OK);
-        check_mft_get_output_current_type_(transform, color_conversion_tests[i].expect_output_type_desc, FALSE);
+        check_mft_get_output_current_type_(__LINE__, transform, color_conversion_tests[i].expect_output_type_desc, FALSE, TRUE);
 
         check_mft_get_input_stream_info(transform, S_OK, &input_info);
         check_mft_get_output_stream_info(transform, S_OK, &output_info);

From 8caa1334f70df5c61a4713d15b84aa77a82f49f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 29 Jan 2024 23:33:13 +0100
Subject: [PATCH 032/389] mf/tests: Add some tests with video processor
 aperture handling.

(cherry picked from commit 604bc7ccf93bd19247742c2116425109b4a36c5e)
---
 dlls/mf/tests/transform.c | 55 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 977e819cdf8..468239b0fd4 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -692,19 +692,21 @@ static void check_mft_set_input_type_required_(int line, IMFTransform *transform
     ok_(__FILE__, line)(!ref, "Release returned %lu\n", ref);
 }
 
-static void check_mft_set_input_type(IMFTransform *transform, const struct attribute_desc *attributes)
+#define check_mft_set_input_type(a, b) check_mft_set_input_type_(__LINE__, a, b, FALSE)
+static void check_mft_set_input_type_(int line, IMFTransform *transform, const struct attribute_desc *attributes, BOOL todo)
 {
     IMFMediaType *media_type;
     HRESULT hr;
 
     hr = MFCreateMediaType(&media_type);
-    ok(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == S_OK, "MFCreateMediaType returned hr %#lx.\n", hr);
     init_media_type(media_type, attributes, -1);
 
     hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY);
-    ok(hr == S_OK, "SetInputType returned %#lx.\n", hr);
+    ok_(__FILE__, line)(hr == S_OK, "SetInputType returned %#lx.\n", hr);
     hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
-    ok(hr == S_OK, "SetInputType returned %#lx.\n", hr);
+    todo_wine_if(todo)
+    ok_(__FILE__, line)(hr == S_OK, "SetInputType returned %#lx.\n", hr);
 
     IMFMediaType_Release(media_type);
 }
@@ -7349,6 +7351,28 @@ static void test_video_processor(void)
         ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2),
         {0},
     };
+    const struct attribute_desc nv12_no_aperture[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 82, 84),
+        {0},
+    };
+    const struct attribute_desc nv12_with_aperture[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height),
+        ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16),
+        {0},
+    };
+    const struct attribute_desc rgb32_no_aperture[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 82, 84),
+        {0},
+    };
     const MFT_OUTPUT_STREAM_INFO initial_output_info = {0};
     const MFT_INPUT_STREAM_INFO initial_input_info = {0};
     MFT_OUTPUT_STREAM_INFO output_info = {0};
@@ -7910,6 +7934,29 @@ static void test_video_processor(void)
     ret = IMFTransform_Release(transform);
     ok(ret == 0, "Release returned %ld\n", ret);
 
+
+    /* check that it is possible to change input media type frame size using geometric aperture */
+
+    hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IMFTransform, (void **)&transform);
+    ok(hr == S_OK, "got hr %#lx\n", hr);
+
+    check_mft_set_input_type(transform, nv12_no_aperture);
+    check_mft_get_input_current_type(transform, nv12_no_aperture);
+
+    check_mft_set_output_type(transform, rgb32_no_aperture, S_OK);
+    check_mft_get_output_current_type(transform, rgb32_no_aperture);
+
+    check_mft_set_input_type_(__LINE__, transform, nv12_with_aperture, TRUE);
+    check_mft_get_input_current_type_(__LINE__, transform, nv12_with_aperture, TRUE, FALSE);
+
+    /* output type is the same as before */
+    check_mft_get_output_current_type(transform, rgb32_no_aperture);
+
+    ret = IMFTransform_Release(transform);
+    ok(ret == 0, "Release returned %ld\n", ret);
+
+
 failed:
     winetest_pop_context();
     CoUninitialize();

From 80df4b598244cbaf3b89f20c3c8dc5f91487eec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 18:04:49 +0100
Subject: [PATCH 033/389] mfreadwrite/tests: Initialize test source stream
 types from descriptors.

(cherry picked from commit 5122f6ad9f2271844531410805bd7a918b9d95c9)
---
 dlls/mfreadwrite/tests/mfplat.c | 179 ++++++++++++++++++++++----------
 1 file changed, 126 insertions(+), 53 deletions(-)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index c3544a31ac6..a93b49a64a6 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -38,11 +38,47 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 #include "mfidl.h"
 #include "mferror.h"
 #include "mfreadwrite.h"
+#include "propvarutil.h"
 #include "d3d9.h"
 #include "dxva2api.h"
 
 #include "wine/test.h"
 
+struct attribute_desc
+{
+    const GUID *key;
+    const char *name;
+    PROPVARIANT value;
+    BOOL ratio;
+    BOOL required;
+    BOOL todo;
+    BOOL todo_value;
+};
+
+#define ATTR_GUID(k, g, ...)      {.key = &k, .name = #k, {.vt = VT_CLSID, .puuid = (GUID *)&g}, __VA_ARGS__ }
+#define ATTR_UINT32(k, v, ...)    {.key = &k, .name = #k, {.vt = VT_UI4, .ulVal = v}, __VA_ARGS__ }
+#define ATTR_BLOB(k, p, n, ...)   {.key = &k, .name = #k, {.vt = VT_VECTOR | VT_UI1, .caub = {.pElems = (void *)p, .cElems = n}}, __VA_ARGS__ }
+#define ATTR_RATIO(k, n, d, ...)  {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE, __VA_ARGS__ }
+#define ATTR_UINT64(k, v, ...)    {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.QuadPart = v}}, __VA_ARGS__ }
+
+#define init_media_type(a, b, c) init_attributes_(__FILE__, __LINE__, (IMFAttributes *)a, b, c)
+#define init_attributes(a, b, c) init_attributes_(__FILE__, __LINE__, a, b, c)
+static void init_attributes_(const char *file, int line, IMFAttributes *attributes,
+        const struct attribute_desc *desc, ULONG limit)
+{
+    HRESULT hr;
+    ULONG i;
+
+    hr = IMFAttributes_DeleteAllItems(attributes);
+    ok_(file, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    for (i = 0; i < limit && desc[i].key; ++i)
+    {
+        hr = IMFAttributes_SetItem(attributes, desc[i].key, &desc[i].value);
+        ok_(file, line)(hr == S_OK, "SetItem %s returned %#lx\n", debugstr_a(desc[i].name), hr);
+    }
+}
+
 static ULONG get_refcount(void *iface)
 {
     IUnknown *unknown = iface;
@@ -357,48 +393,10 @@ static HRESULT WINAPI test_source_GetCharacteristics(IMFMediaSource *iface, DWOR
 static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **pd)
 {
     struct test_source *source = impl_from_IMFMediaSource(iface);
-    IMFStreamDescriptor *sds[ARRAY_SIZE(source->streams)];
-    IMFMediaType *media_type;
     HRESULT hr = S_OK;
-    int i;
 
-    EnterCriticalSection(&source->cs);
-
-    if (source->pd)
-    {
-        *pd = source->pd;
-        IMFPresentationDescriptor_AddRef(*pd);
-    }
-    else
-    {
-        for (i = 0; i < source->stream_count; ++i)
-        {
-            hr = MFCreateMediaType(&media_type);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-            hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-            hr = MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-            IMFMediaType_Release(media_type);
-        }
-
-        hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        for (i = 0; i < source->stream_count; ++i)
-            IMFStreamDescriptor_Release(sds[i]);
-
-        *pd = source->pd;
-        IMFPresentationDescriptor_AddRef(*pd);
-    }
-
-    LeaveCriticalSection(&source->cs);
+    *pd = source->pd;
+    IMFPresentationDescriptor_AddRef(*pd);
 
     return hr;
 }
@@ -522,17 +520,22 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia
     return stream;
 }
 
-static IMFMediaSource *create_test_source(int stream_count)
+static IMFMediaSource *create_test_source(IMFStreamDescriptor **streams, UINT stream_count)
 {
     struct test_source *source;
+    HRESULT hr;
     int i;
 
     source = calloc(1, sizeof(*source));
     source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl;
     source->refcount = 1;
     source->stream_count = stream_count;
-    MFCreateEventQueue(&source->event_queue);
+    hr = MFCreatePresentationDescriptor(stream_count, streams, &source->pd);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = MFCreateEventQueue(&source->event_queue);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     InitializeCriticalSection(&source->cs);
+
     for (i = 0; i < source->stream_count; ++i)
         source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface);
 
@@ -1028,7 +1031,15 @@ static void test_source_reader(const char *filename, bool video)
 static void test_source_reader_from_media_source(void)
 {
     static const DWORD expected_sample_order[10] = {0, 0, 1, 1, 0, 0, 0, 0, 1, 0};
+    static const struct attribute_desc audio_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio),
+        ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM),
+        ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32),
+        {0},
+    };
 
+    IMFStreamDescriptor *audio_streams[3];
     struct async_callback *callback;
     IMFSourceReader *reader;
     IMFMediaSource *source;
@@ -1043,7 +1054,18 @@ static void test_source_reader_from_media_source(void)
     int i;
     PROPVARIANT pos;
 
-    source = create_test_source(3);
+    for (i = 0; i < ARRAY_SIZE(audio_streams); i++)
+    {
+        hr = MFCreateMediaType(&media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        init_media_type(media_type, audio_stream_type_desc, -1);
+
+        hr = MFCreateStreamDescriptor(i, 1, &media_type, &audio_streams[i]);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        IMFMediaType_Release(media_type);
+    }
+
+    source = create_test_source(audio_streams, 3);
     ok(!!source, "Failed to create test source.\n");
 
     hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
@@ -1122,7 +1144,7 @@ static void test_source_reader_from_media_source(void)
     IMFSourceReader_Release(reader);
     IMFMediaSource_Release(source);
 
-    source = create_test_source(1);
+    source = create_test_source(audio_streams, 1);
     ok(!!source, "Failed to create test source.\n");
 
     hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
@@ -1159,7 +1181,7 @@ static void test_source_reader_from_media_source(void)
     IMFMediaSource_Release(source);
 
     /* Request from stream 0. */
-    source = create_test_source(3);
+    source = create_test_source(audio_streams, 3);
     ok(!!source, "Failed to create test source.\n");
 
     hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
@@ -1193,7 +1215,7 @@ static void test_source_reader_from_media_source(void)
     IMFMediaSource_Release(source);
 
     /* Request a non-native bit depth. */
-    source = create_test_source(1);
+    source = create_test_source(audio_streams, 1);
     ok(!!source, "Failed to create test source.\n");
 
     hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
@@ -1241,7 +1263,7 @@ static void test_source_reader_from_media_source(void)
     IMFMediaSource_Release(source);
 
     /* Async mode. */
-    source = create_test_source(3);
+    source = create_test_source(audio_streams, 3);
     ok(!!source, "Failed to create test source.\n");
 
     callback = create_async_callback();
@@ -1286,7 +1308,7 @@ static void test_source_reader_from_media_source(void)
     IMFMediaSource_Release(source);
 
     /* RequestSample failure. */
-    source = create_test_source(3);
+    source = create_test_source(audio_streams, 3);
     ok(!!source, "Failed to create test source.\n");
 
     fail_request_sample = TRUE;
@@ -1329,7 +1351,7 @@ static void test_source_reader_from_media_source(void)
     fail_request_sample = FALSE;
 
     /* MF_SOURCE_READER_ANY_STREAM with streams of different sample sizes */
-    source = create_test_source(2);
+    source = create_test_source(audio_streams, 2);
     ok(!!source, "Failed to create test source.\n");
 
     test_source = impl_from_IMFMediaSource(source);
@@ -1359,19 +1381,32 @@ static void test_source_reader_from_media_source(void)
 
     IMFSourceReader_Release(reader);
     IMFMediaSource_Release(source);
+
+    for (i = 0; i < ARRAY_SIZE(audio_streams); i++)
+        IMFStreamDescriptor_Release(audio_streams[i]);
 }
 
 static void test_reader_d3d9(void)
 {
+    static const struct attribute_desc audio_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio),
+        ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM),
+        ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32),
+        {0},
+    };
+
+    IMFStreamDescriptor *audio_streams[3];
     IDirect3DDeviceManager9 *d3d9_manager;
     IDirect3DDevice9 *d3d9_device;
     IMFAttributes *attributes;
+    IMFMediaType *media_type;
     IMFSourceReader *reader;
     IMFMediaSource *source;
     IDirect3D9 *d3d9;
     HWND window;
     HRESULT hr;
-    UINT token;
+    UINT i, token;
     ULONG refcount;
 
     d3d9 = Direct3DCreate9(D3D_SDK_VERSION);
@@ -1387,13 +1422,24 @@ static void test_reader_d3d9(void)
         goto done;
     }
 
+    for (i = 0; i < ARRAY_SIZE(audio_streams); i++)
+    {
+        hr = MFCreateMediaType(&media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        init_media_type(media_type, audio_stream_type_desc, -1);
+
+        hr = MFCreateStreamDescriptor(i, 1, &media_type, &audio_streams[i]);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        IMFMediaType_Release(media_type);
+    }
+
     hr = DXVA2CreateDirect3DDeviceManager9(&token, &d3d9_manager);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
-    source = create_test_source(3);
+    source = create_test_source(audio_streams, 3);
     ok(!!source, "Failed to create test source.\n");
 
     hr = MFCreateAttributes(&attributes, 1);
@@ -1409,11 +1455,13 @@ static void test_reader_d3d9(void)
 
     IMFSourceReader_Release(reader);
 
+    for (i = 0; i < ARRAY_SIZE(audio_streams); i++)
+        IMFStreamDescriptor_Release(audio_streams[i]);
+
     refcount = IDirect3DDeviceManager9_Release(d3d9_manager);
     ok(!refcount, "Unexpected refcount %lu.\n", refcount);
 
     IDirect3DDevice9_Release(d3d9_device);
-
 done:
     IDirect3D9_Release(d3d9);
     DestroyWindow(window);
@@ -1511,12 +1559,34 @@ static void test_sink_writer_mp4(void)
 
 static void test_interfaces(void)
 {
+    static const struct attribute_desc audio_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio),
+        ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM),
+        ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32),
+        {0},
+    };
+
+    IMFStreamDescriptor *audio_streams[1];
+    IMFMediaType *media_type;
     IMFSourceReader *reader;
     IMFMediaSource *source;
     IUnknown *unk;
     HRESULT hr;
+    UINT i;
+
+    for (i = 0; i < ARRAY_SIZE(audio_streams); i++)
+    {
+        hr = MFCreateMediaType(&media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        init_media_type(media_type, audio_stream_type_desc, -1);
 
-    source = create_test_source(1);
+        hr = MFCreateStreamDescriptor(i, 1, &media_type, &audio_streams[i]);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        IMFMediaType_Release(media_type);
+    }
+
+    source = create_test_source(audio_streams, 1);
     ok(!!source, "Failed to create test source.\n");
 
     hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
@@ -1529,6 +1599,9 @@ static void test_interfaces(void)
 
     IMFSourceReader_Release(reader);
     IMFMediaSource_Release(source);
+
+    for (i = 0; i < ARRAY_SIZE(audio_streams); i++)
+        IMFStreamDescriptor_Release(audio_streams[i]);
 }
 
 START_TEST(mfplat)

From 36a0c4a08a8126bfeb37f0d90144d4d9a5b44a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 18:05:44 +0100
Subject: [PATCH 034/389] mfreadwrite/tests: Test source reader exposed
 transforms and types.

(cherry picked from commit f5daee4a2fb50760347cbeeed5fe39049841aef1)
---
 dlls/mfreadwrite/tests/Makefile.in |   2 +-
 dlls/mfreadwrite/tests/mfplat.c    | 385 +++++++++++++++++++++++++++++
 2 files changed, 386 insertions(+), 1 deletion(-)

diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in
index 90bac9e0896..cada1bf22ff 100644
--- a/dlls/mfreadwrite/tests/Makefile.in
+++ b/dlls/mfreadwrite/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = mfreadwrite.dll
-IMPORTS   = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid
+IMPORTS   = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid propsys
 
 SOURCES = \
 	mfplat.c \
diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index a93b49a64a6..04c077dd027 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -61,6 +61,53 @@ struct attribute_desc
 #define ATTR_RATIO(k, n, d, ...)  {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE, __VA_ARGS__ }
 #define ATTR_UINT64(k, v, ...)    {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.QuadPart = v}}, __VA_ARGS__ }
 
+#define check_media_type(a, b, c) check_attributes_(__FILE__, __LINE__, (IMFAttributes *)a, b, c)
+#define check_attributes(a, b, c) check_attributes_(__FILE__, __LINE__, a, b, c)
+void check_attributes_(const char *file, int line, IMFAttributes *attributes,
+        const struct attribute_desc *desc, ULONG limit)
+{
+    char buffer[1024], *buf = buffer;
+    PROPVARIANT value;
+    int i, j, ret;
+    HRESULT hr;
+
+    for (i = 0; i < limit && desc[i].key; ++i)
+    {
+        hr = IMFAttributes_GetItem(attributes, desc[i].key, &value);
+        todo_wine_if(desc[i].todo)
+        ok_(file, line)(hr == S_OK, "%s missing, hr %#lx\n", debugstr_a(desc[i].name), hr);
+        if (hr != S_OK) continue;
+
+        switch (value.vt)
+        {
+        default: sprintf(buffer, "??"); break;
+        case VT_CLSID: sprintf(buffer, "%s", debugstr_guid(value.puuid)); break;
+        case VT_UI4: sprintf(buffer, "%lu", value.ulVal); break;
+        case VT_UI8:
+            if (desc[i].ratio)
+                sprintf(buffer, "%lu:%lu", value.uhVal.HighPart, value.uhVal.LowPart);
+            else
+                sprintf(buffer, "%I64u", value.uhVal.QuadPart);
+            break;
+        case VT_VECTOR | VT_UI1:
+            buf += sprintf(buf, "size %lu, data {", value.caub.cElems);
+            for (j = 0; j < 128 && j < value.caub.cElems; ++j)
+                buf += sprintf(buf, "0x%02x,", value.caub.pElems[j]);
+            if (value.caub.cElems > 128)
+                buf += sprintf(buf, "...}");
+            else
+                buf += sprintf(buf - (j ? 1 : 0), "}");
+            break;
+        }
+
+        ret = PropVariantCompareEx(&value, &desc[i].value, 0, 0);
+        todo_wine_if(desc[i].todo_value)
+        ok_(file, line)(ret == 0, "%s mismatch, type %u, value %s\n",
+                debugstr_a(desc[i].name), value.vt, buffer);
+        PropVariantClear(&value);
+    }
+}
+
 #define init_media_type(a, b, c) init_attributes_(__FILE__, __LINE__, (IMFAttributes *)a, b, c)
 #define init_attributes(a, b, c) init_attributes_(__FILE__, __LINE__, a, b, c)
 static void init_attributes_(const char *file, int line, IMFAttributes *attributes,
@@ -1604,6 +1651,343 @@ static void test_interfaces(void)
         IMFStreamDescriptor_Release(audio_streams[i]);
 }
 
+static void test_source_reader_transforms(void)
+{
+    static const struct attribute_desc h264_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        {0},
+    };
+    static const struct attribute_desc nv12_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        {0},
+    };
+    static const struct attribute_desc nv12_expect_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001),
+        ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
+        ATTR_UINT32(MF_MT_AVG_BIT_ERROR_RATE, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 96),
+        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 7),
+        ATTR_UINT32(MF_MT_SAMPLE_SIZE, 13824),
+        ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0),
+        {0},
+    };
+    static const struct attribute_desc yuy2_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        {0},
+    };
+    static const struct attribute_desc yuy2_expect_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001),
+        ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
+        ATTR_UINT32(MF_MT_AVG_BIT_ERROR_RATE, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 192),
+        ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 7),
+        ATTR_UINT32(MF_MT_SAMPLE_SIZE, 18432),
+        ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0),
+        {0},
+    };
+    static const struct attribute_desc rgb32_stream_type_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        {0},
+    };
+    IMFStreamDescriptor *video_stream;
+    IMFSourceReaderEx *reader_ex;
+    IMFMediaType *media_type;
+    IMFSourceReader *reader;
+    IMFTransform *transform;
+    IMFMediaSource *source;
+    GUID category;
+    HRESULT hr;
+
+    /* test source reader with a RGB32 source */
+
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, rgb32_stream_type_desc, -1);
+    hr = MFCreateStreamDescriptor(0, 1, &media_type, &video_stream);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    source = create_test_source(&video_stream, 1);
+    ok(!!source, "Failed to create test source.\n");
+
+    hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    /* skip tests on Win7 which misses IMFSourceReaderEx and has uninteresting media types differences */
+    hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
+    ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr);
+    if (broken(hr == E_NOINTERFACE))
+    {
+        win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n");
+        goto skip_tests;
+    }
+    IMFSourceReaderEx_Release(reader_ex);
+
+    hr = IMFSourceReader_GetNativeMediaType(reader, 0, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, rgb32_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, rgb32_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    /* only one stream type and only one stream */
+    hr = IMFSourceReader_GetNativeMediaType(reader, 0, 1, &media_type);
+    ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReader_GetNativeMediaType(reader, 1, 0, &media_type);
+    ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 1, &media_type);
+    ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr);
+
+    /* cannot request encoding to compressed media type */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, h264_stream_type_desc, -1);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    /* SetCurrentMediaType needs major type and subtype */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, nv12_stream_type_desc, 1);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
+
+    /* RGB32 -> NV12 conversion */
+    init_media_type(media_type, nv12_stream_type_desc, -1);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, rgb32_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
+    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+
+    IMFSourceReader_Release(reader);
+    IMFMediaSource_Release(source);
+    IMFStreamDescriptor_Release(video_stream);
+
+
+    /* test source reader with a NV12 source */
+
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, nv12_stream_type_desc, -1);
+    hr = MFCreateStreamDescriptor(0, 1, &media_type, &video_stream);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    source = create_test_source(&video_stream, 1);
+    ok(!!source, "Failed to create test source.\n");
+
+    hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFSourceReader_GetNativeMediaType(reader, 0, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, nv12_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, nv12_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    /* NV12 -> RGB32 conversion */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, rgb32_stream_type_desc, -1);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
+    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+
+    /* NV12 -> YUY2 conversion */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, yuy2_stream_type_desc, -1);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, nv12_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
+    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+
+    IMFSourceReader_Release(reader);
+    IMFMediaSource_Release(source);
+    IMFStreamDescriptor_Release(video_stream);
+
+
+    /* test source reader with a H264 source */
+
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, h264_stream_type_desc, -1);
+    hr = MFCreateStreamDescriptor(0, 1, &media_type, &video_stream);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    source = create_test_source(&video_stream, 1);
+    ok(!!source, "Failed to create test source.\n");
+
+    hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFSourceReader_GetNativeMediaType(reader, 0, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, h264_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, h264_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    /* when H264 output is used, there's no decoder transform */
+    hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
+    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+
+    /* H264 -> RGB32 conversion */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, rgb32_stream_type_desc, -1);
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    /* H264 -> NV12 conversion */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, nv12_stream_type_desc, 2); /* doesn't need the frame size */
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, nv12_expect_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    /* the H264 decoder transform can now be accessed */
+    hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, h264_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, nv12_stream_type_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    IMFTransform_Release(transform);
+
+    /* YUY2 output works too */
+    hr = MFCreateMediaType(&media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(media_type, yuy2_stream_type_desc, 2); /* doesn't need the frame size */
+    hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    check_media_type(media_type, yuy2_expect_desc, -1);
+    IMFMediaType_Release(media_type);
+
+    /* decoder transform is also available through the IMFSourceReaderEx interface */
+    hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform);
+    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, h264_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, yuy2_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        /* changing the transform media type doesn't change the reader output type */
+        hr = MFCreateMediaType(&media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        init_media_type(media_type, nv12_stream_type_desc, -1);
+        hr = IMFTransform_SetOutputType(transform, 0, media_type, 0);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, yuy2_expect_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
+
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform);
+    todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    IMFSourceReaderEx_Release(reader_ex);
+
+skip_tests:
+    IMFSourceReader_Release(reader);
+    IMFMediaSource_Release(source);
+    IMFStreamDescriptor_Release(video_stream);
+}
+
 START_TEST(mfplat)
 {
     HRESULT hr;
@@ -1618,6 +2002,7 @@ START_TEST(mfplat)
     test_source_reader("test.wav", false);
     test_source_reader("test.mp4", true);
     test_source_reader_from_media_source();
+    test_source_reader_transforms();
     test_reader_d3d9();
     test_sink_writer_create();
     test_sink_writer_mp4();

From 98eb371ee06ff06e29ab8a2660f11cff5efe7caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 20:24:28 +0100
Subject: [PATCH 035/389] mfreadwrite/tests: Test source reader transforms with
 MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING.

(cherry picked from commit b37a16c7f39c7054238570d714c56d31af6c5f7d)
---
 dlls/mfreadwrite/tests/mfplat.c | 134 ++++++++++++++++++++++++++++----
 1 file changed, 121 insertions(+), 13 deletions(-)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 04c077dd027..aa333b67065 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -1651,7 +1651,7 @@ static void test_interfaces(void)
         IMFStreamDescriptor_Release(audio_streams[i]);
 }
 
-static void test_source_reader_transforms(void)
+static void test_source_reader_transforms(BOOL enable_processing)
 {
     static const struct attribute_desc h264_stream_type_desc[] =
     {
@@ -1715,8 +1715,20 @@ static void test_source_reader_transforms(void)
         ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
         {0},
     };
+    static const struct attribute_desc rgb32_expect_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .todo_value = TRUE),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 384, .todo = TRUE),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE),
+        ATTR_UINT32(MF_MT_SAMPLE_SIZE, 36864, .todo = TRUE),
+        {0},
+    };
     IMFStreamDescriptor *video_stream;
     IMFSourceReaderEx *reader_ex;
+    IMFAttributes *attributes;
     IMFMediaType *media_type;
     IMFSourceReader *reader;
     IMFTransform *transform;
@@ -1724,6 +1736,13 @@ static void test_source_reader_transforms(void)
     GUID category;
     HRESULT hr;
 
+    winetest_push_context("vp %u", enable_processing);
+
+    hr = MFCreateAttributes(&attributes, 1);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFAttributes_SetUINT32(attributes, &MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, enable_processing);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
     /* test source reader with a RGB32 source */
 
     hr = MFCreateMediaType(&media_type);
@@ -1736,7 +1755,7 @@ static void test_source_reader_transforms(void)
     source = create_test_source(&video_stream, 1);
     ok(!!source, "Failed to create test source.\n");
 
-    hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+    hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1817,7 +1836,7 @@ static void test_source_reader_transforms(void)
     source = create_test_source(&video_stream, 1);
     ok(!!source, "Failed to create test source.\n");
 
-    hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+    hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1832,12 +1851,23 @@ static void test_source_reader_transforms(void)
     check_media_type(media_type, nv12_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
-    /* NV12 -> RGB32 conversion */
+    /* NV12 -> RGB32 conversion with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING */
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    init_media_type(media_type, rgb32_stream_type_desc, -1);
+    init_media_type(media_type, rgb32_stream_type_desc, 2); /* doesn't need the frame size */
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    if (enable_processing)
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    else
+        ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (enable_processing)
+        check_media_type(media_type, rgb32_expect_desc, -1);
+    else
+        check_media_type(media_type, nv12_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
@@ -1853,12 +1883,25 @@ static void test_source_reader_transforms(void)
 
     hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    check_media_type(media_type, nv12_stream_type_desc, -1);
+    if (enable_processing)
+        check_media_type(media_type, rgb32_expect_desc, -1);
+    else
+        check_media_type(media_type, nv12_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
+    /* even though we are now converting to RGB32 the converter transform is not exposed */
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
     ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
 
+    /* not even through the IMFSourceReaderEx interface */
+    hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform);
+    todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform);
+    todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    IMFSourceReaderEx_Release(reader_ex);
+
     IMFSourceReader_Release(reader);
     IMFMediaSource_Release(source);
     IMFStreamDescriptor_Release(video_stream);
@@ -1876,7 +1919,7 @@ static void test_source_reader_transforms(void)
     source = create_test_source(&video_stream, 1);
     ok(!!source, "Failed to create test source.\n");
 
-    hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader);
+    hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1895,14 +1938,74 @@ static void test_source_reader_transforms(void)
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
     ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
 
-    /* H264 -> RGB32 conversion */
+    /* H264 -> RGB32 conversion with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING  */
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    init_media_type(media_type, rgb32_stream_type_desc, -1);
+    init_media_type(media_type, rgb32_stream_type_desc, 2); /* doesn't need the frame size */
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr);
+    if (enable_processing)
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr);
+    IMFMediaType_Release(media_type);
+
+    hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (enable_processing)
+        check_media_type(media_type, rgb32_expect_desc, -1);
+    else
+        check_media_type(media_type, h264_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
+    /* H264 decoder transform is exposed with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING */
+    hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
+    if (!enable_processing)
+        ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, h264_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        /* with NV12 output */
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
+
+    /* H264 decoder transform is also available through the IMFSourceReaderEx interface */
+    hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform);
+    if (!enable_processing)
+        todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, h264_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
+
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform);
+    todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    IMFSourceReaderEx_Release(reader_ex);
+
     /* H264 -> NV12 conversion */
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1945,7 +2048,7 @@ static void test_source_reader_transforms(void)
     check_media_type(media_type, yuy2_expect_desc, -1);
     IMFMediaType_Release(media_type);
 
-    /* decoder transform is also available through the IMFSourceReaderEx interface */
+    /* H264 decoder transform is also available through the IMFSourceReaderEx interface */
     hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform);
@@ -1986,6 +2089,10 @@ static void test_source_reader_transforms(void)
     IMFSourceReader_Release(reader);
     IMFMediaSource_Release(source);
     IMFStreamDescriptor_Release(video_stream);
+
+    IMFAttributes_Release(attributes);
+
+    winetest_pop_context();
 }
 
 START_TEST(mfplat)
@@ -2002,7 +2109,8 @@ START_TEST(mfplat)
     test_source_reader("test.wav", false);
     test_source_reader("test.mp4", true);
     test_source_reader_from_media_source();
-    test_source_reader_transforms();
+    test_source_reader_transforms(FALSE);
+    test_source_reader_transforms(TRUE);
     test_reader_d3d9();
     test_sink_writer_create();
     test_sink_writer_mp4();

From 1e0e93267c61622d71386cdf17aaaa2bae1ce213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 1 Feb 2024 09:37:30 +0100
Subject: [PATCH 036/389] mfreadwrite/tests: Test source reader transforms with
 MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING.

(cherry picked from commit 3c644480377a4aac6bcc0b23b79f726366346c7a)
---
 dlls/mfreadwrite/tests/mfplat.c | 202 +++++++++++++++++++++++++++-----
 1 file changed, 173 insertions(+), 29 deletions(-)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index aa333b67065..08e19589ad1 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -1651,7 +1651,7 @@ static void test_interfaces(void)
         IMFStreamDescriptor_Release(audio_streams[i]);
 }
 
-static void test_source_reader_transforms(BOOL enable_processing)
+static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_advanced)
 {
     static const struct attribute_desc h264_stream_type_desc[] =
     {
@@ -1684,6 +1684,16 @@ static void test_source_reader_transforms(BOOL enable_processing)
         ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0),
         {0},
     };
+    static const struct attribute_desc nv12_expect_advanced_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .todo_value = TRUE),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE),
+        {0},
+    };
     static const struct attribute_desc yuy2_stream_type_desc[] =
     {
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
@@ -1708,6 +1718,16 @@ static void test_source_reader_transforms(BOOL enable_processing)
         ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0),
         {0},
     };
+    static const struct attribute_desc yuy2_expect_advanced_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2, .todo_value = TRUE),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE),
+        {0},
+    };
     static const struct attribute_desc rgb32_stream_type_desc[] =
     {
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
@@ -1726,6 +1746,15 @@ static void test_source_reader_transforms(BOOL enable_processing)
         ATTR_UINT32(MF_MT_SAMPLE_SIZE, 36864, .todo = TRUE),
         {0},
     };
+    static const struct attribute_desc rgb32_expect_advanced_desc[] =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .todo_value = TRUE),
+        ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE),
+        ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE),
+    };
     IMFStreamDescriptor *video_stream;
     IMFSourceReaderEx *reader_ex;
     IMFAttributes *attributes;
@@ -1736,12 +1765,14 @@ static void test_source_reader_transforms(BOOL enable_processing)
     GUID category;
     HRESULT hr;
 
-    winetest_push_context("vp %u", enable_processing);
+    winetest_push_context("vp %u adv %u", enable_processing, enable_advanced);
 
     hr = MFCreateAttributes(&attributes, 1);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFAttributes_SetUINT32(attributes, &MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, enable_processing);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFAttributes_SetUINT32(attributes, &MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING, enable_advanced);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     /* test source reader with a RGB32 source */
 
@@ -1805,19 +1836,43 @@ static void test_source_reader_transforms(BOOL enable_processing)
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
     todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
-    /* RGB32 -> NV12 conversion */
-    init_media_type(media_type, nv12_stream_type_desc, -1);
+    /* RGB32 -> NV12 conversion with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */
+    init_media_type(media_type, nv12_stream_type_desc, 2); /* doesn't need the frame size */
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    if (enable_advanced)
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    else
+        ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
     IMFMediaType_Release(media_type);
 
     hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    check_media_type(media_type, rgb32_stream_type_desc, -1);
+    if (enable_advanced)
+        check_media_type(media_type, nv12_expect_advanced_desc, -1);
+    else
+        check_media_type(media_type, rgb32_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
+    /* video processor is accessible with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
-    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    if (!enable_advanced)
+        ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, rgb32_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
 
     IMFSourceReader_Release(reader);
     IMFMediaSource_Release(source);
@@ -1851,12 +1906,12 @@ static void test_source_reader_transforms(BOOL enable_processing)
     check_media_type(media_type, nv12_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
-    /* NV12 -> RGB32 conversion with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING */
+    /* NV12 -> RGB32 conversion with MF_SOURCE_READER_ENABLE_(ADVANCED_)VIDEO_PROCESSING */
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     init_media_type(media_type, rgb32_stream_type_desc, 2); /* doesn't need the frame size */
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    if (enable_processing)
+    if (enable_processing || enable_advanced)
         todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     else
         ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
@@ -1864,40 +1919,99 @@ static void test_source_reader_transforms(BOOL enable_processing)
 
     hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (enable_processing)
+    if (enable_advanced)
+        check_media_type(media_type, rgb32_expect_advanced_desc, -1);
+    else if (enable_processing)
         check_media_type(media_type, rgb32_expect_desc, -1);
     else
         check_media_type(media_type, nv12_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
+    /* convert transform is only exposed with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
-    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    if (!enable_advanced)
+        ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, rgb32_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
 
-    /* NV12 -> YUY2 conversion */
+        IMFTransform_Release(transform);
+    }
+
+    /* NV12 -> YUY2 conversion with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    init_media_type(media_type, yuy2_stream_type_desc, -1);
+    init_media_type(media_type, yuy2_stream_type_desc, 2); /* doesn't need the frame size */
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
+    if (enable_advanced)
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    else
+        ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr);
     IMFMediaType_Release(media_type);
 
     hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (enable_processing)
+    if (enable_advanced)
+        check_media_type(media_type, yuy2_expect_advanced_desc, -1);
+    else if (enable_processing)
         check_media_type(media_type, rgb32_expect_desc, -1);
     else
         check_media_type(media_type, nv12_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
-    /* even though we are now converting to RGB32 the converter transform is not exposed */
+    /* convert transform is only exposed with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
-    ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    if (!enable_advanced)
+        ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, yuy2_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
 
-    /* not even through the IMFSourceReaderEx interface */
     hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform);
-    todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    if (!enable_advanced)
+        todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, yuy2_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
+
     hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform);
     todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
     IMFSourceReaderEx_Release(reader_ex);
@@ -1938,12 +2052,12 @@ static void test_source_reader_transforms(BOOL enable_processing)
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
     ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
 
-    /* H264 -> RGB32 conversion with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING  */
+    /* H264 -> RGB32 conversion with MF_SOURCE_READER_ENABLE_(ADVANCED_)VIDEO_PROCESSING  */
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     init_media_type(media_type, rgb32_stream_type_desc, 2); /* doesn't need the frame size */
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    if (enable_processing)
+    if (enable_processing || enable_advanced)
         todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     else
         todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr);
@@ -1951,15 +2065,17 @@ static void test_source_reader_transforms(BOOL enable_processing)
 
     hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (enable_processing)
+    if (enable_advanced)
+        check_media_type(media_type, rgb32_expect_advanced_desc, -1);
+    else if (enable_processing)
         check_media_type(media_type, rgb32_expect_desc, -1);
     else
         check_media_type(media_type, h264_stream_type_desc, -1);
     IMFMediaType_Release(media_type);
 
-    /* H264 decoder transform is exposed with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING */
+    /* the exposed transform is the H264 decoder or the converter with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */
     hr = IMFSourceReader_GetServiceForStream(reader, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform);
-    if (!enable_processing)
+    if (!enable_processing && !enable_advanced)
         ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
     else
         todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1967,13 +2083,19 @@ static void test_source_reader_transforms(BOOL enable_processing)
     {
         hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        check_media_type(media_type, h264_stream_type_desc, -1);
+        if (enable_advanced)
+            check_media_type(media_type, nv12_stream_type_desc, -1);
+        else
+            check_media_type(media_type, h264_stream_type_desc, -1);
         IMFMediaType_Release(media_type);
 
         /* with NV12 output */
         hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        check_media_type(media_type, nv12_stream_type_desc, -1);
+        if (enable_advanced)
+            check_media_type(media_type, rgb32_stream_type_desc, -1);
+        else
+            check_media_type(media_type, nv12_stream_type_desc, -1);
         IMFMediaType_Release(media_type);
 
         IMFTransform_Release(transform);
@@ -1983,7 +2105,7 @@ static void test_source_reader_transforms(BOOL enable_processing)
     hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform);
-    if (!enable_processing)
+    if (!enable_processing && !enable_advanced)
         todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
     else
         todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -2002,7 +2124,28 @@ static void test_source_reader_transforms(BOOL enable_processing)
         IMFTransform_Release(transform);
     }
 
+    /* the video processor can be accessed at index 1 with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING  */
     hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform);
+    if (!enable_advanced)
+        todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
+    else
+        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, nv12_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        check_media_type(media_type, rgb32_stream_type_desc, -1);
+        IMFMediaType_Release(media_type);
+
+        IMFTransform_Release(transform);
+    }
+
+    hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 2, &category, &transform);
     todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr);
     IMFSourceReaderEx_Release(reader_ex);
 
@@ -2109,8 +2252,9 @@ START_TEST(mfplat)
     test_source_reader("test.wav", false);
     test_source_reader("test.mp4", true);
     test_source_reader_from_media_source();
-    test_source_reader_transforms(FALSE);
-    test_source_reader_transforms(TRUE);
+    test_source_reader_transforms(FALSE, FALSE);
+    test_source_reader_transforms(TRUE, FALSE);
+    test_source_reader_transforms(FALSE, TRUE);
     test_reader_d3d9();
     test_sink_writer_create();
     test_sink_writer_mp4();

From 9506607e23a7133e204648d43aa79a36be999d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 22 Nov 2023 22:22:22 +0100
Subject: [PATCH 037/389] HACK: winegstreamer/new_media_source: Clone the media
 source to new_media_source.c.

For an experimental, non-decoding, source rewrite, guarded with
WINE_NEW_MEDIA_SOURCE env var.

CW-Bug-Id: #21953
---
 dlls/mfplat/main.c                           |    5 +
 dlls/winegstreamer/Makefile.in               |    1 +
 dlls/winegstreamer/gst_private.h             |    1 +
 dlls/winegstreamer/mfplat.c                  |    2 +
 dlls/winegstreamer/new_media_source.c        | 2053 ++++++++++++++++++
 dlls/winegstreamer/winegstreamer_classes.idl |    6 +
 6 files changed, 2068 insertions(+)
 create mode 100644 dlls/winegstreamer/new_media_source.c

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 4805812e4d1..e545fd5b999 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -6296,6 +6296,11 @@ static HRESULT resolver_get_bytestream_url_hint(IMFByteStream *stream, WCHAR con
 static HRESULT resolver_create_gstreamer_handler(IMFByteStreamHandler **handler)
 {
     static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
+    static const GUID CLSID_GStreamerByteStreamHandler2 = {0x317df619, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
+
+    const char *env = getenv("WINE_NEW_MEDIA_SOURCE");
+    if (env && atoi(env)) return CoCreateInstance(&CLSID_GStreamerByteStreamHandler2, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler);
+
     return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler);
 }
 
diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 02b1b04fdf9..af64d13b7b7 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -14,6 +14,7 @@ SOURCES = \
 	media_sink.c \
 	media_source.c \
 	mfplat.c \
+	new_media_source.c \
 	quartz_parser.c \
 	quartz_transform.c \
 	resampler.c \
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 8bc50d6cd99..e258a5ce532 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -166,6 +166,7 @@ HRESULT wg_transform_read_quartz(wg_transform_t transform, struct wg_sample *sam
 HRESULT wg_transform_read_dmo(wg_transform_t transform, DMO_OUTPUT_DATA_BUFFER *buffer);
 
 HRESULT gstreamer_byte_stream_handler_create(REFIID riid, void **obj);
+HRESULT gstreamer_byte_stream_handler_2_create(REFIID riid, void **obj);
 
 unsigned int wg_format_get_stride(const struct wg_format *format);
 
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 4372678fe0e..2537c6bf455 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -122,6 +122,7 @@ static const IClassFactoryVtbl class_factory_vtbl =
 };
 
 static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
+static const GUID CLSID_GStreamerByteStreamHandler2 = {0x317df619, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
 
 static const GUID CLSID_GStreamerSchemePlugin = {0x587eeb6a,0x7336,0x4ebd,{0xa4,0xf2,0x91,0xc9,0x48,0xde,0x62,0x2c}};
 
@@ -134,6 +135,7 @@ class_objects[] =
 {
     { &CLSID_VideoProcessorMFT, &video_processor_create },
     { &CLSID_GStreamerByteStreamHandler, &gstreamer_byte_stream_handler_create },
+    { &CLSID_GStreamerByteStreamHandler2, &gstreamer_byte_stream_handler_2_create },
     { &CLSID_MSAACDecMFT, &aac_decoder_create },
     { &CLSID_MSH264DecoderMFT, &h264_decoder_create },
     { &CLSID_GStreamerSchemePlugin, &gstreamer_scheme_handler_create },
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
new file mode 100644
index 00000000000..2250a5faab8
--- /dev/null
+++ b/dlls/winegstreamer/new_media_source.c
@@ -0,0 +1,2053 @@
+/* GStreamer Media Source
+ *
+ * Copyright 2020 Derek Lesho
+ * Copyright 2020 Zebediah Figura for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "gst_private.h"
+
+#include "mfapi.h"
+#include "mferror.h"
+
+#include "wine/list.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
+
+struct object_context
+{
+    IUnknown IUnknown_iface;
+    LONG refcount;
+
+    IMFAsyncResult *result;
+    IMFByteStream *stream;
+    UINT64 file_size;
+    WCHAR *url;
+};
+
+static struct object_context *impl_from_IUnknown(IUnknown *iface)
+{
+    return CONTAINING_RECORD(iface, struct object_context, IUnknown_iface);
+}
+
+static HRESULT WINAPI object_context_QueryInterface(IUnknown *iface, REFIID riid, void **obj)
+{
+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
+
+    if (IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IUnknown_AddRef(iface);
+        return S_OK;
+    }
+
+    WARN("Unsupported %s.\n", debugstr_guid(riid));
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI object_context_AddRef(IUnknown *iface)
+{
+    struct object_context *context = impl_from_IUnknown(iface);
+    ULONG refcount = InterlockedIncrement(&context->refcount);
+
+    TRACE("%p, refcount %lu.\n", iface, refcount);
+
+    return refcount;
+}
+
+static ULONG WINAPI object_context_Release(IUnknown *iface)
+{
+    struct object_context *context = impl_from_IUnknown(iface);
+    ULONG refcount = InterlockedDecrement(&context->refcount);
+
+    TRACE("%p, refcount %lu.\n", iface, refcount);
+
+    if (!refcount)
+    {
+        IMFAsyncResult_Release(context->result);
+        IMFByteStream_Release(context->stream);
+        free(context->url);
+        free(context);
+    }
+
+    return refcount;
+}
+
+static const IUnknownVtbl object_context_vtbl =
+{
+    object_context_QueryInterface,
+    object_context_AddRef,
+    object_context_Release,
+};
+
+static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const WCHAR *url,
+        QWORD file_size, IMFAsyncResult *result, IUnknown **out)
+{
+    WCHAR *tmp_url = url ? wcsdup(url) : NULL;
+    struct object_context *context;
+
+    if (!(context = calloc(1, sizeof(*context))))
+    {
+        free(tmp_url);
+        return E_OUTOFMEMORY;
+    }
+
+    context->IUnknown_iface.lpVtbl = &object_context_vtbl;
+    context->refcount = 1;
+    context->stream = stream;
+    IMFByteStream_AddRef(context->stream);
+    context->file_size = file_size;
+    context->url = tmp_url;
+    context->result = result;
+    IMFAsyncResult_AddRef(context->result);
+
+    *out = &context->IUnknown_iface;
+    return S_OK;
+}
+
+struct media_stream
+{
+    IMFMediaStream IMFMediaStream_iface;
+    LONG ref;
+
+    IMFMediaSource *media_source;
+    IMFMediaEventQueue *event_queue;
+    IMFStreamDescriptor *descriptor;
+
+    wg_parser_stream_t wg_stream;
+
+    IUnknown **token_queue;
+    LONG token_queue_count;
+    LONG token_queue_cap;
+
+    DWORD stream_id;
+    BOOL active;
+    BOOL eos;
+};
+
+enum source_async_op
+{
+    SOURCE_ASYNC_START,
+    SOURCE_ASYNC_PAUSE,
+    SOURCE_ASYNC_STOP,
+    SOURCE_ASYNC_REQUEST_SAMPLE,
+};
+
+struct source_async_command
+{
+    IUnknown IUnknown_iface;
+    LONG refcount;
+    enum source_async_op op;
+    union
+    {
+        struct
+        {
+            IMFPresentationDescriptor *descriptor;
+            GUID format;
+            PROPVARIANT position;
+        } start;
+        struct
+        {
+            struct media_stream *stream;
+            IUnknown *token;
+        } request_sample;
+    } u;
+};
+
+struct media_source
+{
+    IMFMediaSource IMFMediaSource_iface;
+    IMFGetService IMFGetService_iface;
+    IMFRateSupport IMFRateSupport_iface;
+    IMFRateControl IMFRateControl_iface;
+    IMFAsyncCallback async_commands_callback;
+    LONG ref;
+    DWORD async_commands_queue;
+    IMFMediaEventQueue *event_queue;
+    IMFByteStream *byte_stream;
+
+    CRITICAL_SECTION cs;
+
+    UINT64 file_size;
+    wg_parser_t wg_parser;
+    UINT64 duration;
+
+    IMFStreamDescriptor **descriptors;
+    struct media_stream **streams;
+    ULONG stream_count;
+
+    enum
+    {
+        SOURCE_OPENING,
+        SOURCE_STOPPED,
+        SOURCE_PAUSED,
+        SOURCE_RUNNING,
+        SOURCE_SHUTDOWN,
+    } state;
+    float rate;
+
+    HANDLE read_thread;
+    bool read_thread_shutdown;
+};
+
+static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_stream, IMFMediaStream_iface);
+}
+
+static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface);
+}
+
+static inline struct media_source *impl_from_IMFGetService(IMFGetService *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, IMFGetService_iface);
+}
+
+static inline struct media_source *impl_from_IMFRateSupport(IMFRateSupport *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, IMFRateSupport_iface);
+}
+
+static inline struct media_source *impl_from_IMFRateControl(IMFRateControl *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, IMFRateControl_iface);
+}
+
+static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, async_commands_callback);
+}
+
+static inline struct source_async_command *impl_from_async_command_IUnknown(IUnknown *iface)
+{
+    return CONTAINING_RECORD(iface, struct source_async_command, IUnknown_iface);
+}
+
+static HRESULT WINAPI source_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj)
+{
+    if (IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IUnknown_AddRef(iface);
+        return S_OK;
+    }
+
+    WARN("Unsupported interface %s.\n", debugstr_guid(riid));
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI source_async_command_AddRef(IUnknown *iface)
+{
+    struct source_async_command *command = impl_from_async_command_IUnknown(iface);
+    return InterlockedIncrement(&command->refcount);
+}
+
+static ULONG WINAPI source_async_command_Release(IUnknown *iface)
+{
+    struct source_async_command *command = impl_from_async_command_IUnknown(iface);
+    ULONG refcount = InterlockedDecrement(&command->refcount);
+
+    if (!refcount)
+    {
+        if (command->op == SOURCE_ASYNC_START)
+        {
+            IMFPresentationDescriptor_Release(command->u.start.descriptor);
+            PropVariantClear(&command->u.start.position);
+        }
+        else if (command->op == SOURCE_ASYNC_REQUEST_SAMPLE)
+        {
+            if (command->u.request_sample.token)
+                IUnknown_Release(command->u.request_sample.token);
+        }
+        free(command);
+    }
+
+    return refcount;
+}
+
+static const IUnknownVtbl source_async_command_vtbl =
+{
+    source_async_command_QueryInterface,
+    source_async_command_AddRef,
+    source_async_command_Release,
+};
+
+static HRESULT source_create_async_op(enum source_async_op op, IUnknown **out)
+{
+    struct source_async_command *command;
+
+    if (!(command = calloc(1, sizeof(*command))))
+        return E_OUTOFMEMORY;
+
+    command->IUnknown_iface.lpVtbl = &source_async_command_vtbl;
+    command->refcount = 1;
+    command->op = op;
+
+    *out = &command->IUnknown_iface;
+    return S_OK;
+}
+
+static HRESULT WINAPI callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj)
+{
+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
+
+    if (IsEqualIID(riid, &IID_IMFAsyncCallback) ||
+            IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IMFAsyncCallback_AddRef(iface);
+        return S_OK;
+    }
+
+    WARN("Unsupported %s.\n", debugstr_guid(riid));
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI callback_GetParameters(IMFAsyncCallback *iface,
+        DWORD *flags, DWORD *queue)
+{
+    return E_NOTIMPL;
+}
+
+static ULONG WINAPI source_async_commands_callback_AddRef(IMFAsyncCallback *iface)
+{
+    struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface);
+    return IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+}
+
+static ULONG WINAPI source_async_commands_callback_Release(IMFAsyncCallback *iface)
+{
+    struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface);
+    return IMFMediaSource_Release(&source->IMFMediaSource_iface);
+}
+
+static HRESULT stream_descriptor_get_media_type(IMFStreamDescriptor *descriptor, IMFMediaType **media_type)
+{
+    IMFMediaTypeHandler *handler;
+    HRESULT hr;
+
+    if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(descriptor, &handler)))
+        return hr;
+    hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, media_type);
+    IMFMediaTypeHandler_Release(handler);
+
+    return hr;
+}
+
+static HRESULT wg_format_from_stream_descriptor(IMFStreamDescriptor *descriptor, struct wg_format *format)
+{
+    IMFMediaType *media_type;
+    HRESULT hr;
+
+    if (FAILED(hr = stream_descriptor_get_media_type(descriptor, &media_type)))
+        return hr;
+    mf_media_type_to_wg_format(media_type, format);
+    IMFMediaType_Release(media_type);
+
+    return hr;
+}
+
+static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor, wg_parser_stream_t stream,
+    const GUID *attr, enum wg_parser_tag tag)
+{
+    WCHAR *strW;
+    HRESULT hr;
+    DWORD len;
+    char *str;
+
+    if (!(str = wg_parser_stream_get_tag(stream, tag))
+            || !(len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0)))
+        hr = S_OK;
+    else if (!(strW = malloc(len * sizeof(*strW))))
+        hr = E_OUTOFMEMORY;
+    else
+    {
+        if (MultiByteToWideChar(CP_UTF8, 0, str, -1, strW, len))
+            hr = IMFStreamDescriptor_SetString(descriptor, attr, strW);
+        else
+            hr = E_FAIL;
+        free(strW);
+    }
+
+    free(str);
+    return hr;
+}
+
+static HRESULT init_video_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count)
+{
+    /* Try to prefer YUV formats over RGB ones. Most decoders output in the
+     * YUV color space, and it's generally much less expensive for
+     * videoconvert to do YUV -> YUV transformations. */
+    static const enum wg_video_format video_formats[] =
+    {
+        WG_VIDEO_FORMAT_NV12,
+        WG_VIDEO_FORMAT_YV12,
+        WG_VIDEO_FORMAT_YUY2,
+        WG_VIDEO_FORMAT_I420,
+    };
+    UINT count = *types_count, i;
+    GUID base_subtype;
+    HRESULT hr;
+
+    if (FAILED(hr = IMFMediaType_GetGUID(types[0], &MF_MT_SUBTYPE, &base_subtype)))
+        return hr;
+
+    for (i = 0; i < ARRAY_SIZE(video_formats); ++i)
+    {
+        struct wg_format new_format = *format;
+        IMFMediaType *new_type;
+
+        new_format.u.video.format = video_formats[i];
+
+        if (!(new_type = mf_media_type_from_wg_format(&new_format)))
+        {
+            hr = E_OUTOFMEMORY;
+            goto done;
+        }
+        types[count++] = new_type;
+
+        if (video_formats[i] == WG_VIDEO_FORMAT_I420)
+        {
+            IMFMediaType *iyuv_type;
+
+            if (FAILED(hr = MFCreateMediaType(&iyuv_type)))
+                goto done;
+            if (FAILED(hr = IMFMediaType_CopyAllItems(new_type, (IMFAttributes *)iyuv_type)))
+                goto done;
+            if (FAILED(hr = IMFMediaType_SetGUID(iyuv_type, &MF_MT_SUBTYPE, &MFVideoFormat_IYUV)))
+                goto done;
+            types[count++] = iyuv_type;
+        }
+    }
+
+done:
+    *types_count = count;
+    return hr;
+}
+
+static HRESULT init_audio_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count)
+{
+    /* Expose at least one PCM and one floating point type for the
+       consumer to pick from. */
+    static const enum wg_audio_format audio_types[] =
+    {
+        WG_AUDIO_FORMAT_S16LE,
+        WG_AUDIO_FORMAT_F32LE,
+    };
+    UINT count = *types_count, i;
+
+    for (i = 0; i < ARRAY_SIZE(audio_types); i++)
+    {
+        struct wg_format new_format = *format;
+        if (new_format.u.audio.format == audio_types[i])
+            continue;
+        new_format.u.audio.format = audio_types[i];
+        if ((types[count] = mf_media_type_from_wg_format(&new_format)))
+            count++;
+    }
+
+    *types_count = count;
+    return S_OK;
+}
+
+static HRESULT stream_descriptor_create(UINT32 id, struct wg_format *format, IMFStreamDescriptor **out)
+{
+    IMFStreamDescriptor *descriptor;
+    IMFMediaTypeHandler *handler;
+    IMFMediaType *types[6];
+    DWORD count = 0;
+    HRESULT hr;
+
+    if (!(types[0] = mf_media_type_from_wg_format(format)))
+        return MF_E_INVALIDMEDIATYPE;
+    count = 1;
+
+    if (format->major_type == WG_MAJOR_TYPE_VIDEO)
+    {
+        if (FAILED(hr = init_video_media_types(format, types, &count)))
+            goto done;
+    }
+    else if (format->major_type == WG_MAJOR_TYPE_AUDIO)
+    {
+        if (FAILED(hr = init_audio_media_types(format, types, &count)))
+            goto done;
+    }
+
+    assert(count <= ARRAY_SIZE(types));
+
+    if (FAILED(hr = MFCreateStreamDescriptor(id, count, types, &descriptor)))
+        goto done;
+
+    if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(descriptor, &handler)))
+        IMFStreamDescriptor_Release(descriptor);
+    else
+    {
+        hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, types[0]);
+        IMFMediaTypeHandler_Release(handler);
+    }
+
+done:
+    while (count--)
+        IMFMediaType_Release(types[count]);
+    *out = SUCCEEDED(hr) ? descriptor : NULL;
+    return hr;
+}
+
+static BOOL enqueue_token(struct media_stream *stream, IUnknown *token)
+{
+    if (stream->token_queue_count == stream->token_queue_cap)
+    {
+        IUnknown **buf;
+        stream->token_queue_cap = stream->token_queue_cap * 2 + 1;
+        buf = realloc(stream->token_queue, stream->token_queue_cap * sizeof(*buf));
+        if (buf)
+            stream->token_queue = buf;
+        else
+        {
+            stream->token_queue_cap = stream->token_queue_count;
+            return FALSE;
+        }
+    }
+    stream->token_queue[stream->token_queue_count++] = token;
+    return TRUE;
+}
+
+static void flush_token_queue(struct media_stream *stream, BOOL send)
+{
+    struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
+    LONG i;
+
+    for (i = 0; i < stream->token_queue_count; i++)
+    {
+        if (send)
+        {
+            IUnknown *op;
+            HRESULT hr;
+
+            if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &op)))
+            {
+                struct source_async_command *command = impl_from_async_command_IUnknown(op);
+                command->u.request_sample.stream = stream;
+                command->u.request_sample.token = stream->token_queue[i];
+
+                hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op);
+                IUnknown_Release(op);
+            }
+            if (FAILED(hr))
+                WARN("Could not enqueue sample request, hr %#lx\n", hr);
+        }
+        else if (stream->token_queue[i])
+            IUnknown_Release(stream->token_queue[i]);
+    }
+    free(stream->token_queue);
+    stream->token_queue = NULL;
+    stream->token_queue_count = 0;
+    stream->token_queue_cap = 0;
+}
+
+static HRESULT media_stream_start(struct media_stream *stream, BOOL active, BOOL seeking, const PROPVARIANT *position)
+{
+    struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
+    struct wg_format format;
+    HRESULT hr;
+
+    TRACE("source %p, stream %p\n", source, stream);
+
+    if (FAILED(hr = wg_format_from_stream_descriptor(stream->descriptor, &format)))
+        WARN("Failed to get wg_format from stream descriptor, hr %#lx\n", hr);
+    wg_parser_stream_enable(stream->wg_stream, &format, 0);
+
+    if (FAILED(hr = IMFMediaEventQueue_QueueEventParamUnk(source->event_queue, active ? MEUpdatedStream : MENewStream,
+            &GUID_NULL, S_OK, (IUnknown *)&stream->IMFMediaStream_iface)))
+        WARN("Failed to send source stream event, hr %#lx\n", hr);
+    return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, seeking ? MEStreamSeeked : MEStreamStarted,
+            &GUID_NULL, S_OK, position);
+}
+
+static HRESULT media_source_start(struct media_source *source, IMFPresentationDescriptor *descriptor,
+        GUID *format, PROPVARIANT *position)
+{
+    BOOL starting = source->state == SOURCE_STOPPED, seek_message = !starting && position->vt != VT_EMPTY;
+    IMFStreamDescriptor **descriptors;
+    DWORD i, count;
+    HRESULT hr;
+
+    TRACE("source %p, descriptor %p, format %s, position %s\n", source, descriptor,
+            debugstr_guid(format), wine_dbgstr_variant((VARIANT *)position));
+
+    if (source->state == SOURCE_SHUTDOWN)
+        return MF_E_SHUTDOWN;
+
+    /* seek to beginning on stop->play */
+    if (source->state == SOURCE_STOPPED && position->vt == VT_EMPTY)
+    {
+        position->vt = VT_I8;
+        position->hVal.QuadPart = 0;
+    }
+
+    if (!(descriptors = calloc(source->stream_count, sizeof(*descriptors))))
+        return E_OUTOFMEMORY;
+
+    if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(descriptor, &count)))
+        WARN("Failed to get presentation descriptor stream count, hr %#lx\n", hr);
+
+    for (i = 0; i < count; i++)
+    {
+        IMFStreamDescriptor *stream_descriptor;
+        BOOL selected;
+        DWORD id;
+
+        if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, i,
+                &selected, &stream_descriptor)))
+            WARN("Failed to get presentation stream descriptor, hr %#lx\n", hr);
+        else
+        {
+            if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(stream_descriptor, &id)))
+                WARN("Failed to get stream descriptor id, hr %#lx\n", hr);
+            else if (id >= source->stream_count)
+                WARN("Invalid stream descriptor id %lu, hr %#lx\n", id, hr);
+            else if (selected)
+                IMFStreamDescriptor_AddRef((descriptors[id] = stream_descriptor));
+
+            IMFStreamDescriptor_Release(stream_descriptor);
+        }
+    }
+
+    for (i = 0; i < source->stream_count; i++)
+    {
+        struct media_stream *stream = source->streams[i];
+        BOOL was_active = !starting && stream->active;
+
+        if (position->vt != VT_EMPTY)
+            stream->eos = FALSE;
+
+        if (!(stream->active = !!descriptors[i]))
+            wg_parser_stream_disable(stream->wg_stream);
+        else
+        {
+            if (FAILED(hr = media_stream_start(stream, was_active, seek_message, position)))
+                WARN("Failed to start media stream, hr %#lx\n", hr);
+            IMFStreamDescriptor_Release(descriptors[i]);
+        }
+    }
+
+    free(descriptors);
+
+    source->state = SOURCE_RUNNING;
+
+    if (position->vt == VT_I8)
+        wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, position->hVal.QuadPart, 0,
+                AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning);
+
+    for (i = 0; i < source->stream_count; i++)
+        flush_token_queue(source->streams[i], position->vt == VT_EMPTY);
+
+    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue,
+            seek_message ? MESourceSeeked : MESourceStarted, &GUID_NULL, S_OK, position);
+}
+
+static HRESULT media_source_pause(struct media_source *source)
+{
+    unsigned int i;
+    HRESULT hr;
+
+    TRACE("source %p\n", source);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        return MF_E_SHUTDOWN;
+
+    for (i = 0; i < source->stream_count; i++)
+    {
+        struct media_stream *stream = source->streams[i];
+        if (stream->active && FAILED(hr = IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamPaused,
+                    &GUID_NULL, S_OK, NULL)))
+            WARN("Failed to queue MEStreamPaused event, hr %#lx\n", hr);
+    }
+
+    source->state = SOURCE_PAUSED;
+    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourcePaused, &GUID_NULL, S_OK, NULL);
+}
+
+static HRESULT media_source_stop(struct media_source *source)
+{
+    unsigned int i;
+    HRESULT hr;
+
+    TRACE("source %p\n", source);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        return MF_E_SHUTDOWN;
+
+    for (i = 0; i < source->stream_count; i++)
+    {
+        struct media_stream *stream = source->streams[i];
+        if (stream->active && FAILED(hr = IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped,
+                    &GUID_NULL, S_OK, NULL)))
+            WARN("Failed to queue MEStreamStopped event, hr %#lx\n", hr);
+    }
+
+    source->state = SOURCE_STOPPED;
+
+    for (i = 0; i < source->stream_count; i++)
+        flush_token_queue(source->streams[i], FALSE);
+
+    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL);
+}
+
+static HRESULT media_stream_send_sample(struct media_stream *stream, const struct wg_parser_buffer *wg_buffer, IUnknown *token)
+{
+    IMFSample *sample = NULL;
+    IMFMediaBuffer *buffer;
+    HRESULT hr;
+    BYTE *data;
+
+    if (FAILED(hr = MFCreateMemoryBuffer(wg_buffer->size, &buffer)))
+        return hr;
+    if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(buffer, wg_buffer->size)))
+        goto out;
+    if (FAILED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL)))
+        goto out;
+
+    if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, wg_buffer->size))
+    {
+        wg_parser_stream_release_buffer(stream->wg_stream);
+        IMFMediaBuffer_Unlock(buffer);
+        goto out;
+    }
+    wg_parser_stream_release_buffer(stream->wg_stream);
+
+    if (FAILED(hr = IMFMediaBuffer_Unlock(buffer)))
+        goto out;
+
+    if (FAILED(hr = MFCreateSample(&sample)))
+        goto out;
+    if (FAILED(hr = IMFSample_AddBuffer(sample, buffer)))
+        goto out;
+    if (FAILED(hr = IMFSample_SetSampleTime(sample, wg_buffer->pts)))
+        goto out;
+    if (FAILED(hr = IMFSample_SetSampleDuration(sample, wg_buffer->duration)))
+        goto out;
+    if (token && FAILED(hr = IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token)))
+        goto out;
+
+    hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample,
+            &GUID_NULL, S_OK, (IUnknown *)sample);
+
+out:
+    if (sample)
+        IMFSample_Release(sample);
+    IMFMediaBuffer_Release(buffer);
+    return hr;
+}
+
+static HRESULT media_stream_send_eos(struct media_source *source, struct media_stream *stream)
+{
+    PROPVARIANT empty = {.vt = VT_EMPTY};
+    HRESULT hr;
+    UINT i;
+
+    TRACE("source %p, stream %p\n", source, stream);
+
+    stream->eos = TRUE;
+    if (FAILED(hr = IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEEndOfStream, &GUID_NULL, S_OK, &empty)))
+        WARN("Failed to queue MEEndOfStream event, hr %#lx\n", hr);
+
+    for (i = 0; i < source->stream_count; i++)
+    {
+        struct media_stream *stream = source->streams[i];
+        if (stream->active && !stream->eos)
+            return S_OK;
+    }
+
+    if (FAILED(hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, &empty)))
+        WARN("Failed to queue MEEndOfPresentation event, hr %#lx\n", hr);
+    return S_OK;
+}
+
+static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token)
+{
+    struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
+    struct wg_parser_buffer buffer;
+
+    TRACE("%p, %p\n", stream, token);
+
+    if (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer))
+        return media_stream_send_sample(stream, &buffer, token);
+
+    return media_stream_send_eos(source, stream);
+}
+
+static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
+{
+    struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface);
+    struct source_async_command *command;
+    IUnknown *state;
+    HRESULT hr;
+
+    if (FAILED(hr = IMFAsyncResult_GetState(result, &state)))
+        return hr;
+
+    EnterCriticalSection(&source->cs);
+
+    command = impl_from_async_command_IUnknown(state);
+    switch (command->op)
+    {
+        case SOURCE_ASYNC_START:
+        {
+            IMFPresentationDescriptor *descriptor = command->u.start.descriptor;
+            GUID format = command->u.start.format;
+            PROPVARIANT position = command->u.start.position;
+
+            if (FAILED(hr = media_source_start(source, descriptor, &format, &position)))
+                WARN("Failed to start source %p, hr %#lx\n", source, hr);
+            break;
+        }
+        case SOURCE_ASYNC_PAUSE:
+            if (FAILED(hr = media_source_pause(source)))
+                WARN("Failed to pause source %p, hr %#lx\n", source, hr);
+            break;
+        case SOURCE_ASYNC_STOP:
+            if (FAILED(hr = media_source_stop(source)))
+                WARN("Failed to stop source %p, hr %#lx\n", source, hr);
+            break;
+        case SOURCE_ASYNC_REQUEST_SAMPLE:
+            if (source->state == SOURCE_PAUSED)
+                enqueue_token(command->u.request_sample.stream, command->u.request_sample.token);
+            else if (source->state == SOURCE_RUNNING)
+            {
+                if (FAILED(hr = wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token)))
+                    WARN("Failed to request sample, hr %#lx\n", hr);
+            }
+            break;
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    IUnknown_Release(state);
+
+    return S_OK;
+}
+
+static const IMFAsyncCallbackVtbl source_async_commands_callback_vtbl =
+{
+    callback_QueryInterface,
+    source_async_commands_callback_AddRef,
+    source_async_commands_callback_Release,
+    callback_GetParameters,
+    source_async_commands_Invoke,
+};
+
+static DWORD CALLBACK read_thread(void *arg)
+{
+    struct media_source *source = arg;
+    IMFByteStream *byte_stream = source->byte_stream;
+    size_t buffer_size = 4096;
+    QWORD file_size;
+    void *data;
+
+    if (!(data = malloc(buffer_size)))
+        return 0;
+
+    IMFByteStream_GetLength(byte_stream, &file_size);
+
+    TRACE("Starting read thread for media source %p.\n", source);
+
+    while (!source->read_thread_shutdown)
+    {
+        uint64_t offset;
+        ULONG ret_size;
+        uint32_t size;
+        HRESULT hr;
+
+        if (!wg_parser_get_next_read_offset(source->wg_parser, &offset, &size))
+            continue;
+
+        if (offset >= file_size)
+            size = 0;
+        else if (offset + size >= file_size)
+            size = file_size - offset;
+
+        /* Some IMFByteStreams (including the standard file-based stream) return
+         * an error when reading past the file size. */
+        if (!size)
+        {
+            wg_parser_push_data(source->wg_parser, data, 0);
+            continue;
+        }
+
+        if (!array_reserve(&data, &buffer_size, size, 1))
+        {
+            free(data);
+            return 0;
+        }
+
+        ret_size = 0;
+
+        if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset)))
+            hr = IMFByteStream_Read(byte_stream, data, size, &ret_size);
+        if (FAILED(hr))
+            ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr);
+        else if (ret_size != size)
+            ERR("Unexpected short read: requested %u bytes, got %lu.\n", size, ret_size);
+        wg_parser_push_data(source->wg_parser, SUCCEEDED(hr) ? data : NULL, ret_size);
+    }
+
+    free(data);
+    TRACE("Media source is shutting down; exiting.\n");
+    return 0;
+}
+
+static HRESULT WINAPI media_stream_QueryInterface(IMFMediaStream *iface, REFIID riid, void **out)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out);
+
+    if (IsEqualIID(riid, &IID_IMFMediaStream) ||
+        IsEqualIID(riid, &IID_IMFMediaEventGenerator) ||
+        IsEqualIID(riid, &IID_IUnknown))
+    {
+        *out = &stream->IMFMediaStream_iface;
+    }
+    else
+    {
+        FIXME("(%s, %p)\n", debugstr_guid(riid), out);
+        *out = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown*)*out);
+    return S_OK;
+}
+
+static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+    ULONG ref = InterlockedIncrement(&stream->ref);
+
+    TRACE("%p, refcount %lu.\n", iface, ref);
+
+    return ref;
+}
+
+static ULONG WINAPI media_stream_Release(IMFMediaStream *iface)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+    ULONG ref = InterlockedDecrement(&stream->ref);
+
+    TRACE("%p, refcount %lu.\n", iface, ref);
+
+    if (!ref)
+    {
+        IMFMediaSource_Release(stream->media_source);
+        IMFStreamDescriptor_Release(stream->descriptor);
+        IMFMediaEventQueue_Release(stream->event_queue);
+        flush_token_queue(stream, FALSE);
+        free(stream);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, IMFMediaEvent **event)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    TRACE("%p, %#lx, %p.\n", iface, flags, event);
+
+    return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event);
+}
+
+static HRESULT WINAPI media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsyncCallback *callback, IUnknown *state)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    TRACE("%p, %p, %p.\n", iface, callback, state);
+
+    return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state);
+}
+
+static HRESULT WINAPI media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncResult *result, IMFMediaEvent **event)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    TRACE("%p, %p, %p.\n", stream, result, event);
+
+    return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event);
+}
+
+static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventType event_type, REFGUID ext_type,
+        HRESULT hr, const PROPVARIANT *value)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
+
+    return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value);
+}
+
+static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMediaSource **out)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+    struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
+    HRESULT hr = S_OK;
+
+    TRACE("%p, %p.\n", iface, out);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else
+    {
+        IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+        *out = &source->IMFMediaSource_iface;
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IMFStreamDescriptor **descriptor)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+    struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
+    HRESULT hr = S_OK;
+
+    TRACE("%p, %p.\n", iface, descriptor);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else
+    {
+        IMFStreamDescriptor_AddRef(stream->descriptor);
+        *descriptor = stream->descriptor;
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token)
+{
+    struct media_stream *stream = impl_from_IMFMediaStream(iface);
+    struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
+    IUnknown *op;
+    HRESULT hr;
+
+    TRACE("%p, %p.\n", iface, token);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (!stream->active)
+        hr = MF_E_MEDIA_SOURCE_WRONGSTATE;
+    else if (stream->eos)
+        hr = MF_E_END_OF_STREAM;
+    else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &op)))
+    {
+        struct source_async_command *command = impl_from_async_command_IUnknown(op);
+        command->u.request_sample.stream = stream;
+        if (token)
+            IUnknown_AddRef(token);
+        command->u.request_sample.token = token;
+
+        hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op);
+        IUnknown_Release(op);
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static const IMFMediaStreamVtbl media_stream_vtbl =
+{
+    media_stream_QueryInterface,
+    media_stream_AddRef,
+    media_stream_Release,
+    media_stream_GetEvent,
+    media_stream_BeginGetEvent,
+    media_stream_EndGetEvent,
+    media_stream_QueueEvent,
+    media_stream_GetMediaSource,
+    media_stream_GetStreamDescriptor,
+    media_stream_RequestSample
+};
+
+static HRESULT media_stream_create(IMFMediaSource *source, IMFStreamDescriptor *descriptor,
+        wg_parser_stream_t wg_stream, struct media_stream **out)
+{
+    struct media_stream *object;
+    HRESULT hr;
+
+    TRACE("source %p, descriptor %p, wg_stream %#I64x.\n", source, descriptor, wg_stream);
+
+    if (!(object = calloc(1, sizeof(*object))))
+        return E_OUTOFMEMORY;
+
+    object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl;
+    object->ref = 1;
+
+    if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))
+    {
+        free(object);
+        return hr;
+    }
+
+    IMFMediaSource_AddRef(source);
+    object->media_source = source;
+    IMFStreamDescriptor_AddRef(descriptor);
+    object->descriptor = descriptor;
+
+    object->active = TRUE;
+    object->eos = FALSE;
+    object->wg_stream = wg_stream;
+
+    TRACE("Created stream object %p.\n", object);
+
+    *out = object;
+    return S_OK;
+}
+
+static HRESULT WINAPI media_source_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+    return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj);
+}
+
+static ULONG WINAPI media_source_get_service_AddRef(IMFGetService *iface)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+    return IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+}
+
+static ULONG WINAPI media_source_get_service_Release(IMFGetService *iface)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+    return IMFMediaSource_Release(&source->IMFMediaSource_iface);
+}
+
+static HRESULT WINAPI media_source_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+
+    TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj);
+
+    *obj = NULL;
+
+    if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE))
+    {
+        if (IsEqualIID(riid, &IID_IMFRateSupport))
+        {
+            *obj = &source->IMFRateSupport_iface;
+        }
+        else if (IsEqualIID(riid, &IID_IMFRateControl))
+        {
+            *obj = &source->IMFRateControl_iface;
+        }
+    }
+    else
+        FIXME("Unsupported service %s.\n", debugstr_guid(service));
+
+    if (*obj)
+        IUnknown_AddRef((IUnknown *)*obj);
+
+    return *obj ? S_OK : E_NOINTERFACE;
+}
+
+static const IMFGetServiceVtbl media_source_get_service_vtbl =
+{
+    media_source_get_service_QueryInterface,
+    media_source_get_service_AddRef,
+    media_source_get_service_Release,
+    media_source_get_service_GetService,
+};
+
+static HRESULT WINAPI media_source_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFRateSupport(iface);
+    return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj);
+}
+
+static ULONG WINAPI media_source_rate_support_AddRef(IMFRateSupport *iface)
+{
+    struct media_source *source = impl_from_IMFRateSupport(iface);
+    return IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+}
+
+static ULONG WINAPI media_source_rate_support_Release(IMFRateSupport *iface)
+{
+    struct media_source *source = impl_from_IMFRateSupport(iface);
+    return IMFMediaSource_Release(&source->IMFMediaSource_iface);
+}
+
+static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate)
+{
+    TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate);
+
+    *rate = 0.0f;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate)
+{
+    TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate);
+
+    *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate,
+        float *nearest_rate)
+{
+    TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate);
+
+    if (nearest_rate)
+        *nearest_rate = rate;
+
+    return rate >= -1e6f && rate <= 1e6f ? S_OK : MF_E_UNSUPPORTED_RATE;
+}
+
+static const IMFRateSupportVtbl media_source_rate_support_vtbl =
+{
+    media_source_rate_support_QueryInterface,
+    media_source_rate_support_AddRef,
+    media_source_rate_support_Release,
+    media_source_rate_support_GetSlowestRate,
+    media_source_rate_support_GetFastestRate,
+    media_source_rate_support_IsRateSupported,
+};
+
+static HRESULT WINAPI media_source_rate_control_QueryInterface(IMFRateControl *iface, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFRateControl(iface);
+    return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj);
+}
+
+static ULONG WINAPI media_source_rate_control_AddRef(IMFRateControl *iface)
+{
+    struct media_source *source = impl_from_IMFRateControl(iface);
+    return IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+}
+
+static ULONG WINAPI media_source_rate_control_Release(IMFRateControl *iface)
+{
+    struct media_source *source = impl_from_IMFRateControl(iface);
+    return IMFMediaSource_Release(&source->IMFMediaSource_iface);
+}
+
+static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, BOOL thin, float rate)
+{
+    struct media_source *source = impl_from_IMFRateControl(iface);
+    HRESULT hr;
+
+    FIXME("%p, %d, %f.\n", iface, thin, rate);
+
+    if (rate < 0.0f)
+        return MF_E_REVERSE_UNSUPPORTED;
+
+    if (thin)
+        return MF_E_THINNING_UNSUPPORTED;
+
+    if (FAILED(hr = IMFRateSupport_IsRateSupported(&source->IMFRateSupport_iface, thin, rate, NULL)))
+        return hr;
+
+    EnterCriticalSection(&source->cs);
+    source->rate = rate;
+    LeaveCriticalSection(&source->cs);
+
+    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceRateChanged, &GUID_NULL, S_OK, NULL);
+}
+
+static HRESULT WINAPI media_source_rate_control_GetRate(IMFRateControl *iface, BOOL *thin, float *rate)
+{
+    struct media_source *source = impl_from_IMFRateControl(iface);
+
+    TRACE("%p, %p, %p.\n", iface, thin, rate);
+
+    if (thin)
+        *thin = FALSE;
+
+    EnterCriticalSection(&source->cs);
+    *rate = source->rate;
+    LeaveCriticalSection(&source->cs);
+
+    return S_OK;
+}
+
+static const IMFRateControlVtbl media_source_rate_control_vtbl =
+{
+    media_source_rate_control_QueryInterface,
+    media_source_rate_control_AddRef,
+    media_source_rate_control_Release,
+    media_source_rate_control_SetRate,
+    media_source_rate_control_GetRate,
+};
+
+static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+
+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out);
+
+    if (IsEqualIID(riid, &IID_IMFMediaSource) ||
+        IsEqualIID(riid, &IID_IMFMediaEventGenerator) ||
+        IsEqualIID(riid, &IID_IUnknown))
+    {
+        *out = &source->IMFMediaSource_iface;
+    }
+    else if (IsEqualIID(riid, &IID_IMFGetService))
+    {
+        *out = &source->IMFGetService_iface;
+    }
+    else
+    {
+        FIXME("%s, %p.\n", debugstr_guid(riid), out);
+        *out = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown*)*out);
+    return S_OK;
+}
+
+static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    ULONG ref = InterlockedIncrement(&source->ref);
+
+    TRACE("%p, refcount %lu.\n", iface, ref);
+
+    return ref;
+}
+
+static ULONG WINAPI media_source_Release(IMFMediaSource *iface)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    ULONG ref = InterlockedDecrement(&source->ref);
+
+    TRACE("%p, refcount %lu.\n", iface, ref);
+
+    if (!ref)
+    {
+        IMFMediaSource_Shutdown(iface);
+        IMFMediaEventQueue_Release(source->event_queue);
+        IMFByteStream_Release(source->byte_stream);
+        wg_parser_destroy(source->wg_parser);
+        source->cs.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&source->cs);
+        free(source);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+
+    TRACE("%p, %#lx, %p.\n", iface, flags, event);
+
+    return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event);
+}
+
+static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+
+    TRACE("%p, %p, %p.\n", iface, callback, state);
+
+    return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state);
+}
+
+static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+
+    TRACE("%p, %p, %p.\n", iface, result, event);
+
+    return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event);
+}
+
+static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type,
+        HRESULT hr, const PROPVARIANT *value)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+
+    TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
+
+    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value);
+}
+
+static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    HRESULT hr = S_OK;
+
+    TRACE("%p, %p.\n", iface, characteristics);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else
+        *characteristics = MFMEDIASOURCE_CAN_SEEK | MFMEDIASOURCE_CAN_PAUSE;
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    HRESULT hr;
+    UINT i;
+
+    TRACE("%p, %p.\n", iface, descriptor);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (SUCCEEDED(hr = MFCreatePresentationDescriptor(source->stream_count, source->descriptors, descriptor)))
+    {
+        if (FAILED(hr = IMFPresentationDescriptor_SetUINT64(*descriptor, &MF_PD_DURATION, source->duration)))
+            WARN("Failed to set presentation descriptor MF_PD_DURATION, hr %#lx\n", hr);
+
+        for (i = 0; i < source->stream_count; ++i)
+        {
+            if (FAILED(hr = IMFPresentationDescriptor_SelectStream(*descriptor, i)))
+                WARN("Failed to select stream %u, hr %#lx\n", i, hr);
+        }
+
+        hr = S_OK;
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor,
+                                     const GUID *time_format, const PROPVARIANT *position)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    IUnknown *op;
+    HRESULT hr;
+
+    TRACE("%p, %p, %p, %p.\n", iface, descriptor, time_format, position);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (!(IsEqualIID(time_format, &GUID_NULL)))
+        hr = MF_E_UNSUPPORTED_TIME_FORMAT;
+    else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_START, &op)))
+    {
+        struct source_async_command *command = impl_from_async_command_IUnknown(op);
+        command->u.start.descriptor = descriptor;
+        IMFPresentationDescriptor_AddRef(descriptor);
+        command->u.start.format = *time_format;
+        PropVariantCopy(&command->u.start.position, position);
+
+        hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op);
+        IUnknown_Release(op);
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    IUnknown *op;
+    HRESULT hr;
+
+    TRACE("%p.\n", iface);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &op)))
+    {
+        hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op);
+        IUnknown_Release(op);
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+    IUnknown *op;
+    HRESULT hr;
+
+    TRACE("%p.\n", iface);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (source->state != SOURCE_RUNNING)
+        hr = MF_E_INVALID_STATE_TRANSITION;
+    else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_PAUSE, &op)))
+    {
+        hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op);
+        IUnknown_Release(op);
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
+{
+    struct media_source *source = impl_from_IMFMediaSource(iface);
+
+    TRACE("%p.\n", iface);
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->state == SOURCE_SHUTDOWN)
+    {
+        LeaveCriticalSection(&source->cs);
+        return MF_E_SHUTDOWN;
+    }
+
+    source->state = SOURCE_SHUTDOWN;
+
+    wg_parser_disconnect(source->wg_parser);
+
+    source->read_thread_shutdown = true;
+    WaitForSingleObject(source->read_thread, INFINITE);
+    CloseHandle(source->read_thread);
+
+    IMFMediaEventQueue_Shutdown(source->event_queue);
+    IMFByteStream_Close(source->byte_stream);
+
+    while (source->stream_count--)
+    {
+        struct media_stream *stream = source->streams[source->stream_count];
+        IMFStreamDescriptor_Release(source->descriptors[source->stream_count]);
+        IMFMediaEventQueue_Shutdown(stream->event_queue);
+        IMFMediaStream_Release(&stream->IMFMediaStream_iface);
+    }
+    free(source->descriptors);
+    free(source->streams);
+
+    LeaveCriticalSection(&source->cs);
+
+    MFUnlockWorkQueue(source->async_commands_queue);
+
+    return S_OK;
+}
+
+static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
+{
+    media_source_QueryInterface,
+    media_source_AddRef,
+    media_source_Release,
+    media_source_GetEvent,
+    media_source_BeginGetEvent,
+    media_source_EndGetEvent,
+    media_source_QueueEvent,
+    media_source_GetCharacteristics,
+    media_source_CreatePresentationDescriptor,
+    media_source_Start,
+    media_source_Stop,
+    media_source_Pause,
+    media_source_Shutdown,
+};
+
+static void media_source_init_descriptors(struct media_source *source)
+{
+    HRESULT hr = S_OK;
+    UINT i;
+
+    for (i = 0; i < source->stream_count; i++)
+    {
+        struct media_stream *stream = source->streams[i];
+        IMFStreamDescriptor *descriptor = stream->descriptor;
+
+        if (FAILED(hr = stream_descriptor_set_tag(descriptor, stream->wg_stream,
+                &MF_SD_LANGUAGE, WG_PARSER_TAG_LANGUAGE)))
+            WARN("Failed to set stream descriptor language, hr %#lx\n", hr);
+        if (FAILED(hr = stream_descriptor_set_tag(descriptor, stream->wg_stream,
+                &MF_SD_STREAM_NAME, WG_PARSER_TAG_NAME)))
+            WARN("Failed to set stream descriptor name, hr %#lx\n", hr);
+    }
+}
+
+static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out)
+{
+    unsigned int stream_count = UINT_MAX;
+    struct media_source *object;
+    wg_parser_t parser;
+    unsigned int i;
+    HRESULT hr;
+
+    if (!(object = calloc(1, sizeof(*object))))
+        return E_OUTOFMEMORY;
+
+    object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl;
+    object->IMFGetService_iface.lpVtbl = &media_source_get_service_vtbl;
+    object->IMFRateSupport_iface.lpVtbl = &media_source_rate_support_vtbl;
+    object->IMFRateControl_iface.lpVtbl = &media_source_rate_control_vtbl;
+    object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl;
+    object->ref = 1;
+    object->byte_stream = context->stream;
+    IMFByteStream_AddRef(context->stream);
+    object->file_size = context->file_size;
+    object->rate = 1.0f;
+    InitializeCriticalSection(&object->cs);
+    object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");
+
+    if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))
+        goto fail;
+
+    if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue)))
+        goto fail;
+
+    if (!(parser = wg_parser_create(WG_PARSER_DECODEBIN, FALSE, FALSE)))
+    {
+        hr = E_OUTOFMEMORY;
+        goto fail;
+    }
+    object->wg_parser = parser;
+
+    object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL);
+
+    object->state = SOURCE_OPENING;
+
+    if (FAILED(hr = wg_parser_connect(parser, object->file_size, NULL)))
+        goto fail;
+
+    stream_count = wg_parser_get_stream_count(parser);
+
+    if (!(object->descriptors = calloc(stream_count, sizeof(*object->descriptors)))
+            || !(object->streams = calloc(stream_count, sizeof(*object->streams))))
+    {
+        hr = E_OUTOFMEMORY;
+        goto fail;
+    }
+
+    for (i = 0; i < stream_count; ++i)
+    {
+        wg_parser_stream_t wg_stream = wg_parser_get_stream(object->wg_parser, i);
+        IMFStreamDescriptor *descriptor;
+        struct media_stream *stream;
+        struct wg_format format;
+
+        wg_parser_stream_get_preferred_format(wg_stream, &format);
+        if (FAILED(hr = stream_descriptor_create(i, &format, &descriptor)))
+            goto fail;
+        if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, wg_stream, &stream)))
+        {
+            IMFStreamDescriptor_Release(descriptor);
+            goto fail;
+        }
+
+        object->duration = max(object->duration, wg_parser_stream_get_duration(wg_stream));
+        IMFStreamDescriptor_AddRef(descriptor);
+        object->descriptors[i] = descriptor;
+        object->streams[i] = stream;
+        object->stream_count++;
+    }
+
+    media_source_init_descriptors(object);
+    object->state = SOURCE_STOPPED;
+
+    *out = &object->IMFMediaSource_iface;
+    TRACE("Created IMFMediaSource %p\n", *out);
+    return S_OK;
+
+fail:
+    WARN("Failed to construct MFMediaSource, hr %#lx.\n", hr);
+
+    while (object->streams && object->stream_count--)
+    {
+        struct media_stream *stream = object->streams[object->stream_count];
+        IMFStreamDescriptor_Release(object->descriptors[object->stream_count]);
+        IMFMediaStream_Release(&stream->IMFMediaStream_iface);
+    }
+    free(object->descriptors);
+    free(object->streams);
+
+    if (stream_count != UINT_MAX)
+        wg_parser_disconnect(object->wg_parser);
+    if (object->read_thread)
+    {
+        object->read_thread_shutdown = true;
+        WaitForSingleObject(object->read_thread, INFINITE);
+        CloseHandle(object->read_thread);
+    }
+    if (object->wg_parser)
+        wg_parser_destroy(object->wg_parser);
+    if (object->async_commands_queue)
+        MFUnlockWorkQueue(object->async_commands_queue);
+    if (object->event_queue)
+        IMFMediaEventQueue_Release(object->event_queue);
+    IMFByteStream_Release(object->byte_stream);
+    free(object);
+    return hr;
+}
+
+struct result_entry
+{
+    struct list entry;
+    IMFAsyncResult *result;
+    MF_OBJECT_TYPE type;
+    IUnknown *object;
+};
+
+static HRESULT result_entry_create(IMFAsyncResult *result, MF_OBJECT_TYPE type,
+        IUnknown *object, struct result_entry **out)
+{
+    struct result_entry *entry;
+
+    if (!(entry = malloc(sizeof(*entry))))
+        return E_OUTOFMEMORY;
+
+    entry->result = result;
+    IMFAsyncResult_AddRef(entry->result);
+    entry->object = object;
+    IUnknown_AddRef(entry->object);
+    entry->type = type;
+
+    *out = entry;
+    return S_OK;
+}
+
+static void result_entry_destroy(struct result_entry *entry)
+{
+    IMFAsyncResult_Release(entry->result);
+    IUnknown_Release(entry->object);
+    free(entry);
+}
+
+struct stream_handler
+{
+    IMFByteStreamHandler IMFByteStreamHandler_iface;
+    IMFAsyncCallback IMFAsyncCallback_iface;
+    LONG refcount;
+    struct list results;
+    CRITICAL_SECTION cs;
+};
+
+static struct result_entry *handler_find_result_entry(struct stream_handler *handler, IMFAsyncResult *result)
+{
+    struct result_entry *entry;
+
+    EnterCriticalSection(&handler->cs);
+    LIST_FOR_EACH_ENTRY(entry, &handler->results, struct result_entry, entry)
+    {
+        if (result == entry->result)
+        {
+            list_remove(&entry->entry);
+            LeaveCriticalSection(&handler->cs);
+            return entry;
+        }
+    }
+    LeaveCriticalSection(&handler->cs);
+
+    return NULL;
+}
+
+static struct stream_handler *impl_from_IMFByteStreamHandler(IMFByteStreamHandler *iface)
+{
+    return CONTAINING_RECORD(iface, struct stream_handler, IMFByteStreamHandler_iface);
+}
+
+static struct stream_handler *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface)
+{
+    return CONTAINING_RECORD(iface, struct stream_handler, IMFAsyncCallback_iface);
+}
+
+static HRESULT WINAPI stream_handler_QueryInterface(IMFByteStreamHandler *iface, REFIID riid, void **obj)
+{
+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
+
+    if (IsEqualIID(riid, &IID_IMFByteStreamHandler) ||
+            IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IMFByteStreamHandler_AddRef(iface);
+        return S_OK;
+    }
+
+    WARN("Unsupported %s.\n", debugstr_guid(riid));
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI stream_handler_AddRef(IMFByteStreamHandler *iface)
+{
+    struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
+    ULONG refcount = InterlockedIncrement(&handler->refcount);
+
+    TRACE("%p, refcount %lu.\n", handler, refcount);
+
+    return refcount;
+}
+
+static ULONG WINAPI stream_handler_Release(IMFByteStreamHandler *iface)
+{
+    struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
+    ULONG refcount = InterlockedDecrement(&handler->refcount);
+    struct result_entry *result, *next;
+
+    TRACE("%p, refcount %lu.\n", iface, refcount);
+
+    if (!refcount)
+    {
+        LIST_FOR_EACH_ENTRY_SAFE(result, next, &handler->results, struct result_entry, entry)
+            result_entry_destroy(result);
+        DeleteCriticalSection(&handler->cs);
+        free(handler);
+    }
+
+    return refcount;
+}
+
+static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *iface, IMFByteStream *stream, const WCHAR *url, DWORD flags,
+        IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state)
+{
+    struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
+    IMFAsyncResult *result;
+    IUnknown *context;
+    QWORD file_size;
+    HRESULT hr;
+    DWORD caps;
+
+    TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state);
+
+    if (cancel_cookie)
+        *cancel_cookie = NULL;
+
+    if (!stream)
+        return E_INVALIDARG;
+    if (flags != MF_RESOLUTION_MEDIASOURCE)
+        FIXME("Unimplemented flags %#lx\n", flags);
+
+    if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps)))
+        return hr;
+    if (!(caps & MFBYTESTREAM_IS_SEEKABLE))
+    {
+        FIXME("Non-seekable bytestreams not supported.\n");
+        return MF_E_BYTESTREAM_NOT_SEEKABLE;
+    }
+    if (FAILED(hr = IMFByteStream_GetLength(stream, &file_size)))
+    {
+        FIXME("Failed to get byte stream length, hr %#lx.\n", hr);
+        return hr;
+    }
+
+    if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result)))
+        return hr;
+    if (FAILED(hr = object_context_create(flags, stream, url, file_size, result, &context)))
+    {
+        IMFAsyncResult_Release(result);
+        return hr;
+    }
+
+    hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, &handler->IMFAsyncCallback_iface, context);
+    IUnknown_Release(context);
+
+    if (SUCCEEDED(hr) && cancel_cookie)
+    {
+        *cancel_cookie = (IUnknown *)result;
+        IUnknown_AddRef(*cancel_cookie);
+    }
+
+    IMFAsyncResult_Release(result);
+
+    return hr;
+}
+
+static HRESULT WINAPI stream_handler_EndCreateObject(IMFByteStreamHandler *iface, IMFAsyncResult *result,
+        MF_OBJECT_TYPE *type, IUnknown **object)
+{
+    struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
+    struct result_entry *entry;
+    HRESULT hr;
+
+    TRACE("%p, %p, %p, %p.\n", iface, result, type, object);
+
+    if (!(entry = handler_find_result_entry(handler, result)))
+    {
+        *type = MF_OBJECT_INVALID;
+        *object = NULL;
+        return MF_E_UNEXPECTED;
+    }
+
+    hr = IMFAsyncResult_GetStatus(entry->result);
+    *type = entry->type;
+    *object = entry->object;
+    IUnknown_AddRef(*object);
+    result_entry_destroy(entry);
+    return hr;
+}
+
+static HRESULT WINAPI stream_handler_CancelObjectCreation(IMFByteStreamHandler *iface, IUnknown *cookie)
+{
+    struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
+    IMFAsyncResult *result = (IMFAsyncResult *)cookie;
+    struct result_entry *entry;
+
+    TRACE("%p, %p.\n", iface, cookie);
+
+    if (!(entry = handler_find_result_entry(handler, result)))
+        return MF_E_UNEXPECTED;
+
+    result_entry_destroy(entry);
+    return S_OK;
+}
+
+static HRESULT WINAPI stream_handler_GetMaxNumberOfBytesRequiredForResolution(IMFByteStreamHandler *iface, QWORD *bytes)
+{
+    FIXME("stub (%p %p)\n", iface, bytes);
+    return E_NOTIMPL;
+}
+
+static const IMFByteStreamHandlerVtbl stream_handler_vtbl =
+{
+    stream_handler_QueryInterface,
+    stream_handler_AddRef,
+    stream_handler_Release,
+    stream_handler_BeginCreateObject,
+    stream_handler_EndCreateObject,
+    stream_handler_CancelObjectCreation,
+    stream_handler_GetMaxNumberOfBytesRequiredForResolution,
+};
+
+static HRESULT WINAPI stream_handler_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj)
+{
+    if (IsEqualIID(riid, &IID_IMFAsyncCallback) ||
+            IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IMFAsyncCallback_AddRef(iface);
+        return S_OK;
+    }
+
+    WARN("Unsupported %s.\n", debugstr_guid(riid));
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI stream_handler_callback_AddRef(IMFAsyncCallback *iface)
+{
+    struct stream_handler *handler = impl_from_IMFAsyncCallback(iface);
+    return IMFByteStreamHandler_AddRef(&handler->IMFByteStreamHandler_iface);
+}
+
+static ULONG WINAPI stream_handler_callback_Release(IMFAsyncCallback *iface)
+{
+    struct stream_handler *handler = impl_from_IMFAsyncCallback(iface);
+    return IMFByteStreamHandler_Release(&handler->IMFByteStreamHandler_iface);
+}
+
+static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue)
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
+{
+    struct stream_handler *handler = impl_from_IMFAsyncCallback(iface);
+    IUnknown *object, *state = IMFAsyncResult_GetStateNoAddRef(result);
+    struct object_context *context;
+    struct result_entry *entry;
+    HRESULT hr;
+
+    if (!state || !(context = impl_from_IUnknown(state)))
+        return E_INVALIDARG;
+
+    if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
+        WARN("Failed to create media source, hr %#lx\n", hr);
+    else
+    {
+        if (FAILED(hr = result_entry_create(context->result, MF_OBJECT_MEDIASOURCE, object, &entry)))
+            WARN("Failed to create handler result, hr %#lx\n", hr);
+        else
+        {
+            EnterCriticalSection(&handler->cs);
+            list_add_tail(&handler->results, &entry->entry);
+            LeaveCriticalSection(&handler->cs);
+        }
+
+        IUnknown_Release(object);
+    }
+
+    IMFAsyncResult_SetStatus(context->result, hr);
+    MFInvokeCallback(context->result);
+
+    return S_OK;
+}
+
+static const IMFAsyncCallbackVtbl stream_handler_callback_vtbl =
+{
+    stream_handler_callback_QueryInterface,
+    stream_handler_callback_AddRef,
+    stream_handler_callback_Release,
+    stream_handler_callback_GetParameters,
+    stream_handler_callback_Invoke,
+};
+
+HRESULT gstreamer_byte_stream_handler_2_create(REFIID riid, void **obj)
+{
+    struct stream_handler *handler;
+    HRESULT hr;
+
+    TRACE("%s, %p.\n", debugstr_guid(riid), obj);
+
+    if (!(handler = calloc(1, sizeof(*handler))))
+        return E_OUTOFMEMORY;
+
+    list_init(&handler->results);
+    InitializeCriticalSection(&handler->cs);
+
+    handler->IMFByteStreamHandler_iface.lpVtbl = &stream_handler_vtbl;
+    handler->IMFAsyncCallback_iface.lpVtbl = &stream_handler_callback_vtbl;
+    handler->refcount = 1;
+
+    hr = IMFByteStreamHandler_QueryInterface(&handler->IMFByteStreamHandler_iface, riid, obj);
+    IMFByteStreamHandler_Release(&handler->IMFByteStreamHandler_iface);
+
+    return hr;
+}
diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl
index 16b24a23261..493e6cff2b0 100644
--- a/dlls/winegstreamer/winegstreamer_classes.idl
+++ b/dlls/winegstreamer/winegstreamer_classes.idl
@@ -83,6 +83,12 @@ coclass VideoProcessorMFT {}
 ]
 coclass GStreamerByteStreamHandler {}
 
+[
+    threading(both),
+    uuid(317df619-5e5a-468a-9f15-d827a9a08162)
+]
+coclass GStreamerByteStreamHandler2 {}
+
 [
     threading(both),
     uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a)

From c6d7a397da1a5cd31f44dc1ef81bc642fa0751fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 22 Nov 2023 22:37:04 +0100
Subject: [PATCH 038/389] HACK: winegstreamer/new_media_source: Fallback to the
 old media source on failure.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 97 ++++++++++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 2250a5faab8..860a14f7bb5 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -119,6 +119,93 @@ static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const W
     return S_OK;
 }
 
+struct media_source_fallback_callback
+{
+    IMFAsyncCallback IMFAsyncCallback_iface;
+    IMFAsyncResult *result;
+    HANDLE event;
+};
+
+static HRESULT WINAPI media_source_fallback_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj)
+{
+    if (IsEqualIID(riid, &IID_IMFAsyncCallback) ||
+            IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IMFAsyncCallback_AddRef(iface);
+        return S_OK;
+    }
+
+    WARN("Unsupported %s.\n", debugstr_guid(riid));
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI media_source_fallback_callback_AddRef(IMFAsyncCallback *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI media_source_fallback_callback_Release(IMFAsyncCallback *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI media_source_fallback_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue)
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI media_source_fallback_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
+{
+    struct media_source_fallback_callback *impl = CONTAINING_RECORD(iface, struct media_source_fallback_callback, IMFAsyncCallback_iface);
+
+    IMFAsyncResult_AddRef((impl->result = result));
+    SetEvent(impl->event);
+
+    return S_OK;
+}
+
+static const IMFAsyncCallbackVtbl media_source_fallback_callback_vtbl =
+{
+    media_source_fallback_callback_QueryInterface,
+    media_source_fallback_callback_AddRef,
+    media_source_fallback_callback_Release,
+    media_source_fallback_callback_GetParameters,
+    media_source_fallback_callback_Invoke,
+};
+
+static HRESULT create_media_source_fallback(struct object_context *context, IUnknown **object)
+{
+    static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
+    struct media_source_fallback_callback callback = {{&media_source_fallback_callback_vtbl}};
+    IMFByteStreamHandler *handler;
+    MF_OBJECT_TYPE type;
+    HRESULT hr;
+
+    if (!(callback.event = CreateEventW(NULL, FALSE, FALSE, NULL)))
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    if (FAILED(hr = CoCreateInstance(&CLSID_GStreamerByteStreamHandler, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IMFByteStreamHandler, (void **)&handler)))
+    {
+        CloseHandle(callback.event);
+        return hr;
+    }
+
+    if (SUCCEEDED(hr = IMFByteStreamHandler_BeginCreateObject(handler, context->stream, NULL, MF_RESOLUTION_MEDIASOURCE,
+            NULL, NULL, &callback.IMFAsyncCallback_iface, NULL)))
+    {
+        WaitForSingleObject(callback.event, INFINITE);
+        hr = IMFByteStreamHandler_EndCreateObject(handler, callback.result, &type, object);
+        IMFAsyncResult_Release(callback.result);
+    }
+
+    IMFByteStreamHandler_Release(handler);
+    CloseHandle(callback.event);
+    return hr;
+}
+
 struct media_stream
 {
     IMFMediaStream IMFMediaStream_iface;
@@ -1724,6 +1811,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         IMFMediaEventQueue_Release(object->event_queue);
     IMFByteStream_Release(object->byte_stream);
     free(object);
+
     return hr;
 }
 
@@ -2000,7 +2088,14 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
 
     if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
-    else
+
+    if (FAILED(hr))
+    {
+        FIXME("Falling back to old media source, hr %#lx\n", hr);
+        hr = create_media_source_fallback(context, (IUnknown **)&object);
+    }
+
+    if (SUCCEEDED(hr))
     {
         if (FAILED(hr = result_entry_create(context->result, MF_OBJECT_MEDIASOURCE, object, &entry)))
             WARN("Failed to create handler result, hr %#lx\n", hr);

From c80502e495ea3c16dc0a62a866de2cb51da11ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 18 Aug 2023 10:59:46 +0200
Subject: [PATCH 039/389] winegstreamer/new_media_source: Introduce a new
 wg_source interface.

CW-Bug-Id: #21953
---
 MAINTAINERS                           |  1 +
 dlls/winegstreamer/Makefile.in        |  1 +
 dlls/winegstreamer/gst_private.h      |  3 +
 dlls/winegstreamer/main.c             | 25 +++++++
 dlls/winegstreamer/new_media_source.c | 15 ++++-
 dlls/winegstreamer/unix_private.h     |  5 ++
 dlls/winegstreamer/unixlib.h          |  9 +++
 dlls/winegstreamer/wg_parser.c        |  6 ++
 dlls/winegstreamer/wg_source.c        | 94 +++++++++++++++++++++++++++
 9 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 dlls/winegstreamer/wg_source.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 4bab36bfdf9..59873f6804c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -223,6 +223,7 @@ F:	dlls/winegstreamer/mfplat.c
 F:	dlls/winegstreamer/resampler.c
 F:	dlls/winegstreamer/video_decoder.c
 F:	dlls/winegstreamer/video_processor.c
+F:	dlls/winegstreamer/wg_source.c
 F:	dlls/winegstreamer/wg_sample.c
 F:	dlls/winegstreamer/wg_transform.c
 F:	dlls/winegstreamer/wma_decoder.c
diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index af64d13b7b7..49cfafc2a8e 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -27,6 +27,7 @@ SOURCES = \
 	wg_muxer.c \
 	wg_parser.c \
 	wg_sample.c \
+	wg_source.c \
 	wg_transform.c \
 	winegstreamer_classes.idl \
 	wm_reader.c \
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index e258a5ce532..13fda53b0be 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -103,6 +103,9 @@ char *wg_parser_stream_get_tag(wg_parser_stream_t stream, enum wg_parser_tag tag
 void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
         uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags);
 
+HRESULT wg_source_create(wg_source_t *out);
+void wg_source_destroy(wg_source_t source);
+
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs);
 void wg_transform_destroy(wg_transform_t transform);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index bc6111abe2a..60968286af4 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -340,6 +340,31 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
     WINE_UNIX_CALL(unix_wg_parser_stream_seek, &params);
 }
 
+HRESULT wg_source_create(wg_source_t *out)
+{
+    struct wg_source_create_params params = {0};
+    NTSTATUS status;
+
+    TRACE("out %p\n", out);
+
+    if ((status = WINE_UNIX_CALL(unix_wg_source_create, &params)))
+        WARN("wg_source_create returned status %#lx\n", status);
+    else
+    {
+        TRACE("Returning source %#I64x.\n", params.source);
+        *out = params.source;
+    }
+
+    return HRESULT_FROM_NT(status);
+}
+
+void wg_source_destroy(wg_source_t source)
+{
+    TRACE("source %#I64x.\n", source);
+
+    WINE_UNIX_CALL(unix_wg_source_destroy, &source);
+}
+
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs)
 {
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 860a14f7bb5..842df5e690d 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -36,6 +36,8 @@ struct object_context
     IMFByteStream *stream;
     UINT64 file_size;
     WCHAR *url;
+
+    wg_source_t wg_source;
 };
 
 static struct object_context *impl_from_IUnknown(IUnknown *iface)
@@ -78,6 +80,8 @@ static ULONG WINAPI object_context_Release(IUnknown *iface)
 
     if (!refcount)
     {
+        if (context->wg_source)
+            wg_source_destroy(context->wg_source);
         IMFAsyncResult_Release(context->result);
         IMFByteStream_Release(context->stream);
         free(context->url);
@@ -269,6 +273,7 @@ struct media_source
 
     CRITICAL_SECTION cs;
 
+    wg_source_t wg_source;
     UINT64 file_size;
     wg_parser_t wg_parser;
     UINT64 duration;
@@ -1446,6 +1451,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface)
         IMFMediaSource_Shutdown(iface);
         IMFMediaEventQueue_Release(source->event_queue);
         IMFByteStream_Release(source->byte_stream);
+        wg_source_destroy(source->wg_source);
         wg_parser_destroy(source->wg_parser);
         source->cs.DebugInfo->Spare[0] = 0;
         DeleteCriticalSection(&source->cs);
@@ -1724,6 +1730,9 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     InitializeCriticalSection(&object->cs);
     object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");
 
+    object->wg_source = context->wg_source;
+    context->wg_source = 0;
+
     if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))
         goto fail;
 
@@ -1803,6 +1812,8 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         WaitForSingleObject(object->read_thread, INFINITE);
         CloseHandle(object->read_thread);
     }
+    if (object->wg_source)
+        wg_source_destroy(object->wg_source);
     if (object->wg_parser)
         wg_parser_destroy(object->wg_parser);
     if (object->async_commands_queue)
@@ -2086,7 +2097,9 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
     if (!state || !(context = impl_from_IUnknown(state)))
         return E_INVALIDARG;
 
-    if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
+    if (FAILED(hr = wg_source_create(&context->wg_source)))
+        WARN("Failed to create wg_source, hr %#lx\n", hr);
+    else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
 
     if (FAILED(hr))
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index 55c850bc1a3..83d18ebbf92 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -57,6 +57,11 @@ extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps);
 extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b);
 extern GstCaps *wg_format_to_caps(const struct wg_format *format);
 
+/* wg_source.c */
+
+extern NTSTATUS wg_source_create(void *args);
+extern NTSTATUS wg_source_destroy(void *args);
+
 /* wg_transform.c */
 
 extern NTSTATUS wg_transform_create(void *args);
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index e7dcb23ab2b..a4f5f758753 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -218,6 +218,7 @@ enum wg_parser_type
 
 typedef UINT64 wg_parser_t;
 typedef UINT64 wg_parser_stream_t;
+typedef UINT64 wg_source_t;
 typedef UINT64 wg_transform_t;
 typedef UINT64 wg_muxer_t;
 
@@ -340,6 +341,11 @@ struct wg_parser_stream_seek_params
     DWORD start_flags, stop_flags;
 };
 
+struct wg_source_create_params
+{
+    wg_source_t source;
+};
+
 struct wg_transform_attrs
 {
     UINT32 output_plane_align;
@@ -450,6 +456,9 @@ enum unix_funcs
     unix_wg_parser_stream_get_tag,
     unix_wg_parser_stream_seek,
 
+    unix_wg_source_create,
+    unix_wg_source_destroy,
+
     unix_wg_transform_create,
     unix_wg_transform_destroy,
     unix_wg_transform_set_output_format,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 7326cbc27cb..b47cf9b852c 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2206,6 +2206,9 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_parser_stream_get_tag),
     X(wg_parser_stream_seek),
 
+    X(wg_source_create),
+    X(wg_source_destroy),
+
     X(wg_transform_create),
     X(wg_transform_destroy),
     X(wg_transform_set_output_format),
@@ -2539,6 +2542,9 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X64(wg_parser_stream_get_tag),
     X(wg_parser_stream_seek),
 
+    X(wg_source_create),
+    X(wg_source_destroy),
+
     X64(wg_transform_create),
     X(wg_transform_destroy),
     X64(wg_transform_set_output_format),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
new file mode 100644
index 00000000000..52a54196ea9
--- /dev/null
+++ b/dlls/winegstreamer/wg_source.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2023 Rémi Bernon for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/audio/audio.h>
+#include <gst/base/base.h>
+#include <gst/tag/tag.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "winternl.h"
+#include "mferror.h"
+
+#include "unix_private.h"
+
+struct wg_source
+{
+    GstElement *container;
+};
+
+static struct wg_source *get_source(wg_source_t source)
+{
+    return (struct wg_source *)(ULONG_PTR)source;
+}
+
+NTSTATUS wg_source_create(void *args)
+{
+    struct wg_source_create_params *params = args;
+    struct wg_source *source;
+
+    if (!(source = calloc(1, sizeof(*source))))
+        return STATUS_UNSUCCESSFUL;
+
+    if (!(source->container = gst_bin_new("wg_source")))
+        goto error;
+
+    gst_element_set_state(source->container, GST_STATE_PAUSED);
+    if (!gst_element_get_state(source->container, NULL, NULL, -1))
+        goto error;
+
+    params->source = (wg_source_t)(ULONG_PTR)source;
+    GST_INFO("Created winegstreamer source %p.", source);
+    return STATUS_SUCCESS;
+
+error:
+    if (source->container)
+    {
+        gst_element_set_state(source->container, GST_STATE_NULL);
+        gst_object_unref(source->container);
+    }
+    free(source);
+
+    GST_ERROR("Failed to create winegstreamer source.");
+    return STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS wg_source_destroy(void *args)
+{
+    struct wg_source *source = get_source(*(wg_source_t *)args);
+
+    GST_TRACE("source %p", source);
+
+    gst_element_set_state(source->container, GST_STATE_NULL);
+    gst_object_unref(source->container);
+    free(source);
+
+    return STATUS_SUCCESS;
+}

From 03d9fecdfbcfaa8285719d73b2758d35888512d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 18 Aug 2023 11:00:42 +0200
Subject: [PATCH 040/389] winegstreamer/new_media_source: Call (Begin|End)Read
 to read the byte stream header.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 35 +++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 842df5e690d..74aec7c8ee6 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -27,6 +27,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 
+#define SOURCE_BUFFER_SIZE (32 * 1024)
+
 struct object_context
 {
     IUnknown IUnknown_iface;
@@ -37,6 +39,7 @@ struct object_context
     UINT64 file_size;
     WCHAR *url;
 
+    BYTE *buffer;
     wg_source_t wg_source;
 };
 
@@ -84,6 +87,7 @@ static ULONG WINAPI object_context_Release(IUnknown *iface)
             wg_source_destroy(context->wg_source);
         IMFAsyncResult_Release(context->result);
         IMFByteStream_Release(context->stream);
+        free(context->buffer);
         free(context->url);
         free(context);
     }
@@ -99,14 +103,16 @@ static const IUnknownVtbl object_context_vtbl =
 };
 
 static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const WCHAR *url,
-        QWORD file_size, IMFAsyncResult *result, IUnknown **out)
+        QWORD file_size, IMFAsyncResult *result, IUnknown **out, BYTE **out_buf)
 {
     WCHAR *tmp_url = url ? wcsdup(url) : NULL;
     struct object_context *context;
 
-    if (!(context = calloc(1, sizeof(*context))))
+    if (!(context = calloc(1, sizeof(*context)))
+            || !(context->buffer = malloc(SOURCE_BUFFER_SIZE)))
     {
         free(tmp_url);
+        free(context);
         return E_OUTOFMEMORY;
     }
 
@@ -120,6 +126,7 @@ static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const W
     IMFAsyncResult_AddRef(context->result);
 
     *out = &context->IUnknown_iface;
+    *out_buf = context->buffer;
     return S_OK;
 }
 
@@ -1949,7 +1956,8 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa
     struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
     IMFAsyncResult *result;
     IUnknown *context;
-    QWORD file_size;
+    QWORD file_size, position;
+    BYTE *buffer;
     HRESULT hr;
     DWORD caps;
 
@@ -1978,13 +1986,16 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa
 
     if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result)))
         return hr;
-    if (FAILED(hr = object_context_create(flags, stream, url, file_size, result, &context)))
-    {
-        IMFAsyncResult_Release(result);
-        return hr;
-    }
+    if (FAILED(hr = object_context_create(flags, stream, url, file_size, result, &context, &buffer)))
+        goto done;
 
-    hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, &handler->IMFAsyncCallback_iface, context);
+    if (FAILED(hr = IMFByteStream_GetCurrentPosition(stream, &position)))
+        WARN("Failed to get byte stream position, hr %#lx\n", hr);
+    else if (position != 0 && FAILED(hr = IMFByteStream_SetCurrentPosition(stream, 0)))
+        WARN("Failed to set byte stream position, hr %#lx\n", hr);
+    else if (FAILED(hr = IMFByteStream_BeginRead(stream, buffer, min(SOURCE_BUFFER_SIZE, file_size),
+            &handler->IMFAsyncCallback_iface, context)))
+        WARN("Failed to queue byte stream async read, hr %#lx\n", hr);
     IUnknown_Release(context);
 
     if (SUCCEEDED(hr) && cancel_cookie)
@@ -1993,6 +2004,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa
         IUnknown_AddRef(*cancel_cookie);
     }
 
+done:
     IMFAsyncResult_Release(result);
 
     return hr;
@@ -2092,12 +2104,15 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
     IUnknown *object, *state = IMFAsyncResult_GetStateNoAddRef(result);
     struct object_context *context;
     struct result_entry *entry;
+    DWORD size = 0;
     HRESULT hr;
 
     if (!state || !(context = impl_from_IUnknown(state)))
         return E_INVALIDARG;
 
-    if (FAILED(hr = wg_source_create(&context->wg_source)))
+    if (FAILED(hr = IMFByteStream_EndRead(context->stream, result, &size)))
+        WARN("Failed to complete stream read, hr %#lx\n", hr);
+    else if (FAILED(hr = wg_source_create(&context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);

From dd14bb64d5aa28230f70bc16aef3b3a8ce5ae16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 18 Aug 2023 11:06:25 +0200
Subject: [PATCH 041/389] winegstreamer/new_media_source: Provide first block
 of data and stream URL to wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  2 +-
 dlls/winegstreamer/main.c             | 15 ++++++++---
 dlls/winegstreamer/new_media_source.c |  2 +-
 dlls/winegstreamer/unixlib.h          |  3 +++
 dlls/winegstreamer/wg_parser.c        | 24 +++++++++++++++++-
 dlls/winegstreamer/wg_source.c        | 36 +++++++++++++++++++++++++++
 6 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 13fda53b0be..c8d1ec0cc7e 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -103,7 +103,7 @@ char *wg_parser_stream_get_tag(wg_parser_stream_t stream, enum wg_parser_tag tag
 void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
         uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags);
 
-HRESULT wg_source_create(wg_source_t *out);
+HRESULT wg_source_create(const WCHAR *url, const void *data, uint32_t size, wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 60968286af4..a3751aba76e 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -340,12 +340,20 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
     WINE_UNIX_CALL(unix_wg_parser_stream_seek, &params);
 }
 
-HRESULT wg_source_create(wg_source_t *out)
+HRESULT wg_source_create(const WCHAR *url, const void *data, uint32_t size, wg_source_t *out)
 {
-    struct wg_source_create_params params = {0};
+    struct wg_source_create_params params =
+    {
+        .data = data, .size = size,
+    };
+    UINT len = url ? WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL) : 0;
+    char *tmp = url ? malloc(len) : NULL;
     NTSTATUS status;
 
-    TRACE("out %p\n", out);
+    TRACE("url %s, data %p, size %#x\n", debugstr_w(url), data, size);
+
+    if ((params.url = tmp))
+        WideCharToMultiByte(CP_ACP, 0, url, -1, tmp, len, NULL, NULL);
 
     if ((status = WINE_UNIX_CALL(unix_wg_source_create, &params)))
         WARN("wg_source_create returned status %#lx\n", status);
@@ -355,6 +363,7 @@ HRESULT wg_source_create(wg_source_t *out)
         *out = params.source;
     }
 
+    free(tmp);
     return HRESULT_FROM_NT(status);
 }
 
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 74aec7c8ee6..a7d4b76c200 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -2112,7 +2112,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
 
     if (FAILED(hr = IMFByteStream_EndRead(context->stream, result, &size)))
         WARN("Failed to complete stream read, hr %#lx\n", hr);
-    else if (FAILED(hr = wg_source_create(&context->wg_source)))
+    else if (FAILED(hr = wg_source_create(context->url, context->buffer, size, &context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index a4f5f758753..ea913f39dd8 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -343,6 +343,9 @@ struct wg_parser_stream_seek_params
 
 struct wg_source_create_params
 {
+    const char *url;
+    const void *data;
+    UINT32 size;
     wg_source_t source;
 };
 
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index b47cf9b852c..dc5c5e6b246 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2356,6 +2356,28 @@ static NTSTATUS wow64_wg_parser_stream_get_tag(void *args)
     return wg_parser_stream_get_tag(&params);
 }
 
+NTSTATUS wow64_wg_source_create(void *args)
+{
+    struct
+    {
+        PTR32 url;
+        PTR32 data;
+        UINT32 size;
+        wg_source_t source;
+    } *params32 = args;
+    struct wg_source_create_params params =
+    {
+        .url = ULongToPtr(params32->url),
+        .data = ULongToPtr(params32->data),
+        .size = params32->size,
+    };
+    NTSTATUS ret;
+
+    ret = wg_source_create(&params);
+    params32->source = params.source;
+    return ret;
+}
+
 NTSTATUS wow64_wg_transform_create(void *args)
 {
     struct
@@ -2542,7 +2564,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X64(wg_parser_stream_get_tag),
     X(wg_parser_stream_seek),
 
-    X(wg_source_create),
+    X64(wg_source_create),
     X(wg_source_destroy),
 
     X64(wg_transform_create),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 52a54196ea9..47f67ea8dae 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -49,13 +49,45 @@ static struct wg_source *get_source(wg_source_t source)
     return (struct wg_source *)(ULONG_PTR)source;
 }
 
+static GstCaps *detect_caps_from_data(const char *url, const void *data, guint size)
+{
+    const char *extension = url ? strrchr(url, '.') : NULL;
+    GstTypeFindProbability probability;
+    GstCaps *caps;
+    gchar *str;
+
+    if (!(caps = gst_type_find_helper_for_data_with_extension(NULL, data, size,
+            extension ? extension + 1 : NULL, &probability)))
+    {
+        GST_ERROR("Failed to detect caps for url %s, data %p, size %u", url, data, size);
+        return NULL;
+    }
+
+    str = gst_caps_to_string(caps);
+    if (probability > GST_TYPE_FIND_POSSIBLE)
+        GST_INFO("Detected caps %s with probability %u for url %s, data %p, size %u",
+                str, probability, url, data, size);
+    else
+        GST_FIXME("Detected caps %s with probability %u for url %s, data %p, size %u",
+                str, probability, url, data, size);
+    g_free(str);
+
+    return caps;
+}
+
 NTSTATUS wg_source_create(void *args)
 {
     struct wg_source_create_params *params = args;
     struct wg_source *source;
+    GstCaps *src_caps;
 
+    if (!(src_caps = detect_caps_from_data(params->url, params->data, params->size)))
+        return STATUS_UNSUCCESSFUL;
     if (!(source = calloc(1, sizeof(*source))))
+    {
+        gst_caps_unref(src_caps);
         return STATUS_UNSUCCESSFUL;
+    }
 
     if (!(source->container = gst_bin_new("wg_source")))
         goto error;
@@ -64,6 +96,8 @@ NTSTATUS wg_source_create(void *args)
     if (!gst_element_get_state(source->container, NULL, NULL, -1))
         goto error;
 
+    gst_caps_unref(src_caps);
+
     params->source = (wg_source_t)(ULONG_PTR)source;
     GST_INFO("Created winegstreamer source %p.", source);
     return STATUS_SUCCESS;
@@ -76,6 +110,8 @@ NTSTATUS wg_source_create(void *args)
     }
     free(source);
 
+    gst_caps_unref(src_caps);
+
     GST_ERROR("Failed to create winegstreamer source.");
     return STATUS_UNSUCCESSFUL;
 }

From 05035dfb6a99c230ffd15315381736bee41abe24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 27 Jul 2023 17:43:51 +0200
Subject: [PATCH 042/389] winegstreamer/new_media_source: Prefer
 MF_BYTESTREAM_ORIGIN_NAME for source URL.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index a7d4b76c200..e3c329bccfd 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -102,10 +102,30 @@ static const IUnknownVtbl object_context_vtbl =
     object_context_Release,
 };
 
+static WCHAR *byte_stream_get_url(IMFByteStream *stream, const WCHAR *url)
+{
+    IMFAttributes *attributes;
+    WCHAR buffer[MAX_PATH];
+    UINT32 size;
+    HRESULT hr;
+
+    if (SUCCEEDED(hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes)))
+    {
+        if (FAILED(hr = IMFAttributes_GetString(attributes, &MF_BYTESTREAM_ORIGIN_NAME,
+                buffer, ARRAY_SIZE(buffer), &size)))
+            WARN("Failed to get MF_BYTESTREAM_ORIGIN_NAME got size %#x, hr %#lx\n", size, hr);
+        else
+            url = buffer;
+        IMFAttributes_Release(attributes);
+    }
+
+    return url ? wcsdup(url) : NULL;
+}
+
 static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const WCHAR *url,
         QWORD file_size, IMFAsyncResult *result, IUnknown **out, BYTE **out_buf)
 {
-    WCHAR *tmp_url = url ? wcsdup(url) : NULL;
+    WCHAR *tmp_url = byte_stream_get_url(stream, url);
     struct object_context *context;
 
     if (!(context = calloc(1, sizeof(*context)))

From 8d1243719fe30b9ad64b97ff0e29c03ab6ceb6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 26 Apr 2023 18:06:11 +0200
Subject: [PATCH 043/389] winegstreamer/new_media_source: Create a source pad
 on the wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 47f67ea8dae..295e1138840 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -41,6 +41,7 @@
 
 struct wg_source
 {
+    GstPad *src_pad;
     GstElement *container;
 };
 
@@ -75,6 +76,21 @@ static GstCaps *detect_caps_from_data(const char *url, const void *data, guint s
     return caps;
 }
 
+static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)
+{
+    GstCaps *pad_caps = caps ? gst_caps_ref(caps) : gst_caps_new_any();
+    const char *name = direction == GST_PAD_SRC ? "src" : "sink";
+    GstPadTemplate *template;
+    GstPad *pad;
+
+    if (!pad_caps || !(template = gst_pad_template_new(name, direction, GST_PAD_ALWAYS, pad_caps)))
+        return NULL;
+    pad = gst_pad_new_from_template(template, "src");
+    g_object_unref(template);
+    gst_caps_unref(pad_caps);
+    return pad;
+}
+
 NTSTATUS wg_source_create(void *args)
 {
     struct wg_source_create_params *params = args;
@@ -91,6 +107,9 @@ NTSTATUS wg_source_create(void *args)
 
     if (!(source->container = gst_bin_new("wg_source")))
         goto error;
+    if (!(source->src_pad = create_pad_with_caps(GST_PAD_SRC, src_caps)))
+        goto error;
+    gst_pad_set_element_private(source->src_pad, source);
 
     gst_element_set_state(source->container, GST_STATE_PAUSED);
     if (!gst_element_get_state(source->container, NULL, NULL, -1))
@@ -108,6 +127,8 @@ NTSTATUS wg_source_create(void *args)
         gst_element_set_state(source->container, GST_STATE_NULL);
         gst_object_unref(source->container);
     }
+    if (source->src_pad)
+        gst_object_unref(source->src_pad);
     free(source);
 
     gst_caps_unref(src_caps);
@@ -124,6 +145,7 @@ NTSTATUS wg_source_destroy(void *args)
 
     gst_element_set_state(source->container, GST_STATE_NULL);
     gst_object_unref(source->container);
+    gst_object_unref(source->src_pad);
     free(source);
 
     return STATUS_SUCCESS;

From cee6b45a79c4b2887954921dc08d3bb7af22266c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 27 Apr 2023 15:22:44 +0200
Subject: [PATCH 044/389] winegstreamer/new_media_source: Create a demuxer
 element in wg_source_create.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 295e1138840..6f63ac0822f 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -94,8 +94,9 @@ static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)
 NTSTATUS wg_source_create(void *args)
 {
     struct wg_source_create_params *params = args;
+    GstElement *first = NULL, *last = NULL, *element;
+    GstCaps *src_caps, *any_caps;
     struct wg_source *source;
-    GstCaps *src_caps;
 
     if (!(src_caps = detect_caps_from_data(params->url, params->data, params->size)))
         return STATUS_UNSUCCESSFUL;
@@ -111,6 +112,21 @@ NTSTATUS wg_source_create(void *args)
         goto error;
     gst_pad_set_element_private(source->src_pad, source);
 
+    if (!(any_caps = gst_caps_new_any()))
+        goto error;
+    if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODABLE, src_caps, any_caps))
+            || !append_element(source->container, element, &first, &last))
+    {
+        gst_caps_unref(any_caps);
+        goto error;
+    }
+    gst_caps_unref(any_caps);
+
+    if (!link_src_to_element(source->src_pad, first))
+        goto error;
+    if (!gst_pad_set_active(source->src_pad, true))
+        goto error;
+
     gst_element_set_state(source->container, GST_STATE_PAUSED);
     if (!gst_element_get_state(source->container, NULL, NULL, -1))
         goto error;

From e4be1a5008cee43f862fec2efe597d1d84dd2a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 22 Nov 2023 23:11:45 +0100
Subject: [PATCH 045/389] winegstreamer/new_media_source: Push a stream and
 segment event to the wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  1 +
 dlls/winegstreamer/main.c             | 14 +++++++++
 dlls/winegstreamer/new_media_source.c |  2 ++
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  8 +++++
 dlls/winegstreamer/wg_parser.c        | 20 +++++++++++++
 dlls/winegstreamer/wg_source.c        | 42 +++++++++++++++++++++++++++
 7 files changed, 88 insertions(+)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index c8d1ec0cc7e..dc50549f82d 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -105,6 +105,7 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
 
 HRESULT wg_source_create(const WCHAR *url, const void *data, uint32_t size, wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
+HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index a3751aba76e..0786024968b 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -374,6 +374,20 @@ void wg_source_destroy(wg_source_t source)
     WINE_UNIX_CALL(unix_wg_source_destroy, &source);
 }
 
+HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size)
+{
+    struct wg_source_push_data_params params =
+    {
+        .source = source,
+        .data = data,
+        .size = size,
+    };
+
+    TRACE("source %#I64x, data %p, size %#x\n", source, data, size);
+
+    return HRESULT_FROM_NT(WINE_UNIX_CALL(unix_wg_source_push_data, &params));
+}
+
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs)
 {
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index e3c329bccfd..d63550e1b8d 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -2134,6 +2134,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
         WARN("Failed to complete stream read, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_create(context->url, context->buffer, size, &context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
+    else if (FAILED(hr = wg_source_push_data(context->wg_source, context->buffer, size)))
+        WARN("Failed to push initial data, hr %#lx\n", hr);
     else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
 
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index 83d18ebbf92..6aa7ef92f38 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -61,6 +61,7 @@ extern GstCaps *wg_format_to_caps(const struct wg_format *format);
 
 extern NTSTATUS wg_source_create(void *args);
 extern NTSTATUS wg_source_destroy(void *args);
+extern NTSTATUS wg_source_push_data(void *args);
 
 /* wg_transform.c */
 
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index ea913f39dd8..001709ca38d 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -349,6 +349,13 @@ struct wg_source_create_params
     wg_source_t source;
 };
 
+struct wg_source_push_data_params
+{
+    wg_source_t source;
+    const void *data;
+    UINT32 size;
+};
+
 struct wg_transform_attrs
 {
     UINT32 output_plane_align;
@@ -461,6 +468,7 @@ enum unix_funcs
 
     unix_wg_source_create,
     unix_wg_source_destroy,
+    unix_wg_source_push_data,
 
     unix_wg_transform_create,
     unix_wg_transform_destroy,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index dc5c5e6b246..5c613a66f45 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2208,6 +2208,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
 
     X(wg_source_create),
     X(wg_source_destroy),
+    X(wg_source_push_data),
 
     X(wg_transform_create),
     X(wg_transform_destroy),
@@ -2378,6 +2379,24 @@ NTSTATUS wow64_wg_source_create(void *args)
     return ret;
 }
 
+NTSTATUS wow64_wg_source_push_data(void *args)
+{
+    struct
+    {
+        wg_source_t source;
+        PTR32 data;
+        UINT32 size;
+    } *params32 = args;
+    struct wg_source_push_data_params params =
+    {
+        .source = params32->source,
+        .data = ULongToPtr(params32->data),
+        .size = params32->size,
+    };
+
+    return wg_source_push_data(&params);
+}
+
 NTSTATUS wow64_wg_transform_create(void *args)
 {
     struct
@@ -2566,6 +2585,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 
     X64(wg_source_create),
     X(wg_source_destroy),
+    X64(wg_source_push_data),
 
     X64(wg_transform_create),
     X(wg_transform_destroy),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 6f63ac0822f..34dae4d8cda 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -43,6 +43,8 @@ struct wg_source
 {
     GstPad *src_pad;
     GstElement *container;
+    GstSegment segment;
+    bool valid_segment;
 };
 
 static struct wg_source *get_source(wg_source_t source)
@@ -91,12 +93,29 @@ static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)
     return pad;
 }
 
+static GstEvent *create_stream_start_event(const char *stream_id)
+{
+    GstStream *stream;
+    GstEvent *event;
+
+    if (!(stream = gst_stream_new(stream_id, NULL, GST_STREAM_TYPE_UNKNOWN, 0)))
+        return NULL;
+    if ((event = gst_event_new_stream_start(stream_id)))
+    {
+        gst_event_set_stream(event, stream);
+        gst_object_unref(stream);
+    }
+
+    return event;
+}
+
 NTSTATUS wg_source_create(void *args)
 {
     struct wg_source_create_params *params = args;
     GstElement *first = NULL, *last = NULL, *element;
     GstCaps *src_caps, *any_caps;
     struct wg_source *source;
+    GstEvent *event;
 
     if (!(src_caps = detect_caps_from_data(params->url, params->data, params->size)))
         return STATUS_UNSUCCESSFUL;
@@ -105,6 +124,7 @@ NTSTATUS wg_source_create(void *args)
         gst_caps_unref(src_caps);
         return STATUS_UNSUCCESSFUL;
     }
+    gst_segment_init(&source->segment, GST_FORMAT_BYTES);
 
     if (!(source->container = gst_bin_new("wg_source")))
         goto error;
@@ -131,6 +151,9 @@ NTSTATUS wg_source_create(void *args)
     if (!gst_element_get_state(source->container, NULL, NULL, -1))
         goto error;
 
+    if (!(event = create_stream_start_event("wg_source"))
+            || !push_event(source->src_pad, event))
+        goto error;
     gst_caps_unref(src_caps);
 
     params->source = (wg_source_t)(ULONG_PTR)source;
@@ -166,3 +189,22 @@ NTSTATUS wg_source_destroy(void *args)
 
     return STATUS_SUCCESS;
 }
+
+NTSTATUS wg_source_push_data(void *args)
+{
+    struct wg_source_push_data_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    GstEvent *event;
+
+    GST_TRACE("source %p, data %p, size %#x", source, params->data, params->size);
+
+    if (!source->valid_segment)
+    {
+        if (!(event = gst_event_new_segment(&source->segment))
+                || !gst_pad_push_event(source->src_pad, event))
+            GST_ERROR("Failed to push new segment event");
+        source->valid_segment = true;
+    }
+
+    return STATUS_SUCCESS;
+}

From 2b543c0b74e47f6948c3c26133662697ae5d55b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 22 Nov 2023 23:12:14 +0100
Subject: [PATCH 046/389] winegstreamer/new_media_source: Handle GST_QUERY_URI
 on wg_source src pad.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 34dae4d8cda..3847f06eb3d 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -41,6 +41,7 @@
 
 struct wg_source
 {
+    gchar *url;
     GstPad *src_pad;
     GstElement *container;
     GstSegment segment;
@@ -93,6 +94,32 @@ static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)
     return pad;
 }
 
+static gboolean src_query_uri(struct wg_source *source, GstQuery *query)
+{
+    gchar *uri;
+
+    gst_query_parse_uri(query, &uri);
+    GST_TRACE("source %p, uri %s", source, uri);
+    gst_query_set_uri(query, source->url);
+
+    return true;
+}
+
+static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
+{
+    struct wg_source *source = gst_pad_get_element_private(pad);
+
+    switch (GST_QUERY_TYPE(query))
+    {
+    case GST_QUERY_URI:
+        if (!source->url)
+            return false;
+        return src_query_uri(source, query);
+    default:
+        return gst_pad_query_default(pad, parent, query);
+    }
+}
+
 static GstEvent *create_stream_start_event(const char *stream_id)
 {
     GstStream *stream;
@@ -124,6 +151,7 @@ NTSTATUS wg_source_create(void *args)
         gst_caps_unref(src_caps);
         return STATUS_UNSUCCESSFUL;
     }
+    source->url = params->url ? strdup(params->url) : NULL;
     gst_segment_init(&source->segment, GST_FORMAT_BYTES);
 
     if (!(source->container = gst_bin_new("wg_source")))
@@ -131,6 +159,7 @@ NTSTATUS wg_source_create(void *args)
     if (!(source->src_pad = create_pad_with_caps(GST_PAD_SRC, src_caps)))
         goto error;
     gst_pad_set_element_private(source->src_pad, source);
+    gst_pad_set_query_function(source->src_pad, src_query_cb);
 
     if (!(any_caps = gst_caps_new_any()))
         goto error;
@@ -168,6 +197,7 @@ NTSTATUS wg_source_create(void *args)
     }
     if (source->src_pad)
         gst_object_unref(source->src_pad);
+    free(source->url);
     free(source);
 
     gst_caps_unref(src_caps);
@@ -185,6 +215,7 @@ NTSTATUS wg_source_destroy(void *args)
     gst_element_set_state(source->container, GST_STATE_NULL);
     gst_object_unref(source->container);
     gst_object_unref(source->src_pad);
+    free(source->url);
     free(source);
 
     return STATUS_SUCCESS;

From 13bfa9fbb77b8bfc94d5978aee4644936b3ba3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 22 Nov 2023 23:12:29 +0100
Subject: [PATCH 047/389] winegstreamer/new_media_source: Handle
 GST_QUERY_DURATION on wg_source src pad.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  3 ++-
 dlls/winegstreamer/main.c             |  7 +++++--
 dlls/winegstreamer/new_media_source.c |  3 ++-
 dlls/winegstreamer/unixlib.h          |  1 +
 dlls/winegstreamer/wg_source.c        | 16 ++++++++++++++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index dc50549f82d..c09c367a66b 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -103,7 +103,8 @@ char *wg_parser_stream_get_tag(wg_parser_stream_t stream, enum wg_parser_tag tag
 void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
         uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags);
 
-HRESULT wg_source_create(const WCHAR *url, const void *data, uint32_t size, wg_source_t *out);
+HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
+        const void *data, uint32_t size, wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 0786024968b..502d77d826a 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -340,17 +340,20 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
     WINE_UNIX_CALL(unix_wg_parser_stream_seek, &params);
 }
 
-HRESULT wg_source_create(const WCHAR *url, const void *data, uint32_t size, wg_source_t *out)
+HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
+        const void *data, uint32_t size, wg_source_t *out)
 {
     struct wg_source_create_params params =
     {
+        .file_size = file_size,
         .data = data, .size = size,
     };
     UINT len = url ? WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL) : 0;
     char *tmp = url ? malloc(len) : NULL;
     NTSTATUS status;
 
-    TRACE("url %s, data %p, size %#x\n", debugstr_w(url), data, size);
+    TRACE("url %s, file_size %#I64x, data %p, size %#x\n", debugstr_w(url),
+            file_size, data, size);
 
     if ((params.url = tmp))
         WideCharToMultiByte(CP_ACP, 0, url, -1, tmp, len, NULL, NULL);
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index d63550e1b8d..d4c66fa3599 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -2132,7 +2132,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
 
     if (FAILED(hr = IMFByteStream_EndRead(context->stream, result, &size)))
         WARN("Failed to complete stream read, hr %#lx\n", hr);
-    else if (FAILED(hr = wg_source_create(context->url, context->buffer, size, &context->wg_source)))
+    else if (FAILED(hr = wg_source_create(context->url, context->file_size,
+            context->buffer, size, &context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_push_data(context->wg_source, context->buffer, size)))
         WARN("Failed to push initial data, hr %#lx\n", hr);
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 001709ca38d..140308436a3 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -344,6 +344,7 @@ struct wg_parser_stream_seek_params
 struct wg_source_create_params
 {
     const char *url;
+    UINT64 file_size;
     const void *data;
     UINT32 size;
     wg_source_t source;
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 3847f06eb3d..70502295537 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -94,6 +94,19 @@ static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)
     return pad;
 }
 
+static gboolean src_query_duration(struct wg_source *source, GstQuery *query)
+{
+    GstFormat format;
+
+    gst_query_parse_duration(query, &format, NULL);
+    GST_TRACE("source %p, format %s", source, gst_format_get_name(format));
+    if (format != GST_FORMAT_BYTES)
+        return false;
+
+    gst_query_set_duration(query, format, source->segment.stop);
+    return true;
+}
+
 static gboolean src_query_uri(struct wg_source *source, GstQuery *query)
 {
     gchar *uri;
@@ -111,6 +124,8 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
 
     switch (GST_QUERY_TYPE(query))
     {
+    case GST_QUERY_DURATION:
+        return src_query_duration(source, query);
     case GST_QUERY_URI:
         if (!source->url)
             return false;
@@ -153,6 +168,7 @@ NTSTATUS wg_source_create(void *args)
     }
     source->url = params->url ? strdup(params->url) : NULL;
     gst_segment_init(&source->segment, GST_FORMAT_BYTES);
+    source->segment.stop = params->file_size;
 
     if (!(source->container = gst_bin_new("wg_source")))
         goto error;

From e6e29231ef8e80a72cf2ddfd2095e7dcde4a9980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 26 Apr 2023 18:49:44 +0200
Subject: [PATCH 048/389] winegstreamer/new_media_source: Handle
 GST_QUERY_SCHEDULING on wg_source src pad.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 70502295537..41fc4af3efd 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -107,6 +107,14 @@ static gboolean src_query_duration(struct wg_source *source, GstQuery *query)
     return true;
 }
 
+static gboolean src_query_scheduling(struct wg_source *source, GstQuery *query)
+{
+    GST_TRACE("source %p", source);
+    gst_query_set_scheduling(query, GST_SCHEDULING_FLAG_SEEKABLE, 1, -1, 0);
+    gst_query_add_scheduling_mode(query, GST_PAD_MODE_PUSH);
+    return true;
+}
+
 static gboolean src_query_uri(struct wg_source *source, GstQuery *query)
 {
     gchar *uri;
@@ -126,6 +134,8 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
     {
     case GST_QUERY_DURATION:
         return src_query_duration(source, query);
+    case GST_QUERY_SCHEDULING:
+        return src_query_scheduling(source, query);
     case GST_QUERY_URI:
         if (!source->url)
             return false;

From 903772fbc765eab1bac1b3e0b15d36ea735e3af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sat, 29 Apr 2023 18:31:16 +0200
Subject: [PATCH 049/389] winegstreamer/new_media_source: Create and link sink
 pads in the wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 68 ++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 41fc4af3efd..3d8c60ebf7f 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -39,6 +39,13 @@
 
 #include "unix_private.h"
 
+#define WG_SOURCE_MAX_STREAMS 32
+
+struct source_stream
+{
+    GstPad *pad;
+};
+
 struct wg_source
 {
     gchar *url;
@@ -46,6 +53,9 @@ struct wg_source
     GstElement *container;
     GstSegment segment;
     bool valid_segment;
+
+    guint stream_count;
+    struct source_stream streams[WG_SOURCE_MAX_STREAMS];
 };
 
 static struct wg_source *get_source(wg_source_t source)
@@ -145,6 +155,14 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
     }
 }
 
+static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer)
+{
+    struct wg_soutce *source = gst_pad_get_element_private(pad);
+    GST_TRACE("source %p, pad %p, buffer %p.", source, pad, buffer);
+    gst_buffer_unref(buffer);
+    return GST_FLOW_EOS;
+}
+
 static GstEvent *create_stream_start_event(const char *stream_id)
 {
     GstStream *stream;
@@ -161,6 +179,24 @@ static GstEvent *create_stream_start_event(const char *stream_id)
     return event;
 }
 
+static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
+{
+    struct wg_source *source = user;
+    GstPad *sink_pad;
+    guint index;
+
+    GST_TRACE("source %p, element %p, pad %p.", source, element, pad);
+    if ((index = source->stream_count++) >= ARRAY_SIZE(source->streams))
+    {
+        GST_FIXME("Not enough sink pads, need %u", source->stream_count);
+        return;
+    }
+
+    sink_pad = source->streams[index].pad;
+    if (gst_pad_link(pad, sink_pad) < 0 || !gst_pad_set_active(sink_pad, true))
+        GST_ERROR("Failed to link new pad to sink pad %p", sink_pad);
+}
+
 NTSTATUS wg_source_create(void *args)
 {
     struct wg_source_create_params *params = args;
@@ -168,6 +204,8 @@ NTSTATUS wg_source_create(void *args)
     GstCaps *src_caps, *any_caps;
     struct wg_source *source;
     GstEvent *event;
+    GstPad *peer;
+    guint i;
 
     if (!(src_caps = detect_caps_from_data(params->url, params->data, params->size)))
         return STATUS_UNSUCCESSFUL;
@@ -182,11 +220,21 @@ NTSTATUS wg_source_create(void *args)
 
     if (!(source->container = gst_bin_new("wg_source")))
         goto error;
+    GST_OBJECT_FLAG_SET(source->container, GST_BIN_FLAG_STREAMS_AWARE);
+
     if (!(source->src_pad = create_pad_with_caps(GST_PAD_SRC, src_caps)))
         goto error;
     gst_pad_set_element_private(source->src_pad, source);
     gst_pad_set_query_function(source->src_pad, src_query_cb);
 
+    for (i = 0; i < ARRAY_SIZE(source->streams); i++)
+    {
+        if (!(source->streams[i].pad = create_pad_with_caps(GST_PAD_SINK, NULL)))
+            goto error;
+        gst_pad_set_element_private(source->streams[i].pad, source);
+        gst_pad_set_chain_function(source->streams[i].pad, sink_chain_cb);
+    }
+
     if (!(any_caps = gst_caps_new_any()))
         goto error;
     if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODABLE, src_caps, any_caps))
@@ -195,6 +243,7 @@ NTSTATUS wg_source_create(void *args)
         gst_caps_unref(any_caps);
         goto error;
     }
+    g_signal_connect(element, "pad-added", G_CALLBACK(pad_added_cb), source);
     gst_caps_unref(any_caps);
 
     if (!link_src_to_element(source->src_pad, first))
@@ -202,6 +251,17 @@ NTSTATUS wg_source_create(void *args)
     if (!gst_pad_set_active(source->src_pad, true))
         goto error;
 
+    /* try to link the first output pad, some demuxers only have static pads */
+    if ((peer = gst_element_get_static_pad(last, "src")))
+    {
+        GstPad *sink_pad = source->streams[0].pad;
+        if (gst_pad_link(peer, sink_pad) < 0 || !gst_pad_set_active(sink_pad, true))
+            GST_ERROR("Failed to link static source pad %p", peer);
+        else
+            source->stream_count++;
+        gst_object_unref(peer);
+    }
+
     gst_element_set_state(source->container, GST_STATE_PAUSED);
     if (!gst_element_get_state(source->container, NULL, NULL, -1))
         goto error;
@@ -221,6 +281,11 @@ NTSTATUS wg_source_create(void *args)
         gst_element_set_state(source->container, GST_STATE_NULL);
         gst_object_unref(source->container);
     }
+    for (i = 0; i < ARRAY_SIZE(source->streams); i++)
+    {
+        if (source->streams[i].pad)
+            gst_object_unref(source->streams[i].pad);
+    }
     if (source->src_pad)
         gst_object_unref(source->src_pad);
     free(source->url);
@@ -235,11 +300,14 @@ NTSTATUS wg_source_create(void *args)
 NTSTATUS wg_source_destroy(void *args)
 {
     struct wg_source *source = get_source(*(wg_source_t *)args);
+    guint i;
 
     GST_TRACE("source %p", source);
 
     gst_element_set_state(source->container, GST_STATE_NULL);
     gst_object_unref(source->container);
+    for (i = 0; i < ARRAY_SIZE(source->streams); i++)
+        gst_object_unref(source->streams[i].pad);
     gst_object_unref(source->src_pad);
     free(source->url);
     free(source);

From 4e9a52094457d1b12f852f93df96fe2dc7655cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 22 Nov 2023 23:13:14 +0100
Subject: [PATCH 050/389] winegstreamer/new_media_source: Push the initial data
 from to the wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c |  2 +-
 dlls/winegstreamer/wg_source.c        | 31 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index d4c66fa3599..1d177cca6f9 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -2136,7 +2136,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
             context->buffer, size, &context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_push_data(context->wg_source, context->buffer, size)))
-        WARN("Failed to push initial data, hr %#lx\n", hr);
+        WARN("Failed to push wg_source data, hr %#lx\n", hr);
     else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
 
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 3d8c60ebf7f..54cdd14668d 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -104,6 +104,21 @@ static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)
     return pad;
 }
 
+static GstBuffer *create_buffer_from_bytes(const void *data, guint size)
+{
+    GstBuffer *buffer;
+
+    if (!(buffer = gst_buffer_new_and_alloc(size)))
+        GST_ERROR("Failed to allocate buffer for %#x bytes\n", size);
+    else
+    {
+        gst_buffer_fill(buffer, 0, data, size);
+        gst_buffer_set_size(buffer, size);
+    }
+
+    return buffer;
+}
+
 static gboolean src_query_duration(struct wg_source *source, GstQuery *query)
 {
     GstFormat format;
@@ -319,6 +334,8 @@ NTSTATUS wg_source_push_data(void *args)
 {
     struct wg_source_push_data_params *params = args;
     struct wg_source *source = get_source(params->source);
+    GstFlowReturn ret = GST_FLOW_OK;
+    GstBuffer *buffer;
     GstEvent *event;
 
     GST_TRACE("source %p, data %p, size %#x", source, params->data, params->size);
@@ -331,5 +348,19 @@ NTSTATUS wg_source_push_data(void *args)
         source->valid_segment = true;
     }
 
+    if (!(buffer = create_buffer_from_bytes(params->data, params->size)))
+    {
+        GST_WARNING("Failed to allocate buffer for data");
+        return STATUS_UNSUCCESSFUL;
+    }
+
+    source->segment.start += params->size;
+    if ((ret = gst_pad_push(source->src_pad, buffer)) && ret != GST_FLOW_EOS)
+    {
+        GST_WARNING("Failed to push data buffer, ret %d", ret);
+        source->segment.start -= params->size;
+        return STATUS_UNSUCCESSFUL;
+    }
+
     return STATUS_SUCCESS;
 }

From e2bb2c048beb1d3b2bb18974b691ee1e2236539b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 28 Apr 2023 22:44:15 +0200
Subject: [PATCH 051/389] winegstreamer/new_media_source: Push EOS event on
 stream or segment end.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 54cdd14668d..ee36e777e62 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -348,6 +348,13 @@ NTSTATUS wg_source_push_data(void *args)
         source->valid_segment = true;
     }
 
+    if (!params->size)
+    {
+        if (source->segment.start != source->segment.stop)
+            goto eos;
+        return STATUS_SUCCESS;
+    }
+
     if (!(buffer = create_buffer_from_bytes(params->data, params->size)))
     {
         GST_WARNING("Failed to allocate buffer for data");
@@ -362,5 +369,14 @@ NTSTATUS wg_source_push_data(void *args)
         return STATUS_UNSUCCESSFUL;
     }
 
+    if (source->segment.start != source->segment.stop)
+        return STATUS_SUCCESS;
+
+eos:
+    if (!(event = gst_event_new_eos())
+            || !gst_pad_push_event(source->src_pad, event))
+        GST_WARNING("Failed to push EOS event");
+    source->segment.start = source->segment.stop;
+
     return STATUS_SUCCESS;
 }

From 084aa80f4fa191135ede5a4af289e84d4ca4792e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 24 Jul 2023 14:03:53 +0200
Subject: [PATCH 052/389] winegstreamer/new_media_source: Handle GST_EVENT_SEEK
 on wg_source src pad.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 77 ++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index ee36e777e62..be40a20f3af 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -119,6 +119,67 @@ static GstBuffer *create_buffer_from_bytes(const void *data, guint size)
     return buffer;
 }
 
+static gboolean src_event_seek(struct wg_source *source, GstEvent *event)
+{
+    guint32 seqnum = gst_event_get_seqnum(event);
+    GstSeekType cur_type, stop_type;
+    GstSeekFlags flags;
+    GstFormat format;
+    gint64 cur, stop;
+    gdouble rate;
+
+    gst_event_parse_seek(event, &rate, &format, &flags, &cur_type, &cur, &stop_type, &stop);
+    gst_event_unref(event);
+    if (format != GST_FORMAT_BYTES)
+        return false;
+
+    GST_TRACE("source %p, rate %f, format %s, flags %#x, cur_type %u, cur %#" G_GINT64_MODIFIER "x, "
+            "stop_type %u, stop %#" G_GINT64_MODIFIER "x.", source, rate, gst_format_get_name(format),
+            flags, cur_type, cur, stop_type, stop);
+
+    if (flags & GST_SEEK_FLAG_FLUSH)
+    {
+        if (!(event = gst_event_new_flush_start()))
+            GST_ERROR("Failed to allocate flush_start event");
+        else
+        {
+            gst_event_set_seqnum(event, seqnum);
+            if (!gst_pad_push_event(source->src_pad, event))
+                GST_ERROR("Failed to push flush_start event");
+        }
+    }
+
+    source->segment.start = cur;
+
+    if (flags & GST_SEEK_FLAG_FLUSH)
+    {
+        if (!(event = gst_event_new_flush_stop(true)))
+            GST_ERROR("Failed to allocate flush_stop event");
+        else
+        {
+            gst_event_set_seqnum(event, seqnum);
+            if (!gst_pad_push_event(source->src_pad, event))
+                GST_ERROR("Failed to push flush_stop event");
+        }
+        source->valid_segment = false;
+    }
+
+    return true;
+}
+
+static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    struct wg_source *source = gst_pad_get_element_private(pad);
+
+    switch (GST_EVENT_TYPE(event))
+    {
+    case GST_EVENT_SEEK:
+        return src_event_seek(source, event);
+    default:
+        return gst_pad_event_default(pad, parent, event);
+    }
+}
+
 static gboolean src_query_duration(struct wg_source *source, GstQuery *query)
 {
     GstFormat format;
@@ -140,6 +201,19 @@ static gboolean src_query_scheduling(struct wg_source *source, GstQuery *query)
     return true;
 }
 
+static gboolean src_query_seeking(struct wg_source *source, GstQuery *query)
+{
+    GstFormat format;
+
+    gst_query_parse_seeking(query, &format, NULL, NULL, NULL);
+    GST_TRACE("source %p, format %s", source, gst_format_get_name(format));
+    if (format != GST_FORMAT_BYTES)
+        return false;
+
+    gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, source->segment.stop);
+    return true;
+}
+
 static gboolean src_query_uri(struct wg_source *source, GstQuery *query)
 {
     gchar *uri;
@@ -161,6 +235,8 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
         return src_query_duration(source, query);
     case GST_QUERY_SCHEDULING:
         return src_query_scheduling(source, query);
+    case GST_QUERY_SEEKING:
+        return src_query_seeking(source, query);
     case GST_QUERY_URI:
         if (!source->url)
             return false;
@@ -241,6 +317,7 @@ NTSTATUS wg_source_create(void *args)
         goto error;
     gst_pad_set_element_private(source->src_pad, source);
     gst_pad_set_query_function(source->src_pad, src_query_cb);
+    gst_pad_set_event_function(source->src_pad, src_event_cb);
 
     for (i = 0; i < ARRAY_SIZE(source->streams); i++)
     {

From 2bec71654b05b2fdcab750b8ca27cf14a31fe55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 28 Apr 2023 11:53:27 +0200
Subject: [PATCH 053/389] winegstreamer/new_media_source: Handle
 GST_EVENT_STREAM_START and create wg_source streams.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 48 ++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index be40a20f3af..f4481166d26 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -254,6 +254,38 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu
     return GST_FLOW_EOS;
 }
 
+static gboolean sink_event_stream_start(struct wg_source *source, GstPad *pad, GstEvent *event)
+{
+    guint group, flags;
+    GstStream *stream;
+    const gchar *id;
+
+    gst_event_parse_stream_start(event, &id);
+    gst_event_parse_stream(event, &stream);
+    gst_event_parse_stream_flags(event, &flags);
+    if (!gst_event_parse_group_id(event, &group))
+        group = -1;
+
+    GST_TRACE("source %p, pad %p, stream %p, id %s, flags %#x, group %d",
+            source, pad, stream, id, flags, group);
+
+    gst_event_unref(event);
+    return true;
+}
+
+static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    struct wg_source *source = gst_pad_get_element_private(pad);
+
+    switch (GST_EVENT_TYPE(event))
+    {
+    case GST_EVENT_STREAM_START:
+        return sink_event_stream_start(source, pad, event);
+    default:
+        return gst_pad_event_default(pad, parent, event);
+    }
+}
+
 static GstEvent *create_stream_start_event(const char *stream_id)
 {
     GstStream *stream;
@@ -273,7 +305,10 @@ static GstEvent *create_stream_start_event(const char *stream_id)
 static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
 {
     struct wg_source *source = user;
+    char stream_id[256];
+    GstFlowReturn ret;
     GstPad *sink_pad;
+    GstEvent *event;
     guint index;
 
     GST_TRACE("source %p, element %p, pad %p.", source, element, pad);
@@ -286,6 +321,18 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
     sink_pad = source->streams[index].pad;
     if (gst_pad_link(pad, sink_pad) < 0 || !gst_pad_set_active(sink_pad, true))
         GST_ERROR("Failed to link new pad to sink pad %p", sink_pad);
+
+    snprintf(stream_id, ARRAY_SIZE(stream_id), "wg_source/%03u", index);
+    if (!(event = create_stream_start_event(stream_id)))
+        GST_ERROR("Failed to create stream event for sink pad %p", sink_pad);
+    else
+    {
+        if ((ret = gst_pad_store_sticky_event(pad, event)) < 0)
+            GST_ERROR("Failed to create pad %p stream, ret %d", sink_pad, ret);
+        if ((ret = gst_pad_store_sticky_event(sink_pad, event)) < 0)
+            GST_ERROR("Failed to create pad %p stream, ret %d", sink_pad, ret);
+        gst_event_unref(event);
+    }
 }
 
 NTSTATUS wg_source_create(void *args)
@@ -325,6 +372,7 @@ NTSTATUS wg_source_create(void *args)
             goto error;
         gst_pad_set_element_private(source->streams[i].pad, source);
         gst_pad_set_chain_function(source->streams[i].pad, sink_chain_cb);
+        gst_pad_set_event_function(source->streams[i].pad, sink_event_cb);
     }
 
     if (!(any_caps = gst_caps_new_any()))

From c9ac74b6efc6b8546332f022f8a929f0b253147b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 18 Jun 2023 22:56:43 +0200
Subject: [PATCH 054/389] winegstreamer/new_media_source: Query stream duration
 from GST_EVENT_STREAM_START.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index f4481166d26..2353d5f3201 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -53,6 +53,7 @@ struct wg_source
     GstElement *container;
     GstSegment segment;
     bool valid_segment;
+    guint64 max_duration;
 
     guint stream_count;
     struct source_stream streams[WG_SOURCE_MAX_STREAMS];
@@ -258,6 +259,7 @@ static gboolean sink_event_stream_start(struct wg_source *source, GstPad *pad, G
 {
     guint group, flags;
     GstStream *stream;
+    gint64 duration;
     const gchar *id;
 
     gst_event_parse_stream_start(event, &id);
@@ -266,8 +268,11 @@ static gboolean sink_event_stream_start(struct wg_source *source, GstPad *pad, G
     if (!gst_event_parse_group_id(event, &group))
         group = -1;
 
-    GST_TRACE("source %p, pad %p, stream %p, id %s, flags %#x, group %d",
-            source, pad, stream, id, flags, group);
+    if (gst_pad_peer_query_duration(pad, GST_FORMAT_TIME, &duration) && GST_CLOCK_TIME_IS_VALID(duration))
+        source->max_duration = max(source->max_duration, duration);
+
+    GST_TRACE("source %p, pad %p, stream %p, id %s, flags %#x, group %d, duration %" GST_TIME_FORMAT,
+            source, pad, stream, id, flags, group, GST_TIME_ARGS(duration));
 
     gst_event_unref(event);
     return true;

From 3af9d0ae13f22a974be14581c3082e46a4377e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 28 Apr 2023 12:20:15 +0200
Subject: [PATCH 055/389] winegstreamer/new_media_source: Handle GST_EVENT_CAPS
 and update wg_source streams caps.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 2353d5f3201..40d75332975 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -255,6 +255,28 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu
     return GST_FLOW_EOS;
 }
 
+static gboolean sink_event_caps(struct wg_source *source, GstPad *pad, GstEvent *event)
+{
+    GstStream *stream;
+    GstCaps *caps;
+    gchar *str;
+
+    gst_event_parse_caps(event, &caps);
+    str = gst_caps_to_string(caps);
+    GST_TRACE("source %p, pad %p, caps %s", source, pad, str);
+    g_free(str);
+
+    if ((stream = gst_pad_get_stream(pad)))
+    {
+        gst_stream_set_caps(stream, gst_caps_copy(caps));
+        gst_stream_set_stream_type(stream, stream_type_from_caps(caps));
+        gst_object_unref(stream);
+    }
+
+    gst_event_unref(event);
+    return !!stream;
+}
+
 static gboolean sink_event_stream_start(struct wg_source *source, GstPad *pad, GstEvent *event)
 {
     guint group, flags;
@@ -284,6 +306,8 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
 
     switch (GST_EVENT_TYPE(event))
     {
+    case GST_EVENT_CAPS:
+        return sink_event_caps(source, pad, event);
     case GST_EVENT_STREAM_START:
         return sink_event_stream_start(source, pad, event);
     default:

From 44ca3c960a8f62c76194aeb7822fd041078aacde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 18 Jun 2023 15:13:06 +0200
Subject: [PATCH 056/389] winegstreamer/new_media_source: Introduce a new
 wg_source_get_stream_count unix call.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  1 +
 dlls/winegstreamer/main.c             | 22 ++++++++++++++++
 dlls/winegstreamer/new_media_source.c |  7 ++++--
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  7 ++++++
 dlls/winegstreamer/wg_parser.c        |  2 ++
 dlls/winegstreamer/wg_source.c        | 36 +++++++++++++++++++++++++++
 7 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index c09c367a66b..1a87e8600b4 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -106,6 +106,7 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
 HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
         const void *data, uint32_t size, wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
+HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 502d77d826a..b98874dd39a 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -377,6 +377,28 @@ void wg_source_destroy(wg_source_t source)
     WINE_UNIX_CALL(unix_wg_source_destroy, &source);
 }
 
+HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count)
+{
+    struct wg_source_get_stream_count_params params =
+    {
+        .source = source,
+    };
+    NTSTATUS status;
+
+    TRACE("source %#I64x, stream_count %p\n", source, stream_count);
+
+    if ((status = WINE_UNIX_CALL(unix_wg_source_get_stream_count, &params))
+            && status != STATUS_PENDING)
+    {
+        WARN("wg_source_get_stream_count returned status %#lx\n", status);
+        return HRESULT_FROM_NT(status);
+    }
+
+    *stream_count = params.stream_count;
+    TRACE("source %#I64x, stream_count %u\n", source, *stream_count);
+    return S_OK;
+}
+
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size)
 {
     struct wg_source_push_data_params params =
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 1d177cca6f9..45893b397d4 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -41,6 +41,7 @@ struct object_context
 
     BYTE *buffer;
     wg_source_t wg_source;
+    UINT32 stream_count;
 };
 
 static struct object_context *impl_from_IUnknown(IUnknown *iface)
@@ -1735,7 +1736,7 @@ static void media_source_init_descriptors(struct media_source *source)
 
 static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out)
 {
-    unsigned int stream_count = UINT_MAX;
+    UINT32 stream_count;
     struct media_source *object;
     wg_parser_t parser;
     unsigned int i;
@@ -1831,7 +1832,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     free(object->descriptors);
     free(object->streams);
 
-    if (stream_count != UINT_MAX)
+    if (object->state == SOURCE_OPENING)
         wg_parser_disconnect(object->wg_parser);
     if (object->read_thread)
     {
@@ -2137,6 +2138,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_push_data(context->wg_source, context->buffer, size)))
         WARN("Failed to push wg_source data, hr %#lx\n", hr);
+    else if (FAILED(hr = wg_source_get_stream_count(context->wg_source, &context->stream_count)))
+        WARN("Failed to get wg_source status, hr %#lx\n", hr);
     else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
 
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index 6aa7ef92f38..e2f56dbd55b 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -61,6 +61,7 @@ extern GstCaps *wg_format_to_caps(const struct wg_format *format);
 
 extern NTSTATUS wg_source_create(void *args);
 extern NTSTATUS wg_source_destroy(void *args);
+extern NTSTATUS wg_source_get_stream_count(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
 
 /* wg_transform.c */
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 140308436a3..09bd01eac99 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -350,6 +350,12 @@ struct wg_source_create_params
     wg_source_t source;
 };
 
+struct wg_source_get_stream_count_params
+{
+    wg_source_t source;
+    UINT32 stream_count;
+};
+
 struct wg_source_push_data_params
 {
     wg_source_t source;
@@ -469,6 +475,7 @@ enum unix_funcs
 
     unix_wg_source_create,
     unix_wg_source_destroy,
+    unix_wg_source_get_stream_count,
     unix_wg_source_push_data,
 
     unix_wg_transform_create,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 5c613a66f45..e14a1f52643 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2208,6 +2208,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
 
     X(wg_source_create),
     X(wg_source_destroy),
+    X(wg_source_get_stream_count),
     X(wg_source_push_data),
 
     X(wg_transform_create),
@@ -2585,6 +2586,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 
     X64(wg_source_create),
     X(wg_source_destroy),
+    X(wg_source_get_stream_count),
     X64(wg_source_push_data),
 
     X64(wg_transform_create),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 40d75332975..82cfd6acfbb 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -120,6 +120,22 @@ static GstBuffer *create_buffer_from_bytes(const void *data, guint size)
     return buffer;
 }
 
+static GstStream *source_get_stream(struct wg_source *source, guint index)
+{
+    return index >= source->stream_count ? NULL : gst_pad_get_stream(source->streams[index].pad);
+}
+
+static GstCaps *source_get_stream_caps(struct wg_source *source, guint index)
+{
+    GstStream *stream;
+    GstCaps *caps;
+    if (!(stream = source_get_stream(source, index)))
+        return NULL;
+    caps = gst_stream_get_caps(stream);
+    gst_object_unref(stream);
+    return caps;
+}
+
 static gboolean src_event_seek(struct wg_source *source, GstEvent *event)
 {
     guint32 seqnum = gst_event_get_seqnum(event);
@@ -484,6 +500,26 @@ NTSTATUS wg_source_destroy(void *args)
     return STATUS_SUCCESS;
 }
 
+NTSTATUS wg_source_get_stream_count(void *args)
+{
+    struct wg_source_get_stream_count_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    UINT i, stream_count;
+    GstCaps *caps;
+
+    GST_TRACE("source %p", source);
+
+    for (i = 0, stream_count = source->stream_count; i < stream_count; i++)
+    {
+        if (!(caps = source_get_stream_caps(source, i)))
+            return STATUS_PENDING;
+        gst_caps_unref(caps);
+    }
+
+    params->stream_count = stream_count;
+    return STATUS_SUCCESS;
+}
+
 NTSTATUS wg_source_push_data(void *args)
 {
     struct wg_source_push_data_params *params = args;

From 799afbf42ef00226972b257e96202258b0600ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 18 Jun 2023 15:14:14 +0200
Subject: [PATCH 057/389] winegstreamer/new_media_source: Set the
 MF_PD_TOTAL_FILE_SIZE presentation descriptor attribute.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 45893b397d4..db2a661b6ff 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -1559,6 +1559,8 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
         hr = MF_E_SHUTDOWN;
     else if (SUCCEEDED(hr = MFCreatePresentationDescriptor(source->stream_count, source->descriptors, descriptor)))
     {
+        if (FAILED(hr = IMFPresentationDescriptor_SetUINT64(*descriptor, &MF_PD_TOTAL_FILE_SIZE, source->file_size)))
+            WARN("Failed to set presentation descriptor MF_PD_TOTAL_FILE_SIZE, hr %#lx\n", hr);
         if (FAILED(hr = IMFPresentationDescriptor_SetUINT64(*descriptor, &MF_PD_DURATION, source->duration)))
             WARN("Failed to set presentation descriptor MF_PD_DURATION, hr %#lx\n", hr);
 

From ce316c3ea31b13a67fcc323b0e18d21e9cb9cc02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 24 Jul 2023 14:06:25 +0200
Subject: [PATCH 058/389] winegstreamer/new_media_source: Read stream data and
 provide samples to wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  1 +
 dlls/winegstreamer/main.c             | 22 ++++++++++++++++++++++
 dlls/winegstreamer/new_media_source.c | 20 +++++++++++++++++++-
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  7 +++++++
 dlls/winegstreamer/wg_parser.c        |  2 ++
 dlls/winegstreamer/wg_source.c        | 11 +++++++++++
 7 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 1a87e8600b4..dd7e2d18817 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -107,6 +107,7 @@ HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
         const void *data, uint32_t size, wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
 HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count);
+HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index b98874dd39a..f656bbacb98 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -399,6 +399,28 @@ HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count)
     return S_OK;
 }
 
+HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset)
+{
+    struct wg_source_get_position_params params =
+    {
+        .source = source,
+    };
+    NTSTATUS status;
+
+    TRACE("source %#I64x, read_offset %p\n", source, read_offset);
+
+    if ((status = WINE_UNIX_CALL(unix_wg_source_get_position, &params))
+            && status != STATUS_PENDING)
+    {
+        WARN("wg_source_get_position returned status %#lx\n", status);
+        return HRESULT_FROM_NT(status);
+    }
+
+    *read_offset = params.read_offset;
+    TRACE("source %#I64x, read_offset %#I64x\n", source, *read_offset);
+    return S_OK;
+}
+
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size)
 {
     struct wg_source_push_data_params params =
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index db2a661b6ff..03def5550de 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -2127,6 +2127,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
     IUnknown *object, *state = IMFAsyncResult_GetStateNoAddRef(result);
     struct object_context *context;
     struct result_entry *entry;
+    UINT64 read_offset;
     DWORD size = 0;
     HRESULT hr;
 
@@ -2135,13 +2136,30 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
 
     if (FAILED(hr = IMFByteStream_EndRead(context->stream, result, &size)))
         WARN("Failed to complete stream read, hr %#lx\n", hr);
-    else if (FAILED(hr = wg_source_create(context->url, context->file_size,
+    else if (!context->wg_source && FAILED(hr = wg_source_create(context->url, context->file_size,
             context->buffer, size, &context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_push_data(context->wg_source, context->buffer, size)))
         WARN("Failed to push wg_source data, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_get_stream_count(context->wg_source, &context->stream_count)))
         WARN("Failed to get wg_source status, hr %#lx\n", hr);
+    else if (!context->stream_count)
+    {
+        QWORD position, offset;
+        if (FAILED(hr = wg_source_get_position(context->wg_source, &read_offset)))
+            WARN("Failed to get wg_source position, hr %#lx\n", hr);
+        else if (FAILED(hr = IMFByteStream_GetCurrentPosition(context->stream, &position)))
+            WARN("Failed to get current byte stream position, hr %#lx\n", hr);
+        else if (position != (offset = min(read_offset, context->file_size))
+                && FAILED(hr = IMFByteStream_SetCurrentPosition(context->stream, offset)))
+            WARN("Failed to set current byte stream position, hr %#lx\n", hr);
+        else
+        {
+            UINT32 read_size = min(SOURCE_BUFFER_SIZE, context->file_size - offset);
+            return IMFByteStream_BeginRead(context->stream, context->buffer, read_size,
+                    &handler->IMFAsyncCallback_iface, state);
+        }
+    }
     else if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object)))
         WARN("Failed to create media source, hr %#lx\n", hr);
 
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index e2f56dbd55b..e6167fef1df 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -62,6 +62,7 @@ extern GstCaps *wg_format_to_caps(const struct wg_format *format);
 extern NTSTATUS wg_source_create(void *args);
 extern NTSTATUS wg_source_destroy(void *args);
 extern NTSTATUS wg_source_get_stream_count(void *args);
+extern NTSTATUS wg_source_get_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
 
 /* wg_transform.c */
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 09bd01eac99..7cb71ea9054 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -356,6 +356,12 @@ struct wg_source_get_stream_count_params
     UINT32 stream_count;
 };
 
+struct wg_source_get_position_params
+{
+    wg_source_t source;
+    UINT64 read_offset;
+};
+
 struct wg_source_push_data_params
 {
     wg_source_t source;
@@ -476,6 +482,7 @@ enum unix_funcs
     unix_wg_source_create,
     unix_wg_source_destroy,
     unix_wg_source_get_stream_count,
+    unix_wg_source_get_position,
     unix_wg_source_push_data,
 
     unix_wg_transform_create,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index e14a1f52643..043af8a32d2 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2209,6 +2209,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_create),
     X(wg_source_destroy),
     X(wg_source_get_stream_count),
+    X(wg_source_get_position),
     X(wg_source_push_data),
 
     X(wg_transform_create),
@@ -2587,6 +2588,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X64(wg_source_create),
     X(wg_source_destroy),
     X(wg_source_get_stream_count),
+    X(wg_source_get_position),
     X64(wg_source_push_data),
 
     X64(wg_transform_create),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 82cfd6acfbb..9906e8c51c6 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -520,6 +520,17 @@ NTSTATUS wg_source_get_stream_count(void *args)
     return STATUS_SUCCESS;
 }
 
+NTSTATUS wg_source_get_position(void *args)
+{
+    struct wg_source_get_position_params *params = args;
+    struct wg_source *source = get_source(params->source);
+
+    GST_TRACE("source %p", source);
+
+    params->read_offset = source->segment.start;
+    return STATUS_SUCCESS;
+}
+
 NTSTATUS wg_source_push_data(void *args)
 {
     struct wg_source_push_data_params *params = args;

From 9ce1f5f7f495546e3b234f0997ce56b27254b5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 29 Nov 2023 18:02:55 +0100
Subject: [PATCH 059/389] winegstreamer/new_media_source: Query the stream max
 duration from the wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  1 +
 dlls/winegstreamer/main.c             | 22 ++++++++++++++++++++++
 dlls/winegstreamer/new_media_source.c |  4 ++--
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  7 +++++++
 dlls/winegstreamer/wg_parser.c        |  2 ++
 dlls/winegstreamer/wg_source.c        | 11 +++++++++++
 7 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index dd7e2d18817..5c23483e332 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -107,6 +107,7 @@ HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
         const void *data, uint32_t size, wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
 HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count);
+HRESULT wg_source_get_duration(wg_source_t source, uint64_t *duration);
 HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index f656bbacb98..1c5c2bec819 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -399,6 +399,28 @@ HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count)
     return S_OK;
 }
 
+HRESULT wg_source_get_duration(wg_source_t source, uint64_t *duration)
+{
+    struct wg_source_get_duration_params params =
+    {
+        .source = source,
+    };
+    NTSTATUS status;
+
+    TRACE("source %#I64x, duration %p\n", source, duration);
+
+    if ((status = WINE_UNIX_CALL(unix_wg_source_get_duration, &params))
+            && status != STATUS_PENDING)
+    {
+        WARN("wg_source_get_duration returned status %#lx\n", status);
+        return HRESULT_FROM_NT(status);
+    }
+
+    *duration = params.duration;
+    TRACE("source %#I64x, duration %s\n", source, debugstr_time(*duration));
+    return S_OK;
+}
+
 HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset)
 {
     struct wg_source_get_position_params params =
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 03def5550de..1ecc6cba040 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -1765,9 +1765,10 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
 
     if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))
         goto fail;
-
     if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue)))
         goto fail;
+    if (FAILED(hr = wg_source_get_duration(object->wg_source, &object->duration)))
+        goto fail;
 
     if (!(parser = wg_parser_create(WG_PARSER_DECODEBIN, FALSE, FALSE)))
     {
@@ -1808,7 +1809,6 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
             goto fail;
         }
 
-        object->duration = max(object->duration, wg_parser_stream_get_duration(wg_stream));
         IMFStreamDescriptor_AddRef(descriptor);
         object->descriptors[i] = descriptor;
         object->streams[i] = stream;
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index e6167fef1df..df3bda1cad3 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -62,6 +62,7 @@ extern GstCaps *wg_format_to_caps(const struct wg_format *format);
 extern NTSTATUS wg_source_create(void *args);
 extern NTSTATUS wg_source_destroy(void *args);
 extern NTSTATUS wg_source_get_stream_count(void *args);
+extern NTSTATUS wg_source_get_duration(void *args);
 extern NTSTATUS wg_source_get_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
 
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 7cb71ea9054..aabc915ebc2 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -356,6 +356,12 @@ struct wg_source_get_stream_count_params
     UINT32 stream_count;
 };
 
+struct wg_source_get_duration_params
+{
+    wg_source_t source;
+    UINT64 duration;
+};
+
 struct wg_source_get_position_params
 {
     wg_source_t source;
@@ -482,6 +488,7 @@ enum unix_funcs
     unix_wg_source_create,
     unix_wg_source_destroy,
     unix_wg_source_get_stream_count,
+    unix_wg_source_get_duration,
     unix_wg_source_get_position,
     unix_wg_source_push_data,
 
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 043af8a32d2..1f6ca1a5ccd 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2209,6 +2209,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_create),
     X(wg_source_destroy),
     X(wg_source_get_stream_count),
+    X(wg_source_get_duration),
     X(wg_source_get_position),
     X(wg_source_push_data),
 
@@ -2588,6 +2589,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X64(wg_source_create),
     X(wg_source_destroy),
     X(wg_source_get_stream_count),
+    X(wg_source_get_duration),
     X(wg_source_get_position),
     X64(wg_source_push_data),
 
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 9906e8c51c6..ee9d7f2c9a0 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -520,6 +520,17 @@ NTSTATUS wg_source_get_stream_count(void *args)
     return STATUS_SUCCESS;
 }
 
+NTSTATUS wg_source_get_duration(void *args)
+{
+    struct wg_source_get_duration_params *params = args;
+    struct wg_source *source = get_source(params->source);
+
+    GST_TRACE("source %p", source);
+
+    params->duration = source->max_duration / 100;
+    return STATUS_SUCCESS;
+}
+
 NTSTATUS wg_source_get_position(void *args)
 {
     struct wg_source_get_position_params *params = args;

From 384697267b5594100791ab23f12a3a545f8498d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 24 Jul 2023 14:12:21 +0200
Subject: [PATCH 060/389] winegstreamer/new_media_source: Set the
 MF_PD_MIME_TYPE presentation descriptor attribute.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      | 3 ++-
 dlls/winegstreamer/main.c             | 8 +++++---
 dlls/winegstreamer/new_media_source.c | 7 ++++++-
 dlls/winegstreamer/unixlib.h          | 1 +
 dlls/winegstreamer/wg_parser.c        | 2 ++
 dlls/winegstreamer/wg_source.c        | 9 +++++++++
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 5c23483e332..4af76cc4371 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -104,7 +104,8 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
         uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags);
 
 HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
-        const void *data, uint32_t size, wg_source_t *out);
+        const void *data, uint32_t size, WCHAR mime_type[256],
+        wg_source_t *out);
 void wg_source_destroy(wg_source_t source);
 HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count);
 HRESULT wg_source_get_duration(wg_source_t source, uint64_t *duration);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 1c5c2bec819..0b2bdbf299e 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -341,7 +341,8 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate,
 }
 
 HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
-        const void *data, uint32_t size, wg_source_t *out)
+        const void *data, uint32_t size, WCHAR mime_type[256],
+        wg_source_t *out)
 {
     struct wg_source_create_params params =
     {
@@ -352,8 +353,8 @@ HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
     char *tmp = url ? malloc(len) : NULL;
     NTSTATUS status;
 
-    TRACE("url %s, file_size %#I64x, data %p, size %#x\n", debugstr_w(url),
-            file_size, data, size);
+    TRACE("url %s, file_size %#I64x, data %p, size %#x, mime_type %p\n", debugstr_w(url),
+            file_size, data, size, mime_type);
 
     if ((params.url = tmp))
         WideCharToMultiByte(CP_ACP, 0, url, -1, tmp, len, NULL, NULL);
@@ -363,6 +364,7 @@ HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
     else
     {
         TRACE("Returning source %#I64x.\n", params.source);
+        MultiByteToWideChar(CP_ACP, 0, params.mime_type, -1, mime_type, 256);
         *out = params.source;
     }
 
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 1ecc6cba040..c279cfdd2f5 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -41,6 +41,7 @@ struct object_context
 
     BYTE *buffer;
     wg_source_t wg_source;
+    WCHAR mime_type[256];
     UINT32 stream_count;
 };
 
@@ -302,6 +303,7 @@ struct media_source
     CRITICAL_SECTION cs;
 
     wg_source_t wg_source;
+    WCHAR mime_type[256];
     UINT64 file_size;
     wg_parser_t wg_parser;
     UINT64 duration;
@@ -1559,6 +1561,8 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
         hr = MF_E_SHUTDOWN;
     else if (SUCCEEDED(hr = MFCreatePresentationDescriptor(source->stream_count, source->descriptors, descriptor)))
     {
+        if (FAILED(hr = IMFPresentationDescriptor_SetString(*descriptor, &MF_PD_MIME_TYPE, source->mime_type)))
+            WARN("Failed to set presentation descriptor MF_PD_MIME_TYPE, hr %#lx\n", hr);
         if (FAILED(hr = IMFPresentationDescriptor_SetUINT64(*descriptor, &MF_PD_TOTAL_FILE_SIZE, source->file_size)))
             WARN("Failed to set presentation descriptor MF_PD_TOTAL_FILE_SIZE, hr %#lx\n", hr);
         if (FAILED(hr = IMFPresentationDescriptor_SetUINT64(*descriptor, &MF_PD_DURATION, source->duration)))
@@ -1755,6 +1759,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     object->ref = 1;
     object->byte_stream = context->stream;
     IMFByteStream_AddRef(context->stream);
+    wcscpy(object->mime_type, context->mime_type);
     object->file_size = context->file_size;
     object->rate = 1.0f;
     InitializeCriticalSection(&object->cs);
@@ -2137,7 +2142,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM
     if (FAILED(hr = IMFByteStream_EndRead(context->stream, result, &size)))
         WARN("Failed to complete stream read, hr %#lx\n", hr);
     else if (!context->wg_source && FAILED(hr = wg_source_create(context->url, context->file_size,
-            context->buffer, size, &context->wg_source)))
+            context->buffer, size, context->mime_type, &context->wg_source)))
         WARN("Failed to create wg_source, hr %#lx\n", hr);
     else if (FAILED(hr = wg_source_push_data(context->wg_source, context->buffer, size)))
         WARN("Failed to push wg_source data, hr %#lx\n", hr);
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index aabc915ebc2..f3111785dab 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -347,6 +347,7 @@ struct wg_source_create_params
     UINT64 file_size;
     const void *data;
     UINT32 size;
+    char mime_type[256];
     wg_source_t source;
 };
 
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 1f6ca1a5ccd..826fa4168bb 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2367,6 +2367,7 @@ NTSTATUS wow64_wg_source_create(void *args)
         PTR32 url;
         PTR32 data;
         UINT32 size;
+        char mime_type[256];
         wg_source_t source;
     } *params32 = args;
     struct wg_source_create_params params =
@@ -2378,6 +2379,7 @@ NTSTATUS wow64_wg_source_create(void *args)
     NTSTATUS ret;
 
     ret = wg_source_create(&params);
+    strcpy(params32->mime_type, params.mime_type);
     params32->source = params.source;
     return ret;
 }
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index ee9d7f2c9a0..ba82c2f107e 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -386,6 +386,7 @@ NTSTATUS wg_source_create(void *args)
     GstElement *first = NULL, *last = NULL, *element;
     GstCaps *src_caps, *any_caps;
     struct wg_source *source;
+    const gchar *media_type;
     GstEvent *event;
     GstPad *peer;
     guint i;
@@ -401,6 +402,14 @@ NTSTATUS wg_source_create(void *args)
     gst_segment_init(&source->segment, GST_FORMAT_BYTES);
     source->segment.stop = params->file_size;
 
+    media_type = gst_structure_get_name(gst_caps_get_structure(src_caps, 0));
+    if (!strcmp(media_type, "video/quicktime"))
+        strcpy(params->mime_type, "video/mp4");
+    else if (!strcmp(media_type, "video/x-msvideo"))
+        strcpy(params->mime_type, "video/avi");
+    else
+        lstrcpynA(params->mime_type, media_type, ARRAY_SIZE(params->mime_type));
+
     if (!(source->container = gst_bin_new("wg_source")))
         goto error;
     GST_OBJECT_FLAG_SET(source->container, GST_BIN_FLAG_STREAMS_AWARE);

From 7d40c1330d2f1934e2af370fc260e0732d3d970b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sat, 29 Apr 2023 18:35:22 +0200
Subject: [PATCH 061/389] winegstreamer/new_media_source: Handle GST_EVENT_TAG
 and udpate wg_source streams tags.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_source.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index ba82c2f107e..1ef7bb7dff9 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -293,6 +293,31 @@ static gboolean sink_event_caps(struct wg_source *source, GstPad *pad, GstEvent
     return !!stream;
 }
 
+static gboolean sink_event_tag(struct wg_source *source, GstPad *pad, GstEvent *event)
+{
+    GstTagList *new_tags;
+    GstStream *stream;
+
+    gst_event_parse_tag(event, &new_tags);
+    GST_TRACE("source %p, pad %p, new_tags %p", source, pad, new_tags);
+
+    if ((stream = gst_pad_get_stream(pad)))
+    {
+        GstTagList *old_tags = gst_stream_get_tags(stream);
+        if ((new_tags = gst_tag_list_merge(old_tags, new_tags, GST_TAG_MERGE_REPLACE)))
+        {
+            gst_stream_set_tags(stream, new_tags);
+            gst_tag_list_unref(new_tags);
+        }
+        if (old_tags)
+            gst_tag_list_unref(old_tags);
+        gst_object_unref(stream);
+    }
+
+    gst_event_unref(event);
+    return stream && new_tags;
+}
+
 static gboolean sink_event_stream_start(struct wg_source *source, GstPad *pad, GstEvent *event)
 {
     guint group, flags;
@@ -324,6 +349,8 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
     {
     case GST_EVENT_CAPS:
         return sink_event_caps(source, pad, event);
+    case GST_EVENT_TAG:
+        return sink_event_tag(source, pad, event);
     case GST_EVENT_STREAM_START:
         return sink_event_stream_start(source, pad, event);
     default:

From 3faccf27b0b44d33e98bb454201977f778f2c291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 19 Nov 2023 16:53:47 +0100
Subject: [PATCH 062/389] winegstreamer/new_media_source: Use wg_source order
 to build media source streams.

And map them to wg_parser streams according to their format.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  2 +
 dlls/winegstreamer/main.c             | 19 ++++++++
 dlls/winegstreamer/new_media_source.c | 64 ++++++++++++++++++++++++---
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  8 ++++
 dlls/winegstreamer/wg_parser.c        |  2 +
 dlls/winegstreamer/wg_source.c        | 18 ++++++++
 7 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 4af76cc4371..b1c482d0250 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -111,6 +111,8 @@ HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count);
 HRESULT wg_source_get_duration(wg_source_t source, uint64_t *duration);
 HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
+bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
+        struct wg_format *format);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 0b2bdbf299e..5f7a5bcb8d8 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -459,6 +459,25 @@ HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size)
     return HRESULT_FROM_NT(WINE_UNIX_CALL(unix_wg_source_push_data, &params));
 }
 
+bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
+        struct wg_format *format)
+{
+    struct wg_source_get_stream_format_params params =
+    {
+        .source = source,
+        .index = index,
+    };
+
+    TRACE("source %#I64x, index %u, format %p\n", source,
+            index, format);
+
+    if (WINE_UNIX_CALL(unix_wg_source_get_stream_format, &params))
+        return false;
+
+    *format = params.format;
+    return true;
+}
+
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs)
 {
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index c279cfdd2f5..11965d58d24 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -1721,6 +1721,50 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
     media_source_Shutdown,
 };
 
+static HRESULT map_stream_to_wg_parser_stream(struct media_source *source, UINT stream_count,
+        wg_parser_stream_t *parser_streams, wg_parser_stream_t parser_stream)
+{
+    struct wg_format parser_format, source_format;
+    HRESULT hr;
+    UINT i;
+
+    wg_parser_stream_get_preferred_format(parser_stream, &parser_format);
+
+    for (i = 0; i < stream_count; i++)
+    {
+        if (parser_streams[i])
+            continue;
+        if (FAILED(hr = wg_source_get_stream_format(source->wg_source, i, &source_format)))
+            return hr;
+        if ((parser_format.major_type >= WG_MAJOR_TYPE_VIDEO) != (source_format.major_type >= WG_MAJOR_TYPE_VIDEO)
+                || (parser_format.major_type >= WG_MAJOR_TYPE_AUDIO) != (source_format.major_type >= WG_MAJOR_TYPE_AUDIO))
+            continue;
+
+        TRACE("Mapped stream %#I64x with descriptor %u\n", parser_stream, i);
+        parser_streams[i] = parser_stream;
+        return S_OK;
+    }
+
+    return E_FAIL;
+}
+
+static void media_source_init_parser_streams(struct media_source *source, UINT stream_count,
+        wg_parser_stream_t *parser_streams)
+{
+    wg_parser_stream_t parser_stream;
+    UINT i, parser_stream_count;
+    HRESULT hr;
+
+    parser_stream_count = wg_parser_get_stream_count(source->wg_parser);
+    for (i = 0; i < parser_stream_count; i++)
+    {
+        if (!(parser_stream = wg_parser_get_stream(source->wg_parser, i)))
+            continue;
+        if (FAILED(hr = map_stream_to_wg_parser_stream(source, stream_count, parser_streams, parser_stream)))
+            WARN("Failed to map parser stream %u, hr %#lx\n", i, hr);
+    }
+}
+
 static void media_source_init_descriptors(struct media_source *source)
 {
     HRESULT hr = S_OK;
@@ -1742,7 +1786,8 @@ static void media_source_init_descriptors(struct media_source *source)
 
 static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out)
 {
-    UINT32 stream_count;
+    UINT32 stream_count = context->stream_count;
+    wg_parser_stream_t *parser_streams = NULL;
     struct media_source *object;
     wg_parser_t parser;
     unsigned int i;
@@ -1789,26 +1834,30 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     if (FAILED(hr = wg_parser_connect(parser, object->file_size, NULL)))
         goto fail;
 
-    stream_count = wg_parser_get_stream_count(parser);
-
     if (!(object->descriptors = calloc(stream_count, sizeof(*object->descriptors)))
+            || !(parser_streams = calloc(stream_count, sizeof(*parser_streams)))
             || !(object->streams = calloc(stream_count, sizeof(*object->streams))))
     {
         hr = E_OUTOFMEMORY;
         goto fail;
     }
 
+    media_source_init_parser_streams(object, stream_count, parser_streams);
+
     for (i = 0; i < stream_count; ++i)
     {
-        wg_parser_stream_t wg_stream = wg_parser_get_stream(object->wg_parser, i);
+        wg_parser_stream_t parser_stream;
         IMFStreamDescriptor *descriptor;
         struct media_stream *stream;
         struct wg_format format;
 
-        wg_parser_stream_get_preferred_format(wg_stream, &format);
+        if (!(parser_stream = parser_streams[i]))
+            continue;
+        wg_parser_stream_get_preferred_format(parser_stream, &format);
+
         if (FAILED(hr = stream_descriptor_create(i, &format, &descriptor)))
             goto fail;
-        if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, wg_stream, &stream)))
+        if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, parser_stream, &stream)))
         {
             IMFStreamDescriptor_Release(descriptor);
             goto fail;
@@ -1820,6 +1869,8 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         object->stream_count++;
     }
 
+    free(parser_streams);
+
     media_source_init_descriptors(object);
     object->state = SOURCE_STOPPED;
 
@@ -1836,6 +1887,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         IMFStreamDescriptor_Release(object->descriptors[object->stream_count]);
         IMFMediaStream_Release(&stream->IMFMediaStream_iface);
     }
+    free(parser_streams);
     free(object->descriptors);
     free(object->streams);
 
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index df3bda1cad3..646d1a90f0f 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -65,6 +65,7 @@ extern NTSTATUS wg_source_get_stream_count(void *args);
 extern NTSTATUS wg_source_get_duration(void *args);
 extern NTSTATUS wg_source_get_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
+extern NTSTATUS wg_source_get_stream_format(void *args);
 
 /* wg_transform.c */
 
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index f3111785dab..f85e6eb74b0 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -376,6 +376,13 @@ struct wg_source_push_data_params
     UINT32 size;
 };
 
+struct wg_source_get_stream_format_params
+{
+    wg_source_t source;
+    UINT32 index;
+    struct wg_format format;
+};
+
 struct wg_transform_attrs
 {
     UINT32 output_plane_align;
@@ -492,6 +499,7 @@ enum unix_funcs
     unix_wg_source_get_duration,
     unix_wg_source_get_position,
     unix_wg_source_push_data,
+    unix_wg_source_get_stream_format,
 
     unix_wg_transform_create,
     unix_wg_transform_destroy,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 826fa4168bb..fe263ac49c4 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2212,6 +2212,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_get_duration),
     X(wg_source_get_position),
     X(wg_source_push_data),
+    X(wg_source_get_stream_format),
 
     X(wg_transform_create),
     X(wg_transform_destroy),
@@ -2594,6 +2595,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X(wg_source_get_duration),
     X(wg_source_get_position),
     X64(wg_source_push_data),
+    X(wg_source_get_stream_format),
 
     X64(wg_transform_create),
     X(wg_transform_destroy),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 1ef7bb7dff9..f6a01413c42 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -628,3 +628,21 @@ NTSTATUS wg_source_push_data(void *args)
 
     return STATUS_SUCCESS;
 }
+
+NTSTATUS wg_source_get_stream_format(void *args)
+{
+    struct wg_source_get_stream_format_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    guint index = params->index;
+    GstCaps *caps;
+
+    GST_TRACE("source %p, index %u", source, index);
+
+    if (!(caps = source_get_stream_caps(source, index)))
+        return STATUS_UNSUCCESSFUL;
+    wg_format_from_caps(&params->format, caps);
+
+    gst_caps_unref(caps);
+    return STATUS_SUCCESS;
+}
+

From 2638b0474dacbeff8215f841069bab3b9013a0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 19 Nov 2023 17:35:23 +0100
Subject: [PATCH 063/389] winegstreamer/new_media_source: Sort media source
 "video/mp4" streams by stream type.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 47 ++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 11965d58d24..4bd379d3bb6 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -311,6 +311,7 @@ struct media_source
     IMFStreamDescriptor **descriptors;
     struct media_stream **streams;
     ULONG stream_count;
+    UINT *stream_map;
 
     enum
     {
@@ -1694,6 +1695,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
         IMFMediaEventQueue_Shutdown(stream->event_queue);
         IMFMediaStream_Release(&stream->IMFMediaStream_iface);
     }
+    free(source->stream_map);
     free(source->descriptors);
     free(source->streams);
 
@@ -1734,7 +1736,7 @@ static HRESULT map_stream_to_wg_parser_stream(struct media_source *source, UINT
     {
         if (parser_streams[i])
             continue;
-        if (FAILED(hr = wg_source_get_stream_format(source->wg_source, i, &source_format)))
+        if (FAILED(hr = wg_source_get_stream_format(source->wg_source, source->stream_map[i], &source_format)))
             return hr;
         if ((parser_format.major_type >= WG_MAJOR_TYPE_VIDEO) != (source_format.major_type >= WG_MAJOR_TYPE_VIDEO)
                 || (parser_format.major_type >= WG_MAJOR_TYPE_AUDIO) != (source_format.major_type >= WG_MAJOR_TYPE_AUDIO))
@@ -1765,6 +1767,46 @@ static void media_source_init_parser_streams(struct media_source *source, UINT s
     }
 }
 
+static void media_source_init_stream_map(struct media_source *source, UINT stream_count)
+{
+    struct wg_format format;
+    int i, n = 0;
+
+    if (wcscmp(source->mime_type, L"video/mp4"))
+    {
+        for (i = stream_count - 1; i >= 0; i--)
+        {
+            TRACE("mapping stream %u to wg_source stream %u\n", i, i);
+            source->stream_map[i] = i;
+        }
+        return;
+    }
+
+    for (i = stream_count - 1; i >= 0; i--)
+    {
+        wg_source_get_stream_format(source->wg_source, i, &format);
+        if (format.major_type == WG_MAJOR_TYPE_UNKNOWN) continue;
+        if (format.major_type >= WG_MAJOR_TYPE_VIDEO) continue;
+        TRACE("mapping stream %u to wg_source stream %u\n", n, i);
+        source->stream_map[n++] = i;
+    }
+    for (i = stream_count - 1; i >= 0; i--)
+    {
+        wg_source_get_stream_format(source->wg_source, i, &format);
+        if (format.major_type == WG_MAJOR_TYPE_UNKNOWN) continue;
+        if (format.major_type < WG_MAJOR_TYPE_VIDEO) continue;
+        TRACE("mapping stream %u to wg_source stream %u\n", n, i);
+        source->stream_map[n++] = i;
+    }
+    for (i = stream_count - 1; i >= 0; i--)
+    {
+        wg_source_get_stream_format(source->wg_source, i, &format);
+        if (format.major_type != WG_MAJOR_TYPE_UNKNOWN) continue;
+        TRACE("mapping stream %u to wg_source stream %u\n", n, i);
+        source->stream_map[n++] = i;
+    }
+}
+
 static void media_source_init_descriptors(struct media_source *source)
 {
     HRESULT hr = S_OK;
@@ -1836,12 +1878,14 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
 
     if (!(object->descriptors = calloc(stream_count, sizeof(*object->descriptors)))
             || !(parser_streams = calloc(stream_count, sizeof(*parser_streams)))
+            || !(object->stream_map = calloc(stream_count, sizeof(*object->stream_map)))
             || !(object->streams = calloc(stream_count, sizeof(*object->streams))))
     {
         hr = E_OUTOFMEMORY;
         goto fail;
     }
 
+    media_source_init_stream_map(object, stream_count);
     media_source_init_parser_streams(object, stream_count, parser_streams);
 
     for (i = 0; i < stream_count; ++i)
@@ -1888,6 +1932,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         IMFMediaStream_Release(&stream->IMFMediaStream_iface);
     }
     free(parser_streams);
+    free(object->stream_map);
     free(object->descriptors);
     free(object->streams);
 

From 10c14fa4effda9268127d2f4ccb02caa22db4c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 13 Mar 2023 12:24:48 +0100
Subject: [PATCH 064/389] winegstreamer/new_media_source: Initialize media
 source descriptor tags from wg_source.

CW-Bug-Id: #21953
---
 dlls/mfplay/tests/mfplay.c            |   2 +-
 dlls/mfreadwrite/tests/mfplat.c       |   8 +-
 dlls/winegstreamer/gst_private.h      |   2 +
 dlls/winegstreamer/main.c             |  29 ++++++
 dlls/winegstreamer/new_media_source.c |  15 ++-
 dlls/winegstreamer/unix_private.h     |   1 +
 dlls/winegstreamer/unixlib.h          |  10 ++
 dlls/winegstreamer/wg_parser.c        |  24 +++++
 dlls/winegstreamer/wg_source.c        | 143 ++++++++++++++++++++++++++
 9 files changed, 221 insertions(+), 13 deletions(-)

diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c
index fa66ccae57e..db23bb7de42 100644
--- a/dlls/mfplay/tests/mfplay.c
+++ b/dlls/mfplay/tests/mfplay.c
@@ -493,7 +493,7 @@ static void test_media_language(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     check_media_language(player, L"test-eng.mp4", L"en");
-    check_media_language(player, L"test-ang.mp4", NULL);
+    todo_check_media_language(player, L"test-ang.mp4", NULL);
     check_media_language(player, L"test-und.mp4", NULL);
     check_media_language(player, L"test-en-US.mp4", L"en");
 
diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 08e19589ad1..2095d2f054d 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -949,7 +949,7 @@ static void test_source_reader(const char *filename, bool video)
         hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags,
                 &timestamp, &sample);
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        todo_wine_if (video) ok(!actual_index, "Unexpected stream index %lu.\n", actual_index);
+        ok(!actual_index, "Unexpected stream index %lu.\n", actual_index);
         ok(!(stream_flags & ~MF_SOURCE_READERF_ENDOFSTREAM), "Unexpected stream flags %#lx.\n", stream_flags);
 
         if (stream_flags & MF_SOURCE_READERF_ENDOFSTREAM)
@@ -970,7 +970,7 @@ static void test_source_reader(const char *filename, bool video)
             hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM,
                     0, &actual_index, &stream_flags, &timestamp, &sample);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            todo_wine ok(actual_index == 1, "Unexpected stream index %lu.\n", actual_index);
+            ok(actual_index == 1, "Unexpected stream index %lu.\n", actual_index);
             ok(!(stream_flags & ~MF_SOURCE_READERF_ENDOFSTREAM), "Unexpected stream flags %#lx.\n", stream_flags);
 
             if (stream_flags & MF_SOURCE_READERF_ENDOFSTREAM)
@@ -1001,7 +1001,7 @@ static void test_source_reader(const char *filename, bool video)
     hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN,
             &actual_index, &stream_flags, &timestamp, &sample);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine_if (video) ok(actual_index == 0, "Unexpected stream index %lu.\n", actual_index);
+    ok(actual_index == 0, "Unexpected stream index %lu.\n", actual_index);
     ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags);
     ok(!sample, "Unexpected sample object.\n");
 
@@ -1022,7 +1022,7 @@ static void test_source_reader(const char *filename, bool video)
     hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN,
             &actual_index, &stream_flags, NULL, &sample);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine_if (video) ok(!actual_index, "Unexpected stream index %lu.\n", actual_index);
+    ok(!actual_index, "Unexpected stream index %lu.\n", actual_index);
     ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags);
     ok(!sample, "Unexpected sample object.\n");
 
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index b1c482d0250..df5f64660a2 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -113,6 +113,8 @@ HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
         struct wg_format *format);
+char *wg_source_get_stream_tag(wg_source_t source, UINT32 index,
+        wg_parser_tag tag);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 5f7a5bcb8d8..11e47b1b952 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -478,6 +478,35 @@ bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
     return true;
 }
 
+char *wg_source_get_stream_tag(wg_source_t source, UINT32 index, wg_parser_tag tag)
+{
+    struct wg_source_get_stream_tag_params params =
+    {
+        .source = source,
+        .index = index,
+        .tag = tag,
+    };
+    char *buffer;
+
+    TRACE("source %#I64x, index %u, tag %#I64x\n", source, index, tag);
+
+    if (WINE_UNIX_CALL(unix_wg_source_get_stream_tag, &params) != STATUS_BUFFER_TOO_SMALL)
+        return NULL;
+    if (!(buffer = malloc(params.size)))
+    {
+        ERR("No memory.\n");
+        return NULL;
+    }
+    params.buffer = buffer;
+    if (WINE_UNIX_CALL(unix_wg_source_get_stream_tag, &params))
+    {
+        ERR("wg_source_get_stream_tag failed unexpectedly.\n");
+        free(buffer);
+        return NULL;
+    }
+    return buffer;
+}
+
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs)
 {
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 4bd379d3bb6..9dbdf069caf 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -488,15 +488,15 @@ static HRESULT wg_format_from_stream_descriptor(IMFStreamDescriptor *descriptor,
     return hr;
 }
 
-static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor, wg_parser_stream_t stream,
-    const GUID *attr, enum wg_parser_tag tag)
+static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor,
+    wg_source_t source, UINT index, const GUID *attr, enum wg_parser_tag tag)
 {
     WCHAR *strW;
     HRESULT hr;
     DWORD len;
     char *str;
 
-    if (!(str = wg_parser_stream_get_tag(stream, tag))
+    if (!(str = wg_source_get_stream_tag(source, index, tag))
             || !(len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0)))
         hr = S_OK;
     else if (!(strW = malloc(len * sizeof(*strW))))
@@ -1809,18 +1809,17 @@ static void media_source_init_stream_map(struct media_source *source, UINT strea
 
 static void media_source_init_descriptors(struct media_source *source)
 {
-    HRESULT hr = S_OK;
+    HRESULT hr;
     UINT i;
 
     for (i = 0; i < source->stream_count; i++)
     {
-        struct media_stream *stream = source->streams[i];
-        IMFStreamDescriptor *descriptor = stream->descriptor;
+        IMFStreamDescriptor *descriptor = source->descriptors[i];
 
-        if (FAILED(hr = stream_descriptor_set_tag(descriptor, stream->wg_stream,
+        if (FAILED(hr = stream_descriptor_set_tag(descriptor, source->wg_source, source->stream_map[i],
                 &MF_SD_LANGUAGE, WG_PARSER_TAG_LANGUAGE)))
             WARN("Failed to set stream descriptor language, hr %#lx\n", hr);
-        if (FAILED(hr = stream_descriptor_set_tag(descriptor, stream->wg_stream,
+        if (FAILED(hr = stream_descriptor_set_tag(descriptor, source->wg_source, source->stream_map[i],
                 &MF_SD_STREAM_NAME, WG_PARSER_TAG_NAME)))
             WARN("Failed to set stream descriptor name, hr %#lx\n", hr);
     }
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index 646d1a90f0f..7116e37d57f 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -66,6 +66,7 @@ extern NTSTATUS wg_source_get_duration(void *args);
 extern NTSTATUS wg_source_get_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
 extern NTSTATUS wg_source_get_stream_format(void *args);
+extern NTSTATUS wg_source_get_stream_tag(void *args);
 
 /* wg_transform.c */
 
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index f85e6eb74b0..cb86c756ad0 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -383,6 +383,15 @@ struct wg_source_get_stream_format_params
     struct wg_format format;
 };
 
+struct wg_source_get_stream_tag_params
+{
+    wg_source_t source;
+    UINT32 index;
+    wg_parser_tag tag;
+    UINT32 size;
+    char *buffer;
+};
+
 struct wg_transform_attrs
 {
     UINT32 output_plane_align;
@@ -500,6 +509,7 @@ enum unix_funcs
     unix_wg_source_get_position,
     unix_wg_source_push_data,
     unix_wg_source_get_stream_format,
+    unix_wg_source_get_stream_tag,
 
     unix_wg_transform_create,
     unix_wg_transform_destroy,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index fe263ac49c4..114c4d38224 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2213,6 +2213,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_get_position),
     X(wg_source_push_data),
     X(wg_source_get_stream_format),
+    X(wg_source_get_stream_tag),
 
     X(wg_transform_create),
     X(wg_transform_destroy),
@@ -2403,6 +2404,28 @@ NTSTATUS wow64_wg_source_push_data(void *args)
     return wg_source_push_data(&params);
 }
 
+NTSTATUS wow64_wg_source_get_stream_tag(void *args)
+{
+    struct
+    {
+        wg_source_t source;
+        UINT32 index;
+        wg_parser_tag tag;
+        UINT32 size;
+        PTR32 buffer;
+    } *params32 = args;
+    struct wg_source_get_stream_tag_params params =
+    {
+        .source = params32->source,
+        .index = params32->index,
+        .tag = params32->tag,
+        .size = params32->size,
+        .buffer = ULongToPtr(params32->buffer),
+    };
+
+    return wg_source_get_stream_tag(&params);
+}
+
 NTSTATUS wow64_wg_transform_create(void *args)
 {
     struct
@@ -2596,6 +2619,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X(wg_source_get_position),
     X64(wg_source_push_data),
     X(wg_source_get_stream_format),
+    X64(wg_source_get_stream_tag),
 
     X64(wg_transform_create),
     X(wg_transform_destroy),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index f6a01413c42..8201c12eb03 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -64,6 +64,14 @@ static struct wg_source *get_source(wg_source_t source)
     return (struct wg_source *)(ULONG_PTR)source;
 }
 
+static const char *media_type_from_caps(GstCaps *caps)
+{
+    GstStructure *structure;
+    if (!caps || !(structure = gst_caps_get_structure(caps, 0)))
+        return "";
+    return gst_structure_get_name(structure);
+}
+
 static GstCaps *detect_caps_from_data(const char *url, const void *data, guint size)
 {
     const char *extension = url ? strrchr(url, '.') : NULL;
@@ -136,6 +144,17 @@ static GstCaps *source_get_stream_caps(struct wg_source *source, guint index)
     return caps;
 }
 
+static GstTagList *source_get_stream_tags(struct wg_source *source, guint index)
+{
+    GstStream *stream;
+    GstTagList *tags;
+    if (!(stream = source_get_stream(source, index)))
+        return NULL;
+    tags = gst_stream_get_tags(stream);
+    gst_object_unref(stream);
+    return tags;
+}
+
 static gboolean src_event_seek(struct wg_source *source, GstEvent *event)
 {
     guint32 seqnum = gst_event_get_seqnum(event);
@@ -646,3 +665,127 @@ NTSTATUS wg_source_get_stream_format(void *args)
     return STATUS_SUCCESS;
 }
 
+static gchar *stream_lang_from_tags(GstTagList *tags, bool is_quicktime)
+{
+    gchar *value;
+
+    if (!gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &value) || !value)
+        return NULL;
+
+    if (is_quicktime)
+    {
+        /* For QuickTime media, we convert the language tags to ISO 639-1. */
+        const gchar *lang_code_iso_639_1 = gst_tag_get_language_code_iso_639_1(value);
+        gchar *tmp = lang_code_iso_639_1 ? g_strdup(lang_code_iso_639_1) : NULL;
+        g_free(value);
+        value = tmp;
+    }
+
+    return value;
+}
+
+static gchar *stream_name_from_tags(GstTagList *tags)
+{
+    /* Extract stream name from Quick Time demuxer private tag where it puts unrecognized chunks. */
+    guint i, tag_count = gst_tag_list_get_tag_size(tags, "private-qt-tag");
+    gchar *value = NULL;
+
+    for (i = 0; !value && i < tag_count; ++i)
+    {
+        const gchar *name;
+        const GValue *val;
+        GstSample *sample;
+        GstBuffer *buf;
+        gsize size;
+
+        if (!(val = gst_tag_list_get_value_index(tags, "private-qt-tag", i)))
+            continue;
+        if (!GST_VALUE_HOLDS_SAMPLE(val) || !(sample = gst_value_get_sample(val)))
+            continue;
+        name = gst_structure_get_name(gst_sample_get_info(sample));
+        if (!name || strcmp(name, "application/x-gst-qt-name-tag"))
+            continue;
+        if (!(buf = gst_sample_get_buffer(sample)))
+            continue;
+        if ((size = gst_buffer_get_size(buf)) < 8)
+            continue;
+        size -= 8;
+        if (!(value = g_malloc(size + 1)))
+            return NULL;
+        if (gst_buffer_extract(buf, 8, value, size) != size)
+        {
+            g_free(value);
+            value = NULL;
+            continue;
+        }
+        value[size] = 0;
+    }
+
+    return value;
+}
+
+NTSTATUS wg_source_get_stream_tag(void *args)
+{
+    struct wg_source_get_stream_tag_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    enum wg_parser_tag tag = params->tag;
+    guint index = params->index;
+    GstTagList *tags;
+    NTSTATUS status;
+    uint32_t len;
+    gchar *value;
+
+    GST_TRACE("source %p, index %u, tag %u", source, index, tag);
+
+    if (params->tag >= WG_PARSER_TAG_COUNT)
+        return STATUS_INVALID_PARAMETER;
+    if (!(tags = source_get_stream_tags(source, index)))
+        return STATUS_UNSUCCESSFUL;
+
+    switch (tag)
+    {
+    case WG_PARSER_TAG_LANGUAGE:
+    {
+        bool is_quicktime = false;
+        GstCaps *caps;
+
+        if ((caps = gst_pad_get_current_caps(source->src_pad)))
+        {
+            is_quicktime = !strcmp(media_type_from_caps(caps), "video/quicktime");
+            gst_caps_unref(caps);
+        }
+
+        value = stream_lang_from_tags(tags, is_quicktime);
+        break;
+    }
+    case WG_PARSER_TAG_NAME:
+        value = stream_name_from_tags(tags);
+        break;
+    default:
+        GST_FIXME("Unsupported stream tag %u", tag);
+        value = NULL;
+        break;
+    }
+
+    if (!value)
+        goto error;
+
+    if ((len = strlen(value) + 1) > params->size)
+    {
+        params->size = len;
+        status = STATUS_BUFFER_TOO_SMALL;
+    }
+    else
+    {
+        memcpy(params->buffer, value, len);
+        status = STATUS_SUCCESS;
+    }
+
+    gst_tag_list_unref(tags);
+    g_free(value);
+    return status;
+
+error:
+    gst_tag_list_unref(tags);
+    return STATUS_NOT_FOUND;
+}

From f7ea3db660821607db68050a28923c854f6ed218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 28 Apr 2023 19:13:44 +0200
Subject: [PATCH 065/389] winegstreamer/new_media_source: Set
 MF_SD_MUTUALLY_EXCLUSIVE stream descriptor attribute.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 39 ++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 9dbdf069caf..e47b71a2e66 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -475,6 +475,19 @@ static HRESULT stream_descriptor_get_media_type(IMFStreamDescriptor *descriptor,
     return hr;
 }
 
+static HRESULT stream_descriptor_get_major_type(IMFStreamDescriptor *descriptor, GUID *major)
+{
+    IMFMediaTypeHandler *handler;
+    HRESULT hr;
+
+    if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(descriptor, &handler)))
+        return hr;
+    hr = IMFMediaTypeHandler_GetMajorType(handler, major);
+    IMFMediaTypeHandler_Release(handler);
+
+    return hr;
+}
+
 static HRESULT wg_format_from_stream_descriptor(IMFStreamDescriptor *descriptor, struct wg_format *format)
 {
     IMFMediaType *media_type;
@@ -1809,12 +1822,36 @@ static void media_source_init_stream_map(struct media_source *source, UINT strea
 
 static void media_source_init_descriptors(struct media_source *source)
 {
+    UINT i, last_audio = -1, last_video = -1;
     HRESULT hr;
-    UINT i;
 
     for (i = 0; i < source->stream_count; i++)
     {
         IMFStreamDescriptor *descriptor = source->descriptors[i];
+        GUID major = GUID_NULL;
+        UINT exclude = -1;
+
+        if (FAILED(hr = stream_descriptor_get_major_type(descriptor, &major)))
+            WARN("Failed to get major type from stream descriptor, hr %#lx\n", hr);
+
+        if (IsEqualGUID(&major, &MFMediaType_Audio))
+        {
+            exclude = last_audio;
+            last_audio = i;
+        }
+        else if (IsEqualGUID(&major, &MFMediaType_Video))
+        {
+            exclude = last_video;
+            last_video = i;
+        }
+
+        if (exclude != -1)
+        {
+            if (FAILED(IMFStreamDescriptor_SetUINT32(source->descriptors[exclude], &MF_SD_MUTUALLY_EXCLUSIVE, 1)))
+                WARN("Failed to set stream %u MF_SD_MUTUALLY_EXCLUSIVE\n", exclude);
+            else if (FAILED(IMFStreamDescriptor_SetUINT32(descriptor, &MF_SD_MUTUALLY_EXCLUSIVE, 1)))
+                WARN("Failed to set stream %u MF_SD_MUTUALLY_EXCLUSIVE\n", i);
+        }
 
         if (FAILED(hr = stream_descriptor_set_tag(descriptor, source->wg_source, source->stream_map[i],
                 &MF_SD_LANGUAGE, WG_PARSER_TAG_LANGUAGE)))

From 00c5d030b0af6239dfb294283e6eb0adf0d144f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sat, 29 Apr 2023 14:51:54 +0200
Subject: [PATCH 066/389] winegstreamer/new_media_source: Select one stream
 descriptor for each major type.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index e47b71a2e66..dcc1effe0c1 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -1258,9 +1258,6 @@ static HRESULT media_stream_create(IMFMediaSource *source, IMFStreamDescriptor *
     object->media_source = source;
     IMFStreamDescriptor_AddRef(descriptor);
     object->descriptor = descriptor;
-
-    object->active = TRUE;
-    object->eos = FALSE;
     object->wg_stream = wg_stream;
 
     TRACE("Created stream object %p.\n", object);
@@ -1584,6 +1581,8 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
 
         for (i = 0; i < source->stream_count; ++i)
         {
+            if (!source->streams[i]->active)
+                continue;
             if (FAILED(hr = IMFPresentationDescriptor_SelectStream(*descriptor, i)))
                 WARN("Failed to select stream %u, hr %#lx\n", i, hr);
         }
@@ -1822,7 +1821,7 @@ static void media_source_init_stream_map(struct media_source *source, UINT strea
 
 static void media_source_init_descriptors(struct media_source *source)
 {
-    UINT i, last_audio = -1, last_video = -1;
+    UINT i, last_audio = -1, last_video = -1, first_audio = -1, first_video = -1;
     HRESULT hr;
 
     for (i = 0; i < source->stream_count; i++)
@@ -1836,11 +1835,15 @@ static void media_source_init_descriptors(struct media_source *source)
 
         if (IsEqualGUID(&major, &MFMediaType_Audio))
         {
+            if (first_audio == -1)
+                first_audio = i;
             exclude = last_audio;
             last_audio = i;
         }
         else if (IsEqualGUID(&major, &MFMediaType_Video))
         {
+            if (first_video == -1)
+                first_video = i;
             exclude = last_video;
             last_video = i;
         }
@@ -1860,6 +1863,21 @@ static void media_source_init_descriptors(struct media_source *source)
                 &MF_SD_STREAM_NAME, WG_PARSER_TAG_NAME)))
             WARN("Failed to set stream descriptor name, hr %#lx\n", hr);
     }
+
+    if (!wcscmp(source->mime_type, L"video/mp4"))
+    {
+        if (last_audio != -1)
+            source->streams[last_audio]->active = TRUE;
+        if (last_video != -1)
+            source->streams[last_video]->active = TRUE;
+    }
+    else
+    {
+        if (first_audio != -1)
+            source->streams[first_audio]->active = TRUE;
+        if (first_video != -1)
+            source->streams[first_video]->active = TRUE;
+    }
 }
 
 static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out)

From 11e980e9787a453dc78e20be316256316252f48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 29 Jun 2023 12:17:55 +0200
Subject: [PATCH 067/389] winegstreamer/new_media_source: Use 1-based ids in
 media source stream descriptors.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/new_media_source.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index dcc1effe0c1..14b2679f529 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -758,10 +758,10 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe
         {
             if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(stream_descriptor, &id)))
                 WARN("Failed to get stream descriptor id, hr %#lx\n", hr);
-            else if (id >= source->stream_count)
+            else if (id > source->stream_count)
                 WARN("Invalid stream descriptor id %lu, hr %#lx\n", id, hr);
             else if (selected)
-                IMFStreamDescriptor_AddRef((descriptors[id] = stream_descriptor));
+                IMFStreamDescriptor_AddRef((descriptors[id - 1] = stream_descriptor));
 
             IMFStreamDescriptor_Release(stream_descriptor);
         }
@@ -1953,7 +1953,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
             continue;
         wg_parser_stream_get_preferred_format(parser_stream, &format);
 
-        if (FAILED(hr = stream_descriptor_create(i, &format, &descriptor)))
+        if (FAILED(hr = stream_descriptor_create(i + 1, &format, &descriptor)))
             goto fail;
         if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, parser_stream, &stream)))
         {

From 135c44ca3f19f6e6520ecc3ccc24864bbeb2d027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 24 Jul 2023 14:25:38 +0200
Subject: [PATCH 068/389] winegstreamer/new_media_source: Select the wg_source
 streams on media source start.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  1 +
 dlls/winegstreamer/main.c             | 14 ++++++++++++++
 dlls/winegstreamer/new_media_source.c |  2 ++
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  8 ++++++++
 dlls/winegstreamer/wg_parser.c        |  1 +
 dlls/winegstreamer/wg_source.c        | 28 +++++++++++++++++++++++++++
 7 files changed, 55 insertions(+)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index df5f64660a2..fc3b617772f 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -115,6 +115,7 @@ bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
         struct wg_format *format);
 char *wg_source_get_stream_tag(wg_source_t source, UINT32 index,
         wg_parser_tag tag);
+void wg_source_set_stream_flags(wg_source_t source, UINT32 index, BOOL select);
 
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 11e47b1b952..0349b2364a0 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -507,6 +507,20 @@ char *wg_source_get_stream_tag(wg_source_t source, UINT32 index, wg_parser_tag t
     return buffer;
 }
 
+void wg_source_set_stream_flags(wg_source_t source, UINT32 index, BOOL select)
+{
+    struct wg_source_set_stream_flags_params params =
+    {
+        .source = source,
+        .index = index,
+        .select = select,
+    };
+
+    TRACE("source %#I64x, index %u, select %u\n", source, index, select);
+
+    WINE_UNIX_CALL(unix_wg_source_set_stream_flags, &params);
+}
+
 wg_transform_t wg_transform_create(const struct wg_format *input_format,
         const struct wg_format *output_format, const struct wg_transform_attrs *attrs)
 {
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 14b2679f529..8c5c30e653e 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -783,6 +783,8 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe
                 WARN("Failed to start media stream, hr %#lx\n", hr);
             IMFStreamDescriptor_Release(descriptors[i]);
         }
+
+        wg_source_set_stream_flags(source->wg_source, source->stream_map[i], stream->active);
     }
 
     free(descriptors);
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index 7116e37d57f..96935676c34 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -67,6 +67,7 @@ extern NTSTATUS wg_source_get_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
 extern NTSTATUS wg_source_get_stream_format(void *args);
 extern NTSTATUS wg_source_get_stream_tag(void *args);
+extern NTSTATUS wg_source_set_stream_flags(void *args);
 
 /* wg_transform.c */
 
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index cb86c756ad0..a465fd9d031 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -392,6 +392,13 @@ struct wg_source_get_stream_tag_params
     char *buffer;
 };
 
+struct wg_source_set_stream_flags_params
+{
+    wg_source_t source;
+    UINT32 index;
+    UINT32 select;
+};
+
 struct wg_transform_attrs
 {
     UINT32 output_plane_align;
@@ -510,6 +517,7 @@ enum unix_funcs
     unix_wg_source_push_data,
     unix_wg_source_get_stream_format,
     unix_wg_source_get_stream_tag,
+    unix_wg_source_set_stream_flags,
 
     unix_wg_transform_create,
     unix_wg_transform_destroy,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 114c4d38224..fd8c5731575 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2214,6 +2214,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_push_data),
     X(wg_source_get_stream_format),
     X(wg_source_get_stream_tag),
+    X(wg_source_set_stream_flags),
 
     X(wg_transform_create),
     X(wg_transform_destroy),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 8201c12eb03..48482303b4b 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -155,6 +155,16 @@ static GstTagList *source_get_stream_tags(struct wg_source *source, guint index)
     return tags;
 }
 
+static bool source_set_stream_flags(struct wg_source *source, guint index, GstStreamFlags flags)
+{
+    GstStream *stream;
+    if (!(stream = source_get_stream(source, index)))
+        return false;
+    gst_stream_set_stream_flags(stream, flags);
+    gst_object_unref(stream);
+    return true;
+}
+
 static gboolean src_event_seek(struct wg_source *source, GstEvent *event)
 {
     guint32 seqnum = gst_event_get_seqnum(event);
@@ -384,6 +394,7 @@ static GstEvent *create_stream_start_event(const char *stream_id)
 
     if (!(stream = gst_stream_new(stream_id, NULL, GST_STREAM_TYPE_UNKNOWN, 0)))
         return NULL;
+    gst_stream_set_stream_flags(stream, GST_STREAM_FLAG_SELECT);
     if ((event = gst_event_new_stream_start(stream_id)))
     {
         gst_event_set_stream(event, stream);
@@ -789,3 +800,20 @@ NTSTATUS wg_source_get_stream_tag(void *args)
     gst_tag_list_unref(tags);
     return STATUS_NOT_FOUND;
 }
+
+NTSTATUS wg_source_set_stream_flags(void *args)
+{
+    struct wg_source_set_stream_flags_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    BOOL select = params->select;
+    guint index = params->index;
+    GstStreamFlags flags;
+
+    GST_TRACE("source %p, index %u, select %u", source, index, select);
+
+    flags = select ? GST_STREAM_FLAG_SELECT : GST_STREAM_FLAG_UNSELECT;
+    if (!source_set_stream_flags(source, index, flags))
+        return STATUS_UNSUCCESSFUL;
+
+    return STATUS_SUCCESS;
+}

From a7bc220b2a3278c12fedde68991b59d6257a8b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 8 Dec 2023 17:12:56 +0100
Subject: [PATCH 069/389] winegstreamer/new_media_source: Seek the wg_source
 streams on media source start.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |  1 +
 dlls/winegstreamer/main.c             |  9 +++++++++
 dlls/winegstreamer/new_media_source.c |  2 ++
 dlls/winegstreamer/unix_private.h     |  1 +
 dlls/winegstreamer/unixlib.h          |  7 +++++++
 dlls/winegstreamer/wg_parser.c        |  1 +
 dlls/winegstreamer/wg_source.c        | 17 +++++++++++++++++
 7 files changed, 38 insertions(+)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index fc3b617772f..e7393e015e7 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -109,6 +109,7 @@ HRESULT wg_source_create(const WCHAR *url, uint64_t file_size,
 void wg_source_destroy(wg_source_t source);
 HRESULT wg_source_get_stream_count(wg_source_t source, uint32_t *stream_count);
 HRESULT wg_source_get_duration(wg_source_t source, uint64_t *duration);
+HRESULT wg_source_set_position(wg_source_t source, uint64_t time);
 HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
 bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 0349b2364a0..0276aa947b4 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -445,6 +445,15 @@ HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset)
     return S_OK;
 }
 
+HRESULT wg_source_set_position(wg_source_t source, uint64_t time)
+{
+    struct wg_source_set_position_params params = {.source = source, .time = time};
+
+    TRACE("source %#I64x, time %s\n", source, debugstr_time(time));
+
+    return HRESULT_FROM_NT(WINE_UNIX_CALL(unix_wg_source_set_position, &params));
+}
+
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size)
 {
     struct wg_source_push_data_params params =
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index 8c5c30e653e..ffea4e8468f 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -790,6 +790,8 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe
     free(descriptors);
 
     source->state = SOURCE_RUNNING;
+    if (position->vt == VT_I8)
+        wg_source_set_position(source->wg_source, position->hVal.QuadPart);
 
     if (position->vt == VT_I8)
         wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, position->hVal.QuadPart, 0,
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index 96935676c34..f83279b9bfa 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -64,6 +64,7 @@ extern NTSTATUS wg_source_destroy(void *args);
 extern NTSTATUS wg_source_get_stream_count(void *args);
 extern NTSTATUS wg_source_get_duration(void *args);
 extern NTSTATUS wg_source_get_position(void *args);
+extern NTSTATUS wg_source_set_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
 extern NTSTATUS wg_source_get_stream_format(void *args);
 extern NTSTATUS wg_source_get_stream_tag(void *args);
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index a465fd9d031..46b6865e39f 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -369,6 +369,12 @@ struct wg_source_get_position_params
     UINT64 read_offset;
 };
 
+struct wg_source_set_position_params
+{
+    wg_source_t source;
+    UINT64 time;
+};
+
 struct wg_source_push_data_params
 {
     wg_source_t source;
@@ -514,6 +520,7 @@ enum unix_funcs
     unix_wg_source_get_stream_count,
     unix_wg_source_get_duration,
     unix_wg_source_get_position,
+    unix_wg_source_set_position,
     unix_wg_source_push_data,
     unix_wg_source_get_stream_format,
     unix_wg_source_get_stream_tag,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index fd8c5731575..861f202995d 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2211,6 +2211,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_get_stream_count),
     X(wg_source_get_duration),
     X(wg_source_get_position),
+    X(wg_source_set_position),
     X(wg_source_push_data),
     X(wg_source_get_stream_format),
     X(wg_source_get_stream_tag),
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 48482303b4b..1c6d387635e 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -608,6 +608,23 @@ NTSTATUS wg_source_get_position(void *args)
     return STATUS_SUCCESS;
 }
 
+NTSTATUS wg_source_set_position(void *args)
+{
+    struct wg_source_set_position_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    guint64 time = params->time * 100;
+    GstEvent *event;
+
+    GST_TRACE("source %p", source);
+
+    if (!(event = gst_event_new_seek(1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
+            GST_SEEK_TYPE_SET, time, GST_SEEK_TYPE_NONE, -1))
+            || !gst_pad_push_event(source->streams[0].pad, event))
+        GST_WARNING("Failed to seek source %p to %" G_GINT64_MODIFIER "x", source, time);
+
+    return S_OK;
+}
+
 NTSTATUS wg_source_push_data(void *args)
 {
     struct wg_source_push_data_params *params = args;

From 1f445af6ce21d690d4288750713248e062a4369d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 8 Dec 2023 17:19:22 +0100
Subject: [PATCH 070/389] winegstreamer/new_media_source: Read and discard
 compressed samples from wg_source.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h      |   1 +
 dlls/winegstreamer/mfplat.c           |   3 +
 dlls/winegstreamer/new_media_source.c |  30 +++++
 dlls/winegstreamer/unix_private.h     |   1 +
 dlls/winegstreamer/unixlib.h          |   8 ++
 dlls/winegstreamer/wg_parser.c        |  20 ++++
 dlls/winegstreamer/wg_sample.c        |  69 +++++++++++
 dlls/winegstreamer/wg_source.c        | 164 +++++++++++++++++++++++++-
 8 files changed, 292 insertions(+), 4 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index e7393e015e7..84857c5adfa 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -112,6 +112,7 @@ HRESULT wg_source_get_duration(wg_source_t source, uint64_t *duration);
 HRESULT wg_source_set_position(wg_source_t source, uint64_t time);
 HRESULT wg_source_get_position(wg_source_t source, uint64_t *read_offset);
 HRESULT wg_source_push_data(wg_source_t source, const void *data, uint32_t size);
+HRESULT wg_source_read_data(wg_source_t source, UINT32 index, IMFSample **out);
 bool wg_source_get_stream_format(wg_source_t source, UINT32 index,
         struct wg_format *format);
 char *wg_source_get_stream_tag(wg_source_t source, UINT32 index,
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 2537c6bf455..452289c2e6a 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "gst_private.h"
 
 #include "ks.h"
@@ -26,6 +28,7 @@
 #include "d3d9types.h"
 #include "mfapi.h"
 #include "mmreg.h"
+#include "mferror.h"
 
 #include "wine/debug.h"
 #include "wine/list.h"
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index ffea4e8468f..b4c8e91db49 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -307,6 +307,7 @@ struct media_source
     UINT64 file_size;
     wg_parser_t wg_parser;
     UINT64 duration;
+    BYTE *read_buffer;
 
     IMFStreamDescriptor **descriptors;
     struct media_stream **streams;
@@ -926,9 +927,34 @@ static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token)
 {
     struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
     struct wg_parser_buffer buffer;
+    DWORD id, read_size;
+    UINT64 read_offset;
+    IMFSample *sample;
+    HRESULT hr;
 
     TRACE("%p, %p\n", stream, token);
 
+    if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(stream->descriptor, &id)))
+        return hr;
+    id = source->stream_map[id - 1];
+
+    while (SUCCEEDED(hr) && (hr = wg_source_read_data(source->wg_source, id, &sample)) == E_PENDING)
+    {
+        if (FAILED(hr = wg_source_get_position(source->wg_source, &read_offset)))
+            break;
+        if (FAILED(hr = IMFByteStream_SetCurrentPosition(source->byte_stream, read_offset)))
+            WARN("Failed to seek stream to %#I64x, hr %#lx\n", read_offset, hr);
+        else if (FAILED(hr = IMFByteStream_Read(source->byte_stream, source->read_buffer, SOURCE_BUFFER_SIZE, &read_size)))
+            WARN("Failed to read %#lx bytes from stream, hr %#lx\n", read_size, hr);
+        else if (FAILED(hr = wg_source_push_data(source->wg_source, source->read_buffer, read_size)))
+            WARN("Failed to push %#lx bytes to source, hr %#lx\n", read_size, hr);
+    }
+
+    if (FAILED(hr))
+        WARN("Failed to read stream %lu data, hr %#lx\n", id, hr);
+    else
+        IMFSample_Release(sample);
+
     if (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer))
         return media_stream_send_sample(stream, &buffer, token);
 
@@ -1497,6 +1523,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface)
         IMFMediaEventQueue_Release(source->event_queue);
         IMFByteStream_Release(source->byte_stream);
         wg_source_destroy(source->wg_source);
+        free(source->read_buffer);
         wg_parser_destroy(source->wg_parser);
         source->cs.DebugInfo->Spare[0] = 0;
         DeleteCriticalSection(&source->cs);
@@ -1910,6 +1937,8 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     InitializeCriticalSection(&object->cs);
     object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");
 
+    object->read_buffer = context->buffer;
+    context->buffer = NULL;
     object->wg_source = context->wg_source;
     context->wg_source = 0;
 
@@ -2011,6 +2040,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     if (object->event_queue)
         IMFMediaEventQueue_Release(object->event_queue);
     IMFByteStream_Release(object->byte_stream);
+    free(object->read_buffer);
     free(object);
 
     return hr;
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index f83279b9bfa..d15054661c7 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -66,6 +66,7 @@ extern NTSTATUS wg_source_get_duration(void *args);
 extern NTSTATUS wg_source_get_position(void *args);
 extern NTSTATUS wg_source_set_position(void *args);
 extern NTSTATUS wg_source_push_data(void *args);
+extern NTSTATUS wg_source_read_data(void *args);
 extern NTSTATUS wg_source_get_stream_format(void *args);
 extern NTSTATUS wg_source_get_stream_tag(void *args);
 extern NTSTATUS wg_source_set_stream_flags(void *args);
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 46b6865e39f..165d0c57fd7 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -382,6 +382,13 @@ struct wg_source_push_data_params
     UINT32 size;
 };
 
+struct wg_source_read_data_params
+{
+    wg_source_t source;
+    UINT32 index;
+    struct wg_sample *sample;
+};
+
 struct wg_source_get_stream_format_params
 {
     wg_source_t source;
@@ -522,6 +529,7 @@ enum unix_funcs
     unix_wg_source_get_position,
     unix_wg_source_set_position,
     unix_wg_source_push_data,
+    unix_wg_source_read_data,
     unix_wg_source_get_stream_format,
     unix_wg_source_get_stream_tag,
     unix_wg_source_set_stream_flags,
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 861f202995d..d6de243f3b2 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2213,6 +2213,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     X(wg_source_get_position),
     X(wg_source_set_position),
     X(wg_source_push_data),
+    X(wg_source_read_data),
     X(wg_source_get_stream_format),
     X(wg_source_get_stream_tag),
     X(wg_source_set_stream_flags),
@@ -2406,6 +2407,24 @@ NTSTATUS wow64_wg_source_push_data(void *args)
     return wg_source_push_data(&params);
 }
 
+NTSTATUS wow64_wg_source_read_data(void *args)
+{
+    struct
+    {
+        wg_source_t source;
+        UINT32 index;
+        PTR32 sample;
+    } *params32 = args;
+    struct wg_source_read_data_params params =
+    {
+        .source = params32->source,
+        .index = params32->index,
+        .sample = ULongToPtr(params32->sample),
+    };
+
+    return wg_source_read_data(&params);
+}
+
 NTSTATUS wow64_wg_source_get_stream_tag(void *args)
 {
     struct
@@ -2620,6 +2639,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     X(wg_source_get_duration),
     X(wg_source_get_position),
     X64(wg_source_push_data),
+    X64(wg_source_read_data),
     X(wg_source_get_stream_format),
     X64(wg_source_get_stream_tag),
 
diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c
index 31281066957..513907d9d77 100644
--- a/dlls/winegstreamer/wg_sample.c
+++ b/dlls/winegstreamer/wg_sample.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "gst_private.h"
 
 #include "wmcodecdsp.h"
@@ -534,3 +536,70 @@ HRESULT wg_transform_read_dmo(wg_transform_t transform, DMO_OUTPUT_DATA_BUFFER *
     wg_sample_release(wg_sample);
     return hr;
 }
+
+HRESULT wg_source_read_data(wg_source_t source, UINT32 index, IMFSample **out)
+{
+    struct wg_sample wg_sample = {0};
+    struct wg_source_read_data_params params =
+    {
+        .source = source,
+        .index = index,
+        .sample = &wg_sample,
+    };
+    IMFMediaBuffer *buffer;
+    IMFSample *sample;
+    NTSTATUS status;
+    HRESULT hr;
+
+    TRACE("source %#I64x, index %u, out %p\n", source, index, out);
+
+    status = WINE_UNIX_CALL(unix_wg_source_read_data, &params);
+    if (status == STATUS_PENDING) return E_PENDING;
+    if (status == STATUS_END_OF_FILE) return MF_E_END_OF_STREAM;
+    if (status != STATUS_BUFFER_TOO_SMALL) return HRESULT_FROM_NT(status);
+
+    if (FAILED(hr = MFCreateSample(&sample)))
+        return hr;
+    if (SUCCEEDED(hr = MFCreateMemoryBuffer(wg_sample.max_size, &buffer)))
+    {
+        hr = IMFSample_AddBuffer(sample, buffer);
+        IMFMediaBuffer_Release(buffer);
+    }
+
+    if (FAILED(hr) || FAILED(hr = wg_sample_create_mf(sample, &params.sample)))
+        goto error;
+
+    status = WINE_UNIX_CALL(unix_wg_source_read_data, &params);
+    if (FAILED(hr = HRESULT_FROM_NT(status)))
+    {
+        wg_sample_release(params.sample);
+        goto error;
+    }
+
+    if (params.sample->flags & WG_SAMPLE_FLAG_HAS_PTS)
+        IMFSample_SetSampleTime(sample, params.sample->pts);
+    if (params.sample->flags & WG_SAMPLE_FLAG_HAS_DURATION)
+        IMFSample_SetSampleDuration(sample, params.sample->duration);
+    if (params.sample->flags & WG_SAMPLE_FLAG_SYNC_POINT)
+        IMFSample_SetUINT32(sample, &MFSampleExtension_CleanPoint, 1);
+    if (params.sample->flags & WG_SAMPLE_FLAG_DISCONTINUITY)
+        IMFSample_SetUINT32(sample, &MFSampleExtension_Discontinuity, 1);
+
+    if (SUCCEEDED(hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer)))
+    {
+        hr = IMFMediaBuffer_SetCurrentLength(buffer, params.sample->size);
+        IMFMediaBuffer_Release(buffer);
+    }
+    wg_sample_release(params.sample);
+
+    if (FAILED(hr))
+        goto error;
+
+    *out = sample;
+    TRACE("source %#I64x, index %u, out %p\n", source, index, *out);
+    return S_OK;
+
+error:
+    IMFSample_Release(sample);
+    return hr;
+}
diff --git a/dlls/winegstreamer/wg_source.c b/dlls/winegstreamer/wg_source.c
index 1c6d387635e..6e000e36e31 100644
--- a/dlls/winegstreamer/wg_source.c
+++ b/dlls/winegstreamer/wg_source.c
@@ -44,6 +44,9 @@
 struct source_stream
 {
     GstPad *pad;
+    GstAtomicQueue *queue;
+    GstBuffer *buffer;
+    gboolean eos;
 };
 
 struct wg_source
@@ -165,9 +168,34 @@ static bool source_set_stream_flags(struct wg_source *source, guint index, GstSt
     return true;
 }
 
+static GstStreamFlags source_get_stream_flags(struct wg_source *source, guint index)
+{
+    GstStreamFlags flags;
+    GstStream *stream;
+    if (!(stream = source_get_stream(source, index)))
+        return 0;
+    flags = gst_stream_get_stream_flags(stream);
+    gst_object_unref(stream);
+    return flags;
+}
+
+static NTSTATUS source_get_stream_buffer(struct wg_source *source, guint index, GstBuffer **buffer)
+{
+    GstBuffer **stream_buffer;
+    if (index >= source->stream_count)
+        return STATUS_INVALID_PARAMETER;
+
+    stream_buffer = &source->streams[index].buffer;
+    if (!*stream_buffer && !(*stream_buffer = gst_atomic_queue_pop(source->streams[index].queue)))
+        return source->streams[index].eos ? STATUS_END_OF_FILE : STATUS_PENDING;
+
+    *buffer = gst_buffer_ref(*stream_buffer);
+    return STATUS_SUCCESS;
+}
+
 static gboolean src_event_seek(struct wg_source *source, GstEvent *event)
 {
-    guint32 seqnum = gst_event_get_seqnum(event);
+    guint32 i, seqnum = gst_event_get_seqnum(event);
     GstSeekType cur_type, stop_type;
     GstSeekFlags flags;
     GstFormat format;
@@ -197,6 +225,9 @@ static gboolean src_event_seek(struct wg_source *source, GstEvent *event)
 
     source->segment.start = cur;
 
+    for (i = 0; i < ARRAY_SIZE(source->streams); i++)
+        source->streams[i].eos = false;
+
     if (flags & GST_SEEK_FLAG_FLUSH)
     {
         if (!(event = gst_event_new_flush_stop(true)))
@@ -294,10 +325,21 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
 
 static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer)
 {
-    struct wg_soutce *source = gst_pad_get_element_private(pad);
+    struct wg_source *source = gst_pad_get_element_private(pad);
+    guint index;
+
     GST_TRACE("source %p, pad %p, buffer %p.", source, pad, buffer);
-    gst_buffer_unref(buffer);
-    return GST_FLOW_EOS;
+
+    for (index = 0; index < source->stream_count; index++)
+        if (source->streams[index].pad == pad)
+            break;
+
+    if (source_get_stream_flags(source, index) & GST_STREAM_FLAG_SELECT)
+        gst_atomic_queue_push(source->streams[index].queue, buffer);
+    else
+        gst_buffer_unref(buffer);
+
+    return GST_FLOW_OK;
 }
 
 static gboolean sink_event_caps(struct wg_source *source, GstPad *pad, GstEvent *event)
@@ -370,6 +412,23 @@ static gboolean sink_event_stream_start(struct wg_source *source, GstPad *pad, G
     return true;
 }
 
+static gboolean sink_event_eos(struct wg_source *source, GstPad *pad, GstEvent *event)
+{
+    guint index;
+
+    GST_TRACE("source %p, pad %p, event %p", source, pad, event);
+
+    for (index = 0; index < source->stream_count; index++)
+        if (source->streams[index].pad == pad)
+            break;
+
+    if (index < source->stream_count)
+        source->streams[index].eos = true;
+
+    gst_event_unref(event);
+    return true;
+}
+
 static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
 {
     struct wg_source *source = gst_pad_get_element_private(pad);
@@ -382,6 +441,8 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event)
         return sink_event_tag(source, pad, event);
     case GST_EVENT_STREAM_START:
         return sink_event_stream_start(source, pad, event);
+    case GST_EVENT_EOS:
+        return sink_event_eos(source, pad, event);
     default:
         return gst_pad_event_default(pad, parent, event);
     }
@@ -481,6 +542,8 @@ NTSTATUS wg_source_create(void *args)
     {
         if (!(source->streams[i].pad = create_pad_with_caps(GST_PAD_SINK, NULL)))
             goto error;
+        if (!(source->streams[i].queue = gst_atomic_queue_new(1)))
+            goto error;
         gst_pad_set_element_private(source->streams[i].pad, source);
         gst_pad_set_chain_function(source->streams[i].pad, sink_chain_cb);
         gst_pad_set_event_function(source->streams[i].pad, sink_event_cb);
@@ -534,6 +597,10 @@ NTSTATUS wg_source_create(void *args)
     }
     for (i = 0; i < ARRAY_SIZE(source->streams); i++)
     {
+        if (source->streams[i].buffer)
+            gst_buffer_unref(source->streams[i].buffer);
+        if (source->streams[i].queue)
+            gst_atomic_queue_unref(source->streams[i].queue);
         if (source->streams[i].pad)
             gst_object_unref(source->streams[i].pad);
     }
@@ -558,7 +625,12 @@ NTSTATUS wg_source_destroy(void *args)
     gst_element_set_state(source->container, GST_STATE_NULL);
     gst_object_unref(source->container);
     for (i = 0; i < ARRAY_SIZE(source->streams); i++)
+    {
+        if (source->streams[i].buffer)
+            gst_buffer_unref(source->streams[i].buffer);
+        gst_atomic_queue_unref(source->streams[i].queue);
         gst_object_unref(source->streams[i].pad);
+    }
     gst_object_unref(source->src_pad);
     free(source->url);
     free(source);
@@ -614,6 +686,7 @@ NTSTATUS wg_source_set_position(void *args)
     struct wg_source *source = get_source(params->source);
     guint64 time = params->time * 100;
     GstEvent *event;
+    guint i;
 
     GST_TRACE("source %p", source);
 
@@ -622,6 +695,18 @@ NTSTATUS wg_source_set_position(void *args)
             || !gst_pad_push_event(source->streams[0].pad, event))
         GST_WARNING("Failed to seek source %p to %" G_GINT64_MODIFIER "x", source, time);
 
+    for (i = 0; i < source->stream_count; i++)
+    {
+        GstBuffer *buffer;
+
+        while (!source_get_stream_buffer(source, i, &buffer))
+        {
+            gst_buffer_unref(source->streams[i].buffer);
+            source->streams[i].buffer = NULL;
+            gst_buffer_unref(buffer);
+        }
+    }
+
     return S_OK;
 }
 
@@ -676,6 +761,65 @@ NTSTATUS wg_source_push_data(void *args)
     return STATUS_SUCCESS;
 }
 
+NTSTATUS wg_source_read_data(void *args)
+{
+    struct wg_source_read_data_params *params = args;
+    struct wg_source *source = get_source(params->source);
+    struct wg_sample *sample = params->sample;
+    NTSTATUS status = STATUS_SUCCESS;
+    guint index = params->index;
+    GstMapInfo info = {0};
+    GstBuffer *buffer;
+
+    GST_TRACE("source %p, index %#x, sample %p", source, index, sample);
+
+    if ((status = source_get_stream_buffer(source, index, &buffer)))
+        return status;
+
+    if (!gst_buffer_map(buffer, &info, GST_MAP_READ))
+        status = STATUS_UNSUCCESSFUL;
+    else
+    {
+        if (info.size > sample->max_size)
+            status = STATUS_BUFFER_TOO_SMALL;
+        else
+        {
+            memcpy(wg_sample_data(sample), info.data, info.size);
+            sample->size = info.size;
+
+            if (GST_BUFFER_PTS_IS_VALID(buffer))
+            {
+                sample->flags |= WG_SAMPLE_FLAG_HAS_PTS;
+                sample->pts = GST_BUFFER_PTS(buffer) / 100;
+            }
+            else if (GST_BUFFER_DTS_IS_VALID(buffer))
+            {
+                sample->flags |= WG_SAMPLE_FLAG_HAS_PTS;
+                sample->pts = GST_BUFFER_DTS(buffer) / 100;
+            }
+            if (GST_BUFFER_DURATION_IS_VALID(buffer))
+            {
+                GstClockTime duration = GST_BUFFER_DURATION(buffer) / 100;
+                sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION;
+                sample->duration = duration;
+            }
+            if (!GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT))
+                sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT;
+            if (GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT))
+                sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY;
+
+            gst_buffer_unref(source->streams[index].buffer);
+            source->streams[index].buffer = NULL;
+        }
+
+        sample->max_size = info.size;
+        gst_buffer_unmap(buffer, &info);
+    }
+
+    gst_buffer_unref(buffer);
+    return status;
+}
+
 NTSTATUS wg_source_get_stream_format(void *args)
 {
     struct wg_source_get_stream_format_params *params = args;
@@ -832,5 +976,17 @@ NTSTATUS wg_source_set_stream_flags(void *args)
     if (!source_set_stream_flags(source, index, flags))
         return STATUS_UNSUCCESSFUL;
 
+    if (!select)
+    {
+        GstBuffer *buffer;
+
+        while (!source_get_stream_buffer(source, index, &buffer))
+        {
+            gst_buffer_unref(source->streams[index].buffer);
+            source->streams[index].buffer = NULL;
+            gst_buffer_unref(buffer);
+        }
+    }
+
     return STATUS_SUCCESS;
 }

From 47ff280361dd9a0b2fc0d2ea15e17420cb4c203a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 1 Jun 2023 09:05:58 +0200
Subject: [PATCH 071/389] winegstreamer/new_media_source: Stop using wg_parser
 to read samples in the media source.

CW-Bug-Id: #21953
---
 dlls/mfmediaengine/tests/mfmediaengine.c |   2 +-
 dlls/winegstreamer/new_media_source.c    | 334 ++---------------------
 2 files changed, 20 insertions(+), 316 deletions(-)

diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index 66a1f0b79e9..f9489f3dcb5 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -152,7 +152,7 @@ static void check_rgb32_data_(int line, const WCHAR *filename, const BYTE *data,
     expect_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource));
 
     diff = compare_rgb32(data, &length, rect, expect_data);
-    ok_(__FILE__, line)(diff == 0, "Unexpected %lu%% diff\n", diff);
+    ok_(__FILE__, line)(diff <= 3 /* small difference in wine */, "Unexpected %lu%% diff\n", diff);
 }
 
 static void init_functions(void)
diff --git a/dlls/winegstreamer/new_media_source.c b/dlls/winegstreamer/new_media_source.c
index b4c8e91db49..efaf6a3e087 100644
--- a/dlls/winegstreamer/new_media_source.c
+++ b/dlls/winegstreamer/new_media_source.c
@@ -248,13 +248,10 @@ struct media_stream
     IMFMediaEventQueue *event_queue;
     IMFStreamDescriptor *descriptor;
 
-    wg_parser_stream_t wg_stream;
-
     IUnknown **token_queue;
     LONG token_queue_count;
     LONG token_queue_cap;
 
-    DWORD stream_id;
     BOOL active;
     BOOL eos;
 };
@@ -305,7 +302,6 @@ struct media_source
     wg_source_t wg_source;
     WCHAR mime_type[256];
     UINT64 file_size;
-    wg_parser_t wg_parser;
     UINT64 duration;
     BYTE *read_buffer;
 
@@ -323,9 +319,6 @@ struct media_source
         SOURCE_SHUTDOWN,
     } state;
     float rate;
-
-    HANDLE read_thread;
-    bool read_thread_shutdown;
 };
 
 static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface)
@@ -528,122 +521,28 @@ static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor,
     return hr;
 }
 
-static HRESULT init_video_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count)
-{
-    /* Try to prefer YUV formats over RGB ones. Most decoders output in the
-     * YUV color space, and it's generally much less expensive for
-     * videoconvert to do YUV -> YUV transformations. */
-    static const enum wg_video_format video_formats[] =
-    {
-        WG_VIDEO_FORMAT_NV12,
-        WG_VIDEO_FORMAT_YV12,
-        WG_VIDEO_FORMAT_YUY2,
-        WG_VIDEO_FORMAT_I420,
-    };
-    UINT count = *types_count, i;
-    GUID base_subtype;
-    HRESULT hr;
-
-    if (FAILED(hr = IMFMediaType_GetGUID(types[0], &MF_MT_SUBTYPE, &base_subtype)))
-        return hr;
-
-    for (i = 0; i < ARRAY_SIZE(video_formats); ++i)
-    {
-        struct wg_format new_format = *format;
-        IMFMediaType *new_type;
-
-        new_format.u.video.format = video_formats[i];
-
-        if (!(new_type = mf_media_type_from_wg_format(&new_format)))
-        {
-            hr = E_OUTOFMEMORY;
-            goto done;
-        }
-        types[count++] = new_type;
-
-        if (video_formats[i] == WG_VIDEO_FORMAT_I420)
-        {
-            IMFMediaType *iyuv_type;
-
-            if (FAILED(hr = MFCreateMediaType(&iyuv_type)))
-                goto done;
-            if (FAILED(hr = IMFMediaType_CopyAllItems(new_type, (IMFAttributes *)iyuv_type)))
-                goto done;
-            if (FAILED(hr = IMFMediaType_SetGUID(iyuv_type, &MF_MT_SUBTYPE, &MFVideoFormat_IYUV)))
-                goto done;
-            types[count++] = iyuv_type;
-        }
-    }
-
-done:
-    *types_count = count;
-    return hr;
-}
-
-static HRESULT init_audio_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count)
-{
-    /* Expose at least one PCM and one floating point type for the
-       consumer to pick from. */
-    static const enum wg_audio_format audio_types[] =
-    {
-        WG_AUDIO_FORMAT_S16LE,
-        WG_AUDIO_FORMAT_F32LE,
-    };
-    UINT count = *types_count, i;
-
-    for (i = 0; i < ARRAY_SIZE(audio_types); i++)
-    {
-        struct wg_format new_format = *format;
-        if (new_format.u.audio.format == audio_types[i])
-            continue;
-        new_format.u.audio.format = audio_types[i];
-        if ((types[count] = mf_media_type_from_wg_format(&new_format)))
-            count++;
-    }
-
-    *types_count = count;
-    return S_OK;
-}
-
 static HRESULT stream_descriptor_create(UINT32 id, struct wg_format *format, IMFStreamDescriptor **out)
 {
     IMFStreamDescriptor *descriptor;
     IMFMediaTypeHandler *handler;
-    IMFMediaType *types[6];
-    DWORD count = 0;
+    IMFMediaType *type;
     HRESULT hr;
 
-    if (!(types[0] = mf_media_type_from_wg_format(format)))
+    if (!(type = mf_media_type_from_wg_format(format)))
         return MF_E_INVALIDMEDIATYPE;
-    count = 1;
-
-    if (format->major_type == WG_MAJOR_TYPE_VIDEO)
-    {
-        if (FAILED(hr = init_video_media_types(format, types, &count)))
-            goto done;
-    }
-    else if (format->major_type == WG_MAJOR_TYPE_AUDIO)
-    {
-        if (FAILED(hr = init_audio_media_types(format, types, &count)))
-            goto done;
-    }
-
-    assert(count <= ARRAY_SIZE(types));
-
-    if (FAILED(hr = MFCreateStreamDescriptor(id, count, types, &descriptor)))
+    if (FAILED(hr = MFCreateStreamDescriptor(id, 1, &type, &descriptor)))
         goto done;
 
     if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(descriptor, &handler)))
         IMFStreamDescriptor_Release(descriptor);
     else
     {
-        hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, types[0]);
+        hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, type);
         IMFMediaTypeHandler_Release(handler);
     }
 
 done:
-    while (count--)
-        IMFMediaType_Release(types[count]);
+    IMFMediaType_Release(type);
     *out = SUCCEEDED(hr) ? descriptor : NULL;
     return hr;
 }
@@ -710,7 +609,6 @@ static HRESULT media_stream_start(struct media_stream *stream, BOOL active, BOOL
 
     if (FAILED(hr = wg_format_from_stream_descriptor(stream->descriptor, &format)))
         WARN("Failed to get wg_format from stream descriptor, hr %#lx\n", hr);
-    wg_parser_stream_enable(stream->wg_stream, &format, 0);
 
     if (FAILED(hr = IMFMediaEventQueue_QueueEventParamUnk(source->event_queue, active ? MEUpdatedStream : MENewStream,
             &GUID_NULL, S_OK, (IUnknown *)&stream->IMFMediaStream_iface)))
@@ -777,15 +675,15 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe
             stream->eos = FALSE;
 
         if (!(stream->active = !!descriptors[i]))
-            wg_parser_stream_disable(stream->wg_stream);
+            wg_source_set_stream_flags(source->wg_source, source->stream_map[i], FALSE);
         else
         {
             if (FAILED(hr = media_stream_start(stream, was_active, seek_message, position)))
                 WARN("Failed to start media stream, hr %#lx\n", hr);
+            else
+                wg_source_set_stream_flags(source->wg_source, source->stream_map[i], TRUE);
             IMFStreamDescriptor_Release(descriptors[i]);
         }
-
-        wg_source_set_stream_flags(source->wg_source, source->stream_map[i], stream->active);
     }
 
     free(descriptors);
@@ -794,10 +692,6 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe
     if (position->vt == VT_I8)
         wg_source_set_position(source->wg_source, position->hVal.QuadPart);
 
-    if (position->vt == VT_I8)
-        wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, position->hVal.QuadPart, 0,
-                AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning);
-
     for (i = 0; i < source->stream_count; i++)
         flush_token_queue(source->streams[i], position->vt == VT_EMPTY);
 
@@ -853,52 +747,6 @@ static HRESULT media_source_stop(struct media_source *source)
     return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL);
 }
 
-static HRESULT media_stream_send_sample(struct media_stream *stream, const struct wg_parser_buffer *wg_buffer, IUnknown *token)
-{
-    IMFSample *sample = NULL;
-    IMFMediaBuffer *buffer;
-    HRESULT hr;
-    BYTE *data;
-
-    if (FAILED(hr = MFCreateMemoryBuffer(wg_buffer->size, &buffer)))
-        return hr;
-    if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(buffer, wg_buffer->size)))
-        goto out;
-    if (FAILED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL)))
-        goto out;
-
-    if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, wg_buffer->size))
-    {
-        wg_parser_stream_release_buffer(stream->wg_stream);
-        IMFMediaBuffer_Unlock(buffer);
-        goto out;
-    }
-    wg_parser_stream_release_buffer(stream->wg_stream);
-
-    if (FAILED(hr = IMFMediaBuffer_Unlock(buffer)))
-        goto out;
-
-    if (FAILED(hr = MFCreateSample(&sample)))
-        goto out;
-    if (FAILED(hr = IMFSample_AddBuffer(sample, buffer)))
-        goto out;
-    if (FAILED(hr = IMFSample_SetSampleTime(sample, wg_buffer->pts)))
-        goto out;
-    if (FAILED(hr = IMFSample_SetSampleDuration(sample, wg_buffer->duration)))
-        goto out;
-    if (token && FAILED(hr = IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token)))
-        goto out;
-
-    hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample,
-            &GUID_NULL, S_OK, (IUnknown *)sample);
-
-out:
-    if (sample)
-        IMFSample_Release(sample);
-    IMFMediaBuffer_Release(buffer);
-    return hr;
-}
-
 static HRESULT media_stream_send_eos(struct media_source *source, struct media_stream *stream)
 {
     PROPVARIANT empty = {.vt = VT_EMPTY};
@@ -926,7 +774,6 @@ static HRESULT media_stream_send_eos(struct media_source *source, struct media_s
 static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token)
 {
     struct media_source *source = impl_from_IMFMediaSource(stream->media_source);
-    struct wg_parser_buffer buffer;
     DWORD id, read_size;
     UINT64 read_offset;
     IMFSample *sample;
@@ -953,10 +800,13 @@ static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token)
     if (FAILED(hr))
         WARN("Failed to read stream %lu data, hr %#lx\n", id, hr);
     else
+    {
+        if (!token || SUCCEEDED(hr = IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token)))
+            hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample,
+                    &GUID_NULL, S_OK, (IUnknown *)sample);
         IMFSample_Release(sample);
-
-    if (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer))
-        return media_stream_send_sample(stream, &buffer, token);
+        return hr;
+    }
 
     return media_stream_send_eos(source, stream);
 }
@@ -1021,66 +871,6 @@ static const IMFAsyncCallbackVtbl source_async_commands_callback_vtbl =
     source_async_commands_Invoke,
 };
 
-static DWORD CALLBACK read_thread(void *arg)
-{
-    struct media_source *source = arg;
-    IMFByteStream *byte_stream = source->byte_stream;
-    size_t buffer_size = 4096;
-    QWORD file_size;
-    void *data;
-
-    if (!(data = malloc(buffer_size)))
-        return 0;
-
-    IMFByteStream_GetLength(byte_stream, &file_size);
-
-    TRACE("Starting read thread for media source %p.\n", source);
-
-    while (!source->read_thread_shutdown)
-    {
-        uint64_t offset;
-        ULONG ret_size;
-        uint32_t size;
-        HRESULT hr;
-
-        if (!wg_parser_get_next_read_offset(source->wg_parser, &offset, &size))
-            continue;
-
-        if (offset >= file_size)
-            size = 0;
-        else if (offset + size >= file_size)
-            size = file_size - offset;
-
-        /* Some IMFByteStreams (including the standard file-based stream) return
-         * an error when reading past the file size. */
-        if (!size)
-        {
-            wg_parser_push_data(source->wg_parser, data, 0);
-            continue;
-        }
-
-        if (!array_reserve(&data, &buffer_size, size, 1))
-        {
-            free(data);
-            return 0;
-        }
-
-        ret_size = 0;
-
-        if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset)))
-            hr = IMFByteStream_Read(byte_stream, data, size, &ret_size);
-        if (FAILED(hr))
-            ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr);
-        else if (ret_size != size)
-            ERR("Unexpected short read: requested %u bytes, got %lu.\n", size, ret_size);
-        wg_parser_push_data(source->wg_parser, SUCCEEDED(hr) ? data : NULL, ret_size);
-    }
-
-    free(data);
-    TRACE("Media source is shutting down; exiting.\n");
-    return 0;
-}
-
 static HRESULT WINAPI media_stream_QueryInterface(IMFMediaStream *iface, REFIID riid, void **out)
 {
     struct media_stream *stream = impl_from_IMFMediaStream(iface);
@@ -1264,13 +1054,12 @@ static const IMFMediaStreamVtbl media_stream_vtbl =
     media_stream_RequestSample
 };
 
-static HRESULT media_stream_create(IMFMediaSource *source, IMFStreamDescriptor *descriptor,
-        wg_parser_stream_t wg_stream, struct media_stream **out)
+static HRESULT media_stream_create(IMFMediaSource *source, IMFStreamDescriptor *descriptor, struct media_stream **out)
 {
     struct media_stream *object;
     HRESULT hr;
 
-    TRACE("source %p, descriptor %p, wg_stream %#I64x.\n", source, descriptor, wg_stream);
+    TRACE("source %p, descriptor %p.\n", source, descriptor);
 
     if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
@@ -1288,7 +1077,6 @@ static HRESULT media_stream_create(IMFMediaSource *source, IMFStreamDescriptor *
     object->media_source = source;
     IMFStreamDescriptor_AddRef(descriptor);
     object->descriptor = descriptor;
-    object->wg_stream = wg_stream;
 
     TRACE("Created stream object %p.\n", object);
 
@@ -1524,7 +1312,6 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface)
         IMFByteStream_Release(source->byte_stream);
         wg_source_destroy(source->wg_source);
         free(source->read_buffer);
-        wg_parser_destroy(source->wg_parser);
         source->cs.DebugInfo->Spare[0] = 0;
         DeleteCriticalSection(&source->cs);
         free(source);
@@ -1722,12 +1509,6 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
 
     source->state = SOURCE_SHUTDOWN;
 
-    wg_parser_disconnect(source->wg_parser);
-
-    source->read_thread_shutdown = true;
-    WaitForSingleObject(source->read_thread, INFINITE);
-    CloseHandle(source->read_thread);
-
     IMFMediaEventQueue_Shutdown(source->event_queue);
     IMFByteStream_Close(source->byte_stream);
 
@@ -1766,50 +1547,6 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
     media_source_Shutdown,
 };
 
-static HRESULT map_stream_to_wg_parser_stream(struct media_source *source, UINT stream_count,
-        wg_parser_stream_t *parser_streams, wg_parser_stream_t parser_stream)
-{
-    struct wg_format parser_format, source_format;
-    HRESULT hr;
-    UINT i;
-
-    wg_parser_stream_get_preferred_format(parser_stream, &parser_format);
-
-    for (i = 0; i < stream_count; i++)
-    {
-        if (parser_streams[i])
-            continue;
-        if (FAILED(hr = wg_source_get_stream_format(source->wg_source, source->stream_map[i], &source_format)))
-            return hr;
-        if ((parser_format.major_type >= WG_MAJOR_TYPE_VIDEO) != (source_format.major_type >= WG_MAJOR_TYPE_VIDEO)
-                || (parser_format.major_type >= WG_MAJOR_TYPE_AUDIO) != (source_format.major_type >= WG_MAJOR_TYPE_AUDIO))
-            continue;
-
-        TRACE("Mapped stream %#I64x with descriptor %u\n", parser_stream, i);
-        parser_streams[i] = parser_stream;
-        return S_OK;
-    }
-
-    return E_FAIL;
-}
-
-static void media_source_init_parser_streams(struct media_source *source, UINT stream_count,
-        wg_parser_stream_t *parser_streams)
-{
-    wg_parser_stream_t parser_stream;
-    UINT i, parser_stream_count;
-    HRESULT hr;
-
-    parser_stream_count = wg_parser_get_stream_count(source->wg_parser);
-    for (i = 0; i < parser_stream_count; i++)
-    {
-        if (!(parser_stream = wg_parser_get_stream(source->wg_parser, i)))
-            continue;
-        if (FAILED(hr = map_stream_to_wg_parser_stream(source, stream_count, parser_streams, parser_stream)))
-            WARN("Failed to map parser stream %u, hr %#lx\n", i, hr);
-    }
-}
-
 static void media_source_init_stream_map(struct media_source *source, UINT stream_count)
 {
     struct wg_format format;
@@ -1914,9 +1651,7 @@ static void media_source_init_descriptors(struct media_source *source)
 static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out)
 {
     UINT32 stream_count = context->stream_count;
-    wg_parser_stream_t *parser_streams = NULL;
     struct media_source *object;
-    wg_parser_t parser;
     unsigned int i;
     HRESULT hr;
 
@@ -1948,23 +1683,9 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         goto fail;
     if (FAILED(hr = wg_source_get_duration(object->wg_source, &object->duration)))
         goto fail;
-
-    if (!(parser = wg_parser_create(WG_PARSER_DECODEBIN, FALSE, FALSE)))
-    {
-        hr = E_OUTOFMEMORY;
-        goto fail;
-    }
-    object->wg_parser = parser;
-
-    object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL);
-
     object->state = SOURCE_OPENING;
 
-    if (FAILED(hr = wg_parser_connect(parser, object->file_size, NULL)))
-        goto fail;
-
     if (!(object->descriptors = calloc(stream_count, sizeof(*object->descriptors)))
-            || !(parser_streams = calloc(stream_count, sizeof(*parser_streams)))
             || !(object->stream_map = calloc(stream_count, sizeof(*object->stream_map)))
             || !(object->streams = calloc(stream_count, sizeof(*object->streams))))
     {
@@ -1973,22 +1694,18 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
     }
 
     media_source_init_stream_map(object, stream_count);
-    media_source_init_parser_streams(object, stream_count, parser_streams);
 
     for (i = 0; i < stream_count; ++i)
     {
-        wg_parser_stream_t parser_stream;
         IMFStreamDescriptor *descriptor;
         struct media_stream *stream;
         struct wg_format format;
 
-        if (!(parser_stream = parser_streams[i]))
-            continue;
-        wg_parser_stream_get_preferred_format(parser_stream, &format);
-
+        if (FAILED(hr = wg_source_get_stream_format(object->wg_source, object->stream_map[i], &format)))
+            goto fail;
         if (FAILED(hr = stream_descriptor_create(i + 1, &format, &descriptor)))
             goto fail;
-        if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, parser_stream, &stream)))
+        if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, &stream)))
         {
             IMFStreamDescriptor_Release(descriptor);
             goto fail;
@@ -2000,8 +1717,6 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         object->stream_count++;
     }
 
-    free(parser_streams);
-
     media_source_init_descriptors(object);
     object->state = SOURCE_STOPPED;
 
@@ -2018,23 +1733,12 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc
         IMFStreamDescriptor_Release(object->descriptors[object->stream_count]);
         IMFMediaStream_Release(&stream->IMFMediaStream_iface);
     }
-    free(parser_streams);
     free(object->stream_map);
     free(object->descriptors);
     free(object->streams);
 
-    if (object->state == SOURCE_OPENING)
-        wg_parser_disconnect(object->wg_parser);
-    if (object->read_thread)
-    {
-        object->read_thread_shutdown = true;
-        WaitForSingleObject(object->read_thread, INFINITE);
-        CloseHandle(object->read_thread);
-    }
     if (object->wg_source)
         wg_source_destroy(object->wg_source);
-    if (object->wg_parser)
-        wg_parser_destroy(object->wg_parser);
     if (object->async_commands_queue)
         MFUnlockWorkQueue(object->async_commands_queue);
     if (object->event_queue)

From 841ac075f26a403006df0199b1e375e7f911e471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 15 Nov 2023 18:47:17 +0100
Subject: [PATCH 072/389] winegstreamer: Call gst_audio_info_from_caps for all
 audio formats.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_format.c | 54 +++++++++++++---------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index 1c9b49a1e55..d09031a339f 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -396,43 +396,31 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
 {
     const GstStructure *structure = gst_caps_get_structure(caps, 0);
     const char *name = gst_structure_get_name(structure);
+    GstAudioInfo audio_info;
+    GstVideoInfo video_info;
     gboolean parsed;
 
     memset(format, 0, sizeof(*format));
 
-    if (!strcmp(name, "audio/x-raw"))
-    {
-        GstAudioInfo info;
-
-        if (gst_audio_info_from_caps(&info, caps))
-            wg_format_from_audio_info(format, &info);
-    }
-    else if (!strcmp(name, "video/x-raw"))
-    {
-        GstVideoInfo info;
-
-        if (gst_video_info_from_caps(&info, caps))
-            wg_format_from_video_info(format, &info);
-    }
-    else if (!strcmp(name, "audio/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed)
-    {
-        wg_format_from_caps_audio_mpeg1(format, caps);
-    }
-    else if (!strcmp(name, "audio/x-wma"))
-    {
-        wg_format_from_caps_audio_wma(format, caps);
-    }
-    else if (!strcmp(name, "video/x-cinepak"))
-    {
-        wg_format_from_caps_video_cinepak(format, caps);
-    }
-    else if (!strcmp(name, "video/x-wmv"))
-    {
-        wg_format_from_caps_video_wmv(format, caps);
-    }
-    else if (!strcmp(name, "video/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed)
-    {
-        wg_format_from_caps_video_mpeg1(format, caps);
+    if (g_str_has_prefix(name, "audio/") && gst_audio_info_from_caps(&audio_info, caps))
+    {
+        if (GST_AUDIO_INFO_FORMAT(&audio_info) != GST_AUDIO_FORMAT_ENCODED)
+            wg_format_from_audio_info(format, &audio_info);
+        else if (!strcmp(name, "audio/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed)
+            wg_format_from_caps_audio_mpeg1(format, caps);
+        else if (!strcmp(name, "audio/x-wma"))
+            wg_format_from_caps_audio_wma(format, caps);
+    }
+    else if (g_str_has_prefix(name, "video/") && gst_video_info_from_caps(&video_info, caps))
+    {
+        if (GST_VIDEO_INFO_FORMAT(&video_info) != GST_VIDEO_FORMAT_ENCODED)
+            wg_format_from_video_info(format, &video_info);
+        else if (!strcmp(name, "video/x-cinepak"))
+            wg_format_from_caps_video_cinepak(format, caps);
+        else if (!strcmp(name, "video/x-wmv"))
+            wg_format_from_caps_video_wmv(format, caps);
+        else if (!strcmp(name, "video/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed)
+            wg_format_from_caps_video_mpeg1(format, caps);
     }
     else
     {

From 77f74e7ad626ebcaea69d762d0b3ef7973162c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 15 Nov 2023 18:13:17 +0100
Subject: [PATCH 073/389] winegstreamer: Support generic audio / video encoded
 format.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/mfplat.c        |  2 ++
 dlls/winegstreamer/quartz_parser.c |  4 +++
 dlls/winegstreamer/unixlib.h       | 14 ++++++++
 dlls/winegstreamer/wg_format.c     | 56 ++++++++++++++++++++++++++++++
 dlls/winegstreamer/wg_transform.c  |  6 +++-
 dlls/winegstreamer/wm_reader.c     |  8 +++++
 6 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 452289c2e6a..8c8dcc32383 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -576,11 +576,13 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_WMV:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             FIXME("Format %u not implemented!\n", format->major_type);
             /* fallthrough */
         case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
index dcd29d1c9fd..569a7010ebb 100644
--- a/dlls/winegstreamer/quartz_parser.c
+++ b/dlls/winegstreamer/quartz_parser.c
@@ -467,8 +467,10 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
             return format->u.audio_wma.rate * format->u.audio_wma.channels * format->u.audio_wma.depth / 8;
 
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             FIXME("Format %u not implemented!\n", format->major_type);
             return 0;
 
@@ -729,8 +731,10 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool
     switch (format->major_type)
     {
     case WG_MAJOR_TYPE_AUDIO_MPEG4:
+    case WG_MAJOR_TYPE_AUDIO_ENCODED:
     case WG_MAJOR_TYPE_VIDEO_H264:
     case WG_MAJOR_TYPE_VIDEO_INDEO:
+    case WG_MAJOR_TYPE_VIDEO_ENCODED:
         FIXME("Format %u not implemented!\n", format->major_type);
         /* fallthrough */
     case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 165d0c57fd7..1e74a36764f 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -37,12 +37,14 @@ enum wg_major_type
     WG_MAJOR_TYPE_AUDIO_MPEG1,
     WG_MAJOR_TYPE_AUDIO_MPEG4,
     WG_MAJOR_TYPE_AUDIO_WMA,
+    WG_MAJOR_TYPE_AUDIO_ENCODED,
     WG_MAJOR_TYPE_VIDEO,
     WG_MAJOR_TYPE_VIDEO_CINEPAK,
     WG_MAJOR_TYPE_VIDEO_H264,
     WG_MAJOR_TYPE_VIDEO_WMV,
     WG_MAJOR_TYPE_VIDEO_INDEO,
     WG_MAJOR_TYPE_VIDEO_MPEG1,
+    WG_MAJOR_TYPE_VIDEO_ENCODED,
 };
 
 typedef UINT32 wg_audio_format;
@@ -128,6 +130,12 @@ struct wg_format
             unsigned char codec_data[64];
             UINT8 is_xma;
         } audio_wma;
+        struct
+        {
+            uint32_t channels;
+            uint32_t rate;
+            char caps[512];
+        } audio_encoded;
 
         struct
         {
@@ -173,6 +181,12 @@ struct wg_format
             int32_t width, height;
             uint32_t fps_n, fps_d;
         } video_mpeg1;
+        struct
+        {
+            int32_t width, height;
+            uint32_t fps_n, fps_d;
+            char caps[512];
+        } video_encoded;
     } u;
 };
 
diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index d09031a339f..e6fc0f7b351 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -267,6 +267,25 @@ static void wg_format_from_caps_audio_wma(struct wg_format *format, const GstCap
     gst_buffer_unmap(codec_data, &map);
 }
 
+static void wg_format_from_caps_audio_encoded(struct wg_format *format, const GstCaps *caps,
+        const GstAudioInfo *info)
+{
+    gchar *str;
+    gint len;
+
+    format->major_type = WG_MAJOR_TYPE_AUDIO_ENCODED;
+    format->u.audio_encoded.rate = info->rate;
+    format->u.audio_encoded.channels = info->channels;
+
+    str = gst_caps_to_string(caps);
+    len = strlen(str) + 1;
+    if (len >= ARRAY_SIZE(format->u.audio_encoded.caps))
+        GST_FIXME("wg_format.audio_encoded.caps buffer is too small, need %u bytes", len);
+    else
+        memcpy(format->u.audio_encoded.caps, str, len);
+    g_free(str);
+}
+
 static void wg_format_from_caps_video_cinepak(struct wg_format *format, const GstCaps *caps)
 {
     const GstStructure *structure = gst_caps_get_structure(caps, 0);
@@ -392,6 +411,27 @@ static void wg_format_from_caps_video_mpeg1(struct wg_format *format, const GstC
     format->u.video_mpeg1.fps_d = fps_d;
 }
 
+static void wg_format_from_caps_video_encoded(struct wg_format *format, const GstCaps *caps,
+        const GstVideoInfo *info)
+{
+    gchar *str;
+    gint len;
+
+    format->major_type = WG_MAJOR_TYPE_VIDEO_ENCODED;
+    format->u.video_encoded.width = info->width;
+    format->u.video_encoded.height = info->height;
+    format->u.video_encoded.fps_n = info->fps_n;
+    format->u.video_encoded.fps_d = info->fps_d;
+
+    str = gst_caps_to_string(caps);
+    len = strlen(str) + 1;
+    if (len >= ARRAY_SIZE(format->u.video_encoded.caps))
+        GST_FIXME("wg_format.video_encoded.caps buffer is too small, need %u bytes", len);
+    else
+        memcpy(format->u.video_encoded.caps, str, len);
+    g_free(str);
+}
+
 void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
 {
     const GstStructure *structure = gst_caps_get_structure(caps, 0);
@@ -410,6 +450,11 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
             wg_format_from_caps_audio_mpeg1(format, caps);
         else if (!strcmp(name, "audio/x-wma"))
             wg_format_from_caps_audio_wma(format, caps);
+        else
+        {
+            GST_FIXME("Using fallback for encoded audio caps %" GST_PTR_FORMAT ".", caps);
+            wg_format_from_caps_audio_encoded(format, caps, &audio_info);
+        }
     }
     else if (g_str_has_prefix(name, "video/") && gst_video_info_from_caps(&video_info, caps))
     {
@@ -421,6 +466,11 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
             wg_format_from_caps_video_wmv(format, caps);
         else if (!strcmp(name, "video/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed)
             wg_format_from_caps_video_mpeg1(format, caps);
+        else
+        {
+            GST_FIXME("Using fallback for encoded video caps %" GST_PTR_FORMAT ".", caps);
+            wg_format_from_caps_video_encoded(format, caps, &video_info);
+        }
     }
     else
     {
@@ -870,6 +920,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
             return wg_format_to_caps_audio_mpeg4(format);
         case WG_MAJOR_TYPE_AUDIO_WMA:
             return wg_format_to_caps_audio_wma(format);
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
+            return gst_caps_from_string(format->u.audio_encoded.caps);
         case WG_MAJOR_TYPE_VIDEO:
             return wg_format_to_caps_video(format);
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
@@ -882,6 +934,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
             return wg_format_to_caps_video_indeo(format);
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
             return wg_format_to_caps_video_mpeg1(format);
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
+            return gst_caps_from_string(format->u.video_encoded.caps);
     }
     assert(0);
     return NULL;
@@ -897,9 +951,11 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b)
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             GST_FIXME("Format %u not implemented!", a->major_type);
             /* fallthrough */
         case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 557d7024246..4acc449a7f5 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -404,10 +404,12 @@ NTSTATUS wg_transform_create(void *args)
 
     switch (input_format.major_type)
     {
-        case WG_MAJOR_TYPE_VIDEO_H264:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
+        case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_WMV:
@@ -486,11 +488,13 @@ NTSTATUS wg_transform_create(void *args)
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_WMV:
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             GST_FIXME("Format %u not implemented!", output_format.major_type);
             goto out;
     }
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index ffb78f3cbc9..1421fb6a5ac 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1675,6 +1675,10 @@ static const char *get_major_type_string(enum wg_major_type type)
             return "indeo";
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
             return "mpeg1-video";
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
+            return "unknown-audio";
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
+            return "unknown-video";
         case WG_MAJOR_TYPE_UNKNOWN:
             return "unknown";
     }
@@ -2043,11 +2047,13 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface,
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_WMV:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             FIXME("Format %u not implemented!\n", format.major_type);
             break;
         case WG_MAJOR_TYPE_UNKNOWN:
@@ -2086,11 +2092,13 @@ static HRESULT WINAPI reader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD o
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_WMV:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             FIXME("Format %u not implemented!\n", format.major_type);
             /* fallthrough */
         case WG_MAJOR_TYPE_AUDIO:

From 3dcb087767194196ae5e336cd14cde131e28cbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 19 Nov 2023 12:49:03 +0100
Subject: [PATCH 074/389] winegstreamer: Skip encoded formats in
 format_is_compressed.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/wg_parser.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index d6de243f3b2..dd555a7ce19 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -147,7 +147,9 @@ static bool format_is_compressed(struct wg_format *format)
 {
     return format->major_type != WG_MAJOR_TYPE_UNKNOWN
             && format->major_type != WG_MAJOR_TYPE_VIDEO
-            && format->major_type != WG_MAJOR_TYPE_AUDIO;
+            && format->major_type != WG_MAJOR_TYPE_AUDIO
+            && format->major_type != WG_MAJOR_TYPE_VIDEO_ENCODED
+            && format->major_type != WG_MAJOR_TYPE_AUDIO_ENCODED;
 }
 
 static NTSTATUS wg_parser_get_stream_count(void *args)

From b98066788e613d9eba4e1b69dcedb2a63a947cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 15 Nov 2023 18:13:17 +0100
Subject: [PATCH 075/389] winegstreamer: Translate generic audio / video
 encoded media types.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/mfplat.c | 138 +++++++++++++++++++++++++++++++++++-
 1 file changed, 136 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 8c8dcc32383..a5325061b66 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -45,6 +45,8 @@ DEFINE_MEDIATYPE_GUID(MFAudioFormat_RAW_AAC,WAVE_FORMAT_RAW_AAC1);
 DEFINE_MEDIATYPE_GUID(MFAudioFormat_XMAudio2, 0x0166);
 DEFINE_MEDIATYPE_GUID(MFVideoFormat_VC1S,MAKEFOURCC('V','C','1','S'));
 DEFINE_MEDIATYPE_GUID(MFVideoFormat_IV50,MAKEFOURCC('I','V','5','0'));
+DEFINE_MEDIATYPE_GUID(MFAudioFormat_GStreamer,MAKEFOURCC('G','S','T','a'));
+DEFINE_MEDIATYPE_GUID(MFVideoFormat_GStreamer,MAKEFOURCC('G','S','T','v'));
 
 extern GUID MEDIASUBTYPE_VC1S;
 
@@ -569,6 +571,74 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format *
     return NULL;
 }
 
+static IMFMediaType *mf_media_type_from_wg_format_audio_encoded(const struct wg_format *format)
+{
+    IMFMediaType *type;
+    UINT32 value;
+    HRESULT hr;
+
+    if (FAILED(MFCreateMediaType(&type)))
+        return NULL;
+    if (FAILED(hr = IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio)))
+        goto done;
+    if (FAILED(hr = IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFAudioFormat_GStreamer)))
+        goto done;
+
+    value = format->u.audio_encoded.rate;
+    if (value && FAILED(hr = IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, value)))
+        goto done;
+    value = format->u.audio_encoded.channels;
+    if (value && FAILED(hr = IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, value)))
+        goto done;
+    if (FAILED(hr = IMFMediaType_SetBlob(type, &MF_MT_USER_DATA, (BYTE *)format->u.audio_encoded.caps,
+            strlen(format->u.audio_encoded.caps) + 1)))
+        goto done;
+
+done:
+    if (FAILED(hr))
+    {
+        IMFMediaType_Release(type);
+        return NULL;
+    }
+    return type;
+}
+
+static IMFMediaType *mf_media_type_from_wg_format_video_encoded(const struct wg_format *format)
+{
+    UINT64 frame_rate, frame_size;
+    IMFMediaType *type;
+    HRESULT hr;
+
+    if (FAILED(MFCreateMediaType(&type)))
+        return NULL;
+    if (FAILED(hr = IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video)))
+        goto done;
+    if (FAILED(hr = IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFVideoFormat_GStreamer)))
+        goto done;
+    if (FAILED(hr = IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0)))
+        goto done;
+    if (FAILED(hr = IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, TRUE)))
+        goto done;
+
+    frame_size = (UINT64)format->u.video_encoded.width << 32 | format->u.video_encoded.height;
+    if (FAILED(hr = IMFMediaType_SetUINT64(type, &MF_MT_FRAME_SIZE, frame_size)))
+        goto done;
+    frame_rate = (UINT64)format->u.video_encoded.fps_n << 32 | format->u.video_encoded.fps_d;
+    if (FAILED(hr = IMFMediaType_SetUINT64(type, &MF_MT_FRAME_RATE, frame_rate)))
+        goto done;
+    if (FAILED(hr = IMFMediaType_SetBlob(type, &MF_MT_USER_DATA, (BYTE *)format->u.video_encoded.caps,
+            strlen(format->u.video_encoded.caps) + 1)))
+        goto done;
+
+done:
+    if (FAILED(hr))
+    {
+        IMFMediaType_Release(type);
+        return NULL;
+    }
+    return type;
+}
+
 IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
 {
     switch (format->major_type)
@@ -576,13 +646,11 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
         case WG_MAJOR_TYPE_AUDIO_MPEG1:
         case WG_MAJOR_TYPE_AUDIO_MPEG4:
         case WG_MAJOR_TYPE_AUDIO_WMA:
-        case WG_MAJOR_TYPE_AUDIO_ENCODED:
         case WG_MAJOR_TYPE_VIDEO_CINEPAK:
         case WG_MAJOR_TYPE_VIDEO_H264:
         case WG_MAJOR_TYPE_VIDEO_WMV:
         case WG_MAJOR_TYPE_VIDEO_INDEO:
         case WG_MAJOR_TYPE_VIDEO_MPEG1:
-        case WG_MAJOR_TYPE_VIDEO_ENCODED:
             FIXME("Format %u not implemented!\n", format->major_type);
             /* fallthrough */
         case WG_MAJOR_TYPE_UNKNOWN:
@@ -590,9 +658,13 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
 
         case WG_MAJOR_TYPE_AUDIO:
             return mf_media_type_from_wg_format_audio(format);
+        case WG_MAJOR_TYPE_AUDIO_ENCODED:
+            return mf_media_type_from_wg_format_audio_encoded(format);
 
         case WG_MAJOR_TYPE_VIDEO:
             return mf_media_type_from_wg_format_video(format);
+        case WG_MAJOR_TYPE_VIDEO_ENCODED:
+            return mf_media_type_from_wg_format_video_encoded(format);
     }
 
     assert(0);
@@ -684,6 +756,29 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUI
     format->u.audio_mpeg4.codec_data_len = codec_data_size;
 }
 
+static void mf_media_type_to_wg_format_audio_encoded(IMFMediaType *type, struct wg_format *format)
+{
+    UINT32 caps_len;
+    BYTE *caps;
+    HRESULT hr;
+
+    memset(format, 0, sizeof(*format));
+    format->major_type = WG_MAJOR_TYPE_AUDIO_ENCODED;
+
+    if (FAILED(hr = IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->u.audio_encoded.rate)))
+        WARN("Failed to get MF_MT_AUDIO_SAMPLES_PER_SECOND for type %p, hr %#lx.\n", type, hr);
+    if (FAILED(hr = IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &format->u.audio_encoded.channels)))
+        WARN("Failed to get MF_MT_AUDIO_NUM_CHANNELS for type %p, hr %#lx.\n", type, hr);
+
+    if (FAILED(hr = IMFMediaType_GetAllocatedBlob(type, &MF_MT_USER_DATA, &caps, &caps_len)))
+        WARN("Failed to get MF_MT_USER_DATA for type %p, hr %#lx.\n", type, hr);
+    else
+    {
+        strcpy(format->u.audio_encoded.caps, (char *)caps);
+        CoTaskMemFree(caps);
+    }
+}
+
 static enum wg_video_format mf_video_format_to_wg(const GUID *subtype)
 {
     unsigned int i;
@@ -922,6 +1017,41 @@ static void mf_media_type_to_wg_format_wmv(IMFMediaType *type, const GUID *subty
         format->u.video_wmv.format = WG_WMV_VIDEO_FORMAT_UNKNOWN;
 }
 
+static void mf_media_type_to_wg_format_video_encoded(IMFMediaType *type, struct wg_format *format)
+{
+    UINT64 frame_rate, frame_size;
+    UINT32 caps_len;
+    HRESULT hr;
+    BYTE *caps;
+
+    memset(format, 0, sizeof(*format));
+    format->major_type = WG_MAJOR_TYPE_VIDEO_ENCODED;
+
+    if (FAILED(hr = IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
+        WARN("Failed to get MF_MT_FRAME_SIZE for type %p, hr %#lx.\n", type, hr);
+    else
+    {
+        format->u.video_encoded.width = frame_size >> 32;
+        format->u.video_encoded.height = (UINT32)frame_size;
+    }
+
+    if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &frame_rate)) && (UINT32)frame_rate)
+        WARN("Failed to get MF_MT_FRAME_RATE for type %p, hr %#lx.\n", type, hr);
+    else
+    {
+        format->u.video_encoded.fps_n = frame_rate >> 32;
+        format->u.video_encoded.fps_d = (UINT32)frame_rate;
+    }
+
+    if (FAILED(hr = IMFMediaType_GetAllocatedBlob(type, &MF_MT_USER_DATA, &caps, &caps_len)))
+        WARN("Failed to get MF_MT_USER_DATA for type %p, hr %#lx.\n", type, hr);
+    else
+    {
+        strcpy(format->u.video_encoded.caps, (char *)caps);
+        CoTaskMemFree(caps);
+    }
+}
+
 void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
 {
     GUID major_type, subtype;
@@ -949,6 +1079,8 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
             mf_media_type_to_wg_format_audio_wma(type, &subtype, format);
         else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC) || IsEqualGUID(&subtype, &MFAudioFormat_RAW_AAC))
             mf_media_type_to_wg_format_audio_mpeg4(type, &subtype, format);
+        else if (IsEqualGUID(&subtype, &MFAudioFormat_GStreamer))
+            mf_media_type_to_wg_format_audio_encoded(type, format);
         else
             mf_media_type_to_wg_format_audio(type, &subtype, format);
     }
@@ -968,6 +1100,8 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
                 || IsEqualGUID(&subtype, &MFVideoFormat_WVC1)
                 || IsEqualGUID(&subtype, &MEDIASUBTYPE_VC1S))
             mf_media_type_to_wg_format_wmv(type, &subtype, format);
+        else if (IsEqualGUID(&subtype, &MFVideoFormat_GStreamer))
+            mf_media_type_to_wg_format_video_encoded(type, format);
         else
             mf_media_type_to_wg_format_video(type, &subtype, format);
     }

From fbea0ea230e34c36869882fe6277c5cd673337b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 17 Nov 2023 11:13:35 +0100
Subject: [PATCH 076/389] winegstreamer: Rename aac_decoder to audio_decoder.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/Makefile.in                |  2 +-
 .../{aac_decoder.c => audio_decoder.c}        | 50 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)
 rename dlls/winegstreamer/{aac_decoder.c => audio_decoder.c} (92%)

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 49cfafc2a8e..22238b3b765 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -7,7 +7,7 @@ UNIX_CFLAGS  = $(GSTREAMER_CFLAGS)
 UNIX_LIBS    = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
 
 SOURCES = \
-	aac_decoder.c \
+	audio_decoder.c \
 	color_convert.c \
 	h264_decoder.c \
 	main.c \
diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/audio_decoder.c
similarity index 92%
rename from dlls/winegstreamer/aac_decoder.c
rename to dlls/winegstreamer/audio_decoder.c
index c0bc57f278e..82af33b671b 100644
--- a/dlls/winegstreamer/aac_decoder.c
+++ b/dlls/winegstreamer/audio_decoder.c
@@ -34,7 +34,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 #define NEXT_WAVEFORMATEXTENSIBLE(format) (WAVEFORMATEXTENSIBLE *)((BYTE *)(&(format)->Format + 1) + (format)->Format.cbSize)
 
-static WAVEFORMATEXTENSIBLE const aac_decoder_output_types[] =
+static WAVEFORMATEXTENSIBLE const audio_decoder_output_types[] =
 {
     {.Format = {.wFormatTag = WAVE_FORMAT_IEEE_FLOAT, .wBitsPerSample = 32, .nSamplesPerSec = 48000, .nChannels = 2}},
     {.Format = {.wFormatTag = WAVE_FORMAT_PCM, .wBitsPerSample = 16, .nSamplesPerSec = 48000, .nChannels = 2}},
@@ -51,7 +51,7 @@ static const UINT32 default_channel_mask[7] =
     KSAUDIO_SPEAKER_5POINT1,
 };
 
-struct aac_decoder
+struct audio_decoder
 {
     IMFTransform IMFTransform_iface;
     LONG refcount;
@@ -66,12 +66,12 @@ struct aac_decoder
     struct wg_sample_queue *wg_sample_queue;
 };
 
-static struct aac_decoder *impl_from_IMFTransform(IMFTransform *iface)
+static struct audio_decoder *impl_from_IMFTransform(IMFTransform *iface)
 {
-    return CONTAINING_RECORD(iface, struct aac_decoder, IMFTransform_iface);
+    return CONTAINING_RECORD(iface, struct audio_decoder, IMFTransform_iface);
 }
 
-static HRESULT try_create_wg_transform(struct aac_decoder *decoder)
+static HRESULT try_create_wg_transform(struct audio_decoder *decoder)
 {
     struct wg_format input_format, output_format;
     struct wg_transform_attrs attrs = {0};
@@ -96,7 +96,7 @@ static HRESULT try_create_wg_transform(struct aac_decoder *decoder)
 
 static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
 
@@ -115,7 +115,7 @@ static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid,
 
 static ULONG WINAPI transform_AddRef(IMFTransform *iface)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     ULONG refcount = InterlockedIncrement(&decoder->refcount);
     TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount);
     return refcount;
@@ -123,7 +123,7 @@ static ULONG WINAPI transform_AddRef(IMFTransform *iface)
 
 static ULONG WINAPI transform_Release(IMFTransform *iface)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     ULONG refcount = InterlockedDecrement(&decoder->refcount);
 
     TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount);
@@ -228,7 +228,7 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea
 static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     const WAVEFORMATEXTENSIBLE *format = decoder->input_types;
     UINT count = decoder->input_type_count;
 
@@ -245,7 +245,7 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD
 static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     UINT32 channel_count, sample_rate;
     WAVEFORMATEXTENSIBLE wfx = {{0}};
     IMFMediaType *media_type;
@@ -260,7 +260,7 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
     if (!decoder->input_type)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
-    wfx = aac_decoder_output_types[index % ARRAY_SIZE(aac_decoder_output_types)];
+    wfx = audio_decoder_output_types[index % ARRAY_SIZE(audio_decoder_output_types)];
 
     if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_NUM_CHANNELS, &channel_count))
             || !channel_count)
@@ -271,15 +271,15 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
     if (channel_count >= ARRAY_SIZE(default_channel_mask))
         return MF_E_INVALIDMEDIATYPE;
 
-    if (channel_count > 2 && index >= ARRAY_SIZE(aac_decoder_output_types))
+    if (channel_count > 2 && index >= ARRAY_SIZE(audio_decoder_output_types))
     {
         /* If there are more than two channels in the input type GetOutputAvailableType additionally lists
          * types with 2 channels. */
-        index -= ARRAY_SIZE(aac_decoder_output_types);
+        index -= ARRAY_SIZE(audio_decoder_output_types);
         channel_count = 2;
     }
 
-    if (index >= ARRAY_SIZE(aac_decoder_output_types))
+    if (index >= ARRAY_SIZE(audio_decoder_output_types))
         return MF_E_NO_MORE_TYPES;
 
     wfx.Format.nChannels = channel_count;
@@ -321,7 +321,7 @@ static BOOL matches_format(const WAVEFORMATEXTENSIBLE *a, const WAVEFORMATEXTENS
 
 static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     UINT32 size, count = decoder->input_type_count;
     WAVEFORMATEXTENSIBLE *format, wfx;
     HRESULT hr;
@@ -361,7 +361,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     WAVEFORMATEXTENSIBLE *format, wfx;
     UINT32 size;
     HRESULT hr;
@@ -380,10 +380,10 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
     wfx = *format;
     CoTaskMemFree(format);
 
-    for (i = 0; i < ARRAY_SIZE(aac_decoder_output_types); ++i)
-        if (matches_format(&aac_decoder_output_types[i], &wfx))
+    for (i = 0; i < ARRAY_SIZE(audio_decoder_output_types); ++i)
+        if (matches_format(&audio_decoder_output_types[i], &wfx))
             break;
-    if (i == ARRAY_SIZE(aac_decoder_output_types))
+    if (i == ARRAY_SIZE(audio_decoder_output_types))
         return MF_E_INVALIDMEDIATYPE;
 
     if (!wfx.Format.wBitsPerSample || !wfx.Format.nChannels || !wfx.Format.nSamplesPerSec)
@@ -410,7 +410,7 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
 
 static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **out)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     IMFMediaType *type;
     HRESULT hr;
 
@@ -432,7 +432,7 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i
 
 static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **out)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     IMFMediaType *type;
     HRESULT hr;
 
@@ -454,7 +454,7 @@ static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD
 
 static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     bool accepts_input;
 
     TRACE("iface %p, id %#lx, flags %p.\n", iface, id, flags);
@@ -495,7 +495,7 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_
 
 static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags);
 
@@ -508,7 +508,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS
 static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
         MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
 {
-    struct aac_decoder *decoder = impl_from_IMFTransform(iface);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
     MFT_OUTPUT_STREAM_INFO info;
     HRESULT hr;
 
@@ -598,7 +598,7 @@ HRESULT aac_decoder_create(REFIID riid, void **ret)
     static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_AUDIO_MPEG4};
     struct wg_transform_attrs attrs = {0};
     wg_transform_t transform;
-    struct aac_decoder *decoder;
+    struct audio_decoder *decoder;
     HRESULT hr;
 
     TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret);

From 8608e399f0ad44a2529f22d15634f288c9987677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 28 Jul 2023 15:46:13 +0200
Subject: [PATCH 077/389] winegstreamer: Introduce a generic audio decoder
 transform.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/audio_decoder.c           | 38 ++++++++++++++++++++
 dlls/winegstreamer/gst_private.h             |  1 +
 dlls/winegstreamer/mfplat.c                  | 22 ++++++++++++
 dlls/winegstreamer/winegstreamer_classes.idl |  6 ++++
 4 files changed, 67 insertions(+)

diff --git a/dlls/winegstreamer/audio_decoder.c b/dlls/winegstreamer/audio_decoder.c
index 82af33b671b..771eae465fe 100644
--- a/dlls/winegstreamer/audio_decoder.c
+++ b/dlls/winegstreamer/audio_decoder.c
@@ -612,6 +612,9 @@ HRESULT aac_decoder_create(REFIID riid, void **ret)
 
     if (!(decoder = calloc(1, sizeof(*decoder))))
         return E_OUTOFMEMORY;
+    decoder->IMFTransform_iface.lpVtbl = &transform_vtbl;
+    decoder->refcount = 1;
+
     decoder->input_types = (WAVEFORMATEXTENSIBLE *)aac_decoder_input_types;
     decoder->input_type_count = ARRAY_SIZE(aac_decoder_input_types);
 
@@ -621,9 +624,44 @@ HRESULT aac_decoder_create(REFIID riid, void **ret)
         return hr;
     }
 
+    *ret = &decoder->IMFTransform_iface;
+    TRACE("Created decoder %p\n", *ret);
+    return S_OK;
+}
+
+static WAVEFORMATEXTENSIBLE audio_decoder_input_types[] =
+{
+#define MAKE_WAVEFORMATEXTENSIBLE(format) \
+    {.Format = {.wFormatTag = WAVE_FORMAT_EXTENSIBLE, .nChannels = 6, .nSamplesPerSec = 48000, .nAvgBytesPerSec = 1152000, \
+                .nBlockAlign = 24, .wBitsPerSample = 32, .cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)}, \
+     .SubFormat = {format,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}}
+
+    MAKE_WAVEFORMATEXTENSIBLE(MAKEFOURCC('G','S','T','a')),
+
+#undef MAKE_WAVEFORMATEXTENSIBLE
+};
+
+HRESULT audio_decoder_create(REFIID riid, void **ret)
+{
+    struct audio_decoder *decoder;
+    HRESULT hr;
+
+    TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret);
+
+    if (!(decoder = calloc(1, sizeof(*decoder))))
+        return E_OUTOFMEMORY;
     decoder->IMFTransform_iface.lpVtbl = &transform_vtbl;
     decoder->refcount = 1;
 
+    decoder->input_types = audio_decoder_input_types;
+    decoder->input_type_count = ARRAY_SIZE(audio_decoder_input_types);
+
+    if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue)))
+    {
+        free(decoder);
+        return hr;
+    }
+
     *ret = &decoder->IMFTransform_iface;
     TRACE("Created decoder %p\n", *ret);
     return S_OK;
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 84857c5adfa..c894fd0b1ae 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -188,6 +188,7 @@ unsigned int wg_format_get_stride(const struct wg_format *format);
 
 bool wg_video_format_is_rgb(enum wg_video_format format);
 
+HRESULT audio_decoder_create(REFIID riid, void **ret);
 HRESULT aac_decoder_create(REFIID riid, void **ret);
 HRESULT h264_decoder_create(REFIID riid, void **ret);
 HRESULT video_processor_create(REFIID riid, void **ret);
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index a5325061b66..ea72539d1b6 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -128,6 +128,7 @@ static const IClassFactoryVtbl class_factory_vtbl =
 
 static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
 static const GUID CLSID_GStreamerByteStreamHandler2 = {0x317df619, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
+static const GUID CLSID_GStreamerAudioDecoder = {0x480b1517, 0xc8e9, 0x4eae, {0xb0, 0x06, 0xe6, 0x30, 0x07, 0x18, 0xd8, 0x5d}};
 
 static const GUID CLSID_GStreamerSchemePlugin = {0x587eeb6a,0x7336,0x4ebd,{0xa4,0xf2,0x91,0xc9,0x48,0xde,0x62,0x2c}};
 
@@ -138,6 +139,7 @@ static const struct class_object
 }
 class_objects[] =
 {
+    { &CLSID_GStreamerAudioDecoder, &audio_decoder_create },
     { &CLSID_VideoProcessorMFT, &video_processor_create },
     { &CLSID_GStreamerByteStreamHandler, &gstreamer_byte_stream_handler_create },
     { &CLSID_GStreamerByteStreamHandler2, &gstreamer_byte_stream_handler_2_create },
@@ -339,6 +341,16 @@ HRESULT mfplat_DllRegisterServer(void)
         {MFMediaType_Video, MFVideoFormat_NV11},
     };
 
+    MFT_REGISTER_TYPE_INFO audio_decoder_input_types[] =
+    {
+        {MFMediaType_Audio, MFAudioFormat_GStreamer},
+    };
+    MFT_REGISTER_TYPE_INFO audio_decoder_output_types[] =
+    {
+        {MFMediaType_Audio, MFAudioFormat_Float},
+        {MFMediaType_Audio, MFAudioFormat_PCM},
+    };
+
     struct mft
     {
         GUID clsid;
@@ -422,6 +434,16 @@ HRESULT mfplat_DllRegisterServer(void)
             ARRAY_SIZE(color_convert_output_types),
             color_convert_output_types,
         },
+        {
+            CLSID_GStreamerAudioDecoder,
+            MFT_CATEGORY_AUDIO_DECODER,
+            L"Wine Audio Decoder MFT",
+            MFT_ENUM_FLAG_SYNCMFT,
+            ARRAY_SIZE(audio_decoder_input_types),
+            audio_decoder_input_types,
+            ARRAY_SIZE(audio_decoder_output_types),
+            audio_decoder_output_types,
+        },
     };
 
     unsigned int i;
diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl
index 493e6cff2b0..2ef6d994274 100644
--- a/dlls/winegstreamer/winegstreamer_classes.idl
+++ b/dlls/winegstreamer/winegstreamer_classes.idl
@@ -89,6 +89,12 @@ coclass GStreamerByteStreamHandler {}
 ]
 coclass GStreamerByteStreamHandler2 {}
 
+[
+    threading(both),
+    uuid(480b1517-c8e9-4eae-b006-e6300718d85d)
+]
+coclass GStreamerAudioDecoder {}
+
 [
     threading(both),
     uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a)

From 9c862139acf40f99d060b5a3a53c32ef40e4b2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 11:44:51 +0100
Subject: [PATCH 078/389] winegstreamer: Use MFCreateVideoMediaTypeFromSubtype
 in GetInputAvailableType.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/h264_decoder.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index aff9e73d051..0ba9f378373 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -398,27 +398,12 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea
 static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
-    IMFMediaType *media_type;
-    const GUID *subtype;
-    HRESULT hr;
-
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
     *type = NULL;
-
     if (index >= ARRAY_SIZE(h264_decoder_input_types))
         return MF_E_NO_MORE_TYPES;
-    subtype = h264_decoder_input_types[index];
-
-    if (FAILED(hr = MFCreateMediaType(&media_type)))
-        return hr;
-
-    if (SUCCEEDED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video)) &&
-            SUCCEEDED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, subtype)))
-        IMFMediaType_AddRef((*type = media_type));
-
-    IMFMediaType_Release(media_type);
-    return hr;
+    return MFCreateVideoMediaTypeFromSubtype(h264_decoder_input_types[index], (IMFVideoMediaType **)type);
 }
 
 static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,

From e297f0ba75b9a83c7acbd84850939aaab96a6f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 11:52:09 +0100
Subject: [PATCH 079/389] winegstreamer: Use MFCreateVideoMediaTypeFromSubtype
 in GetOutputAvailableType.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/h264_decoder.c | 116 +++++++++++++-----------------
 1 file changed, 49 insertions(+), 67 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 0ba9f378373..8ec0671bbbe 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -122,102 +122,106 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
     return S_OK;
 }
 
-static HRESULT fill_output_media_type(struct h264_decoder *decoder, IMFMediaType *media_type)
+static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID *subtype,
+        IMFMediaType **media_type)
 {
     IMFMediaType *default_type = decoder->output_type;
+    IMFVideoMediaType *video_type;
     UINT32 value, width, height;
     MFVideoArea aperture;
     UINT64 ratio;
-    GUID subtype;
     HRESULT hr;
 
-    if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype)))
+    if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(subtype, &video_type)))
         return hr;
 
-    if (FAILED(hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &ratio)))
+    if (FAILED(IMFVideoMediaType_GetUINT64(video_type, &MF_MT_FRAME_SIZE, &ratio)))
     {
         if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &ratio)))
             ratio = (UINT64)1920 << 32 | 1080;
-        if (FAILED(hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, ratio)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, ratio)))
+            goto done;
     }
     width = ratio >> 32;
     height = ratio;
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_FRAME_RATE, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_FRAME_RATE, NULL)))
     {
         if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_RATE, &ratio)))
             ratio = (UINT64)30000 << 32 | 1001;
-        if (FAILED(hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_RATE, ratio)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ratio)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_PIXEL_ASPECT_RATIO, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_PIXEL_ASPECT_RATIO, NULL)))
     {
         if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio)))
             ratio = (UINT64)1 << 32 | 1;
-        if (FAILED(hr = IMFMediaType_SetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_SAMPLE_SIZE, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_SAMPLE_SIZE, NULL)))
     {
-        if (FAILED(hr = MFCalculateImageSize(&subtype, width, height, &value)))
-            return hr;
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, value)))
-            return hr;
+        if (FAILED(hr = MFCalculateImageSize(subtype, width, height, &value)))
+            goto done;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_SAMPLE_SIZE, value)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_DEFAULT_STRIDE, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_DEFAULT_STRIDE, NULL)))
     {
-        if (FAILED(hr = MFGetStrideForBitmapInfoHeader(subtype.Data1, width, (LONG *)&value)))
-            return hr;
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, value)))
-            return hr;
+        if (FAILED(hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, width, (LONG *)&value)))
+            goto done;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_DEFAULT_STRIDE, value)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_INTERLACE_MODE, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_INTERLACE_MODE, NULL)))
     {
-        if (!default_type || FAILED(hr = IMFMediaType_GetUINT32(default_type, &MF_MT_INTERLACE_MODE, &value)))
+        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_INTERLACE_MODE, &value)))
             value = MFVideoInterlace_MixedInterlaceOrProgressive;
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_INTERLACE_MODE, value)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_INTERLACE_MODE, value)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, NULL)))
     {
-        if (!default_type || FAILED(hr = IMFMediaType_GetUINT32(default_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value)))
+        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value)))
             value = 1;
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, value)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, value)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_VIDEO_ROTATION, NULL)))
     {
-        if (!default_type || FAILED(hr = IMFMediaType_GetUINT32(default_type, &MF_MT_VIDEO_ROTATION, &value)))
+        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_VIDEO_ROTATION, &value)))
             value = 0;
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_VIDEO_ROTATION, value)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_VIDEO_ROTATION, value)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_FIXED_SIZE_SAMPLES, NULL)))
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_FIXED_SIZE_SAMPLES, NULL)))
     {
-        if (!default_type || FAILED(hr = IMFMediaType_GetUINT32(default_type, &MF_MT_FIXED_SIZE_SAMPLES, &value)))
+        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_FIXED_SIZE_SAMPLES, &value)))
             value = 1;
-        if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, value)))
-            return hr;
+        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, value)))
+            goto done;
     }
 
-    if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL))
-            && SUCCEEDED(hr = IMFMediaType_GetBlob(decoder->stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
+    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL))
+            && SUCCEEDED(IMFMediaType_GetBlob(decoder->stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
             (BYTE *)&aperture, sizeof(aperture), &value)))
     {
-        if (FAILED(hr = IMFMediaType_SetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
+        if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
                 (BYTE *)&aperture, sizeof(aperture))))
-            return hr;
+            goto done;
     }
 
-    return S_OK;
+    IMFMediaType_AddRef((*media_type = (IMFMediaType *)video_type));
+done:
+    IMFVideoMediaType_Release(video_type);
+    return hr;
 }
 
 static HRESULT init_allocator(struct h264_decoder *decoder)
@@ -410,37 +414,15 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
         DWORD index, IMFMediaType **type)
 {
     struct h264_decoder *decoder = impl_from_IMFTransform(iface);
-    IMFMediaType *media_type;
-    const GUID *output_type;
-    HRESULT hr;
 
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
+    *type = NULL;
     if (!decoder->input_type)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    *type = NULL;
-
     if (index >= ARRAY_SIZE(h264_decoder_output_types))
         return MF_E_NO_MORE_TYPES;
-    output_type = h264_decoder_output_types[index];
-
-    if (FAILED(hr = MFCreateMediaType(&media_type)))
-        return hr;
-
-    if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video)))
-        goto done;
-    if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, output_type)))
-        goto done;
-
-    hr = fill_output_media_type(decoder, media_type);
-
-done:
-    if (SUCCEEDED(hr))
-        IMFMediaType_AddRef((*type = media_type));
-
-    IMFMediaType_Release(media_type);
-    return hr;
+    return create_output_media_type(decoder, h264_decoder_output_types[index], type);
 }
 
 static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)

From e4cb607f6ae5289645f2e5dbaae8e355c4d64f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 11:57:46 +0100
Subject: [PATCH 080/389] winegstreamer: Remove unnecessary
 create_output_media_type checks.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/h264_decoder.c | 118 ++++++++++++------------------
 1 file changed, 45 insertions(+), 73 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 8ec0671bbbe..db36af36a20 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -135,82 +135,54 @@ static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID
     if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(subtype, &video_type)))
         return hr;
 
-    if (FAILED(IMFVideoMediaType_GetUINT64(video_type, &MF_MT_FRAME_SIZE, &ratio)))
-    {
-        if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &ratio)))
-            ratio = (UINT64)1920 << 32 | 1080;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, ratio)))
-            goto done;
-    }
+    if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &ratio)))
+        ratio = (UINT64)1920 << 32 | 1080;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, ratio)))
+        goto done;
     width = ratio >> 32;
     height = ratio;
 
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_FRAME_RATE, NULL)))
-    {
-        if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_RATE, &ratio)))
-            ratio = (UINT64)30000 << 32 | 1001;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ratio)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_PIXEL_ASPECT_RATIO, NULL)))
-    {
-        if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio)))
-            ratio = (UINT64)1 << 32 | 1;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_SAMPLE_SIZE, NULL)))
-    {
-        if (FAILED(hr = MFCalculateImageSize(subtype, width, height, &value)))
-            goto done;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_SAMPLE_SIZE, value)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_DEFAULT_STRIDE, NULL)))
-    {
-        if (FAILED(hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, width, (LONG *)&value)))
-            goto done;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_DEFAULT_STRIDE, value)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_INTERLACE_MODE, NULL)))
-    {
-        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_INTERLACE_MODE, &value)))
-            value = MFVideoInterlace_MixedInterlaceOrProgressive;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_INTERLACE_MODE, value)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, NULL)))
-    {
-        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value)))
-            value = 1;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, value)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_VIDEO_ROTATION, NULL)))
-    {
-        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_VIDEO_ROTATION, &value)))
-            value = 0;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_VIDEO_ROTATION, value)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_FIXED_SIZE_SAMPLES, NULL)))
-    {
-        if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_FIXED_SIZE_SAMPLES, &value)))
-            value = 1;
-        if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, value)))
-            goto done;
-    }
-
-    if (FAILED(IMFVideoMediaType_GetItem(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL))
-            && SUCCEEDED(IMFMediaType_GetBlob(decoder->stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
+    if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_RATE, &ratio)))
+        ratio = (UINT64)30000 << 32 | 1001;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ratio)))
+        goto done;
+
+    if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio)))
+        ratio = (UINT64)1 << 32 | 1;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio)))
+        goto done;
+
+    if (FAILED(hr = MFCalculateImageSize(subtype, width, height, &value)))
+        goto done;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_SAMPLE_SIZE, value)))
+        goto done;
+
+    if (FAILED(hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, width, (LONG *)&value)))
+        goto done;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_DEFAULT_STRIDE, value)))
+        goto done;
+
+    if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_INTERLACE_MODE, &value)))
+        value = MFVideoInterlace_MixedInterlaceOrProgressive;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_INTERLACE_MODE, value)))
+        goto done;
+
+    if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value)))
+        value = 1;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, value)))
+        goto done;
+
+    if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_VIDEO_ROTATION, &value)))
+        value = 0;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_VIDEO_ROTATION, value)))
+        goto done;
+
+    if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_FIXED_SIZE_SAMPLES, &value)))
+        value = 1;
+    if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, value)))
+        goto done;
+
+    if (SUCCEEDED(IMFMediaType_GetBlob(decoder->stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,
             (BYTE *)&aperture, sizeof(aperture), &value)))
     {
         if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE,

From 717153865765f83da2dbd2ab9d950a4de8174886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 12:00:01 +0100
Subject: [PATCH 081/389] winegstreamer: Use GUID arrays for H264 decoder media
 types.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/h264_decoder.c | 108 ++++++++++++++++++------------
 1 file changed, 67 insertions(+), 41 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index db36af36a20..a08dd320b57 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -33,14 +33,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
-#define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment)))
-
-static const GUID *const h264_decoder_input_types[] =
-{
-    &MFVideoFormat_H264,
-    &MFVideoFormat_H264_ES,
-};
-static const GUID *const h264_decoder_output_types[] =
+static const GUID *const video_decoder_output_types[] =
 {
     &MFVideoFormat_NV12,
     &MFVideoFormat_YV12,
@@ -57,6 +50,11 @@ struct h264_decoder
     IMFAttributes *attributes;
     IMFAttributes *output_attributes;
 
+    UINT input_type_count;
+    const GUID *const *input_types;
+    UINT output_type_count;
+    const GUID *const *output_types;
+
     UINT64 sample_time;
     IMFMediaType *input_type;
     MFT_INPUT_STREAM_INFO input_info;
@@ -374,12 +372,14 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea
 static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
+    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
     *type = NULL;
-    if (index >= ARRAY_SIZE(h264_decoder_input_types))
+    if (index >= decoder->input_type_count)
         return MF_E_NO_MORE_TYPES;
-    return MFCreateVideoMediaTypeFromSubtype(h264_decoder_input_types[index], (IMFVideoMediaType **)type);
+    return MFCreateVideoMediaTypeFromSubtype(decoder->input_types[index], (IMFVideoMediaType **)type);
 }
 
 static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,
@@ -392,9 +392,9 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
     *type = NULL;
     if (!decoder->input_type)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
-    if (index >= ARRAY_SIZE(h264_decoder_output_types))
+    if (index >= decoder->output_type_count)
         return MF_E_NO_MORE_TYPES;
-    return create_output_media_type(decoder, h264_decoder_output_types[index], type);
+    return create_output_media_type(decoder, decoder->output_types[index], type);
 }
 
 static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
@@ -414,10 +414,10 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
     if (!IsEqualGUID(&major, &MFMediaType_Video))
         return MF_E_INVALIDMEDIATYPE;
 
-    for (i = 0; i < ARRAY_SIZE(h264_decoder_input_types); ++i)
-        if (IsEqualGUID(&subtype, h264_decoder_input_types[i]))
+    for (i = 0; i < decoder->input_type_count; ++i)
+        if (IsEqualGUID(&subtype, decoder->input_types[i]))
             break;
-    if (i == ARRAY_SIZE(h264_decoder_input_types))
+    if (i == decoder->input_type_count)
         return MF_E_INVALIDMEDIATYPE;
     if (flags & MFT_SET_TYPE_TEST_ONLY)
         return S_OK;
@@ -462,10 +462,10 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
     if (!IsEqualGUID(&major, &MFMediaType_Video))
         return MF_E_INVALIDMEDIATYPE;
 
-    for (i = 0; i < ARRAY_SIZE(h264_decoder_output_types); ++i)
-        if (IsEqualGUID(&subtype, h264_decoder_output_types[i]))
+    for (i = 0; i < decoder->output_type_count; ++i)
+        if (IsEqualGUID(&subtype, decoder->output_types[i]))
             break;
-    if (i == ARRAY_SIZE(h264_decoder_output_types))
+    if (i == decoder->output_type_count)
         return MF_E_INVALIDMEDIATYPE;
 
     if (FAILED(hr = IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
@@ -777,39 +777,23 @@ static const IMFTransformVtbl transform_vtbl =
     transform_ProcessOutput,
 };
 
-HRESULT h264_decoder_create(REFIID riid, void **ret)
+static HRESULT video_decoder_create_with_types(const GUID *const *input_types, UINT input_type_count,
+        const GUID *const *output_types, UINT output_type_count, IMFTransform **ret)
 {
-    static const struct wg_format output_format =
-    {
-        .major_type = WG_MAJOR_TYPE_VIDEO,
-        .u.video =
-        {
-            .format = WG_VIDEO_FORMAT_I420,
-            .width = 1920,
-            .height = 1080,
-        },
-    };
-    static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_VIDEO_H264};
-    struct wg_transform_attrs attrs = {0};
-    wg_transform_t transform;
     struct h264_decoder *decoder;
     HRESULT hr;
 
-    TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret);
-
-    if (!(transform = wg_transform_create(&input_format, &output_format, &attrs)))
-    {
-        ERR_(winediag)("GStreamer doesn't support H.264 decoding, please install appropriate plugins\n");
-        return E_FAIL;
-    }
-    wg_transform_destroy(transform);
-
     if (!(decoder = calloc(1, sizeof(*decoder))))
         return E_OUTOFMEMORY;
 
     decoder->IMFTransform_iface.lpVtbl = &transform_vtbl;
     decoder->refcount = 1;
 
+    decoder->input_type_count = input_type_count;
+    decoder->input_types = input_types;
+    decoder->output_type_count = output_type_count;
+    decoder->output_types = output_types;
+
     decoder->input_info.dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER
             | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE;
     decoder->input_info.cbSize = 0x1000;
@@ -861,3 +845,45 @@ HRESULT h264_decoder_create(REFIID riid, void **ret)
     free(decoder);
     return hr;
 }
+
+static const GUID *const h264_decoder_input_types[] =
+{
+    &MFVideoFormat_H264,
+    &MFVideoFormat_H264_ES,
+};
+
+HRESULT h264_decoder_create(REFIID riid, void **out)
+{
+    static const struct wg_format output_format =
+    {
+        .major_type = WG_MAJOR_TYPE_VIDEO,
+        .u.video =
+        {
+            .format = WG_VIDEO_FORMAT_I420,
+            .width = 1920,
+            .height = 1080,
+        },
+    };
+    static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_VIDEO_H264};
+    struct wg_transform_attrs attrs = {0};
+    wg_transform_t transform;
+    IMFTransform *iface;
+    HRESULT hr;
+
+    TRACE("riid %s, out %p.\n", debugstr_guid(riid), out);
+
+    if (!(transform = wg_transform_create(&input_format, &output_format, &attrs)))
+    {
+        ERR_(winediag)("GStreamer doesn't support H.264 decoding, please install appropriate plugins\n");
+        return E_FAIL;
+    }
+    wg_transform_destroy(transform);
+
+    if (FAILED(hr = video_decoder_create_with_types(h264_decoder_input_types, ARRAY_SIZE(h264_decoder_input_types),
+            video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), &iface)))
+        return hr;
+
+    hr = IMFTransform_QueryInterface(iface, riid, out);
+    IMFTransform_Release(iface);
+    return hr;
+}

From cd234ee21b8a42748498176cc53a490b32974074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 12:09:57 +0100
Subject: [PATCH 082/389] winegstreamer: Use MFCalculateImageSize to compute
 output info size.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/h264_decoder.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index a08dd320b57..66396660a05 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -436,7 +436,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
     {
         if (FAILED(hr = IMFMediaType_SetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, frame_size)))
             WARN("Failed to update stream type frame size, hr %#lx\n", hr);
-        decoder->output_info.cbSize = (frame_size >> 32) * (UINT32)frame_size * 2;
+        MFCalculateImageSize(decoder->output_types[0], frame_size >> 32, frame_size, (UINT32 *)&decoder->output_info.cbSize);
     }
 
     return S_OK;
@@ -642,6 +642,7 @@ static HRESULT output_sample(struct h264_decoder *decoder, IMFSample **out, IMFS
 static HRESULT handle_stream_type_change(struct h264_decoder *decoder, const struct wg_format *format)
 {
     UINT64 frame_size, frame_rate;
+    GUID subtype;
     HRESULT hr;
 
     if (decoder->stream_type)
@@ -655,7 +656,9 @@ static HRESULT handle_stream_type_change(struct h264_decoder *decoder, const str
 
     if (FAILED(hr = IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &frame_size)))
         return hr;
-    decoder->output_info.cbSize = (frame_size >> 32) * (UINT32)frame_size * 2;
+    if (FAILED(hr = IMFMediaType_GetGUID(decoder->stream_type, &MF_MT_SUBTYPE, &subtype)))
+        return hr;
+    MFCalculateImageSize(&subtype, frame_size >> 32, frame_size, (UINT32 *)&decoder->output_info.cbSize);
     uninit_allocator(decoder);
 
     return MF_E_TRANSFORM_STREAM_CHANGE;

From 01823cf0bc8ba449c6dd6ea5ec760bd8259b3cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 17 Nov 2023 00:08:42 +0100
Subject: [PATCH 083/389] ir50_32: Use the proper hr value for stream format
 change.

CW-Bug-Id: #21953
---
 dlls/ir50_32/ir50.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c
index 65c93f7fe5e..69700359e99 100644
--- a/dlls/ir50_32/ir50.c
+++ b/dlls/ir50_32/ir50.c
@@ -252,7 +252,7 @@ static LRESULT IV50_Decompress( IMFTransform *decoder, ICDECOMPRESS *icd, DWORD
     mft_buf.pSample = out_sample;
 
     hr = IMFTransform_ProcessOutput( decoder, 0, 1, &mft_buf, &mft_status );
-    if ( SUCCEEDED(hr) && (mft_status & MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE) )
+    if ( hr == MF_E_TRANSFORM_STREAM_CHANGE )
         hr = IMFTransform_ProcessOutput( decoder, 0, 1, &mft_buf, &mft_status );
 
     if ( SUCCEEDED(hr) )

From c3792c209e5b53094c25cb978b7ee3c0f8a9b92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 12:11:54 +0100
Subject: [PATCH 084/389] winegstreamer: Use the H264 decoder to implement the
 IV50 decoder.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/Makefile.in     |   1 -
 dlls/winegstreamer/h264_decoder.c  |  35 +-
 dlls/winegstreamer/video_decoder.c | 502 -----------------------------
 3 files changed, 34 insertions(+), 504 deletions(-)
 delete mode 100644 dlls/winegstreamer/video_decoder.c

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 22238b3b765..942d6569f28 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -20,7 +20,6 @@ SOURCES = \
 	resampler.c \
 	rsrc.rc \
 	unixlib.c \
-	video_decoder.c \
 	video_processor.c \
 	wg_allocator.c \
 	wg_format.c \
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 66396660a05..8953a61b73a 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -1,6 +1,7 @@
-/* H264 Decoder Transform
+/* Generic Video Decoder Transform
  *
  * Copyright 2022 Rémi Bernon for CodeWeavers
+ * Copyright 2023 Shaun Ren for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -115,7 +116,10 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
     }
 
     if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs)))
+    {
+        ERR("Failed to create transform with input major_type %u.\n", input_format.major_type);
         return E_FAIL;
+    }
 
     return S_OK;
 }
@@ -890,3 +894,32 @@ HRESULT h264_decoder_create(REFIID riid, void **out)
     IMFTransform_Release(iface);
     return hr;
 }
+
+extern GUID MFVideoFormat_IV50;
+static const GUID *const iv50_decoder_input_types[] =
+{
+    &MFVideoFormat_IV50,
+};
+static const GUID *const iv50_decoder_output_types[] =
+{
+    &MFVideoFormat_YV12,
+    &MFVideoFormat_YUY2,
+    &MFVideoFormat_NV11,
+    &MFVideoFormat_NV12,
+    &MFVideoFormat_RGB32,
+    &MFVideoFormat_RGB24,
+    &MFVideoFormat_RGB565,
+    &MFVideoFormat_RGB555,
+    &MFVideoFormat_RGB8,
+};
+
+HRESULT WINAPI winegstreamer_create_video_decoder(IMFTransform **out)
+{
+    TRACE("out %p.\n", out);
+
+    if (!init_gstreamer())
+        return E_FAIL;
+
+    return video_decoder_create_with_types(iv50_decoder_input_types, ARRAY_SIZE(iv50_decoder_input_types),
+            iv50_decoder_output_types, ARRAY_SIZE(iv50_decoder_output_types), out);
+}
diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
deleted file mode 100644
index f24c25e03f2..00000000000
--- a/dlls/winegstreamer/video_decoder.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/* Generic Video Decoder Transform
- *
- * Copyright 2022 Rémi Bernon for CodeWeavers
- * Copyright 2023 Shaun Ren for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "gst_private.h"
-
-#include "mfapi.h"
-#include "mferror.h"
-#include "mfobjects.h"
-#include "mftransform.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
-
-DEFINE_MEDIATYPE_GUID(MFVideoFormat_IV50, MAKEFOURCC('I','V','5','0'));
-
-static const GUID *const input_types[] =
-{
-    &MFVideoFormat_IV50,
-};
-static const GUID *const output_types[] =
-{
-    &MFVideoFormat_YV12,
-    &MFVideoFormat_YUY2,
-    &MFVideoFormat_NV11,
-    &MFVideoFormat_NV12,
-    &MFVideoFormat_RGB32,
-    &MFVideoFormat_RGB24,
-    &MFVideoFormat_RGB565,
-    &MFVideoFormat_RGB555,
-    &MFVideoFormat_RGB8,
-};
-
-struct video_decoder
-{
-    IMFTransform IMFTransform_iface;
-    LONG refcount;
-
-    IMFMediaType *input_type;
-    IMFMediaType *output_type;
-
-    struct wg_format wg_format;
-    wg_transform_t wg_transform;
-    struct wg_sample_queue *wg_sample_queue;
-};
-
-static struct video_decoder *impl_from_IMFTransform(IMFTransform *iface)
-{
-    return CONTAINING_RECORD(iface, struct video_decoder, IMFTransform_iface);
-}
-
-static HRESULT try_create_wg_transform(struct video_decoder *decoder)
-{
-    struct wg_transform_attrs attrs = {0};
-    struct wg_format input_format;
-    struct wg_format output_format;
-
-    if (decoder->wg_transform)
-        wg_transform_destroy(decoder->wg_transform);
-    decoder->wg_transform = 0;
-
-    mf_media_type_to_wg_format(decoder->input_type, &input_format);
-    if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
-        return MF_E_INVALIDMEDIATYPE;
-
-    mf_media_type_to_wg_format(decoder->output_type, &output_format);
-    if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
-        return MF_E_INVALIDMEDIATYPE;
-
-    if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs)))
-    {
-        ERR("Failed to create transform with input major_type %u.\n", input_format.major_type);
-        return E_FAIL;
-    }
-
-    return S_OK;
-}
-
-static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-
-    TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
-
-    if (IsEqualGUID(iid, &IID_IUnknown) ||
-            IsEqualGUID(iid, &IID_IMFTransform))
-        *out = &decoder->IMFTransform_iface;
-    else
-    {
-        *out = NULL;
-        WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
-        return E_NOINTERFACE;
-    }
-
-    IUnknown_AddRef((IUnknown *)*out);
-    return S_OK;
-}
-
-static ULONG WINAPI transform_AddRef(IMFTransform *iface)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-    ULONG refcount = InterlockedIncrement(&decoder->refcount);
-
-    TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount);
-
-    return refcount;
-}
-
-static ULONG WINAPI transform_Release(IMFTransform *iface)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-    ULONG refcount = InterlockedDecrement(&decoder->refcount);
-
-    TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount);
-
-    if (!refcount)
-    {
-        if (decoder->wg_transform)
-            wg_transform_destroy(decoder->wg_transform);
-        if (decoder->input_type)
-            IMFMediaType_Release(decoder->input_type);
-        if (decoder->output_type)
-            IMFMediaType_Release(decoder->output_type);
-
-        wg_sample_queue_destroy(decoder->wg_sample_queue);
-        free(decoder);
-    }
-
-    return refcount;
-}
-
-static HRESULT WINAPI transform_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum,
-        DWORD *input_maximum, DWORD *output_minimum, DWORD *output_maximum)
-{
-    FIXME("iface %p, input_minimum %p, input_maximum %p, output_minimum %p, output_maximum %p.\n",
-            iface, input_minimum, input_maximum, output_minimum, output_maximum);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs)
-{
-    FIXME("iface %p, inputs %p, outputs %p.\n", iface, inputs, outputs);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs,
-        DWORD output_size, DWORD *outputs)
-{
-    FIXME("iface %p, input_size %lu, inputs %p, output_size %lu, outputs %p.\n",
-            iface, input_size, inputs, output_size, outputs);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
-{
-    FIXME("iface %p, id %#lx, info %p.\n", iface, id, info);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
-{
-    FIXME("iface %p, id %#lx, info %p.\n", iface, id, info);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes)
-{
-    FIXME("iface %p, attributes %p semi-stub!\n", iface, attributes);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)
-{
-    FIXME("iface %p, id %#lx, attributes %p.\n", iface, id, attributes);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)
-{
-    FIXME("iface %p, id %#lx, attributes %p stub!\n", iface, id, attributes);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_DeleteInputStream(IMFTransform *iface, DWORD id)
-{
-    FIXME("iface %p, id %#lx.\n", iface, id);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids)
-{
-    FIXME("iface %p, streams %lu, ids %p.\n", iface, streams, ids);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
-        IMFMediaType **type)
-{
-    FIXME("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,
-        DWORD index, IMFMediaType **type)
-{
-    FIXME("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-    GUID major, subtype;
-    UINT64 frame_size;
-    HRESULT hr;
-    ULONG i;
-
-    TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags);
-
-    if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) ||
-            FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-        return E_INVALIDARG;
-
-    if (!IsEqualGUID(&major, &MFMediaType_Video))
-        return MF_E_INVALIDMEDIATYPE;
-
-    for (i = 0; i < ARRAY_SIZE(input_types); ++i)
-        if (IsEqualGUID(&subtype, input_types[i]))
-            break;
-    if (i == ARRAY_SIZE(input_types))
-        return MF_E_INVALIDMEDIATYPE;
-
-    if (FAILED(hr = IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)) ||
-            (frame_size >> 32) == 0 || (UINT32)frame_size == 0)
-        return MF_E_INVALIDMEDIATYPE;
-
-    if (flags & MFT_SET_TYPE_TEST_ONLY)
-        return S_OK;
-
-    if (decoder->output_type)
-    {
-        IMFMediaType_Release(decoder->output_type);
-        decoder->output_type = NULL;
-    }
-
-    if (decoder->input_type)
-        IMFMediaType_Release(decoder->input_type);
-    IMFMediaType_AddRef((decoder->input_type = type));
-
-    return S_OK;
-}
-
-static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-    GUID major, subtype;
-    UINT64 frame_size;
-    struct wg_format output_format;
-    HRESULT hr;
-    ULONG i;
-
-    TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags);
-
-    if (!decoder->input_type)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) ||
-            FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-        return hr;
-
-    if (!IsEqualGUID(&major, &MFMediaType_Video))
-        return MF_E_INVALIDMEDIATYPE;
-
-    for (i = 0; i < ARRAY_SIZE(output_types); ++i)
-        if (IsEqualGUID(&subtype, output_types[i]))
-            break;
-    if (i == ARRAY_SIZE(output_types))
-        return MF_E_INVALIDMEDIATYPE;
-
-    if (FAILED(hr = IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
-        return hr;
-
-    if (flags & MFT_SET_TYPE_TEST_ONLY)
-        return S_OK;
-
-    if (decoder->output_type)
-        IMFMediaType_Release(decoder->output_type);
-    IMFMediaType_AddRef((decoder->output_type = type));
-
-    if (decoder->wg_transform)
-    {
-        mf_media_type_to_wg_format(decoder->output_type, &output_format);
-
-        if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN
-            || !wg_transform_set_output_format(decoder->wg_transform, &output_format))
-        {
-            IMFMediaType_Release(decoder->output_type);
-            decoder->output_type = NULL;
-            return MF_E_INVALIDMEDIATYPE;
-        }
-    }
-    else if (FAILED(hr = try_create_wg_transform(decoder)))
-    {
-        IMFMediaType_Release(decoder->output_type);
-        decoder->output_type = NULL;
-        return hr;
-    }
-
-    decoder->wg_format.u.video.width = frame_size >> 32;
-    decoder->wg_format.u.video.height = (UINT32)frame_size;
-
-    return hr;
-}
-
-static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
-{
-    FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
-{
-    FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
-{
-    FIXME("iface %p, id %#lx, flags %p stub!\n", iface, id, flags);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_GetOutputStatus(IMFTransform *iface, DWORD *flags)
-{
-    FIXME("iface %p, flags %p stub!\n", iface, flags);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper)
-{
-    TRACE("iface %p, lower %I64d, upper %I64d.\n", iface, lower, upper);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event)
-{
-    FIXME("iface %p, id %#lx, event %p stub!\n", iface, id, event);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
-{
-    FIXME("iface %p, message %#x, param %Ix stub!\n", iface, message, param);
-    return S_OK;
-}
-
-static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-    HRESULT hr;
-
-    TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags);
-
-    if (!decoder->wg_transform)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    hr = wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue);
-
-    return hr;
-}
-
-static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
-        MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
-{
-    struct video_decoder *decoder = impl_from_IMFTransform(iface);
-    struct wg_format wg_format;
-    UINT32 sample_size;
-    UINT64 frame_rate;
-    GUID subtype;
-    HRESULT hr;
-
-    TRACE("iface %p, flags %#lx, count %lu, samples %p, status %p.\n", iface, flags, count, samples, status);
-
-    if (count != 1)
-        return E_INVALIDARG;
-
-    if (!decoder->wg_transform)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    *status = samples->dwStatus = 0;
-    if (!samples->pSample)
-        return E_INVALIDARG;
-
-    if (FAILED(hr = IMFMediaType_GetGUID(decoder->output_type, &MF_MT_SUBTYPE, &subtype)))
-        return hr;
-    if (FAILED(hr = MFCalculateImageSize(&subtype, decoder->wg_format.u.video.width,
-            decoder->wg_format.u.video.height, &sample_size)))
-        return hr;
-
-    if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, samples->pSample,
-            sample_size, &wg_format, &samples->dwStatus)))
-        wg_sample_queue_flush(decoder->wg_sample_queue, false);
-
-    if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
-    {
-        decoder->wg_format = wg_format;
-
-        if (FAILED(hr = MFCalculateImageSize(&subtype, decoder->wg_format.u.video.width,
-            decoder->wg_format.u.video.height, &sample_size)))
-            return hr;
-
-        /* keep the frame rate that was requested, GStreamer doesn't provide any */
-        if (SUCCEEDED(IMFMediaType_GetUINT64(decoder->output_type, &MF_MT_FRAME_RATE, &frame_rate)))
-        {
-            decoder->wg_format.u.video.fps_n = frame_rate >> 32;
-            decoder->wg_format.u.video.fps_d = (UINT32)frame_rate;
-        }
-
-        samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE;
-        *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE;
-    }
-
-    return hr;
-}
-
-static const IMFTransformVtbl transform_vtbl =
-{
-    transform_QueryInterface,
-    transform_AddRef,
-    transform_Release,
-    transform_GetStreamLimits,
-    transform_GetStreamCount,
-    transform_GetStreamIDs,
-    transform_GetInputStreamInfo,
-    transform_GetOutputStreamInfo,
-    transform_GetAttributes,
-    transform_GetInputStreamAttributes,
-    transform_GetOutputStreamAttributes,
-    transform_DeleteInputStream,
-    transform_AddInputStreams,
-    transform_GetInputAvailableType,
-    transform_GetOutputAvailableType,
-    transform_SetInputType,
-    transform_SetOutputType,
-    transform_GetInputCurrentType,
-    transform_GetOutputCurrentType,
-    transform_GetInputStatus,
-    transform_GetOutputStatus,
-    transform_SetOutputBounds,
-    transform_ProcessEvent,
-    transform_ProcessMessage,
-    transform_ProcessInput,
-    transform_ProcessOutput,
-};
-
-HRESULT WINAPI winegstreamer_create_video_decoder(IMFTransform **out)
-{
-    struct video_decoder *decoder;
-    HRESULT hr;
-
-    TRACE("out %p.\n", out);
-
-    if (!init_gstreamer())
-        return E_FAIL;
-
-    if (!(decoder = calloc(1, sizeof(*decoder))))
-        return E_OUTOFMEMORY;
-
-    decoder->IMFTransform_iface.lpVtbl = &transform_vtbl;
-    decoder->refcount = 1;
-
-    decoder->wg_format.u.video.fps_d = 1;
-    decoder->wg_format.u.video.fps_n = 1;
-
-    if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue)))
-        goto failed;
-
-    *out = &decoder->IMFTransform_iface;
-    TRACE("created decoder %p.\n", *out);
-    return S_OK;
-
-failed:
-    free(decoder);
-    return hr;
-}

From caf1db51967aeb3d131ce790276d5e3398839de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 12:14:03 +0100
Subject: [PATCH 085/389] winegstreamer: Rename struct h264_decoder to struct
 video_decoder.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/Makefile.in                |  2 +-
 .../{h264_decoder.c => video_decoder.c}       | 54 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)
 rename dlls/winegstreamer/{h264_decoder.c => video_decoder.c} (94%)

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 942d6569f28..3f143e355c5 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -9,7 +9,6 @@ UNIX_LIBS    = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
 SOURCES = \
 	audio_decoder.c \
 	color_convert.c \
-	h264_decoder.c \
 	main.c \
 	media_sink.c \
 	media_source.c \
@@ -20,6 +19,7 @@ SOURCES = \
 	resampler.c \
 	rsrc.rc \
 	unixlib.c \
+	video_decoder.c \
 	video_processor.c \
 	wg_allocator.c \
 	wg_format.c \
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/video_decoder.c
similarity index 94%
rename from dlls/winegstreamer/h264_decoder.c
rename to dlls/winegstreamer/video_decoder.c
index 8953a61b73a..3f72a3df944 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -43,7 +43,7 @@ static const GUID *const video_decoder_output_types[] =
     &MFVideoFormat_YUY2,
 };
 
-struct h264_decoder
+struct video_decoder
 {
     IMFTransform IMFTransform_iface;
     LONG refcount;
@@ -72,12 +72,12 @@ struct h264_decoder
     IMFMediaBuffer *temp_buffer;
 };
 
-static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface)
+static struct video_decoder *impl_from_IMFTransform(IMFTransform *iface)
 {
-    return CONTAINING_RECORD(iface, struct h264_decoder, IMFTransform_iface);
+    return CONTAINING_RECORD(iface, struct video_decoder, IMFTransform_iface);
 }
 
-static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
+static HRESULT try_create_wg_transform(struct video_decoder *decoder)
 {
     /* Call of Duty: Black Ops 3 doesn't care about the ProcessInput/ProcessOutput
      * return values, it calls them in a specific order and expects the decoder
@@ -124,7 +124,7 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder)
     return S_OK;
 }
 
-static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID *subtype,
+static HRESULT create_output_media_type(struct video_decoder *decoder, const GUID *subtype,
         IMFMediaType **media_type)
 {
     IMFMediaType *default_type = decoder->output_type;
@@ -198,7 +198,7 @@ static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID
     return hr;
 }
 
-static HRESULT init_allocator(struct h264_decoder *decoder)
+static HRESULT init_allocator(struct video_decoder *decoder)
 {
     HRESULT hr;
 
@@ -217,7 +217,7 @@ static HRESULT init_allocator(struct h264_decoder *decoder)
     return S_OK;
 }
 
-static void uninit_allocator(struct h264_decoder *decoder)
+static void uninit_allocator(struct video_decoder *decoder)
 {
     IMFVideoSampleAllocatorEx_UninitializeSampleAllocator(decoder->allocator);
     decoder->allocator_initialized = FALSE;
@@ -225,7 +225,7 @@ static void uninit_allocator(struct h264_decoder *decoder)
 
 static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
 
@@ -245,7 +245,7 @@ static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid,
 
 static ULONG WINAPI transform_AddRef(IMFTransform *iface)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     ULONG refcount = InterlockedIncrement(&decoder->refcount);
 
     TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount);
@@ -255,7 +255,7 @@ static ULONG WINAPI transform_AddRef(IMFTransform *iface)
 
 static ULONG WINAPI transform_Release(IMFTransform *iface)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     ULONG refcount = InterlockedDecrement(&decoder->refcount);
 
     TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount);
@@ -309,7 +309,7 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si
 
 static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, info %p.\n", iface, id, info);
 
@@ -319,7 +319,7 @@ static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id
 
 static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, info %p.\n", iface, id, info);
 
@@ -329,7 +329,7 @@ static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD i
 
 static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     FIXME("iface %p, attributes %p semi-stub!\n", iface, attributes);
 
@@ -348,7 +348,7 @@ static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DW
 
 static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     FIXME("iface %p, id %#lx, attributes %p semi-stub!\n", iface, id, attributes);
 
@@ -376,7 +376,7 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea
 static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
         IMFMediaType **type)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
@@ -389,7 +389,7 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD
 static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,
         DWORD index, IMFMediaType **type)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type);
 
@@ -403,7 +403,7 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
 
 static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     GUID major, subtype;
     UINT64 frame_size;
     HRESULT hr;
@@ -448,7 +448,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     UINT64 frame_size, stream_frame_size;
     GUID major, subtype;
     HRESULT hr;
@@ -508,7 +508,7 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
 
 static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     HRESULT hr;
 
     TRACE("iface %p, id %#lx, type %p\n", iface, id, type);
@@ -524,7 +524,7 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i
 
 static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     HRESULT hr;
 
     TRACE("iface %p, id %#lx, type %p\n", iface, id, type);
@@ -540,7 +540,7 @@ static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD
 
 static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, flags %p.\n", iface, id, flags);
 
@@ -571,7 +571,7 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     HRESULT hr;
 
     TRACE("iface %p, message %#x, param %Ix.\n", iface, message, param);
@@ -603,7 +603,7 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_
 
 static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
 
     TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags);
 
@@ -613,7 +613,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS
     return wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue);
 }
 
-static HRESULT output_sample(struct h264_decoder *decoder, IMFSample **out, IMFSample *src_sample)
+static HRESULT output_sample(struct video_decoder *decoder, IMFSample **out, IMFSample *src_sample)
 {
     MFT_OUTPUT_DATA_BUFFER output[1];
     IMFSample *sample;
@@ -643,7 +643,7 @@ static HRESULT output_sample(struct h264_decoder *decoder, IMFSample **out, IMFS
     return S_OK;
 }
 
-static HRESULT handle_stream_type_change(struct h264_decoder *decoder, const struct wg_format *format)
+static HRESULT handle_stream_type_change(struct video_decoder *decoder, const struct wg_format *format)
 {
     UINT64 frame_size, frame_rate;
     GUID subtype;
@@ -671,7 +671,7 @@ static HRESULT handle_stream_type_change(struct h264_decoder *decoder, const str
 static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
         MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
 {
-    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    struct video_decoder *decoder = impl_from_IMFTransform(iface);
     struct wg_format wg_format;
     UINT32 sample_size;
     LONGLONG duration;
@@ -787,7 +787,7 @@ static const IMFTransformVtbl transform_vtbl =
 static HRESULT video_decoder_create_with_types(const GUID *const *input_types, UINT input_type_count,
         const GUID *const *output_types, UINT output_type_count, IMFTransform **ret)
 {
-    struct h264_decoder *decoder;
+    struct video_decoder *decoder;
     HRESULT hr;
 
     if (!(decoder = calloc(1, sizeof(*decoder))))

From 0dfbb87378b70526b3bcf876e1f567db7b4dd591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 13:51:11 +0100
Subject: [PATCH 086/389] winegstreamer: Ignore input / output fps mismatch in
 video_processor.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/video_processor.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c
index 3075bf997d2..1cbb37dafc7 100644
--- a/dlls/winegstreamer/video_processor.c
+++ b/dlls/winegstreamer/video_processor.c
@@ -102,6 +102,13 @@ static HRESULT try_create_wg_transform(struct video_processor *impl)
     if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
         return MF_E_INVALIDMEDIATYPE;
 
+    /* prevent fps differences from failing to connect the elements */
+    if (output_format.u.video.fps_d || output_format.u.video.fps_n)
+    {
+        input_format.u.video.fps_d = output_format.u.video.fps_d;
+        input_format.u.video.fps_n = output_format.u.video.fps_n;
+    }
+
     if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs)))
         return E_FAIL;
 

From 9a96d36988e87b2507ad31e6794f1f5ddac639f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 12:14:49 +0100
Subject: [PATCH 087/389] winegstreamer: Expose the generic video decoder
 transform.

CW-Bug-Id: #21953
---
 dlls/winegstreamer/gst_private.h             |  1 +
 dlls/winegstreamer/mfplat.c                  | 30 ++++++++++++++++++++
 dlls/winegstreamer/video_decoder.c           | 21 ++++++++++++++
 dlls/winegstreamer/winegstreamer_classes.idl |  6 ++++
 4 files changed, 58 insertions(+)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index c894fd0b1ae..bce9b5d2fe4 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -189,6 +189,7 @@ unsigned int wg_format_get_stride(const struct wg_format *format);
 bool wg_video_format_is_rgb(enum wg_video_format format);
 
 HRESULT audio_decoder_create(REFIID riid, void **ret);
+HRESULT video_decoder_create(REFIID riid, void **ret);
 HRESULT aac_decoder_create(REFIID riid, void **ret);
 HRESULT h264_decoder_create(REFIID riid, void **ret);
 HRESULT video_processor_create(REFIID riid, void **ret);
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index ea72539d1b6..1e5b7a38f66 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -129,6 +129,7 @@ static const IClassFactoryVtbl class_factory_vtbl =
 static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
 static const GUID CLSID_GStreamerByteStreamHandler2 = {0x317df619, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
 static const GUID CLSID_GStreamerAudioDecoder = {0x480b1517, 0xc8e9, 0x4eae, {0xb0, 0x06, 0xe6, 0x30, 0x07, 0x18, 0xd8, 0x5d}};
+static const GUID CLSID_GStreamerVideoDecoder = {0x480b1518, 0xc8e9, 0x4eae, {0xb0, 0x06, 0xe6, 0x30, 0x07, 0x18, 0xd8, 0x5d}};
 
 static const GUID CLSID_GStreamerSchemePlugin = {0x587eeb6a,0x7336,0x4ebd,{0xa4,0xf2,0x91,0xc9,0x48,0xde,0x62,0x2c}};
 
@@ -140,6 +141,7 @@ static const struct class_object
 class_objects[] =
 {
     { &CLSID_GStreamerAudioDecoder, &audio_decoder_create },
+    { &CLSID_GStreamerVideoDecoder, &video_decoder_create },
     { &CLSID_VideoProcessorMFT, &video_processor_create },
     { &CLSID_GStreamerByteStreamHandler, &gstreamer_byte_stream_handler_create },
     { &CLSID_GStreamerByteStreamHandler2, &gstreamer_byte_stream_handler_2_create },
@@ -351,6 +353,24 @@ HRESULT mfplat_DllRegisterServer(void)
         {MFMediaType_Audio, MFAudioFormat_PCM},
     };
 
+    MFT_REGISTER_TYPE_INFO video_decoder_input_types[] =
+    {
+        {MFMediaType_Video, MFVideoFormat_GStreamer},
+        {MFMediaType_Video, MFVideoFormat_IV50},
+    };
+    MFT_REGISTER_TYPE_INFO video_decoder_output_types[] =
+    {
+        {MFMediaType_Video, MFVideoFormat_YV12},
+        {MFMediaType_Video, MFVideoFormat_YUY2},
+        {MFMediaType_Video, MFVideoFormat_NV11},
+        {MFMediaType_Video, MFVideoFormat_NV12},
+        {MFMediaType_Video, MFVideoFormat_RGB32},
+        {MFMediaType_Video, MFVideoFormat_RGB24},
+        {MFMediaType_Video, MFVideoFormat_RGB565},
+        {MFMediaType_Video, MFVideoFormat_RGB555},
+        {MFMediaType_Video, MFVideoFormat_RGB8},
+    };
+
     struct mft
     {
         GUID clsid;
@@ -444,6 +464,16 @@ HRESULT mfplat_DllRegisterServer(void)
             ARRAY_SIZE(audio_decoder_output_types),
             audio_decoder_output_types,
         },
+        {
+            CLSID_GStreamerVideoDecoder,
+            MFT_CATEGORY_VIDEO_DECODER,
+            L"Wine Video Decoder MFT",
+            MFT_ENUM_FLAG_SYNCMFT,
+            ARRAY_SIZE(video_decoder_input_types),
+            video_decoder_input_types,
+            ARRAY_SIZE(video_decoder_output_types),
+            video_decoder_output_types,
+        },
     };
 
     unsigned int i;
diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 3f72a3df944..f75fb51ca84 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -34,6 +34,11 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
+extern GUID MFVideoFormat_GStreamer;
+static const GUID *const video_decoder_input_types[] =
+{
+    &MFVideoFormat_GStreamer,
+};
 static const GUID *const video_decoder_output_types[] =
 {
     &MFVideoFormat_NV12,
@@ -853,6 +858,22 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U
     return hr;
 }
 
+HRESULT video_decoder_create(REFIID riid, void **out)
+{
+    IMFTransform *iface;
+    HRESULT hr;
+
+    TRACE("riid %s, out %p.\n", debugstr_guid(riid), out);
+
+    if (FAILED(hr = video_decoder_create_with_types(video_decoder_input_types, ARRAY_SIZE(video_decoder_input_types),
+            video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), &iface)))
+        return hr;
+
+    hr = IMFTransform_QueryInterface(iface, riid, out);
+    IMFTransform_Release(iface);
+    return hr;
+}
+
 static const GUID *const h264_decoder_input_types[] =
 {
     &MFVideoFormat_H264,
diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl
index 2ef6d994274..dc56ad2b0ab 100644
--- a/dlls/winegstreamer/winegstreamer_classes.idl
+++ b/dlls/winegstreamer/winegstreamer_classes.idl
@@ -95,6 +95,12 @@ coclass GStreamerByteStreamHandler2 {}
 ]
 coclass GStreamerAudioDecoder {}
 
+[
+    threading(both),
+    uuid(480b1518-c8e9-4eae-b006-e6300718d85d)
+]
+coclass GStreamerVideoDecoder {}
+
 [
     threading(both),
     uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a)

From d89e62d774d6a8d6f88a0a587ad614cfd6a09911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 11:21:21 +0100
Subject: [PATCH 088/389] HACK: mfplat: Enable the new media source for some
 games.

CW-Bug-Id: #21953
---
 dlls/mfplat/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index e545fd5b999..facb39ee3d6 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -6298,7 +6298,13 @@ static HRESULT resolver_create_gstreamer_handler(IMFByteStreamHandler **handler)
     static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
     static const GUID CLSID_GStreamerByteStreamHandler2 = {0x317df619, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}};
 
-    const char *env = getenv("WINE_NEW_MEDIA_SOURCE");
+    const char *env = getenv("WINE_NEW_MEDIA_SOURCE"), *sgi = getenv("SteamGameId");
+    if (!env && sgi)
+    {
+        if (!strcmp(sgi, "399810") /* Call of Cthulhu */) env = "1";
+        if (!strcmp(sgi, "606880") /* Greedfall */) env = "1";
+        if (!strcmp(sgi, "692850") /* Bloodstained */) env = "1";
+    }
     if (env && atoi(env)) return CoCreateInstance(&CLSID_GStreamerByteStreamHandler2, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler);
 
     return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler);

From 6c1326b0e6f4df6ce0c21073c4bf057428760116 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 29 Nov 2023 17:02:43 -0600
Subject: [PATCH 089/389] ntdll: HACK: Try to load steamoverlay.so manually if
 LD_PRELOAD was lost.

CW-Bug-Id: #23064
---
 dlls/ntdll/unix/loader.c  |  5 +++++
 dlls/ntdll/unix/virtual.c | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 9dec5d15d80..b7d1f677203 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -598,6 +598,8 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i
     if (pe_info->wine_fakedll) res_start = res_end = 0;
     if (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) machine = native_machine;
 
+    unsetenv( "WINE_LD_PRELOAD" );
+
     /* HACK: Unset LD_PRELOAD before executing explorer.exe to disable buggy gameoverlayrenderer.so */
     if (ld_preload && argv[2] && !strcmp( argv[2], "C:\\windows\\system32\\explorer.exe" ) &&
         argv[3] && !strcmp( argv[3], "/desktop" ))
@@ -626,8 +628,11 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i
         while (*next);
 
         putenv( env );
+        ld_preload = NULL;
     }
 
+    if (ld_preload) setenv( "WINE_LD_PRELOAD", ld_preload, 1 );
+
     signal( SIGPIPE, SIG_DFL );
 
     snprintf( socket_env, sizeof(socket_env), "WINESERVERSOCKET=%u", socketfd );
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 42f572e8479..b3535c8a8df 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -649,6 +649,30 @@ void *get_builtin_so_handle( void *module )
     return ret;
 }
 
+static void load_steam_overlay(const char *unix_lib_path)
+{
+    const char *preload, *p;
+    char path[PATH_MAX];
+    unsigned int len;
+    void *handle;
+
+    if (!strstr(unix_lib_path, "winex11.so")) return;
+    if (getenv("LD_PRELOAD") || !(preload = getenv("WINE_LD_PRELOAD"))) return;
+
+    p = preload;
+    while (*(preload = p))
+    {
+        p = strchrnul( preload, ':' );
+        len = p - preload;
+        if (*p) ++p;
+        if (len + 1 > sizeof(path)) continue;
+        memcpy( path, preload, len );
+        path[len] = 0;
+        if (!strstr( path, "gameoverlayrenderer.so" )) continue;
+        handle = dlopen( path, RTLD_NOW | RTLD_GLOBAL );
+        FIXME( "HACK: tried to load %s, handle %p.\n", debugstr_a(path), handle );
+    }
+}
 
 /***********************************************************************
  *           get_builtin_unix_funcs
@@ -665,7 +689,10 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun
     {
         if (builtin->module != module) continue;
         if (builtin->unix_path && !builtin->unix_handle)
+        {
+            load_steam_overlay(builtin->unix_path);
             builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW );
+        }
         if (builtin->unix_handle)
         {
             *funcs = dlsym( builtin->unix_handle, ptr_name );
@@ -693,7 +720,11 @@ NTSTATUS load_builtin_unixlib( void *module, const char *name )
         if (builtin->module != module) continue;
         if (!builtin->unix_path) builtin->unix_path = strdup( name );
         else status = STATUS_IMAGE_ALREADY_LOADED;
-        if (!builtin->unix_handle) builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW );
+        if (!builtin->unix_handle)
+        {
+            load_steam_overlay(builtin->unix_path);
+            builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW );
+        }
         break;
     }
     server_leave_uninterrupted_section( &virtual_mutex, &sigset );

From 044acf45072716646e435865e88e1e1369859aba Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Thu, 23 Nov 2023 10:25:57 +0200
Subject: [PATCH 090/389] winegstreamer: Support WMA with 5.1 and 7.1 audio.

---
 dlls/winegstreamer/mfplat.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 1e5b7a38f66..a4cf2dfcd99 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -749,6 +749,10 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub
             channel_mask = KSAUDIO_SPEAKER_MONO;
         else if (channels == 2)
             channel_mask = KSAUDIO_SPEAKER_STEREO;
+        else if (channels == 6)
+            channel_mask = KSAUDIO_SPEAKER_5POINT1;
+        else if (channels == 8)
+            channel_mask = KSAUDIO_SPEAKER_7POINT1;
         else
         {
             FIXME("Channel mask is not set.\n");

From 92181d905f9435eab90a03c5b2a118642b5531ad Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Fri, 29 Dec 2023 13:23:25 +0200
Subject: [PATCH 091/389] FAudio: Create fake codec data for WMA3.

Already upstreamed, can be dropped the next bump.

Link: https://github.com/FNA-XNA/FAudio/pull/327
---
 libs/faudio/src/FAudio_platform_win32.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c
index c45b4a2f4f2..01a3a84d5e0 100644
--- a/libs/faudio/src/FAudio_platform_win32.c
+++ b/libs/faudio/src/FAudio_platform_win32.c
@@ -1300,6 +1300,7 @@ static void FAudio_INTERNAL_DecodeWMAMF(
 uint32_t FAudio_WMADEC_init(FAudioSourceVoice *voice, uint32_t type)
 {
 	static const uint8_t fake_codec_data[16] = {0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+	uint8_t fake_codec_data_wma3[18] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 0, 0, 0};
 	const FAudioWaveFormatExtensible *wfx = (FAudioWaveFormatExtensible *)voice->src.format;
 	struct FAudioWMADEC *impl;
 	MFT_OUTPUT_STREAM_INFO info = {0};
@@ -1361,11 +1362,17 @@ uint32_t FAudio_WMADEC_init(FAudioSourceVoice *voice, uint32_t type)
 		FAudio_assert(!FAILED(hr) && "Failed set input block align!");
 		break;
 	case FAUDIO_FORMAT_WMAUDIO3:
+                *(uint16_t *)fake_codec_data_wma3  = voice->src.format->wBitsPerSample;
+                for (i = 0; i < voice->src.format->nChannels; i++)
+                {
+                    fake_codec_data_wma3[2] <<= 1;
+                    fake_codec_data_wma3[2] |= 1;
+                }
 		hr = IMFMediaType_SetBlob(
 			media_type,
 			&MF_MT_USER_DATA,
-			(void *)&wfx->Samples,
-			wfx->Format.cbSize
+			(void *)fake_codec_data_wma3,
+			sizeof(fake_codec_data_wma3)
 		);
 		FAudio_assert(!FAILED(hr) && "Failed set codec private data!");
 		hr = IMFMediaType_SetGUID(

From 4d110a8917e9e811d00cfb7c1137da6613871167 Mon Sep 17 00:00:00 2001
From: Etaash Mathamsetty <etaash.mathamsetty@gmail.com>
Date: Sun, 10 Dec 2023 15:29:32 -0500
Subject: [PATCH 092/389] xinput: Implement XInputGetCapabilitiesEx.

CW-Bug-Id: #23185
---
 dlls/xinput1_3/main.c         | 30 ++++++++++++++++++++++++++++++
 dlls/xinput1_4/xinput1_4.spec |  1 +
 include/xinput.h              | 11 +++++++++++
 3 files changed, 42 insertions(+)

diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c
index a18f63545cc..3e6a8d0288c 100644
--- a/dlls/xinput1_3/main.c
+++ b/dlls/xinput1_3/main.c
@@ -1159,3 +1159,33 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE typ
 
     return ERROR_NOT_SUPPORTED;
 }
+
+DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilitiesEx(DWORD unk, DWORD index, DWORD flags, XINPUT_CAPABILITIES_EX *caps)
+{
+    DWORD ret = ERROR_SUCCESS;
+    HIDD_ATTRIBUTES attr;
+
+    TRACE("unk %lu, index %lu, flags %#lx, capabilities %p.\n", unk, index, flags, caps);
+
+    start_update_thread();
+
+    if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;
+
+    if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED;
+
+    if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD)
+        ret = ERROR_DEVICE_NOT_CONNECTED;
+    else if (!HidD_GetAttributes(controllers[index].device, &attr))
+        ret = ERROR_DEVICE_NOT_CONNECTED;
+    else
+    {
+        caps->Capabilities = controllers[index].caps;
+        caps->VendorId = attr.VendorID;
+        caps->ProductId = attr.ProductID;
+        caps->VersionNumber = attr.VersionNumber;
+    }
+
+    controller_unlock(&controllers[index]);
+
+    return ret;
+}
diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec
index 8c3f4c0cd73..22c511237dd 100644
--- a/dlls/xinput1_4/xinput1_4.spec
+++ b/dlls/xinput1_4/xinput1_4.spec
@@ -7,3 +7,4 @@
 8 stdcall XInputGetKeystroke(long long ptr)
 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr)
 100 stdcall XInputGetStateEx(long ptr)
+108 stdcall XInputGetCapabilitiesEx(long long long ptr)
diff --git a/include/xinput.h b/include/xinput.h
index f7c291630cb..96efae1858d 100644
--- a/include/xinput.h
+++ b/include/xinput.h
@@ -210,6 +210,16 @@ typedef struct _XINPUT_CAPABILITIES {
     XINPUT_VIBRATION Vibration;
 } XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES;
 
+typedef struct _XINPUT_CAPABILITIES_EX
+{
+    XINPUT_CAPABILITIES Capabilities;
+    WORD VendorId;
+    WORD ProductId;
+    WORD VersionNumber;
+    WORD unk1;
+    DWORD unk2;
+} XINPUT_CAPABILITIES_EX, *PXINPUT_CAPABILITIES_EX;
+
 /*
  * Defines the structure for a joystick input event which is
  * retrieved using the function XInputGetKeystroke
@@ -237,6 +247,7 @@ DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*);
 DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*);
 DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE);
 DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*);
+DWORD WINAPI XInputGetCapabilitiesEx(DWORD, DWORD, DWORD, XINPUT_CAPABILITIES_EX*);
 DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*);
 DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*);
 

From c7b6134c90e3cd0cce311605c5608c311feea2b3 Mon Sep 17 00:00:00 2001
From: Etaash Mathamsetty <etaash.mathamsetty@gmail.com>
Date: Sun, 10 Dec 2023 15:36:26 -0500
Subject: [PATCH 093/389] xinput: Reimplement XInputGetCapabilities.

CW-Bug-Id: #23185
---
 dlls/xinput1_3/main.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c
index 3e6a8d0288c..4cb9793fa30 100644
--- a/dlls/xinput1_3/main.c
+++ b/dlls/xinput1_3/main.c
@@ -1116,25 +1116,15 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, P
 
 DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES *capabilities)
 {
-    TRACE("index %lu, flags %#lx, capabilities %p.\n", index, flags, capabilities);
-
-    start_update_thread();
-
-    if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;
-
-    if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED;
-
-    if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD)
-    {
-        controller_unlock(&controllers[index]);
-        return ERROR_DEVICE_NOT_CONNECTED;
-    }
+    XINPUT_CAPABILITIES_EX caps_ex;
+    DWORD ret;
 
-    memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities));
+    TRACE("index %lu, flags %#lx, capabilities %p.\n", index, flags, capabilities);
 
-    controller_unlock(&controllers[index]);
+    ret = XInputGetCapabilitiesEx(0, index, flags, &caps_ex);
+    if (!ret) *capabilities = caps_ex.Capabilities;
 
-    return ERROR_SUCCESS;
+    return ret;
 }
 
 DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID *render_guid, GUID *capture_guid)

From 5a7981f0d94764d65befb2acb54e4c5df8bfac49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 21 Feb 2022 15:18:15 +0100
Subject: [PATCH 094/389] windows.gaming.input: Stub IRawGameController2
 interface.

CW-Bug-Id: #23185
---
 dlls/windows.gaming.input/controller.c | 60 ++++++++++++++++++++++++++
 include/windows.devices.haptics.idl    |  3 ++
 2 files changed, 63 insertions(+)

diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c
index bd3d441c445..e1749a3032d 100644
--- a/dlls/windows.gaming.input/controller.c
+++ b/dlls/windows.gaming.input/controller.c
@@ -61,6 +61,7 @@ struct controller
     IGameControllerImpl IGameControllerImpl_iface;
     IGameControllerInputSink IGameControllerInputSink_iface;
     IRawGameController IRawGameController_iface;
+    IRawGameController2 IRawGameController2_iface;
     IGameController *IGameController_outer;
     LONG ref;
 
@@ -99,6 +100,12 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF
         return S_OK;
     }
 
+    if (IsEqualGUID( iid, &IID_IRawGameController2 ))
+    {
+        IInspectable_AddRef( (*out = &impl->IRawGameController2_iface) );
+        return S_OK;
+    }
+
     FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
     *out = NULL;
     return E_NOINTERFACE;
@@ -330,6 +337,58 @@ static const struct IRawGameControllerVtbl raw_controller_vtbl =
     raw_controller_GetSwitchKind,
 };
 
+DEFINE_IINSPECTABLE_OUTER( raw_controller_2, IRawGameController2, struct controller, IGameController_outer )
+
+static HRESULT WINAPI raw_controller_2_get_SimpleHapticsControllers( IRawGameController2 *iface, IVectorView_SimpleHapticsController** value)
+{
+    static const struct vector_iids iids =
+    {
+        .vector = &IID_IVector_SimpleHapticsController,
+        .view = &IID_IVectorView_SimpleHapticsController,
+        .iterable = &IID_IIterable_SimpleHapticsController,
+        .iterator = &IID_IIterator_SimpleHapticsController,
+    };
+    IVector_SimpleHapticsController *vector;
+    HRESULT hr;
+
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+
+    if (SUCCEEDED(hr = vector_create( &iids, (void **)&vector )))
+    {
+        hr = IVector_SimpleHapticsController_GetView( vector, value );
+        IVector_SimpleHapticsController_Release( vector );
+    }
+
+    return hr;
+}
+
+static HRESULT WINAPI raw_controller_2_get_NonRoamableId( IRawGameController2 *iface, HSTRING* value )
+{
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI raw_controller_2_get_DisplayName( IRawGameController2 *iface, HSTRING* value )
+{
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+    return E_NOTIMPL;
+}
+
+static const struct IRawGameController2Vtbl raw_controller_2_vtbl =
+{
+    raw_controller_2_QueryInterface,
+    raw_controller_2_AddRef,
+    raw_controller_2_Release,
+    /* IInspectable methods */
+    raw_controller_2_GetIids,
+    raw_controller_2_GetRuntimeClassName,
+    raw_controller_2_GetTrustLevel,
+    /* IRawGameController2 methods */
+    raw_controller_2_get_SimpleHapticsControllers,
+    raw_controller_2_get_NonRoamableId,
+    raw_controller_2_get_DisplayName,
+};
+
 struct controller_statics
 {
     IActivationFactory IActivationFactory_iface;
@@ -525,6 +584,7 @@ static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameContro
     impl->IGameControllerImpl_iface.lpVtbl = &controller_vtbl;
     impl->IGameControllerInputSink_iface.lpVtbl = &input_sink_vtbl;
     impl->IRawGameController_iface.lpVtbl = &raw_controller_vtbl;
+    impl->IRawGameController2_iface.lpVtbl = &raw_controller_2_vtbl;
     impl->ref = 1;
 
     TRACE( "created RawGameController %p\n", impl );
diff --git a/include/windows.devices.haptics.idl b/include/windows.devices.haptics.idl
index c056ab4941c..506525a6d3c 100644
--- a/include/windows.devices.haptics.idl
+++ b/include/windows.devices.haptics.idl
@@ -30,7 +30,10 @@ namespace Windows.Devices.Haptics {
     runtimeclass SimpleHapticsController;
 
     declare {
+        interface Windows.Foundation.Collections.IIterator<Windows.Devices.Haptics.SimpleHapticsController *>;
+        interface Windows.Foundation.Collections.IIterable<Windows.Devices.Haptics.SimpleHapticsController *>;
         interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsController *>;
+        interface Windows.Foundation.Collections.IVector<Windows.Devices.Haptics.SimpleHapticsController *>;
         interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsControllerFeedback *>;
     }
 

From 262c60c40f1ee7df306d40036f4459dc71e361d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 095/389] windows.gaming.input: Forward get_NonRoamableId to
 Wine provider.

CW-Bug-Id: #23185
---
 dlls/windows.gaming.input/controller.c | 4 ++--
 dlls/windows.gaming.input/provider.c   | 7 +++++++
 dlls/windows.gaming.input/provider.idl | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c
index e1749a3032d..1adbc5cce0b 100644
--- a/dlls/windows.gaming.input/controller.c
+++ b/dlls/windows.gaming.input/controller.c
@@ -364,8 +364,8 @@ static HRESULT WINAPI raw_controller_2_get_SimpleHapticsControllers( IRawGameCon
 
 static HRESULT WINAPI raw_controller_2_get_NonRoamableId( IRawGameController2 *iface, HSTRING* value )
 {
-    FIXME( "iface %p, value %p stub!\n", iface, value );
-    return E_NOTIMPL;
+    struct controller *impl = impl_from_IRawGameController2( iface );
+    return IWineGameControllerProvider_get_NonRoamableId( impl->wine_provider, value );
 }
 
 static HRESULT WINAPI raw_controller_2_get_DisplayName( IRawGameController2 *iface, HSTRING* value )
diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c
index d0472727224..bb84a45b874 100644
--- a/dlls/windows.gaming.input/provider.c
+++ b/dlls/windows.gaming.input/provider.c
@@ -148,6 +148,12 @@ static BOOL CALLBACK count_ffb_axes( const DIDEVICEOBJECTINSTANCEW *obj, void *a
     return DIENUM_CONTINUE;
 }
 
+static HRESULT WINAPI wine_provider_get_NonRoamableId( IWineGameControllerProvider *iface, HSTRING *value )
+{
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+    return E_NOTIMPL;
+}
+
 static HRESULT WINAPI wine_provider_get_Type( IWineGameControllerProvider *iface, WineGameControllerType *value )
 {
     struct provider *impl = impl_from_IWineGameControllerProvider( iface );
@@ -356,6 +362,7 @@ static const struct IWineGameControllerProviderVtbl wine_provider_vtbl =
     wine_provider_GetRuntimeClassName,
     wine_provider_GetTrustLevel,
     /* IWineGameControllerProvider methods */
+    wine_provider_get_NonRoamableId,
     wine_provider_get_Type,
     wine_provider_get_AxisCount,
     wine_provider_get_ButtonCount,
diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl
index e7b6e96b8aa..a6fcc6e84f3 100644
--- a/dlls/windows.gaming.input/provider.idl
+++ b/dlls/windows.gaming.input/provider.idl
@@ -173,6 +173,8 @@ namespace Windows.Gaming.Input.Custom {
     interface IWineGameControllerProvider : IInspectable
         requires Windows.Gaming.Input.Custom.IGameControllerProvider
     {
+        [propget] HRESULT NonRoamableId([out, retval] HSTRING *value);
+
         [propget] HRESULT Type([out, retval] WineGameControllerType *value);
         [propget] HRESULT AxisCount([out, retval] INT32 *value);
         [propget] HRESULT ButtonCount([out, retval] INT32 *value);

From 2247fac81cd938972e75ca2df5197a644026c4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 096/389] HACK: dinput: Emulate Steam Input native hooks.

CW-Bug-Id: #23185
---
 dlls/dinput/joystick_hid.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index b5fc76b9222..a28c3ba39e7 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -864,6 +864,16 @@ static HRESULT hid_joystick_get_property( IDirectInputDevice8W *iface, DWORD pro
     {
         DIPROPGUIDANDPATH *value = (DIPROPGUIDANDPATH *)header;
         value->guidClass = GUID_DEVCLASS_HIDCLASS;
+
+        /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+        if (impl->attrs.VendorID == 0x28de && impl->attrs.ProductID == 0x11ff)
+        {
+            const WCHAR *tmp;
+            if ((tmp = wcschr( impl->device_path, '#' ))) tmp = wcschr( tmp + 1, '#' );
+            lstrcpynW( value->wszPath, impl->device_path, tmp - impl->device_path + 1 );
+            return DI_OK;
+        }
+
         lstrcpynW( value->wszPath, impl->device_path, MAX_PATH );
         return DI_OK;
     }

From 6aa6c4ea91c48645d25ac88ed54ffbab25c8bb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 097/389] HACK: hidclass: Emulate Steam Input native hooks.

CW-Bug-Id: #23185
---
 dlls/hidclass.sys/device.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c
index 7d1b9d2c356..135e58bf587 100644
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -390,6 +390,8 @@ struct device_strings
 
 static const struct device_strings device_strings[] =
 {
+    /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+    { .id = L"VID_28DE&PID_11FF", .product = L"Controller (XBOX 360 For Windows)" },
     /* Microsoft controllers */
     { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" },
     { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" },

From c3e45768c0324ea48a9a687ec0b69f4c69fc151e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 098/389] HACK: ntdll: Emulate Steam Input native hooks.

CW-Bug-Id: #23185
---
 dlls/ntdll/unix/file.c | 68 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index c251d9c1955..d84f44d4560 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -2844,6 +2844,67 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i
     return STATUS_OBJECT_NAME_NOT_FOUND;
 }
 
+/* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+static BOOL replace_steam_input_path( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *redir )
+{
+    static const WCHAR pipe_prefixW[] =
+    {
+        '\\','?','?','\\','p','i','p','e','\\','H','I','D','#','V','I','D','_','0','4','5','E',
+        '&','P','I','D','_','0','2','8','E','&','I','G','_','0','0',
+    };
+    static const WCHAR hid_prefixW[] =
+    {
+        '\\','?','?','\\','h','i','d','#','v','i','d','_','2','8','d','e',
+        '&','p','i','d','_','1','1','f','f','&','i','g','_','0'
+    };
+    static const WCHAR hid_midW[] =
+    {
+        '#','0',
+    };
+    static const WCHAR hid_tailW[] =
+    {
+        '&','0','&','0','&','1','#','{','4','d','1','e','5','5','b','2','-','f','1','6','f','-',
+        '1','1','c','f','-','8','8','c','b','-','0','0','1','1','1','1','0','0','0','0','3','0','}'
+    };
+    UNICODE_STRING *path = attr->ObjectName;
+    const WCHAR *slot = NULL, *slot_end = NULL, *serial, *serial_end = NULL;
+    UINT len = 0;
+
+    if (!path || !path->Buffer || path->Length <= sizeof(pipe_prefixW)) return FALSE;
+    if (wcsnicmp( path->Buffer, pipe_prefixW, ARRAY_SIZE(pipe_prefixW) )) return FALSE;
+
+    serial = path->Buffer + path->Length / sizeof(WCHAR);
+    while (serial > path->Buffer && *serial != '&')
+    {
+        if (*serial == '#')
+        {
+            slot_end = serial_end;
+            serial_end = serial;
+            slot = serial_end + 1;
+        }
+        serial--;
+    }
+    if (serial == path->Buffer || *serial != '&' || !slot_end || !serial_end) return FALSE;
+
+    redir->Length = sizeof(hid_prefixW) + sizeof(hid_midW) + sizeof(hid_tailW);
+    redir->Length += (serial_end - serial + slot_end - slot) * sizeof(WCHAR);
+    redir->MaximumLength = redir->Length + sizeof(WCHAR);
+    if (!(redir->Buffer = malloc( redir->MaximumLength ))) return FALSE;
+
+    memcpy( redir->Buffer, hid_prefixW, sizeof(hid_prefixW) );
+    len += ARRAY_SIZE(hid_prefixW);
+    memcpy( redir->Buffer + len, slot, (slot_end - slot) * sizeof(WCHAR) );
+    len += slot_end - slot;
+    memcpy( redir->Buffer + len, hid_midW, sizeof(hid_midW) );
+    len += ARRAY_SIZE(hid_midW);
+    memcpy( redir->Buffer + len, serial, (serial_end - serial) * sizeof(WCHAR) );
+    len += serial_end - serial;
+    memcpy( redir->Buffer + len, hid_tailW, sizeof(hid_tailW) );
+
+    TRACE( "HACK: %s -> %s\n", debugstr_us(attr->ObjectName), debugstr_us(redir) );
+    attr->ObjectName = redir;
+    return TRUE;
+}
 
 #ifndef _WIN64
 
@@ -2945,6 +3006,10 @@ BOOL get_redirect( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *redir )
     unsigned int i, prefix_len = 0, len = attr->ObjectName->Length / sizeof(WCHAR);
 
     redir->Buffer = NULL;
+
+    /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+    if (replace_steam_input_path( attr, redir )) return TRUE;
+
     if (!NtCurrentTeb64()) return FALSE;
     if (!len) return FALSE;
 
@@ -3004,7 +3069,8 @@ BOOL get_redirect( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *redir )
 BOOL get_redirect( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *redir )
 {
     redir->Buffer = NULL;
-    return FALSE;
+    /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+    return replace_steam_input_path( attr, redir );
 }
 
 #endif

From 88ad474267c139f50174c1ad30b9ff91f3bb3d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 099/389] HACK: win32u: Emulate Steam Input native hooks.

CW-Bug-Id: #23185
---
 dlls/win32u/rawinput.c | 43 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c
index e5eab049fa3..c0e64c7dc3a 100644
--- a/dlls/win32u/rawinput.c
+++ b/dlls/win32u/rawinput.c
@@ -568,10 +568,49 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data
     switch (command)
     {
     case RIDI_DEVICENAME:
-        if ((len = wcslen( device->path ) + 1) <= data_len && data)
-            memcpy( data, device->path, len * sizeof(WCHAR) );
+    {
+        static const WCHAR steam_input_idW[] =
+        {
+            '\\','\\','?','\\','H','I','D','#','V','I','D','_','2','8','D','E','&','P','I','D','_','1','1','F','F','&','I','G','_',0
+        };
+        const WCHAR *device_path;
+        WCHAR bufferW[MAX_PATH];
+
+        /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+        if (wcsnicmp( device->path, steam_input_idW, 29 )) device_path = device->path;
+        else
+        {
+            char buffer[MAX_PATH];
+            UINT size = 0, slot;
+            const WCHAR *tmpW;
+            UINT16 vid, pid;
+
+            tmpW = device->path + 29;
+            while (*tmpW && *tmpW != '#' && size < ARRAY_SIZE(buffer)) buffer[size++] = *tmpW++;
+            buffer[size] = 0;
+            if (sscanf( buffer, "%02u", &slot ) != 1) slot = 0;
+
+            /* FIXME: Return the actual underlying device VID / PID somehow */
+            vid = 0x045e;
+            pid = 0x028e;
+
+            size = snprintf( buffer, ARRAY_SIZE(buffer), "\\\\.\\pipe\\HID#VID_045E&PID_028E&IG_00#%04X&%04X", vid, pid );
+            if ((tmpW = wcschr( device->path + 29, '&' )))
+            {
+                do buffer[size++] = *tmpW++;
+                while (*tmpW != '&' && size < ARRAY_SIZE(buffer));
+            }
+            size += snprintf( buffer + size, ARRAY_SIZE(buffer) - size, "#%d#%u", slot, (UINT)GetCurrentProcessId() );
+
+            ntdll_umbstowcs( buffer, size + 1, bufferW, sizeof(bufferW) );
+            device_path = bufferW;
+        }
+
+        if ((len = wcslen( device_path ) + 1) <= data_len && data)
+            memcpy( data, device_path, len * sizeof(WCHAR) );
         *data_size = len;
         break;
+    }
 
     case RIDI_DEVICEINFO:
         if ((len = sizeof(info)) <= data_len && data)

From 71f8db3bacb3f2654e5a32c2b97c7b770b44ce51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 100/389] HACK: windows.gaming.input: Emulate Steam Input
 native hooks.

CW-Bug-Id: #23185
---
 dlls/windows.gaming.input/provider.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c
index bb84a45b874..9bbf42cdf0a 100644
--- a/dlls/windows.gaming.input/provider.c
+++ b/dlls/windows.gaming.input/provider.c
@@ -150,7 +150,34 @@ static BOOL CALLBACK count_ffb_axes( const DIDEVICEOBJECTINSTANCEW *obj, void *a
 
 static HRESULT WINAPI wine_provider_get_NonRoamableId( IWineGameControllerProvider *iface, HSTRING *value )
 {
+    struct provider *impl = impl_from_IWineGameControllerProvider( iface );
+    WCHAR buffer[1024];
+    UINT16 vid, pid;
+    HRESULT hr;
+
     FIXME( "iface %p, value %p stub!\n", iface, value );
+
+    if (FAILED(hr = IGameControllerProvider_get_HardwareVendorId( &impl->IGameControllerProvider_iface, &vid ))) return hr;
+    if (FAILED(hr = IGameControllerProvider_get_HardwareProductId( &impl->IGameControllerProvider_iface, &pid ))) return hr;
+
+    /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+    if (vid == 0x28de && pid == 0x11ff)
+    {
+        const WCHAR *tmp;
+        char serial[256];
+        UINT32 len, slot;
+
+        if (!(tmp = wcschr( impl->device_path + 8, '#' )) || wcsnicmp( tmp - 6, L"&XI_", 4 )) return E_NOTIMPL;
+        if (swscanf( tmp - 2, L"%02u#%*u&%255[^&]&", &slot, serial ) != 2) return E_NOTIMPL;
+
+        /* FIXME: Return the actual underlying device VID / PID somehow */
+        vid = 0x045e;
+        pid = 0x028e;
+
+        len = swprintf( buffer, ARRAY_SIZE(buffer), L"{wgi/nrid/:steam-%04X&%04X&%s#%d#%u}", vid, pid, serial, slot, GetCurrentProcessId() );
+        return WindowsCreateString( buffer, len, value );
+    }
+
     return E_NOTIMPL;
 }
 

From 8c5fbf529816d5bb9808106eaca9f3ed698c839f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 101/389] HACK: xinput: Emulate Steam Input native hooks.

CW-Bug-Id: #23185
---
 dlls/xinput1_3/main.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c
index 4cb9793fa30..594010f8770 100644
--- a/dlls/xinput1_3/main.c
+++ b/dlls/xinput1_3/main.c
@@ -519,6 +519,16 @@ static BOOL find_opened_device(const WCHAR *device_path, int *free_slot)
         *free_slot = i - 1;
     }
 
+    /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+    if ((swscanf(device_path, L"\\\\?\\hid#vid_28de&pid_11ff&xi_%02u#", &i) == 1 ||
+         swscanf(device_path, L"\\\\?\\HID#VID_28DE&PID_11FF&XI_%02u#", &i) == 1) &&
+        i < XUSER_MAX_COUNT && *free_slot != i)
+    {
+        controller_destroy(&controllers[i], TRUE);
+        if (*free_slot != XUSER_MAX_COUNT) open_device_at_index(controllers[i].device_path, *free_slot);
+        *free_slot = i;
+    }
+
     return FALSE;
 }
 
@@ -1173,6 +1183,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilitiesEx(DWORD unk, DWORD index, D
         caps->VendorId = attr.VendorID;
         caps->ProductId = attr.ProductID;
         caps->VersionNumber = attr.VersionNumber;
+        /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+        caps->unk2 = index;
     }
 
     controller_unlock(&controllers[index]);

From 532d8b068633efe4ad49b80353a7f4f28ab3dd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 8 Jan 2024 14:35:42 +0100
Subject: [PATCH 102/389] HACK: winebus: Expose virtual controller for Steam
 Input hooks emulation.

Guarded behind a PROTON_EXPOSE_STEAM_CONTROLLER=1 variable.

CW-Bug-Id: #23185
---
 dlls/winebus.sys/bus_sdl.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 674da28f8e4..2e8fadb43d3 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -964,7 +964,8 @@ static void sdl_add_device(unsigned int index)
     SDL_JoystickID id;
     SDL_JoystickType joystick_type;
     SDL_GameController *controller = NULL;
-    const char *product, *sdl_serial, *str;
+    const char *product, *sdl_serial, *str, *env;
+    BOOL expose_steam_controller = (env = getenv("PROTON_EXPOSE_STEAM_CONTROLLER")) && atoi(env) == 1;
     char guid_str[33], buffer[ARRAY_SIZE(desc.product)];
     int axis_count, axis_offset;
 
@@ -1013,7 +1014,7 @@ static void sdl_add_device(unsigned int index)
         return;
     }
 
-    if (desc.vid == 0x28de && desc.pid == 0x11ff)
+    if (desc.vid == 0x28de && desc.pid == 0x11ff && !expose_steam_controller)
     {
         TRACE("Steam virtual controller, pretending it's an Xbox 360 controller\n");
         desc.vid = 0x045e;
@@ -1021,8 +1022,12 @@ static void sdl_add_device(unsigned int index)
     }
 
     /* CW-Bug-Id: #20528 Check steam virtual controller indexes to keep them ordered */
-    if ((str = pSDL_JoystickName(joystick)) && sscanf(str, "Microsoft X-Box 360 pad %u", &desc.input) == 1) desc.input++;
-    else desc.input = -1;
+    /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+    if ((str = pSDL_JoystickName(joystick)) && sscanf(str, "Microsoft X-Box 360 pad %u", &desc.input) == 1)
+    {
+        if (!expose_steam_controller) desc.input++;
+        desc.version = 0; /* keep version fixed as 0 so we can hardcode it in ntdll rawinput pipe redirection */
+    }
 
     if (pSDL_JoystickGetSerial && (sdl_serial = pSDL_JoystickGetSerial(joystick)))
     {
@@ -1033,8 +1038,15 @@ static void sdl_add_device(unsigned int index)
         /* Overcooked! All You Can Eat only adds controllers with unique serial numbers
          * Prefer keeping serial numbers unique over keeping them consistent across runs */
         pSDL_JoystickGetGUIDString(pSDL_JoystickGetGUID(joystick), guid_str, sizeof(guid_str));
-        snprintf(buffer, sizeof(buffer), "%s.%d", guid_str, index);
-        TRACE("Making up serial number for %s: %s\n", product, buffer);
+
+        /* CW-Bug-Id: #23185 Emulate Steam Input native hooks for native SDL */
+        if (desc.input != -1) snprintf(buffer, sizeof(buffer), "%s", guid_str);
+        else
+        {
+            snprintf(buffer, sizeof(buffer), "%s.%d", guid_str, index);
+            TRACE("Making up serial number for %s: %s\n", product, buffer);
+        }
+
         ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber));
     }
 

From 0c21e0c1cf8af04c068519381895c1d00794cda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 9 Jan 2024 14:10:03 +0100
Subject: [PATCH 103/389] HACK: win32u: Report underlying VID/PID in Steam
 Input hooks emulation.

CW-Bug-Id: #23185
---
 dlls/win32u/rawinput.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c
index c0e64c7dc3a..3fa187f9673 100644
--- a/dlls/win32u/rawinput.c
+++ b/dlls/win32u/rawinput.c
@@ -531,6 +531,30 @@ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT *
     return count;
 }
 
+static BOOL steam_input_get_vid_pid( UINT slot, UINT16 *vid, UINT16 *pid )
+{
+    const char *info = getenv( "SteamVirtualGamepadInfo" );
+    char buffer[256];
+    UINT current;
+    FILE *file;
+
+    TRACE( "reading SteamVirtualGamepadInfo %s\n", debugstr_a(info) );
+
+    if (!info || !(file = fopen( info, "r" ))) return FALSE;
+    while (fscanf( file, "%255[^\n]\n", buffer ) == 1)
+    {
+        if (sscanf( buffer, "[slot %d]", &current )) continue;
+        if (current < slot) continue;
+        if (current > slot) break;
+        if (sscanf( buffer, "VID=0x%hx", vid )) continue;
+        if (sscanf( buffer, "PID=0x%hx", pid )) continue;
+    }
+
+    fclose( file );
+
+    return TRUE;
+}
+
 /**********************************************************************
  *         NtUserGetRawInputDeviceInfo   (win32u.@)
  */
@@ -590,9 +614,11 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data
             buffer[size] = 0;
             if (sscanf( buffer, "%02u", &slot ) != 1) slot = 0;
 
-            /* FIXME: Return the actual underlying device VID / PID somehow */
-            vid = 0x045e;
-            pid = 0x028e;
+            if (!steam_input_get_vid_pid( slot, &vid, &pid ))
+            {
+                vid = 0x045e;
+                pid = 0x028e;
+            }
 
             size = snprintf( buffer, ARRAY_SIZE(buffer), "\\\\.\\pipe\\HID#VID_045E&PID_028E&IG_00#%04X&%04X", vid, pid );
             if ((tmpW = wcschr( device->path + 29, '&' )))

From 20a91d23955080ce8c8d99ea07b84cf18095d7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 9 Jan 2024 14:10:03 +0100
Subject: [PATCH 104/389] HACK: windows.gaming.input: Report underlying VID/PID
 in Steam Input hooks emulation.

CW-Bug-Id: #23185
---
 dlls/windows.gaming.input/provider.c | 32 +++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c
index 9bbf42cdf0a..3515d5c9ba6 100644
--- a/dlls/windows.gaming.input/provider.c
+++ b/dlls/windows.gaming.input/provider.c
@@ -148,6 +148,30 @@ static BOOL CALLBACK count_ffb_axes( const DIDEVICEOBJECTINSTANCEW *obj, void *a
     return DIENUM_CONTINUE;
 }
 
+static BOOL steam_input_get_vid_pid( UINT slot, UINT16 *vid, UINT16 *pid )
+{
+    const char *info = getenv( "SteamVirtualGamepadInfo" );
+    char buffer[256];
+    UINT current;
+    FILE *file;
+
+    TRACE( "reading SteamVirtualGamepadInfo %s\n", debugstr_a(info) );
+
+    if (!info || !(file = fopen( info, "r" ))) return FALSE;
+    while (fscanf( file, "%255[^\n]\n", buffer ) == 1)
+    {
+        if (sscanf( buffer, "[slot %d]", &current )) continue;
+        if (current < slot) continue;
+        if (current > slot) break;
+        if (sscanf( buffer, "VID=0x%hx", vid )) continue;
+        if (sscanf( buffer, "PID=0x%hx", pid )) continue;
+    }
+
+    fclose( file );
+
+    return TRUE;
+}
+
 static HRESULT WINAPI wine_provider_get_NonRoamableId( IWineGameControllerProvider *iface, HSTRING *value )
 {
     struct provider *impl = impl_from_IWineGameControllerProvider( iface );
@@ -170,9 +194,11 @@ static HRESULT WINAPI wine_provider_get_NonRoamableId( IWineGameControllerProvid
         if (!(tmp = wcschr( impl->device_path + 8, '#' )) || wcsnicmp( tmp - 6, L"&XI_", 4 )) return E_NOTIMPL;
         if (swscanf( tmp - 2, L"%02u#%*u&%255[^&]&", &slot, serial ) != 2) return E_NOTIMPL;
 
-        /* FIXME: Return the actual underlying device VID / PID somehow */
-        vid = 0x045e;
-        pid = 0x028e;
+        if (!steam_input_get_vid_pid( slot, &vid, &pid ))
+        {
+            vid = 0x045e;
+            pid = 0x028e;
+        }
 
         len = swprintf( buffer, ARRAY_SIZE(buffer), L"{wgi/nrid/:steam-%04X&%04X&%s#%d#%u}", vid, pid, serial, slot, GetCurrentProcessId() );
         return WindowsCreateString( buffer, len, value );

From ba11cd978077518e55b8f87311287e48109f3c49 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 23 Jan 2024 16:34:49 -0600
Subject: [PATCH 105/389] winhttp: Always return result at once if available in
 WinHttpQueryDataAvailable().

CW-Bug-Id: #23312
---
 dlls/winhttp/request.c            | 59 ++++++++++++++++++++++++++++---
 dlls/winhttp/tests/notification.c |  7 +++-
 dlls/winhttp/winhttp_private.h    | 13 +++++++
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 84af8e58988..74278195fc3 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -257,6 +257,16 @@ static BOOL cancel_queue( struct queue *queue )
     return cancelled;
 }
 
+static void task_send_callback( void *ctx, BOOL abort )
+{
+    struct send_callback *s = ctx;
+
+    if (abort) return;
+
+    TRACE( "running %p\n", ctx );
+    send_callback( s->task_hdr.obj, s->status, s->info, s->buflen );
+}
+
 static void free_header( struct header *header )
 {
     free( header->field );
@@ -3052,9 +3062,10 @@ static DWORD query_data_ready( struct request *request )
     return count;
 }
 
-static BOOL skip_async_queue( struct request *request )
+static BOOL skip_async_queue( struct request *request, BOOL *data_available )
 {
-    return request->hdr.recursion_count < 3 && (end_of_read_data( request ) || query_data_ready( request ));
+    *data_available = end_of_read_data( request ) || query_data_ready( request );
+    return request->hdr.recursion_count < 3 && *data_available;
 }
 
 static DWORD query_data_available( struct request *request, DWORD *available, BOOL async )
@@ -3106,6 +3117,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
     DWORD ret;
     struct request *request;
     BOOL async;
+    BOOL data_available = FALSE;
 
     TRACE("%p, %p\n", hrequest, available);
 
@@ -3121,7 +3133,44 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request ))
+    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &data_available ))
+    {
+        ret = query_data_available( request, available, async );
+    }
+    else if (data_available)
+    {
+        /* Data available but recursion limit reached, only queue callback. */
+        struct send_callback *s;
+
+        if (!(s = malloc( sizeof(*s) )))
+        {
+            release_object( &request->hdr );
+            SetLastError( ERROR_OUTOFMEMORY );
+            return FALSE;
+        }
+
+        if (!(ret = query_data_available( request, &s->count, FALSE )))
+        {
+            if (available) *available = s->count;
+            s->status = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE;
+            s->info = &s->count;
+            s->buflen = sizeof(s->count);
+        }
+        else
+        {
+            s->result.dwResult = API_QUERY_DATA_AVAILABLE;
+            s->result.dwError  = ret;
+            s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
+            s->info = &s->result;
+            s->buflen = sizeof(s->result);
+        }
+
+        if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr )))
+            free( s );
+        else
+            ret = ERROR_IO_PENDING;
+    }
+    else
     {
         struct query_data *q;
 
@@ -3139,7 +3188,6 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         else
             ret = ERROR_IO_PENDING;
     }
-    else ret = query_data_available( request, available, async );
 
     release_object( &request->hdr );
     SetLastError( ret );
@@ -3165,6 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
     DWORD ret;
     struct request *request;
     BOOL async;
+    BOOL data_available;
 
     TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read );
 
@@ -3180,7 +3229,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request ))
+    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &data_available ))
     {
         struct read_data *r;
 
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index 78319f0df5c..40db323fb5e 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1863,6 +1863,7 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
                                               DWORD status, void *buffer, DWORD buflen )
 {
     struct test_recursion_context *context = (struct test_recursion_context *)context_ptr;
+    static DWORD len;
     DWORD err;
     BOOL ret;
     BYTE b;
@@ -1939,10 +1940,14 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
             context->max_recursion_read = max( context->max_recursion_read, context->recursion_count );
             context->read_from_callback = TRUE;
             InterlockedIncrement( &context->recursion_count );
-            ret = WinHttpQueryDataAvailable( context->request, NULL );
+            len = 0xdeadbeef;
+            /* Use static variable len here so write to it doesn't destroy the stack on old Windows which
+             * doesn't set the value at once. */
+            ret = WinHttpQueryDataAvailable( context->request, &len );
             err = GetLastError();
             ok( ret, "failed to query data available, GetLastError() %lu\n", err );
             ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err );
+            ok( len != 0xdeadbeef || broken( len == 0xdeadbeef ) /* Win7 */, "got %lu.\n", len );
             if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE;
             InterlockedDecrement( &context->recursion_count );
             break;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 0bf1c5bc6b0..80ce2614ca1 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -312,6 +312,19 @@ struct task_header
     volatile LONG completion_sent;
 };
 
+struct send_callback
+{
+    struct task_header task_hdr;
+    DWORD status;
+    void *info;
+    DWORD buflen;
+    union
+    {
+        WINHTTP_ASYNC_RESULT result;
+        DWORD count;
+    };
+};
+
 struct send_request
 {
     struct task_header task_hdr;

From 665742a23a47aab45b1b28bfe4873c5d15e0ab6a Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 23 Jan 2024 16:56:09 -0600
Subject: [PATCH 106/389] winhttp: Always return result at once if available in
 WinHttpReadData().

CW-Bug-Id: #23312
---
 dlls/winhttp/request.c            | 42 ++++++++++++++++++++++++++++---
 dlls/winhttp/tests/notification.c |  6 ++++-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 74278195fc3..14e5b493f77 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -3213,7 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
     DWORD ret;
     struct request *request;
     BOOL async;
-    BOOL data_available;
+    BOOL data_available = FALSE;
 
     TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read );
 
@@ -3229,7 +3229,44 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &data_available ))
+    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &data_available ))
+    {
+        ret = read_data( request, buffer, to_read, read, async );
+    }
+    else if (data_available)
+    {
+        /* Data available but recursion limit reached, only queue callback. */
+        struct send_callback *s;
+
+        if (!(s = malloc( sizeof(*s) )))
+        {
+            release_object( &request->hdr );
+            SetLastError( ERROR_OUTOFMEMORY );
+            return FALSE;
+        }
+
+        if (!(ret = read_data( request, buffer, to_read, &s->count, FALSE )))
+        {
+            if (read) *read = s->count;
+            s->status = WINHTTP_CALLBACK_STATUS_READ_COMPLETE;
+            s->info = buffer;
+            s->buflen = s->count;
+        }
+        else
+        {
+            s->result.dwResult = API_READ_DATA;
+            s->result.dwError  = ret;
+            s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
+            s->info = &s->result;
+            s->buflen = sizeof(s->result);
+        }
+
+        if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr )))
+            free( s );
+        else
+            ret = ERROR_IO_PENDING;
+    }
+    else
     {
         struct read_data *r;
 
@@ -3248,7 +3285,6 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         else
             ret = ERROR_IO_PENDING;
     }
-    else ret = read_data( request, buffer, to_read, read, async );
 
     release_object( &request->hdr );
     SetLastError( ret );
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index 40db323fb5e..ed70ed906f0 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1921,10 +1921,14 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
                 "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() );
             context->max_recursion_query = max( context->max_recursion_query, context->recursion_count );
             InterlockedIncrement( &context->recursion_count );
-            ret = WinHttpReadData( context->request, &b, 1, NULL );
+            b = 0xff;
+            len = 0xdeadbeef;
+            ret = WinHttpReadData( context->request, &b, 1, &len );
             err = GetLastError();
             ok( ret, "failed to read data, GetLastError() %lu\n", err );
             ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err );
+            ok( b != 0xff, "got %#x.\n", b );
+            ok( len == 1, "got %lu.\n", len );
             if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE;
             InterlockedDecrement( &context->recursion_count );
             break;

From 357c1ff890d8acdb7c6913c42a25ce9a80f0f4d2 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 23 Jan 2024 21:23:02 -0600
Subject: [PATCH 107/389] ntdll: HACK: Substitute different d3dcompiler version
 for BDO.

CW-Bug-Id: #23314
---
 dlls/ntdll/loader.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 24efd25e8db..5ef024631a2 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3335,6 +3335,21 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI
     return status;
 }
 
+static void substitute_dll( const WCHAR **libname )
+{
+    static int substitute = -1;
+
+    if (substitute == -1)
+    {
+        WCHAR env_str[32];
+
+        if ((substitute = (get_env( L"SteamGameId", env_str, sizeof(env_str)) && !wcsicmp( env_str, L"582660" ))))
+            FIXME( "HACK: substituting dll name.\n" );
+    }
+    if (!substitute) return;
+    if (*libname && !wcsicmp( *libname, L"d3dcompiler_46.dll" ))
+        *libname = L"d3dcompiler_43.dll";
+}
 
 /***********************************************************************
  *	load_dll  (internal)
@@ -3353,6 +3368,8 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD fl
 
     TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) );
 
+    substitute_dll( &libname );
+
     if (system && system_dll_path.Buffer)
         nts = search_dll_file( system_dll_path.Buffer, libname, &nt_name, pwm, &mapping, &image_info, &id );
 

From 61176033a2bb3c6a5a229078f684b85ee085ef80 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 6 Feb 2024 19:05:00 -0600
Subject: [PATCH 108/389] ntdll: Better track thread pool wait's wait_pending
 state.

CW-Bug-Id: #21509
---
 dlls/ntdll/threadpool.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c
index 4f22114a55e..9a8f380bf72 100644
--- a/dlls/ntdll/threadpool.c
+++ b/dlls/ntdll/threadpool.c
@@ -1265,6 +1265,7 @@ static void CALLBACK waitqueue_thread_proc( void *param )
                                   u.wait.wait_entry )
         {
             assert( wait->type == TP_OBJECT_TYPE_WAIT );
+            assert( wait->u.wait.wait_pending );
             if (wait->u.wait.timeout <= now.QuadPart)
             {
                 /* Wait object timed out. */
@@ -1272,6 +1273,7 @@ static void CALLBACK waitqueue_thread_proc( void *param )
                 {
                     list_remove( &wait->u.wait.wait_entry );
                     list_add_tail( &bucket->reserved, &wait->u.wait.wait_entry );
+                    wait->u.wait.wait_pending = FALSE;
                 }
                 if ((wait->u.wait.flags & (WT_EXECUTEINWAITTHREAD | WT_EXECUTEINIOTHREAD)))
                 {
@@ -1329,6 +1331,7 @@ static void CALLBACK waitqueue_thread_proc( void *param )
                     {
                         list_remove( &wait->u.wait.wait_entry );
                         list_add_tail( &bucket->reserved, &wait->u.wait.wait_entry );
+                        wait->u.wait.wait_pending = FALSE;
                     }
                     if ((wait->u.wait.flags & (WT_EXECUTEINWAITTHREAD | WT_EXECUTEINIOTHREAD)))
                     {

From 25d2d4c847b03b409564079a5cef1ab6ff71e457 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 6 Feb 2024 19:14:40 -0600
Subject: [PATCH 109/389] ntdll: Make sure wakeups from already unset events
 are ignored in waitqueue_thread_proc().

CW-Bug-Id: #21509
---
 dlls/ntdll/threadpool.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c
index 9a8f380bf72..2887e84b12c 100644
--- a/dlls/ntdll/threadpool.c
+++ b/dlls/ntdll/threadpool.c
@@ -160,6 +160,7 @@ struct threadpool_object
     LONG                    num_pending_callbacks;
     LONG                    num_running_callbacks;
     LONG                    num_associated_callbacks;
+    LONG                    update_serial;
     /* arguments for callback */
     union
     {
@@ -1243,6 +1244,7 @@ static void tp_timerqueue_unlock( struct threadpool_object *timer )
 static void CALLBACK waitqueue_thread_proc( void *param )
 {
     struct threadpool_object *objects[MAXIMUM_WAITQUEUE_OBJECTS];
+    LONG update_serials[MAXIMUM_WAITQUEUE_OBJECTS];
     HANDLE handles[MAXIMUM_WAITQUEUE_OBJECTS + 1];
     struct waitqueue_bucket *bucket = param;
     struct threadpool_object *wait, *next;
@@ -1295,6 +1297,7 @@ static void CALLBACK waitqueue_thread_proc( void *param )
                 InterlockedIncrement( &wait->refcount );
                 objects[num_handles] = wait;
                 handles[num_handles] = wait->u.wait.handle;
+                update_serials[num_handles] = wait->update_serial;
                 num_handles++;
             }
         }
@@ -1323,7 +1326,7 @@ static void CALLBACK waitqueue_thread_proc( void *param )
             {
                 wait = objects[status - STATUS_WAIT_0];
                 assert( wait->type == TP_OBJECT_TYPE_WAIT );
-                if (wait->u.wait.bucket)
+                if (wait->u.wait.bucket && wait->update_serial == update_serials[status - STATUS_WAIT_0])
                 {
                     /* Wait object signaled. */
                     assert( wait->u.wait.bucket == bucket );
@@ -1344,7 +1347,10 @@ static void CALLBACK waitqueue_thread_proc( void *param )
                     else tp_object_submit( wait, TRUE );
                 }
                 else
-                    WARN("wait object %p triggered while object was destroyed\n", wait);
+                {
+                    WARN("wait object %p triggered while object was %s.\n",
+                            wait, wait->u.wait.bucket ? "updated" : "destroyed");
+                }
             }
 
             /* Release temporary references to wait objects. */
@@ -1917,6 +1923,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa
     object->num_pending_callbacks   = 0;
     object->num_running_callbacks   = 0;
     object->num_associated_callbacks = 0;
+    object->update_serial           = 0;
 
     if (environment)
     {
@@ -3051,12 +3058,15 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout )
 {
     struct threadpool_object *this = impl_from_TP_WAIT( wait );
     ULONGLONG timestamp = MAXLONGLONG;
+    BOOL same_handle;
 
     TRACE( "%p %p %p\n", wait, handle, timeout );
 
     RtlEnterCriticalSection( &waitqueue.cs );
 
     assert( this->u.wait.bucket );
+
+    same_handle = this->u.wait.handle == handle;
     this->u.wait.handle = handle;
 
     if (handle || this->u.wait.wait_pending)
@@ -3090,6 +3100,8 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout )
         }
 
         /* Wake up the wait queue thread. */
+        if (!same_handle)
+            ++this->update_serial;
         NtSetEvent( bucket->update_event, NULL );
     }
 

From f961d5e51fb1e5839e42fa6a45f0506d7c78d325 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 9 Feb 2024 11:33:41 -0600
Subject: [PATCH 110/389] win32u: Send message with timeout in send_erase().

CW-Bug-Id: #23394
---
 dlls/win32u/dce.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c
index d7aa75b3039..3f1e25ae9e2 100644
--- a/dlls/win32u/dce.c
+++ b/dlls/win32u/dce.c
@@ -1248,7 +1248,10 @@ static BOOL send_erase( HWND hwnd, UINT flags, HRGN client_rgn,
             {
                 /* don't erase if the clip box is empty */
                 if (type != NULLREGION)
-                    need_erase = !send_message( hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0 );
+                {
+                    need_erase = !send_message_timeout( hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0, SMTO_ABORTIFHUNG, 1000, FALSE );
+                    if (need_erase && RtlGetLastWin32Error() == ERROR_TIMEOUT) ERR( "timeout.\n" );
+                }
             }
             if (!hdc_ret) release_dc( hwnd, hdc, TRUE );
         }

From 99f8658c2929cad83579e74e5fda722ea23f16b7 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 9 Feb 2024 11:46:31 -0600
Subject: [PATCH 111/389] ntdll: HACK: Add WINE_HEAP_ZERO_MEMORY variable to
 force zeroing allocated memory.

CW-Bug-Id: #23394
---
 dlls/ntdll/loader.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 5ef024631a2..8ddd5c66022 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4456,6 +4456,7 @@ void loader_init( CONTEXT *context, void **entry )
         WINE_MODREF *kernel32;
         PEB *peb = NtCurrentTeb()->Peb;
         WCHAR env_str[16];
+        ULONG heap_flags = HEAP_GROWABLE;
 
         NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation,
                               &meminfo, sizeof(meminfo), NULL );
@@ -4474,8 +4475,13 @@ void loader_init( CONTEXT *context, void **entry )
                 delay_heap_free = TRUE;
             }
         }
+        if (get_env( L"WINE_HEAP_ZERO_MEMORY", env_str, sizeof(env_str)) && env_str[0] == L'1')
+        {
+            ERR( "Enabling heap zero hack.\n" );
+            heap_flags |= HEAP_ZERO_MEMORY;
+        }
 
-        peb->ProcessHeap        = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL );
+        peb->ProcessHeap        = RtlCreateHeap( heap_flags, NULL, 0, 0, NULL, NULL );
 
         RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 );
         RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits,

From e311dafbf4ac00906a0576babc1fbdf2d043dd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 12 May 2023 13:34:23 +0200
Subject: [PATCH 112/389] winegstreamer: Introduce and use a new wg_task_pool
 helper.

To better track GStreamer threads, avoiding potential task leaks in the
default pool which keeps some thread alive.

CW-Bug-Id: #22045
---
 dlls/winegstreamer/Makefile.in    |  1 +
 dlls/winegstreamer/unix_private.h |  4 ++
 dlls/winegstreamer/wg_parser.c    | 28 +++++++++
 dlls/winegstreamer/wg_task_pool.c | 98 +++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+)
 create mode 100644 dlls/winegstreamer/wg_task_pool.c

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 3f143e355c5..9cae96c5ebc 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -27,6 +27,7 @@ SOURCES = \
 	wg_parser.c \
 	wg_sample.c \
 	wg_source.c \
+	wg_task_pool.c \
 	wg_transform.c \
 	winegstreamer_classes.idl \
 	wm_reader.c \
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
index d15054661c7..a165b8f1cfe 100644
--- a/dlls/winegstreamer/unix_private.h
+++ b/dlls/winegstreamer/unix_private.h
@@ -93,6 +93,10 @@ extern NTSTATUS wg_muxer_push_sample(void *args);
 extern NTSTATUS wg_muxer_read_data(void *args);
 extern NTSTATUS wg_muxer_finalize(void *args);
 
+/* wg_task_pool.c */
+
+extern GstTaskPool *wg_task_pool_new(void);
+
 /* wg_allocator.c */
 
 static inline BYTE *wg_sample_data(struct wg_sample *sample)
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index dd555a7ce19..2d00f4247e0 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -73,6 +73,7 @@ struct wg_parser
 
     GstElement *container, *decodebin;
     GstBus *bus;
+    GstTaskPool *task_pool;
     GstPad *my_src;
 
     guint64 file_size, start_offset, next_offset, stop_offset;
@@ -1613,6 +1614,24 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use
         }
         break;
 
+    case GST_MESSAGE_STREAM_STATUS:
+    {
+        GstStreamStatusType type;
+        GstElement *element;
+        const GValue *val;
+        GstTask *task;
+
+        gst_message_parse_stream_status(msg, &type, &element);
+        val = gst_message_get_stream_status_object(msg);
+        GST_DEBUG("parser %p, message %s, type %u, value %p (%s).", parser, GST_MESSAGE_TYPE_NAME(msg), type, val, G_VALUE_TYPE_NAME(val));
+
+        if (G_VALUE_TYPE(val) == GST_TYPE_TASK && (task = g_value_get_object(val))
+                && type == GST_STREAM_STATUS_TYPE_CREATE)
+            gst_task_set_pool(task, parser->task_pool);
+
+        break;
+    }
+
     default:
         break;
     }
@@ -2011,6 +2030,7 @@ static NTSTATUS wg_parser_disconnect(void *args)
         parser->input_cache_chunks[i].data = NULL;
     }
 
+    gst_task_pool_cleanup(parser->task_pool);
     return S_OK;
 }
 
@@ -2127,6 +2147,7 @@ static NTSTATUS wg_parser_create(void *args)
 
     struct wg_parser_create_params *params = args;
     struct wg_parser *parser;
+    GError *error;
 
     if (!(parser = calloc(1, sizeof(*parser))))
         return E_OUTOFMEMORY;
@@ -2140,6 +2161,12 @@ static NTSTATUS wg_parser_create(void *args)
             parser->use_opengl = FALSE;
         }
     }
+    if (!(parser->task_pool = wg_task_pool_new()))
+    {
+        free(parser);
+        return E_OUTOFMEMORY;
+    }
+    gst_task_pool_prepare(parser->task_pool, &error);
 
     pthread_mutex_init(&parser->mutex, NULL);
     pthread_cond_init(&parser->init_cond, NULL);
@@ -2163,6 +2190,7 @@ static NTSTATUS wg_parser_destroy(void *args)
         gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL);
         gst_object_unref(parser->bus);
     }
+    gst_object_unref(parser->task_pool);
 
     if (parser->context)
         gst_context_unref(parser->context);
diff --git a/dlls/winegstreamer/wg_task_pool.c b/dlls/winegstreamer/wg_task_pool.c
new file mode 100644
index 00000000000..ec7da286d5f
--- /dev/null
+++ b/dlls/winegstreamer/wg_task_pool.c
@@ -0,0 +1,98 @@
+/*
+ * GStreamer task pool
+ *
+ * Copyright 2023 Rémi Bernon for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdarg.h>
+
+#include <gst/gst.h>
+
+#include "unix_private.h"
+
+typedef struct
+{
+    GstTaskPool parent;
+} WgTaskPool;
+
+typedef struct
+{
+    GstTaskPoolClass parent_class;
+} WgTaskPoolClass;
+
+G_DEFINE_TYPE(WgTaskPool, wg_task_pool, GST_TYPE_TASK_POOL);
+
+static void wg_task_pool_prepare(GstTaskPool *pool, GError **error)
+{
+    GST_LOG("pool %p, error %p", pool, error);
+}
+
+static void wg_task_pool_cleanup(GstTaskPool *pool)
+{
+    GST_LOG("pool %p", pool);
+}
+
+static gpointer wg_task_pool_push(GstTaskPool *pool, GstTaskPoolFunction func, gpointer data, GError **error)
+{
+    pthread_t *tid;
+    gint res;
+
+    GST_LOG("pool %p, func %p, data %p, error %p", pool, func, data, error);
+
+    if (!(tid = malloc(sizeof(*tid))) || !(res = pthread_create(tid, NULL, (void *)func, data)))
+        return tid;
+
+    g_set_error(error, G_THREAD_ERROR, G_THREAD_ERROR_AGAIN, "Error creating thread: %s", g_strerror(res));
+    free(tid);
+
+    return NULL;
+}
+
+static void wg_task_pool_join(GstTaskPool *pool, gpointer id)
+{
+    pthread_t *tid = id;
+
+    GST_LOG("pool %p, id %p", pool, id);
+
+    pthread_join(*tid, NULL);
+    free(tid);
+}
+
+static void wg_task_pool_class_init(WgTaskPoolClass *klass)
+{
+    GstTaskPoolClass *parent_class = (GstTaskPoolClass *)klass;
+    parent_class->prepare = wg_task_pool_prepare;
+    parent_class->cleanup = wg_task_pool_cleanup;
+    parent_class->push = wg_task_pool_push;
+    parent_class->join = wg_task_pool_join;
+}
+
+static void wg_task_pool_init(WgTaskPool *pool)
+{
+}
+
+GstTaskPool *wg_task_pool_new(void)
+{
+    return g_object_new(wg_task_pool_get_type(), NULL);
+}

From 3a3400aa407c2362a08095cb57ccb6e5aa68077d Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 20 Jan 2023 14:18:25 -0600
Subject: [PATCH 113/389] winegstreamer: Implement MFT_MESSAGE_COMMAND_DRAIN
 for aac decoder.

CW-Bug-Id: #21804
CW-Bug-Id: #22299
---
 dlls/winegstreamer/audio_decoder.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/audio_decoder.c b/dlls/winegstreamer/audio_decoder.c
index 771eae465fe..cd63f116cbf 100644
--- a/dlls/winegstreamer/audio_decoder.c
+++ b/dlls/winegstreamer/audio_decoder.c
@@ -489,7 +489,18 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    FIXME("iface %p, message %#x, param %p stub!\n", iface, message, (void *)param);
+    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
+
+    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
+
+    if (!decoder->wg_transform)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (message == MFT_MESSAGE_COMMAND_DRAIN)
+        return wg_transform_drain(decoder->wg_transform);
+
+    FIXME("Ignoring message %#x.\n", message);
+
     return S_OK;
 }
 

From 73410b62a84a58ecee639600a6b3fe689b2aa513 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 20 Jan 2023 14:47:47 -0600
Subject: [PATCH 114/389] winegstreamer: Implement MFT_MESSAGE_COMMAND_DRAIN
 for resampler.

CW-Bug-Id: #21804
CW-Bug-Id: #22299
---
 dlls/winegstreamer/resampler.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c
index b5b62d58800..22fb273e84c 100644
--- a/dlls/winegstreamer/resampler.c
+++ b/dlls/winegstreamer/resampler.c
@@ -509,7 +509,18 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    FIXME("iface %p, message %#x, param %p stub!\n", iface, message, (void *)param);
+    struct resampler *impl = impl_from_IMFTransform(iface);
+
+    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
+
+    if (!impl->wg_transform)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (message == MFT_MESSAGE_COMMAND_DRAIN)
+        return wg_transform_drain(impl->wg_transform);
+
+    FIXME("Ignoring message %#x.\n", message);
+
     return S_OK;
 }
 

From c6fe011aa26d50c761c932265af9d4d506ce72b4 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 20 Jan 2023 14:48:48 -0600
Subject: [PATCH 115/389] winegstreamer: Implement MFT_MESSAGE_COMMAND_DRAIN
 for video processor.

CW-Bug-Id: #21804
CW-Bug-Id: #22299
---
 dlls/winegstreamer/video_processor.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c
index 1cbb37dafc7..698ae498ec7 100644
--- a/dlls/winegstreamer/video_processor.c
+++ b/dlls/winegstreamer/video_processor.c
@@ -513,7 +513,18 @@ static HRESULT WINAPI video_processor_ProcessEvent(IMFTransform *iface, DWORD id
 
 static HRESULT WINAPI video_processor_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    FIXME("iface %p, message %#x, param %#Ix stub!\n", iface, message, param);
+    struct video_processor *impl = impl_from_IMFTransform(iface);
+
+    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
+
+    if (!impl->wg_transform)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (message == MFT_MESSAGE_COMMAND_DRAIN)
+        return wg_transform_drain(impl->wg_transform);
+
+    FIXME("Ignoring message %#x.\n", message);
+
     return S_OK;
 }
 

From d6fff9c2a5511cdffc9ebbcd3b20dfe871d4ea5f Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 20 Jan 2023 14:50:38 -0600
Subject: [PATCH 116/389] winegstreamer: Implement MFT_MESSAGE_COMMAND_DRAIN
 for wma decoder.

CW-Bug-Id: #21804
CW-Bug-Id: #22299
---
 dlls/winegstreamer/wma_decoder.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
index 9a9ea857e0d..a4380d3a3b5 100644
--- a/dlls/winegstreamer/wma_decoder.c
+++ b/dlls/winegstreamer/wma_decoder.c
@@ -501,7 +501,18 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    FIXME("iface %p, message %#x, param %p stub!\n", iface, message, (void *)param);
+    struct wma_decoder *decoder = impl_from_IMFTransform(iface);
+
+    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
+
+    if (!decoder->wg_transform)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (message == MFT_MESSAGE_COMMAND_DRAIN)
+        return wg_transform_drain(decoder->wg_transform);
+
+    FIXME("Ignoring message %#x.\n", message);
+
     return S_OK;
 }
 

From 88da48b1db4e75baadc77abb807cd369858448df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 17 Aug 2023 11:21:56 +0200
Subject: [PATCH 117/389] HACK: winegstreamer: Do not report live latency for
 some games.

CW-Bug-Id: #22581
---
 dlls/winegstreamer/video_decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index f75fb51ca84..35917be2951 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -116,7 +116,7 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder)
 
     {
         const char *sgi;
-        if ((sgi = getenv("SteamGameId")) && (!strcmp(sgi, "2009100")))
+        if ((sgi = getenv("SteamGameId")) && ((!strcmp(sgi, "2009100")) || (!strcmp(sgi, "2555360"))))
             attrs.low_latency = FALSE;
     }
 

From 4bf150b45d93f340bf663e89479856d14df0c5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 21 Aug 2023 19:17:48 +0200
Subject: [PATCH 118/389] HACK: winegstreamer: Don't add unnecessary and slow?
 videoflip for some games.

CW-Bug-Id: #22581
---
 dlls/winegstreamer/wg_transform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 4acc449a7f5..3a17ac9b401 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -457,7 +457,7 @@ NTSTATUS wg_transform_create(void *args)
         case WG_MAJOR_TYPE_VIDEO:
         {
             const char *sgi;
-            if ((sgi = getenv("SteamGameId")) && (!strcmp(sgi, "2009100")))
+            if ((sgi = getenv("SteamGameId")) && ((!strcmp(sgi, "2009100")) || (!strcmp(sgi, "2555360"))))
             {
                 if (!(element = create_element("videoconvert", "base"))
                         || !append_element(transform->container, element, &first, &last))

From 68f76f5d9c04361bc0bc88b08ab5174e150849dc Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 21 Aug 2023 12:52:48 -0600
Subject: [PATCH 119/389] HACK: winegstreamer: Disable MF_SA_D3D11_AWARE for
 some games.

CW-Bug-Id: #22581
---
 dlls/winegstreamer/video_decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 35917be2951..95a014a46e0 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -826,7 +826,7 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U
 
     {
         const char *sgi;
-        if ((sgi = getenv("SteamGameId")) && (!strcmp(sgi, "2009100")))
+        if ((sgi = getenv("SteamGameId")) && ((!strcmp(sgi, "2009100")) || (!strcmp(sgi, "2555360"))))
             IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, FALSE);
     }
 

From 410b000fde88d761881036fc25945e67030ec7e3 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 14 Feb 2024 10:23:33 -0600
Subject: [PATCH 120/389] Revert "winhttp: Always return result at once if
 available in WinHttpReadData()."

This reverts commit ec94ccd297c8e5f080b45b5d48a1d035a1492df6.
---
 dlls/winhttp/request.c            | 42 +++----------------------------
 dlls/winhttp/tests/notification.c |  6 +----
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 14e5b493f77..74278195fc3 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -3213,7 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
     DWORD ret;
     struct request *request;
     BOOL async;
-    BOOL data_available = FALSE;
+    BOOL data_available;
 
     TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read );
 
@@ -3229,44 +3229,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &data_available ))
-    {
-        ret = read_data( request, buffer, to_read, read, async );
-    }
-    else if (data_available)
-    {
-        /* Data available but recursion limit reached, only queue callback. */
-        struct send_callback *s;
-
-        if (!(s = malloc( sizeof(*s) )))
-        {
-            release_object( &request->hdr );
-            SetLastError( ERROR_OUTOFMEMORY );
-            return FALSE;
-        }
-
-        if (!(ret = read_data( request, buffer, to_read, &s->count, FALSE )))
-        {
-            if (read) *read = s->count;
-            s->status = WINHTTP_CALLBACK_STATUS_READ_COMPLETE;
-            s->info = buffer;
-            s->buflen = s->count;
-        }
-        else
-        {
-            s->result.dwResult = API_READ_DATA;
-            s->result.dwError  = ret;
-            s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
-            s->info = &s->result;
-            s->buflen = sizeof(s->result);
-        }
-
-        if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr )))
-            free( s );
-        else
-            ret = ERROR_IO_PENDING;
-    }
-    else
+    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &data_available ))
     {
         struct read_data *r;
 
@@ -3285,6 +3248,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         else
             ret = ERROR_IO_PENDING;
     }
+    else ret = read_data( request, buffer, to_read, read, async );
 
     release_object( &request->hdr );
     SetLastError( ret );
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index ed70ed906f0..40db323fb5e 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1921,14 +1921,10 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
                 "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() );
             context->max_recursion_query = max( context->max_recursion_query, context->recursion_count );
             InterlockedIncrement( &context->recursion_count );
-            b = 0xff;
-            len = 0xdeadbeef;
-            ret = WinHttpReadData( context->request, &b, 1, &len );
+            ret = WinHttpReadData( context->request, &b, 1, NULL );
             err = GetLastError();
             ok( ret, "failed to read data, GetLastError() %lu\n", err );
             ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err );
-            ok( b != 0xff, "got %#x.\n", b );
-            ok( len == 1, "got %lu.\n", len );
             if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE;
             InterlockedDecrement( &context->recursion_count );
             break;

From 6ae40c74f3586a5bffd1159c90f30603d4a87339 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 14 Feb 2024 10:23:35 -0600
Subject: [PATCH 121/389] Revert "winhttp: Always return result at once if
 available in WinHttpQueryDataAvailable()."

This reverts commit 41ffcf40a4244b2bc23709d57aa87fa01b13e80f.
---
 dlls/winhttp/request.c            | 59 +++----------------------------
 dlls/winhttp/tests/notification.c |  7 +---
 dlls/winhttp/winhttp_private.h    | 13 -------
 3 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 74278195fc3..84af8e58988 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -257,16 +257,6 @@ static BOOL cancel_queue( struct queue *queue )
     return cancelled;
 }
 
-static void task_send_callback( void *ctx, BOOL abort )
-{
-    struct send_callback *s = ctx;
-
-    if (abort) return;
-
-    TRACE( "running %p\n", ctx );
-    send_callback( s->task_hdr.obj, s->status, s->info, s->buflen );
-}
-
 static void free_header( struct header *header )
 {
     free( header->field );
@@ -3062,10 +3052,9 @@ static DWORD query_data_ready( struct request *request )
     return count;
 }
 
-static BOOL skip_async_queue( struct request *request, BOOL *data_available )
+static BOOL skip_async_queue( struct request *request )
 {
-    *data_available = end_of_read_data( request ) || query_data_ready( request );
-    return request->hdr.recursion_count < 3 && *data_available;
+    return request->hdr.recursion_count < 3 && (end_of_read_data( request ) || query_data_ready( request ));
 }
 
 static DWORD query_data_available( struct request *request, DWORD *available, BOOL async )
@@ -3117,7 +3106,6 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
     DWORD ret;
     struct request *request;
     BOOL async;
-    BOOL data_available = FALSE;
 
     TRACE("%p, %p\n", hrequest, available);
 
@@ -3133,44 +3121,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         return FALSE;
     }
 
-    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &data_available ))
-    {
-        ret = query_data_available( request, available, async );
-    }
-    else if (data_available)
-    {
-        /* Data available but recursion limit reached, only queue callback. */
-        struct send_callback *s;
-
-        if (!(s = malloc( sizeof(*s) )))
-        {
-            release_object( &request->hdr );
-            SetLastError( ERROR_OUTOFMEMORY );
-            return FALSE;
-        }
-
-        if (!(ret = query_data_available( request, &s->count, FALSE )))
-        {
-            if (available) *available = s->count;
-            s->status = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE;
-            s->info = &s->count;
-            s->buflen = sizeof(s->count);
-        }
-        else
-        {
-            s->result.dwResult = API_QUERY_DATA_AVAILABLE;
-            s->result.dwError  = ret;
-            s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
-            s->info = &s->result;
-            s->buflen = sizeof(s->result);
-        }
-
-        if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr )))
-            free( s );
-        else
-            ret = ERROR_IO_PENDING;
-    }
-    else
+    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request ))
     {
         struct query_data *q;
 
@@ -3188,6 +3139,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         else
             ret = ERROR_IO_PENDING;
     }
+    else ret = query_data_available( request, available, async );
 
     release_object( &request->hdr );
     SetLastError( ret );
@@ -3213,7 +3165,6 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
     DWORD ret;
     struct request *request;
     BOOL async;
-    BOOL data_available;
 
     TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read );
 
@@ -3229,7 +3180,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &data_available ))
+    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request ))
     {
         struct read_data *r;
 
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index 40db323fb5e..78319f0df5c 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1863,7 +1863,6 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
                                               DWORD status, void *buffer, DWORD buflen )
 {
     struct test_recursion_context *context = (struct test_recursion_context *)context_ptr;
-    static DWORD len;
     DWORD err;
     BOOL ret;
     BYTE b;
@@ -1940,14 +1939,10 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
             context->max_recursion_read = max( context->max_recursion_read, context->recursion_count );
             context->read_from_callback = TRUE;
             InterlockedIncrement( &context->recursion_count );
-            len = 0xdeadbeef;
-            /* Use static variable len here so write to it doesn't destroy the stack on old Windows which
-             * doesn't set the value at once. */
-            ret = WinHttpQueryDataAvailable( context->request, &len );
+            ret = WinHttpQueryDataAvailable( context->request, NULL );
             err = GetLastError();
             ok( ret, "failed to query data available, GetLastError() %lu\n", err );
             ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err );
-            ok( len != 0xdeadbeef || broken( len == 0xdeadbeef ) /* Win7 */, "got %lu.\n", len );
             if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE;
             InterlockedDecrement( &context->recursion_count );
             break;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 80ce2614ca1..0bf1c5bc6b0 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -312,19 +312,6 @@ struct task_header
     volatile LONG completion_sent;
 };
 
-struct send_callback
-{
-    struct task_header task_hdr;
-    DWORD status;
-    void *info;
-    DWORD buflen;
-    union
-    {
-        WINHTTP_ASYNC_RESULT result;
-        DWORD count;
-    };
-};
-
 struct send_request
 {
     struct task_header task_hdr;

From a7c59316d8f8e7795abf30591b85b485ecdda07c Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 23 Jan 2024 16:34:49 -0600
Subject: [PATCH 122/389] winhttp: Always return result at once if available in
 WinHttpQueryDataAvailable().

(cherry picked from commit fd2534422ba66d66cc811c75d012b2b1060d1770)

CW-Bug-Id: #23312
---
 dlls/winhttp/request.c            | 59 ++++++++++++++++++++++++++++---
 dlls/winhttp/tests/notification.c | 11 +++++-
 dlls/winhttp/winhttp_private.h    | 13 +++++++
 3 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 84af8e58988..59431e3a9f2 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -257,6 +257,16 @@ static BOOL cancel_queue( struct queue *queue )
     return cancelled;
 }
 
+static void task_send_callback( void *ctx, BOOL abort )
+{
+    struct send_callback *s = ctx;
+
+    if (abort) return;
+
+    TRACE( "running %p\n", ctx );
+    send_callback( s->task_hdr.obj, s->status, s->info, s->buflen );
+}
+
 static void free_header( struct header *header )
 {
     free( header->field );
@@ -3052,9 +3062,10 @@ static DWORD query_data_ready( struct request *request )
     return count;
 }
 
-static BOOL skip_async_queue( struct request *request )
+static BOOL skip_async_queue( struct request *request, BOOL *wont_block )
 {
-    return request->hdr.recursion_count < 3 && (end_of_read_data( request ) || query_data_ready( request ));
+    *wont_block = end_of_read_data( request ) || query_data_ready( request );
+    return request->hdr.recursion_count < 3 && *wont_block;
 }
 
 static DWORD query_data_available( struct request *request, DWORD *available, BOOL async )
@@ -3106,6 +3117,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
     DWORD ret;
     struct request *request;
     BOOL async;
+    BOOL wont_block = FALSE;
 
     TRACE("%p, %p\n", hrequest, available);
 
@@ -3121,7 +3133,44 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request ))
+    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block ))
+    {
+        ret = query_data_available( request, available, async );
+    }
+    else if (wont_block)
+    {
+        /* Data available but recursion limit reached, only queue callback. */
+        struct send_callback *s;
+
+        if (!(s = malloc( sizeof(*s) )))
+        {
+            release_object( &request->hdr );
+            SetLastError( ERROR_OUTOFMEMORY );
+            return FALSE;
+        }
+
+        if (!(ret = query_data_available( request, &s->count, FALSE )))
+        {
+            if (available) *available = s->count;
+            s->status = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE;
+            s->info = &s->count;
+            s->buflen = sizeof(s->count);
+        }
+        else
+        {
+            s->result.dwResult = API_QUERY_DATA_AVAILABLE;
+            s->result.dwError  = ret;
+            s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
+            s->info = &s->result;
+            s->buflen = sizeof(s->result);
+        }
+
+        if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr )))
+            free( s );
+        else
+            ret = ERROR_IO_PENDING;
+    }
+    else
     {
         struct query_data *q;
 
@@ -3139,7 +3188,6 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         else
             ret = ERROR_IO_PENDING;
     }
-    else ret = query_data_available( request, available, async );
 
     release_object( &request->hdr );
     SetLastError( ret );
@@ -3165,6 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
     DWORD ret;
     struct request *request;
     BOOL async;
+    BOOL wont_block;
 
     TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read );
 
@@ -3180,7 +3229,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request ))
+    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &wont_block ))
     {
         struct read_data *r;
 
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index 78319f0df5c..98df1571464 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1929,6 +1929,9 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
             break;
 
         case WINHTTP_CALLBACK_STATUS_READ_COMPLETE:
+        {
+            static DWORD len;
+
             if (!buflen)
             {
                 SetEvent( context->wait );
@@ -1939,13 +1942,19 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
             context->max_recursion_read = max( context->max_recursion_read, context->recursion_count );
             context->read_from_callback = TRUE;
             InterlockedIncrement( &context->recursion_count );
-            ret = WinHttpQueryDataAvailable( context->request, NULL );
+            len = 0xdeadbeef;
+            /* Use static variable len here so write to it doesn't destroy the stack on old Windows which
+             * doesn't set the value at once. */
+            ret = WinHttpQueryDataAvailable( context->request, &len );
             err = GetLastError();
             ok( ret, "failed to query data available, GetLastError() %lu\n", err );
             ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err );
+            ok( len != 0xdeadbeef || broken( len == 0xdeadbeef ) /* Win7 */, "got %lu.\n", len );
             if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE;
             InterlockedDecrement( &context->recursion_count );
             break;
+        }
+
         case WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE:
             if (!context->headers_available
                 && context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE)
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 0bf1c5bc6b0..80ce2614ca1 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -312,6 +312,19 @@ struct task_header
     volatile LONG completion_sent;
 };
 
+struct send_callback
+{
+    struct task_header task_hdr;
+    DWORD status;
+    void *info;
+    DWORD buflen;
+    union
+    {
+        WINHTTP_ASYNC_RESULT result;
+        DWORD count;
+    };
+};
+
 struct send_request
 {
     struct task_header task_hdr;

From c53c9075b4e22d0f03144bad7b4b294c90c9b6cb Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 23 Jan 2024 16:56:09 -0600
Subject: [PATCH 123/389] winhttp: Always return result at once if available in
 WinHttpReadData().

(cherry picked from commit bd2a2c25f54e33b5ffae1f28f5ead4b020f55456)

CW-Bug-Id: #23312
---
 dlls/winhttp/request.c            | 42 ++++++++++++++++++++++++++++---
 dlls/winhttp/tests/notification.c | 10 +++++++-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 59431e3a9f2..29b30fc2583 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -3213,7 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
     DWORD ret;
     struct request *request;
     BOOL async;
-    BOOL wont_block;
+    BOOL wont_block = FALSE;
 
     TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read );
 
@@ -3229,7 +3229,44 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &wont_block ))
+    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block ))
+    {
+        ret = read_data( request, buffer, to_read, read, async );
+    }
+    else if (wont_block)
+    {
+        /* Data available but recursion limit reached, only queue callback. */
+        struct send_callback *s;
+
+        if (!(s = malloc( sizeof(*s) )))
+        {
+            release_object( &request->hdr );
+            SetLastError( ERROR_OUTOFMEMORY );
+            return FALSE;
+        }
+
+        if (!(ret = read_data( request, buffer, to_read, &s->count, FALSE )))
+        {
+            if (read) *read = s->count;
+            s->status = WINHTTP_CALLBACK_STATUS_READ_COMPLETE;
+            s->info = buffer;
+            s->buflen = s->count;
+        }
+        else
+        {
+            s->result.dwResult = API_READ_DATA;
+            s->result.dwError  = ret;
+            s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
+            s->info = &s->result;
+            s->buflen = sizeof(s->result);
+        }
+
+        if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr )))
+            free( s );
+        else
+            ret = ERROR_IO_PENDING;
+    }
+    else
     {
         struct read_data *r;
 
@@ -3248,7 +3285,6 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         else
             ret = ERROR_IO_PENDING;
     }
-    else ret = read_data( request, buffer, to_read, read, async );
 
     release_object( &request->hdr );
     SetLastError( ret );
diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c
index 98df1571464..3e67c439bb5 100644
--- a/dlls/winhttp/tests/notification.c
+++ b/dlls/winhttp/tests/notification.c
@@ -1904,6 +1904,9 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
             break;
 
         case WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE:
+        {
+            DWORD len;
+
             if (!context->read_from_callback)
             {
                 SetEvent( context->wait );
@@ -1920,13 +1923,18 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex
                 "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() );
             context->max_recursion_query = max( context->max_recursion_query, context->recursion_count );
             InterlockedIncrement( &context->recursion_count );
-            ret = WinHttpReadData( context->request, &b, 1, NULL );
+            b = 0xff;
+            len = 0xdeadbeef;
+            ret = WinHttpReadData( context->request, &b, 1, &len );
             err = GetLastError();
             ok( ret, "failed to read data, GetLastError() %lu\n", err );
             ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err );
+            ok( b != 0xff, "got %#x.\n", b );
+            ok( len == 1, "got %lu.\n", len );
             if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE;
             InterlockedDecrement( &context->recursion_count );
             break;
+        }
 
         case WINHTTP_CALLBACK_STATUS_READ_COMPLETE:
         {

From 970f435f0158e7f7e91c71546ab03a3415f41ebd Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 30 Jan 2024 11:55:31 -0600
Subject: [PATCH 124/389] winex11.drv: Default swap interval to 0 for child
 window drawables in create_gl_drawable().

CW-Bug-Id: #23329
---
 dlls/winex11.drv/opengl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 43f87e11b1d..af404540fde 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1541,6 +1541,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel
                                         (visual->class == PseudoColor || visual->class == GrayScale ||
                                          visual->class == DirectColor) ? AllocAll : AllocNone );
         gl->window = create_client_window( hwnd, visual, gl->colormap );
+        gl->swap_interval = 0;
         if (gl->window)
         {
             gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL );

From 4bf230ae4cf44dd2130dfb621ae0e3e8ab4aa9b6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 22 Jan 2024 16:28:32 -0600
Subject: [PATCH 125/389] winex11.drv: Fix wglSwapBuffers() with NULL current
 context with child window rendering.

(cherry picked from commit eb5993a7c6fbc1cd9deac0dceabc8f1c76e14ba8)

CW-Bug-Id: #23302
---
 dlls/opengl32/tests/opengl.c | 52 ++++++++++++++++++++++++++++++++++++
 dlls/winex11.drv/opengl.c    | 10 +++----
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
index e3ca82a9b03..74aff6b4bbd 100644
--- a/dlls/opengl32/tests/opengl.c
+++ b/dlls/opengl32/tests/opengl.c
@@ -2006,6 +2006,55 @@ static void test_copy_context(HDC hdc)
     ok(ret, "wglMakeCurrent failed, last error %#lx.\n", GetLastError());
 }
 
+static void test_child_window(HWND hwnd, PIXELFORMATDESCRIPTOR *pfd)
+{
+    int pixel_format;
+    DWORD t1, t;
+    HGLRC hglrc;
+    HWND child;
+    HDC hdc;
+    int res;
+
+    child = CreateWindowA("static", "Title", WS_CHILDWINDOW | WS_VISIBLE, 50, 50, 100, 100, hwnd, NULL, NULL, NULL);
+    ok(!!child, "got error %lu.\n", GetLastError());
+
+    hdc = GetDC(child);
+    pixel_format = ChoosePixelFormat(hdc, pfd);
+    res = SetPixelFormat(hdc, pixel_format, pfd);
+    ok(res, "got error %lu.\n", GetLastError());
+
+    hglrc = wglCreateContext(hdc);
+    ok(!!hglrc, "got error %lu.\n", GetLastError());
+
+    /* Test SwapBuffers with NULL context. */
+
+    glDrawBuffer(GL_BACK);
+
+    /* Currently blit happening for child window in winex11 may not be updated with the latest GL frame
+     * even on glXWaitForSbcOML() path. So simulate continuous present for the test purpose. */
+    trace("Child window rectangle should turn from red to green now.\n");
+    t1 = GetTickCount();
+    while ((t = GetTickCount()) - t1 < 3000)
+    {
+        res = wglMakeCurrent(hdc, hglrc);
+        ok(res, "got error %lu.\n", GetLastError());
+        if (t - t1 > 1500)
+            glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
+        else
+            glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+        res = wglMakeCurrent(NULL, NULL);
+        ok(res, "got error %lu.\n", GetLastError());
+        SwapBuffers(hdc);
+    }
+
+    res = wglDeleteContext(hglrc);
+    ok(res, "got error %lu.\n", GetLastError());
+
+    ReleaseDC(child, hdc);
+    DestroyWindow(child);
+}
+
 START_TEST(opengl)
 {
     HWND hwnd;
@@ -2138,6 +2187,9 @@ START_TEST(opengl)
         else
             skip("WGL_EXT_swap_control not supported, skipping test\n");
 
+        if (winetest_interactive)
+            test_child_window(hwnd, &pfd);
+
 cleanup:
         ReleaseDC(hwnd, hdc);
         DestroyWindow(hwnd);
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index af404540fde..fde7a9672af 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -4894,7 +4894,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc )
     case DC_GL_PIXMAP_WIN:
         if (ctx) sync_context( ctx );
         if (!gl->layered_type) escape.drawable = gl->pixmap;
-        if (pglXCopySubBufferMESA) {
+        if (ctx && pglXCopySubBufferMESA) {
             /* (glX)SwapBuffers has an implicit glFlush effect, however
              * GLX_MESA_copy_sub_buffer doesn't. Make sure GL is flushed before
              * copying */
@@ -4903,7 +4903,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc )
                                    gl->pixmap_size.cx, gl->pixmap_size.cy );
             break;
         }
-        if (pglXSwapBuffersMscOML)
+        if (ctx && pglXSwapBuffersMscOML)
         {
             pglFlush();
             target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 );
@@ -4929,7 +4929,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc )
             ctx->fs_hack = FALSE;
             fs_hack_setup_context( ctx, gl );
         }
-        if ((escape.drawable || gl->layered_type) && pglXSwapBuffersMscOML)
+        if (ctx && (escape.drawable || gl->layered_type) && pglXSwapBuffersMscOML)
         {
             pglFlush();
             target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 );
@@ -4939,14 +4939,14 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc )
         break;
     }
 
-    if ((escape.drawable || gl->layered_type) && pglXWaitForSbcOML)
+    if (ctx && (escape.drawable || gl->layered_type) && pglXWaitForSbcOML)
         pglXWaitForSbcOML( gdi_display, gl->drawable, target_sbc, &ust, &msc, &sbc );
 
     update_window_surface( gl, hwnd );
     release_gl_drawable( gl );
 
     if (escape.drawable)
-        NtGdiExtEscape( ctx->hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );
+        NtGdiExtEscape( ctx ? ctx->hdc : hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );
     return TRUE;
 }
 

From 7819be399ecd7fcaa379aee9c7678c13b923e927 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 14 Feb 2024 10:48:03 -0600
Subject: [PATCH 126/389] Revert "explorer: Don't pop start menu on "minimize
 all windows" systray command."

This reverts commit 1cf7a85d1288f67b3e677f3b03533d46da1d2775.
---
 programs/explorer/systray.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 84ae37d8b36..61490f7a325 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -1059,15 +1059,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
         break;
 
     case WM_COMMAND:
-        if (HIWORD(wparam) == BN_CLICKED)
-        {
-            if (LOWORD(wparam) == 419)
-            {
-                FIXME( "Minimize all windows command is not supported.\n" );
-                break;
-            }
-            click_taskbar_button( (HWND)lparam );
-        }
+        if (HIWORD(wparam) == BN_CLICKED) click_taskbar_button( (HWND)lparam );
         break;
 
     case WM_CONTEXTMENU:

From b2832654aa9add01ab328170fafc79f6421a3d15 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 8 Jan 2024 21:05:35 -0600
Subject: [PATCH 127/389] explorer: Don't pop start menu on "minimize all
 windows" systray command.

(cherry picked from commit d66fe6206d950eeeabfcf408ae4d199a558150f3)

CW-Bug-Id: #23178
---
 dlls/user32/tests/win.c     | 29 ++++++++++++++++++++++++++++-
 programs/explorer/systray.c | 12 +++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 2fd31be3314..44ea1c04e61 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -1796,7 +1796,7 @@ static void test_shell_window(void)
 
     WaitForSingleObject(hthread, INFINITE);
 
-    DeleteObject(hthread);
+    CloseHandle(hthread);
 
     CloseDesktop(hdesk);
 }
@@ -13030,6 +13030,32 @@ static void test_WM_NCCALCSIZE(void)
     DestroyWindow(hwnd);
 }
 
+#define TRAY_MINIMIZE_ALL 419
+
+static void test_shell_tray(void)
+{
+    HWND hwnd, traywnd;
+
+    if (!(traywnd = FindWindowA( "Shell_TrayWnd", NULL )))
+    {
+        skip( "Shell_TrayWnd not found, skipping tests.\n" );
+        return;
+    }
+
+    hwnd = CreateWindowW( L"static", L"parent", WS_OVERLAPPEDWINDOW|WS_VISIBLE,
+                                  100, 100, 200, 200, 0, 0, 0, NULL );
+    ok( !!hwnd, "failed, error %lu.\n", GetLastError() );
+    flush_events( TRUE );
+
+    ok( !IsIconic( hwnd ), "window is minimized.\n" );
+
+    SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL, 0xdeadbeef );
+    flush_events( TRUE );
+    todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" );
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(win)
 {
     char **argv;
@@ -13226,4 +13252,5 @@ START_TEST(win)
     test_topmost();
 
     test_shell_window();
+    test_shell_tray();
 }
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 61490f7a325..330dea710fc 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -33,6 +33,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(systray);
 
+#define TRAY_MINIMIZE_ALL 419
+
 struct notify_data  /* platform-independent format for NOTIFYICONDATA */
 {
     LONG  hWnd;
@@ -1059,7 +1061,15 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
         break;
 
     case WM_COMMAND:
-        if (HIWORD(wparam) == BN_CLICKED) click_taskbar_button( (HWND)lparam );
+        if (HIWORD(wparam) == BN_CLICKED)
+        {
+            if (LOWORD(wparam) == TRAY_MINIMIZE_ALL)
+            {
+                FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) );
+                break;
+            }
+            click_taskbar_button( (HWND)lparam );
+        }
         break;
 
     case WM_CONTEXTMENU:

From cf0afdcb7c455a5a883a9043a84611dcfa3c1334 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 6 Feb 2024 10:04:09 -0600
Subject: [PATCH 128/389] explorer: Don't pop start menu on "undo minimize all
 windows" systray command.

(cherry picked from commit 5da459f1f2471365bc98078be1a3a1f84ef1a3dd)

CW-Bug-Id: #23178
---
 dlls/user32/tests/win.c     | 5 +++++
 programs/explorer/systray.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 44ea1c04e61..69c8d945951 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -13031,6 +13031,7 @@ static void test_WM_NCCALCSIZE(void)
 }
 
 #define TRAY_MINIMIZE_ALL 419
+#define TRAY_MINIMIZE_ALL_UNDO 416
 
 static void test_shell_tray(void)
 {
@@ -13053,6 +13054,10 @@ static void test_shell_tray(void)
     flush_events( TRUE );
     todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" );
 
+    SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL_UNDO, 0xdeadbeef );
+    flush_events( TRUE );
+    ok( !IsIconic( hwnd ), "window is minimized.\n" );
+
     DestroyWindow(hwnd);
 }
 
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 330dea710fc..54f1abbb30f 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -34,6 +34,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(systray);
 
 #define TRAY_MINIMIZE_ALL 419
+#define TRAY_MINIMIZE_ALL_UNDO 416
 
 struct notify_data  /* platform-independent format for NOTIFYICONDATA */
 {
@@ -1063,7 +1064,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
     case WM_COMMAND:
         if (HIWORD(wparam) == BN_CLICKED)
         {
-            if (LOWORD(wparam) == TRAY_MINIMIZE_ALL)
+            if (LOWORD(wparam) == TRAY_MINIMIZE_ALL || LOWORD(wparam) == TRAY_MINIMIZE_ALL_UNDO)
             {
                 FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) );
                 break;

From 98ba5ebe8c4afbba9dd23a196580b7feb10fd67a Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 2 Feb 2024 17:55:27 +0000
Subject: [PATCH 129/389] mscoree: Update Wine Mono to 9.0.0.

(cherry picked from commit e891073c9eacc391cfa1bdb65e734922742c2c17)
---
 dlls/appwiz.cpl/addons.c       | 4 ++--
 dlls/mscoree/mscoree_private.h | 2 +-
 tools/gitlab/test.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index a2957c3040a..12d32a46216 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
 #define GECKO_SHA "???"
 #endif
 
-#define MONO_VERSION "8.1.0"
+#define MONO_VERSION "9.0.0"
 #if defined(__i386__) || defined(__x86_64__)
 #define MONO_ARCH "x86"
-#define MONO_SHA "0ed3ec533aef79b2f312155931cf7b1080009ac0c5b4c2bcfeb678ac948e0810"
+#define MONO_SHA "79f6c43100675566c112f4199b9ea7b944d338164b34bd91fa11b0b0a414e1c4"
 #else
 #define MONO_ARCH ""
 #define MONO_SHA "???"
diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h
index 06db53136e1..f27ff95be2d 100644
--- a/dlls/mscoree/mscoree_private.h
+++ b/dlls/mscoree/mscoree_private.h
@@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version);
 extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count);
 extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func);
 
-#define WINE_MONO_VERSION "8.1.0"
+#define WINE_MONO_VERSION "9.0.0"
 
 /* Mono embedding */
 typedef struct _MonoDomain MonoDomain;
diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
index 92c14d83996..aaad7b31c36 100644
--- a/tools/gitlab/test.yml
+++ b/tools/gitlab/test.yml
@@ -7,7 +7,7 @@
   variables:
     GIT_STRATEGY: none
     GECKO_VER: 2.47.4
-    MONO_VER: 8.1.0
+    MONO_VER: 9.0.0
   cache:
     - key: wine-gecko-$GECKO_VER
       paths:

From 2455a0d61e9463028edd951a31459a6dba3a806e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 13 Feb 2023 15:05:53 +0100
Subject: [PATCH 130/389] windows.media.speech: Add Vosk checks to autoconf.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 configure.ac | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3decacab398..e8338e9eb50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (plug an
 AC_ARG_WITH(unwind,    AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)]))
 AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb library]))
 AC_ARG_WITH(v4l2,      AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
+AC_ARG_WITH(vosk,      AS_HELP_STRING([--without-vosk],[do not use Vosk]))
 AC_ARG_WITH(vulkan,    AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
 AC_ARG_WITH(wayland,   AS_HELP_STRING([--without-wayland],[do not build the Wayland driver]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
@@ -492,7 +493,8 @@ AC_CHECK_HEADERS(\
 	syscall.h \
 	utime.h \
 	valgrind/memcheck.h \
-	valgrind/valgrind.h
+	valgrind/valgrind.h \
+	vosk_api.h
 )
 WINE_HEADER_MAJOR()
 AC_HEADER_STAT()
@@ -1874,6 +1876,14 @@ then
     WINE_WARNING([No sound system was found. Windows applications will be silent.])
 fi
 
+dnl **** Check for Vosk ****
+if test x$with_vosk != xno
+then
+    WINE_CHECK_SONAME(vosk,vosk_recognizer_new)
+fi
+WINE_NOTICE_WITH(vosk,[test x$ac_cv_lib_soname_vosk = x],
+                 [libvosk ${notice_platform}development files not found, speech recognition won't be supported.])
+
 dnl *** Check for Vulkan ***
 if test "x$with_vulkan" != "xno"
 then

From 4a816ddd1621aa90a0a3de531b7f9d93458cb3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 13 Feb 2023 00:17:50 +0100
Subject: [PATCH 131/389] windows.media.speech: Add unixlib stub.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/Makefile.in |   2 +
 dlls/windows.media.speech/main.c      |  26 ++++++
 dlls/windows.media.speech/private.h   |   4 +
 dlls/windows.media.speech/unixlib.c   | 125 ++++++++++++++++++++++++++
 dlls/windows.media.speech/unixlib.h   |  39 ++++++++
 5 files changed, 196 insertions(+)
 create mode 100644 dlls/windows.media.speech/unixlib.c
 create mode 100644 dlls/windows.media.speech/unixlib.h

diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in
index 5be66d8367e..11a8ad2bba8 100644
--- a/dlls/windows.media.speech/Makefile.in
+++ b/dlls/windows.media.speech/Makefile.in
@@ -1,4 +1,5 @@
 MODULE = windows.media.speech.dll
+UNIXLIB = windows.media.speech.so
 IMPORTS = combase uuid
 
 SOURCES = \
@@ -9,4 +10,5 @@ SOURCES = \
 	main.c \
 	recognizer.c \
 	synthesizer.c \
+	unixlib.c \
 	vector.c
diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c
index e772a791588..d53e1599eb8 100644
--- a/dlls/windows.media.speech/main.c
+++ b/dlls/windows.media.speech/main.c
@@ -20,10 +20,36 @@
 #include "initguid.h"
 #include "private.h"
 
+#include "unixlib.h"
+
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(speech);
 
+BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
+{
+    NTSTATUS status;
+
+    switch (reason)
+    {
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls(instance);
+
+        if ((status = __wine_init_unix_call()))
+            ERR("loading the unixlib failed with status %#lx.\n", status);
+
+        if ((status = WINE_UNIX_CALL(unix_process_attach, NULL)))
+            WARN("initializing the unixlib failed with status %#lx.\n", status);
+
+        break;
+    case DLL_PROCESS_DETACH:
+        WINE_UNIX_CALL(unix_process_detach, NULL);
+        break;
+    }
+
+    return TRUE;
+}
+
 HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out)
 {
     FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out);
diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h
index d03fe0e773e..4b6a8327d6e 100644
--- a/dlls/windows.media.speech/private.h
+++ b/dlls/windows.media.speech/private.h
@@ -22,6 +22,10 @@
 
 #include <stdarg.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "winerror.h"
+#include "winternl.h"
 #define COBJMACROS
 #include "corerror.h"
 #include "windef.h"
diff --git a/dlls/windows.media.speech/unixlib.c b/dlls/windows.media.speech/unixlib.c
new file mode 100644
index 00000000000..6a9dac6f067
--- /dev/null
+++ b/dlls/windows.media.speech/unixlib.c
@@ -0,0 +1,125 @@
+/*
+ * Unixlib for Windows.Media.Speech
+ *
+ * Copyright 2023 Bernhard Kölbl for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <dlfcn.h>
+
+#ifdef SONAME_LIBVOSK
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#include <vosk_api.h>
+#pragma GCC diagnostic pop
+#endif
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "winerror.h"
+#include "winternl.h"
+
+#include "wine/debug.h"
+
+#include "unixlib.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(speech);
+#ifdef SONAME_LIBVOSK
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
+
+static void *vosk_handle;
+#define MAKE_FUNCPTR( f ) static typeof(f) * p_##f
+MAKE_FUNCPTR(vosk_model_new);
+MAKE_FUNCPTR(vosk_model_free);
+MAKE_FUNCPTR(vosk_recognizer_new);
+MAKE_FUNCPTR(vosk_recognizer_free);
+#undef MAKE_FUNCPTR
+
+static NTSTATUS process_attach( void *args )
+{
+    if (!(vosk_handle = dlopen(SONAME_LIBVOSK, RTLD_NOW)))
+    {
+        ERR_(winediag)("Wine is unable to load the Unix side dependencies for speech recognition. "
+                       "Make sure Vosk is installed and up to date on your system and try again.\n");
+        return STATUS_DLL_NOT_FOUND;
+    }
+
+#define LOAD_FUNCPTR( f ) \
+    if (!(p_##f = dlsym(vosk_handle, #f))) \
+    { \
+        ERR("failed to load %s\n", #f); \
+        goto error; \
+    }
+    LOAD_FUNCPTR(vosk_model_new)
+    LOAD_FUNCPTR(vosk_model_free)
+    LOAD_FUNCPTR(vosk_recognizer_new)
+    LOAD_FUNCPTR(vosk_recognizer_free)
+#undef LOAD_FUNCPTR
+
+    return STATUS_SUCCESS;
+
+error:
+    dlclose(vosk_handle);
+    vosk_handle = NULL;
+    return STATUS_DLL_NOT_FOUND;
+}
+
+static NTSTATUS process_detach( void *args )
+{
+    if (vosk_handle)
+    {
+        dlclose(vosk_handle);
+        vosk_handle = NULL;
+    }
+    return STATUS_SUCCESS;
+}
+
+#else /* SONAME_LIBVOSK */
+
+#define MAKE_UNSUPPORTED_FUNC( f ) \
+    static NTSTATUS f( void *args ) \
+    { \
+        ERR("wine was compiled without Vosk support. Speech recognition won't work.\n"); \
+        return STATUS_NOT_SUPPORTED; \
+    }
+
+MAKE_UNSUPPORTED_FUNC(process_attach)
+MAKE_UNSUPPORTED_FUNC(process_detach)
+#undef MAKE_UNSUPPORTED_FUNC
+
+#endif /* SONAME_LIBVOSK */
+
+const unixlib_entry_t __wine_unix_call_funcs[] =
+{
+    process_attach,
+    process_detach,
+};
+
+const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
+{
+    process_attach,
+    process_detach,
+};
diff --git a/dlls/windows.media.speech/unixlib.h b/dlls/windows.media.speech/unixlib.h
new file mode 100644
index 00000000000..6c337e54511
--- /dev/null
+++ b/dlls/windows.media.speech/unixlib.h
@@ -0,0 +1,39 @@
+/*
+ * Unix library interface for Windows.Media.Speech
+ *
+ * Copyright 2023 Bernhard Kölbl for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_WINDOWS_MEDIA_SPEECH_UNIXLIB_H
+#define __WINE_WINDOWS_MEDIA_SPEECH_UNIXLIB_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "windef.h"
+#include "winternl.h"
+#include "wtypes.h"
+
+#include "wine/unixlib.h"
+
+enum unix_funcs
+{
+    unix_process_attach,
+    unix_process_detach,
+};
+
+#endif

From 186309d1aec56e0084bd8100c2efb2a5b8102774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 6 Feb 2023 21:24:26 +0100
Subject: [PATCH 132/389] windows.media.speech/tests: Get rid of duplicated
 hresult.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/tests/speech.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c
index ade056a0a39..9be4fa462df 100644
--- a/dlls/windows.media.speech/tests/speech.c
+++ b/dlls/windows.media.speech/tests/speech.c
@@ -42,7 +42,6 @@
 #define AsyncStatus_Closed 4
 
 #define SPERR_WINRT_INTERNAL_ERROR 0x800455a0
-#define SPERR_WINRT_INCORRECT_FORMAT 0x80131537
 
 #define IHandler_RecognitionResult ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgs
 #define IHandler_RecognitionResultVtbl ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgsVtbl
@@ -1082,7 +1081,7 @@ static void test_SpeechSynthesizer(void)
     operation_ss_stream = (void *)0xdeadbeef;
     hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, str, &operation_ss_stream);
     /* Broken on Win 8 + 8.1 */
-    ok(hr == S_OK || broken(hr == SPERR_WINRT_INCORRECT_FORMAT), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr);
+    ok(hr == S_OK || broken(hr == COR_E_FORMAT), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr);
 
     if (hr == S_OK)
     {

From 3d1efbbddce37a2ae017e9792bc599522aa0d366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 20 Feb 2023 23:10:16 +0100
Subject: [PATCH 133/389] windows.media.speech/tests: Allow the
 SpeechRecognizer creation to fail in Wine.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To allow for error handling of missing Unix-side dependencies.

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/tests/speech.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c
index 9be4fa462df..743955ab9bd 100644
--- a/dlls/windows.media.speech/tests/speech.c
+++ b/dlls/windows.media.speech/tests/speech.c
@@ -1307,7 +1307,7 @@ static void test_SpeechRecognizer(void)
     ok(ref == 1, "Got unexpected ref %lu.\n", ref);
 
     hr = RoActivateInstance(hstr, &inspectable);
-    ok(hr == S_OK || broken(hr == SPERR_WINRT_INTERNAL_ERROR), "Got unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK || hr == SPERR_WINRT_INTERNAL_ERROR, "Got unexpected hr %#lx.\n", hr);
 
     if (hr == S_OK)
     {
@@ -1526,7 +1526,7 @@ static void test_SpeechRecognizer(void)
     }
     else if (hr == SPERR_WINRT_INTERNAL_ERROR) /* Not sure when this triggers. Probably if a language pack is not installed. */
     {
-        win_skip("Could not init SpeechRecognizer with default language!\n");
+        skip("Could not init SpeechRecognizer with default language!\n");
     }
 
 done:
@@ -1743,12 +1743,12 @@ static void test_Recognition(void)
     ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
 
     hr = RoActivateInstance(hstr, &inspectable);
-    ok(hr == S_OK || broken(hr == SPERR_WINRT_INTERNAL_ERROR || hr == REGDB_E_CLASSNOTREG), "Got unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK || hr == SPERR_WINRT_INTERNAL_ERROR || broken(hr == REGDB_E_CLASSNOTREG), "Got unexpected hr %#lx.\n", hr);
     WindowsDeleteString(hstr);
 
-    if (FAILED(hr))  /* Win 8 and 8.1 and Win10 without enabled SR. */
+    if (FAILED(hr))  /* Win 8 and 8.1 and Win10 without enabled SR. Wine with missing Unix side dependencies. */
     {
-        win_skip("SpeechRecognizer cannot be activated!\n");
+        skip("SpeechRecognizer cannot be activated!\n");
         goto done;
     }
 

From 1076aa8746ceb20227c30f8234b62488fe726ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 20 Feb 2023 23:11:02 +0100
Subject: [PATCH 134/389] windows.media.speech: Implement Vosk create and
 release functions in the unixlib.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/Makefile.in  |   2 +-
 dlls/windows.media.speech/private.h    |   3 +
 dlls/windows.media.speech/recognizer.c |  42 ++++++
 dlls/windows.media.speech/unixlib.c    | 169 ++++++++++++++++++++++++-
 dlls/windows.media.speech/unixlib.h    |  16 +++
 5 files changed, 230 insertions(+), 2 deletions(-)

diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in
index 11a8ad2bba8..ea1e4272139 100644
--- a/dlls/windows.media.speech/Makefile.in
+++ b/dlls/windows.media.speech/Makefile.in
@@ -1,6 +1,6 @@
 MODULE = windows.media.speech.dll
 UNIXLIB = windows.media.speech.so
-IMPORTS = combase uuid
+IMPORTS = combase uuid user32
 
 SOURCES = \
 	async.c \
diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h
index 4b6a8327d6e..60d09c9f7d1 100644
--- a/dlls/windows.media.speech/private.h
+++ b/dlls/windows.media.speech/private.h
@@ -31,6 +31,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winstring.h"
+#include "winuser.h"
 #include "objbase.h"
 
 #include "activation.h"
@@ -47,6 +48,8 @@
 
 #include "wine/list.h"
 
+#define SPERR_WINRT_INTERNAL_ERROR 0x800455a0
+
 /*
  *
  * Windows.Media.SpeechRecognition
diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index 790d127fc64..7f45605d23a 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -25,6 +25,9 @@
 
 #include "wine/debug.h"
 
+#include "unixlib.h"
+#include "wine/unixlib.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(speech);
 
 /*
@@ -171,6 +174,8 @@ struct session
     IAudioCaptureClient *capture_client;
     WAVEFORMATEX capture_wfx;
 
+    speech_recognizer_handle unix_handle;
+
     HANDLE worker_thread, worker_control_event, audio_buf_event;
     BOOLEAN worker_running, worker_paused;
     CRITICAL_SECTION cs;
@@ -319,7 +324,9 @@ static ULONG WINAPI session_AddRef( ISpeechContinuousRecognitionSession *iface )
 static ULONG WINAPI session_Release( ISpeechContinuousRecognitionSession *iface )
 {
     struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface);
+    struct speech_release_recognizer_params release_params;
     ULONG ref = InterlockedDecrement(&impl->ref);
+
     TRACE("iface %p, ref %lu.\n", iface, ref);
 
     if (!ref)
@@ -345,6 +352,9 @@ static ULONG WINAPI session_Release( ISpeechContinuousRecognitionSession *iface
         impl->cs.DebugInfo->Spare[0] = 0;
         DeleteCriticalSection(&impl->cs);
 
+        release_params.handle = impl->unix_handle;
+        WINE_UNIX_CALL(unix_speech_release_recognizer, &release_params);
+
         IVector_ISpeechRecognitionConstraint_Release(impl->constraints);
         free(impl);
     }
@@ -1080,6 +1090,35 @@ static HRESULT recognizer_factory_create_audio_capture(struct session *session)
     return hr;
 }
 
+static HRESULT recognizer_factory_create_unix_instance( struct session *session )
+{
+    struct speech_create_recognizer_params create_params = { 0 };
+    WCHAR locale[LOCALE_NAME_MAX_LENGTH];
+    NTSTATUS status;
+    INT len;
+
+    if (!(len = GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH)))
+        return E_FAIL;
+
+    if (CharLowerBuffW(locale, len) != len)
+        return E_FAIL;
+
+    if (!WideCharToMultiByte(CP_ACP, 0, locale, len, create_params.locale, ARRAY_SIZE(create_params.locale), NULL, NULL))
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    create_params.sample_rate = (FLOAT)session->capture_wfx.nSamplesPerSec;
+
+    if ((status = WINE_UNIX_CALL(unix_speech_create_recognizer, &create_params)))
+    {
+        ERR("Unable to create Vosk instance for locale %s, status %#lx. Speech recognition won't work.\n", debugstr_a(create_params.locale), status);
+        return SPERR_WINRT_INTERNAL_ERROR;
+    }
+
+    session->unix_handle = create_params.handle;
+
+    return S_OK;
+}
+
 static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface, ILanguage *language, ISpeechRecognizer **speechrecognizer )
 {
     struct recognizer *impl;
@@ -1126,6 +1165,9 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface
     if (FAILED(hr = recognizer_factory_create_audio_capture(session)))
         goto error;
 
+    if (FAILED(hr = recognizer_factory_create_unix_instance(session)))
+        goto error;
+
     InitializeCriticalSection(&session->cs);
     session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": recognition_session.cs");
 
diff --git a/dlls/windows.media.speech/unixlib.c b/dlls/windows.media.speech/unixlib.c
index 6a9dac6f067..155780a3e4b 100644
--- a/dlls/windows.media.speech/unixlib.c
+++ b/dlls/windows.media.speech/unixlib.c
@@ -26,9 +26,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <stdarg.h>
+#include <string.h>
+#include <dirent.h>
 #include <dlfcn.h>
+#include <errno.h>
+#include <sys/stat.h>
 
 #ifdef SONAME_LIBVOSK
 #pragma GCC diagnostic push
@@ -97,6 +100,164 @@ static NTSTATUS process_detach( void *args )
     return STATUS_SUCCESS;
 }
 
+static inline speech_recognizer_handle vosk_recognizer_to_handle( VoskRecognizer *recognizer )
+{
+    return (speech_recognizer_handle)(UINT_PTR)recognizer;
+}
+
+static inline VoskRecognizer *vosk_recognizer_from_handle( speech_recognizer_handle handle )
+{
+    return (VoskRecognizer *)(UINT_PTR)handle;
+}
+
+static NTSTATUS find_model_by_locale_and_path( const char *path, const char *locale, VoskModel **model )
+{
+    static const char *vosk_model_identifier_small = "vosk-model-small-";
+    static const char *vosk_model_identifier = "vosk-model-";
+    size_t ident_small_len = strlen(vosk_model_identifier_small);
+    size_t ident_len = strlen(vosk_model_identifier);
+    char *ent_name, *model_path, *best_match, *delim;
+    NTSTATUS status = STATUS_UNSUCCESSFUL;
+    struct dirent *dirent;
+    size_t path_len, len;
+    DIR *dir;
+
+    TRACE("path %s, locale %s, model %p.\n", path, debugstr_a(locale), model);
+
+    if (!path || !locale || (len = strlen(locale)) < 4)
+        return STATUS_UNSUCCESSFUL;
+
+    if (!(dir = opendir(path)))
+        return STATUS_UNSUCCESSFUL;
+
+    delim = strchr(locale, '-');
+    path_len = strlen(path);
+    best_match = NULL;
+    *model = NULL;
+
+    while ((dirent = readdir(dir)))
+    {
+        ent_name = dirent->d_name;
+
+        if (!strncmp(ent_name, vosk_model_identifier_small, ident_small_len))
+            ent_name += ident_small_len;
+        else if (!strncmp(ent_name, vosk_model_identifier, ident_len))
+            ent_name += ident_len;
+        else
+            continue;
+
+        /*
+         * Find the first matching model for lang and region (en-us).
+         * If there isn't any, pick the first one just matching lang (en).
+         */
+        if (!strncmp(ent_name, locale, len))
+        {
+            if (best_match) free(best_match);
+            best_match = strdup(dirent->d_name);
+            break;
+        }
+
+        if (!best_match && !strncmp(ent_name, locale, delim - locale))
+            best_match = strdup(dirent->d_name);
+    }
+
+    closedir(dir);
+
+    if (!best_match)
+        return STATUS_UNSUCCESSFUL;
+
+    if (!(model_path = malloc(path_len + 1 /* '/' */ + strlen(best_match) + 1)))
+    {
+        status = STATUS_NO_MEMORY;
+        goto done;
+    }
+
+    sprintf(model_path, "%s/%s", path, best_match);
+
+    TRACE("trying to load Vosk model %s.\n", debugstr_a(model_path));
+
+    if ((*model = p_vosk_model_new(model_path)) != NULL)
+        status = STATUS_SUCCESS;
+
+done:
+    free(model_path);
+    free(best_match);
+
+    return status;
+}
+
+static NTSTATUS find_model_by_locale( const char *locale, VoskModel **model )
+{
+    const char *suffix = NULL;
+    char *env, *path = NULL;
+    NTSTATUS status;
+
+    TRACE("locale %s, model %p.\n", debugstr_a(locale), model);
+
+    if (!model)
+        return STATUS_UNSUCCESSFUL;
+
+    if (!find_model_by_locale_and_path(getenv("VOSK_MODEL_PATH"), locale, model))
+        return STATUS_SUCCESS;
+    if (!find_model_by_locale_and_path("/usr/share/vosk", locale, model))
+        return STATUS_SUCCESS;
+
+    if ((env = getenv("XDG_CACHE_HOME")))
+        suffix = "/vosk";
+    else if ((env = getenv("HOME")))
+        suffix = "/.cache/vosk";
+    else
+        return STATUS_UNSUCCESSFUL;
+
+    if (!(path = malloc(strlen(env) + strlen(suffix) + 1)))
+        return STATUS_NO_MEMORY;
+
+    sprintf(path, "%s%s", env, suffix);
+    status = find_model_by_locale_and_path(path, locale, model);
+    free(path);
+
+    return status;
+}
+
+static NTSTATUS speech_create_recognizer( void *args )
+{
+    struct speech_create_recognizer_params *params = args;
+    VoskRecognizer *recognizer = NULL;
+    VoskModel *model = NULL;
+    NTSTATUS status = STATUS_SUCCESS;
+
+    TRACE("args %p.\n", args);
+
+    if (!vosk_handle)
+        return STATUS_NOT_SUPPORTED;
+
+    if ((status = find_model_by_locale(params->locale, &model)))
+        return status;
+
+    if (!(recognizer = p_vosk_recognizer_new(model, params->sample_rate)))
+        status = STATUS_UNSUCCESSFUL;
+
+    /* VoskModel is reference-counted.  A VoskRecognizer keeps a reference to its model. */
+    p_vosk_model_free(model);
+
+    params->handle = vosk_recognizer_to_handle(recognizer);
+    return status;
+}
+
+static NTSTATUS speech_release_recognizer( void *args )
+{
+    struct speech_release_recognizer_params *params = args;
+
+    TRACE("args %p.\n", args);
+
+    if (!vosk_handle)
+        return STATUS_NOT_SUPPORTED;
+
+    p_vosk_recognizer_free(vosk_recognizer_from_handle(params->handle));
+
+    return STATUS_SUCCESS;
+}
+
 #else /* SONAME_LIBVOSK */
 
 #define MAKE_UNSUPPORTED_FUNC( f ) \
@@ -108,6 +269,8 @@ static NTSTATUS process_detach( void *args )
 
 MAKE_UNSUPPORTED_FUNC(process_attach)
 MAKE_UNSUPPORTED_FUNC(process_detach)
+MAKE_UNSUPPORTED_FUNC(speech_create_recognizer)
+MAKE_UNSUPPORTED_FUNC(speech_release_recognizer)
 #undef MAKE_UNSUPPORTED_FUNC
 
 #endif /* SONAME_LIBVOSK */
@@ -116,10 +279,14 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
 {
     process_attach,
     process_detach,
+    speech_create_recognizer,
+    speech_release_recognizer,
 };
 
 const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 {
     process_attach,
     process_detach,
+    speech_create_recognizer,
+    speech_release_recognizer,
 };
diff --git a/dlls/windows.media.speech/unixlib.h b/dlls/windows.media.speech/unixlib.h
index 6c337e54511..974e8d5f797 100644
--- a/dlls/windows.media.speech/unixlib.h
+++ b/dlls/windows.media.speech/unixlib.h
@@ -30,10 +30,26 @@
 
 #include "wine/unixlib.h"
 
+typedef UINT64 speech_recognizer_handle;
+
+struct speech_create_recognizer_params
+{
+    speech_recognizer_handle handle;
+    CHAR locale[LOCALE_NAME_MAX_LENGTH];
+    FLOAT sample_rate;
+};
+
+struct speech_release_recognizer_params
+{
+    speech_recognizer_handle handle;
+};
+
 enum unix_funcs
 {
     unix_process_attach,
     unix_process_detach,
+    unix_speech_create_recognizer,
+    unix_speech_release_recognizer,
 };
 
 #endif

From d6306d3d62260cb5ded246b74f710ef28b0e9f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 6 Mar 2023 23:51:31 +0100
Subject: [PATCH 135/389] windows.media.speech: Move unix side recognizer
 creation to recognizer_CompileConstraintsAsync().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 76 ++++++++++++++------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index 7f45605d23a..77fb38455f7 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -735,17 +735,55 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec
     return E_NOTIMPL;
 }
 
+static HRESULT recognizer_create_unix_instance( struct session *session )
+{
+    struct speech_create_recognizer_params create_params = { 0 };
+    WCHAR locale[LOCALE_NAME_MAX_LENGTH];
+    NTSTATUS status;
+    INT len;
+
+    if (!(len = GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH)))
+        return E_FAIL;
+
+    if (CharLowerBuffW(locale, len) != len)
+        return E_FAIL;
+
+    if (!WideCharToMultiByte(CP_ACP, 0, locale, len, create_params.locale, ARRAY_SIZE(create_params.locale), NULL, NULL))
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    create_params.sample_rate = (FLOAT)session->capture_wfx.nSamplesPerSec;
+
+    if ((status = WINE_UNIX_CALL(unix_speech_create_recognizer, &create_params)))
+    {
+        ERR("Unable to create Vosk instance for locale %s, status %#lx. Speech recognition won't work.\n", debugstr_a(create_params.locale), status);
+        return SPERR_WINRT_INTERNAL_ERROR;
+    }
+
+    session->unix_handle = create_params.handle;
+
+    return S_OK;
+}
+
 static HRESULT recognizer_compile_constraints_async( IInspectable *invoker, IInspectable **result )
 {
-    return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result);
+    struct recognizer *impl = impl_from_ISpeechRecognizer((ISpeechRecognizer *)invoker);
+    struct session *session = impl_from_ISpeechContinuousRecognitionSession(impl->session);
+    HRESULT hr;
+
+    if (FAILED(hr = recognizer_create_unix_instance(session)))
+    {
+        WARN("Failed to created recognizer instance.\n");
+        return compilation_result_create(SpeechRecognitionResultStatus_GrammarCompilationFailure, (ISpeechRecognitionCompilationResult **) result);
+    }
+    else return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result);
 }
 
 static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *iface,
                                                           IAsyncOperation_SpeechRecognitionCompilationResult **operation )
 {
     IAsyncOperation_IInspectable **value = (IAsyncOperation_IInspectable **)operation;
-    FIXME("iface %p, operation %p semi-stub!\n", iface, operation);
-    return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, NULL, recognizer_compile_constraints_async, value);
+    TRACE("iface %p, operation %p semi-stub!\n", iface, operation);
+    return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, (IInspectable *)iface, recognizer_compile_constraints_async, value);
 }
 
 static HRESULT WINAPI recognizer_RecognizeAsync( ISpeechRecognizer *iface,
@@ -1090,35 +1128,6 @@ static HRESULT recognizer_factory_create_audio_capture(struct session *session)
     return hr;
 }
 
-static HRESULT recognizer_factory_create_unix_instance( struct session *session )
-{
-    struct speech_create_recognizer_params create_params = { 0 };
-    WCHAR locale[LOCALE_NAME_MAX_LENGTH];
-    NTSTATUS status;
-    INT len;
-
-    if (!(len = GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH)))
-        return E_FAIL;
-
-    if (CharLowerBuffW(locale, len) != len)
-        return E_FAIL;
-
-    if (!WideCharToMultiByte(CP_ACP, 0, locale, len, create_params.locale, ARRAY_SIZE(create_params.locale), NULL, NULL))
-        return HRESULT_FROM_WIN32(GetLastError());
-
-    create_params.sample_rate = (FLOAT)session->capture_wfx.nSamplesPerSec;
-
-    if ((status = WINE_UNIX_CALL(unix_speech_create_recognizer, &create_params)))
-    {
-        ERR("Unable to create Vosk instance for locale %s, status %#lx. Speech recognition won't work.\n", debugstr_a(create_params.locale), status);
-        return SPERR_WINRT_INTERNAL_ERROR;
-    }
-
-    session->unix_handle = create_params.handle;
-
-    return S_OK;
-}
-
 static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface, ILanguage *language, ISpeechRecognizer **speechrecognizer )
 {
     struct recognizer *impl;
@@ -1165,9 +1174,6 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface
     if (FAILED(hr = recognizer_factory_create_audio_capture(session)))
         goto error;
 
-    if (FAILED(hr = recognizer_factory_create_unix_instance(session)))
-        goto error;
-
     InitializeCriticalSection(&session->cs);
     session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": recognition_session.cs");
 

From b500dc2aef3ef90f5f180988fa977e6a8b67d686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 27 Feb 2023 13:22:00 +0100
Subject: [PATCH 136/389] windows.media.speech: Implement recognition in the
 unixlib.

CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 35 +++++++++++-
 dlls/windows.media.speech/unixlib.c    | 79 ++++++++++++++++++++++++++
 dlls/windows.media.speech/unixlib.h    | 26 ++++++++-
 3 files changed, 138 insertions(+), 2 deletions(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index 77fb38455f7..ea3b1b1859a 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -196,10 +196,13 @@ static DWORD CALLBACK session_worker_thread_cb( void *args )
 {
     ISpeechContinuousRecognitionSession *iface = args;
     struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface);
+    struct speech_get_recognition_result_params recognition_result_params;
+    struct speech_recognize_audio_params recognize_audio_params;
     BOOLEAN running = TRUE, paused = FALSE;
     UINT32 frame_count, tmp_buf_size;
     BYTE *audio_buf, *tmp_buf = NULL;
     DWORD flags, status;
+    NTSTATUS nt_status;
     HANDLE events[2];
     HRESULT hr;
 
@@ -269,7 +272,37 @@ static DWORD CALLBACK session_worker_thread_cb( void *args )
                 IAudioCaptureClient_ReleaseBuffer(impl->capture_client, frames_available);
             }
 
-            /* TODO: Send mic data to recognizer and handle results. */
+            recognize_audio_params.handle = impl->unix_handle;
+            recognize_audio_params.samples = tmp_buf;
+            recognize_audio_params.samples_size = tmp_buf_offset;
+            recognize_audio_params.status = RECOGNITION_STATUS_EXCEPTION;
+
+            if (NT_ERROR(nt_status = WINE_UNIX_CALL(unix_speech_recognize_audio, &recognize_audio_params)))
+                WARN("unix_speech_recognize_audio failed with status %#lx.\n", nt_status);
+
+            if (recognize_audio_params.status != RECOGNITION_STATUS_RESULT_AVAILABLE)
+                continue;
+
+            recognition_result_params.handle = impl->unix_handle;
+            recognition_result_params.result_buf = NULL;
+            recognition_result_params.result_buf_size = 512;
+
+            do
+            {
+                recognition_result_params.result_buf = realloc(recognition_result_params.result_buf, recognition_result_params.result_buf_size);
+            }
+            while (WINE_UNIX_CALL(unix_speech_get_recognition_result, &recognition_result_params) == STATUS_BUFFER_TOO_SMALL &&
+                   recognition_result_params.result_buf);
+
+            if (!recognition_result_params.result_buf)
+            {
+                WARN("memory allocation failed.\n");
+                break;
+            }
+
+            /* TODO: Compare recognized text to available options. */
+
+            free(recognition_result_params.result_buf);
         }
         else
         {
diff --git a/dlls/windows.media.speech/unixlib.c b/dlls/windows.media.speech/unixlib.c
index 155780a3e4b..c41bb4cc445 100644
--- a/dlls/windows.media.speech/unixlib.c
+++ b/dlls/windows.media.speech/unixlib.c
@@ -59,6 +59,9 @@ MAKE_FUNCPTR(vosk_model_new);
 MAKE_FUNCPTR(vosk_model_free);
 MAKE_FUNCPTR(vosk_recognizer_new);
 MAKE_FUNCPTR(vosk_recognizer_free);
+MAKE_FUNCPTR(vosk_recognizer_accept_waveform);
+MAKE_FUNCPTR(vosk_recognizer_final_result);
+MAKE_FUNCPTR(vosk_recognizer_reset);
 #undef MAKE_FUNCPTR
 
 static NTSTATUS process_attach( void *args )
@@ -80,6 +83,9 @@ static NTSTATUS process_attach( void *args )
     LOAD_FUNCPTR(vosk_model_free)
     LOAD_FUNCPTR(vosk_recognizer_new)
     LOAD_FUNCPTR(vosk_recognizer_free)
+    LOAD_FUNCPTR(vosk_recognizer_accept_waveform)
+    LOAD_FUNCPTR(vosk_recognizer_final_result)
+    LOAD_FUNCPTR(vosk_recognizer_reset)
 #undef LOAD_FUNCPTR
 
     return STATUS_SUCCESS;
@@ -258,6 +264,73 @@ static NTSTATUS speech_release_recognizer( void *args )
     return STATUS_SUCCESS;
 }
 
+static NTSTATUS speech_recognize_audio( void *args )
+{
+    struct speech_recognize_audio_params *params = args;
+    VoskRecognizer *recognizer = vosk_recognizer_from_handle(params->handle);
+
+    if (!vosk_handle)
+        return STATUS_NOT_SUPPORTED;
+
+    if (!recognizer)
+        return STATUS_UNSUCCESSFUL;
+
+    params->status = p_vosk_recognizer_accept_waveform(recognizer, (const char *)params->samples, params->samples_size);
+
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS speech_get_recognition_result( void* args )
+{
+    struct speech_get_recognition_result_params *params = args;
+    VoskRecognizer *recognizer = vosk_recognizer_from_handle(params->handle);
+    static const char *result_json_start = "{\n  \"text\" : \"";
+    const size_t json_start_len = strlen(result_json_start);
+    static size_t last_result_len = 0;
+    static char *last_result = NULL;
+    const char *tmp = NULL;
+
+    TRACE("args %p.\n", args);
+
+    if (!vosk_handle)
+        return STATUS_NOT_SUPPORTED;
+
+    if (!recognizer)
+        return STATUS_UNSUCCESSFUL;
+
+    if (!last_result)
+    {
+        if ((tmp = p_vosk_recognizer_final_result(recognizer)))
+        {
+            last_result = strdup(tmp);
+            tmp = last_result;
+
+            /* Operations to remove the JSON wrapper "{\n  \"text\" : \"some recognized text\"\n}" -> "some recognized text\0" */
+            memmove(last_result, last_result + json_start_len, strlen(last_result) - json_start_len + 1);
+            last_result = strrchr(last_result, '\"');
+            last_result[0] = '\0';
+
+            last_result = (char *)tmp;
+            last_result_len = strlen(last_result);
+            TRACE("last_result %s.\n", debugstr_a(last_result));
+        }
+        else return STATUS_NOT_FOUND;
+    }
+    else if (params->result_buf_size >= last_result_len + 1)
+    {
+        memcpy(params->result_buf, last_result, last_result_len + 1);
+        p_vosk_recognizer_reset(recognizer);
+
+        free (last_result);
+        last_result = NULL;
+
+        return STATUS_SUCCESS;
+    }
+
+    params->result_buf_size = last_result_len + 1;
+    return STATUS_BUFFER_TOO_SMALL;
+}
+
 #else /* SONAME_LIBVOSK */
 
 #define MAKE_UNSUPPORTED_FUNC( f ) \
@@ -271,6 +344,8 @@ MAKE_UNSUPPORTED_FUNC(process_attach)
 MAKE_UNSUPPORTED_FUNC(process_detach)
 MAKE_UNSUPPORTED_FUNC(speech_create_recognizer)
 MAKE_UNSUPPORTED_FUNC(speech_release_recognizer)
+MAKE_UNSUPPORTED_FUNC(speech_recognize_audio)
+MAKE_UNSUPPORTED_FUNC(speech_get_recognition_result)
 #undef MAKE_UNSUPPORTED_FUNC
 
 #endif /* SONAME_LIBVOSK */
@@ -281,6 +356,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     process_detach,
     speech_create_recognizer,
     speech_release_recognizer,
+    speech_recognize_audio,
+    speech_get_recognition_result,
 };
 
 const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
@@ -289,4 +366,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     process_detach,
     speech_create_recognizer,
     speech_release_recognizer,
+    speech_recognize_audio,
+    speech_get_recognition_result,
 };
diff --git a/dlls/windows.media.speech/unixlib.h b/dlls/windows.media.speech/unixlib.h
index 974e8d5f797..a07d76705d5 100644
--- a/dlls/windows.media.speech/unixlib.h
+++ b/dlls/windows.media.speech/unixlib.h
@@ -44,12 +44,36 @@ struct speech_release_recognizer_params
     speech_recognizer_handle handle;
 };
 
-enum unix_funcs
+enum speech_recognition_status
+{
+    RECOGNITION_STATUS_CONTINUING,
+    RECOGNITION_STATUS_RESULT_AVAILABLE,
+    RECOGNITION_STATUS_EXCEPTION,
+};
+
+struct speech_recognize_audio_params
+{
+    speech_recognizer_handle handle;
+    const BYTE *samples;
+    UINT32 samples_size;
+    enum speech_recognition_status status;
+};
+
+struct speech_get_recognition_result_params
+{
+    speech_recognizer_handle handle;
+    char *result_buf;
+    UINT32 result_buf_size;
+};
+
+enum vosk_funcs
 {
     unix_process_attach,
     unix_process_detach,
     unix_speech_create_recognizer,
     unix_speech_release_recognizer,
+    unix_speech_recognize_audio,
+    unix_speech_get_recognition_result,
 };
 
 #endif

From 615562d27331dc683983fe744b5c0fe03265ab85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Wed, 25 May 2022 14:14:18 +0200
Subject: [PATCH 137/389] windows.media.speech: Compare recognized words with
 available constraints.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 115 ++++++++++++++++++++++++-
 1 file changed, 114 insertions(+), 1 deletion(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index ea3b1b1859a..3d6d85336ef 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -192,18 +192,105 @@ static inline struct session *impl_from_ISpeechContinuousRecognitionSession( ISp
     return CONTAINING_RECORD(iface, struct session, ISpeechContinuousRecognitionSession_iface);
 }
 
+static HRESULT session_find_constraint_by_string(struct session *session, WCHAR *str, HSTRING *hstr_out, ISpeechRecognitionConstraint **out)
+{
+    ISpeechRecognitionListConstraint *list_constraint;
+    IIterable_IInspectable *constraints_iterable;
+    IIterator_IInspectable *constraints_iterator;
+    ISpeechRecognitionConstraint *constraint;
+    IIterable_HSTRING *commands_iterable;
+    IIterator_HSTRING *commands_iterator;
+    BOOLEAN has_constraint, has_command;
+    IVector_HSTRING *commands;
+    const WCHAR *command_str;
+    HSTRING command;
+    HRESULT hr;
+
+    TRACE("session %p, str %s, out %p.\n", session, debugstr_w(str), out);
+
+    if (FAILED(hr = IVector_ISpeechRecognitionConstraint_QueryInterface(session->constraints, &IID_IIterable_ISpeechRecognitionConstraint, (void **)&constraints_iterable)))
+        return hr;
+
+    if (FAILED(hr = IIterable_IInspectable_First(constraints_iterable, &constraints_iterator)))
+    {
+        IIterable_IInspectable_Release(constraints_iterable);
+        return hr;
+    }
+
+    *out = NULL;
+
+    for (hr = IIterator_IInspectable_get_HasCurrent(constraints_iterator, &has_constraint); SUCCEEDED(hr) && has_constraint && !(*out); hr = IIterator_IInspectable_MoveNext(constraints_iterator, &has_constraint))
+    {
+        list_constraint = NULL;
+        commands_iterable = NULL;
+        commands_iterator = NULL;
+        commands = NULL;
+
+        if (FAILED(IIterator_IInspectable_get_Current(constraints_iterator, (IInspectable **)&constraint)))
+            goto skip;
+
+        if (FAILED(ISpeechRecognitionConstraint_QueryInterface(constraint, &IID_ISpeechRecognitionListConstraint, (void**)&list_constraint)))
+            goto skip;
+
+        if (FAILED(ISpeechRecognitionListConstraint_get_Commands(list_constraint, &commands)))
+            goto skip;
+
+        if (FAILED(IVector_HSTRING_QueryInterface(commands, &IID_IIterable_HSTRING, (void **)&commands_iterable)))
+            goto skip;
+
+        if (FAILED(IIterable_HSTRING_First(commands_iterable, &commands_iterator)))
+            goto skip;
+
+        for (hr = IIterator_HSTRING_get_HasCurrent(commands_iterator, &has_command); SUCCEEDED(hr) && has_command && !(*out); hr = IIterator_HSTRING_MoveNext(commands_iterator, &has_command))
+        {
+            if (FAILED(IIterator_HSTRING_get_Current(commands_iterator, &command)))
+                continue;
+
+            command_str = WindowsGetStringRawBuffer(command, NULL);
+
+            TRACE("Comparing str %s to command_str %s.\n", debugstr_w(str), debugstr_w(command_str));
+
+            if (!wcsicmp(str, command_str))
+            {
+                TRACE("constraint %p has str %s.\n", constraint, debugstr_w(str));
+                ISpeechRecognitionConstraint_AddRef((*out = constraint));
+                WindowsDuplicateString(command, hstr_out);
+            }
+
+            WindowsDeleteString(command);
+        }
+
+skip:
+        if (commands_iterator) IIterator_HSTRING_Release(commands_iterator);
+        if (commands_iterable) IIterable_HSTRING_Release(commands_iterable);
+        if (commands) IVector_HSTRING_Release(commands);
+
+        if (list_constraint) ISpeechRecognitionListConstraint_Release(list_constraint);
+        if (constraint) ISpeechRecognitionConstraint_Release(constraint);
+    }
+
+    IIterator_IInspectable_Release(constraints_iterator);
+    IIterable_IInspectable_Release(constraints_iterable);
+
+    hr = (*out) ? S_OK : COR_E_KEYNOTFOUND;
+    return hr;
+}
+
 static DWORD CALLBACK session_worker_thread_cb( void *args )
 {
     ISpeechContinuousRecognitionSession *iface = args;
     struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface);
     struct speech_get_recognition_result_params recognition_result_params;
     struct speech_recognize_audio_params recognize_audio_params;
+    ISpeechRecognitionConstraint *constraint;
     BOOLEAN running = TRUE, paused = FALSE;
     UINT32 frame_count, tmp_buf_size;
     BYTE *audio_buf, *tmp_buf = NULL;
+    WCHAR *recognized_text;
     DWORD flags, status;
     NTSTATUS nt_status;
     HANDLE events[2];
+    HSTRING hstring;
     HRESULT hr;
 
     SetThreadDescription(GetCurrentThread(), L"wine_speech_recognition_session_worker");
@@ -253,6 +340,7 @@ static DWORD CALLBACK session_worker_thread_cb( void *args )
         {
             SIZE_T packet_size = 0, tmp_buf_offset = 0;
             UINT32 frames_available = 0;
+            INT recognized_text_len = 0;
 
             while (tmp_buf_offset < tmp_buf_size
                    && IAudioCaptureClient_GetBuffer(impl->capture_client, &audio_buf, &frames_available, &flags, NULL, NULL) == S_OK)
@@ -300,8 +388,33 @@ static DWORD CALLBACK session_worker_thread_cb( void *args )
                 break;
             }
 
-            /* TODO: Compare recognized text to available options. */
+            /* Silence was recognized. */
+            if (!strcmp(recognition_result_params.result_buf, ""))
+            {
+                free(recognition_result_params.result_buf);
+                continue;
+            }
+
+            recognized_text_len = MultiByteToWideChar(CP_UTF8, 0, recognition_result_params.result_buf, -1, NULL, 0);
+
+            if (!(recognized_text = malloc(recognized_text_len * sizeof(WCHAR))))
+            {
+                free(recognition_result_params.result_buf);
+                WARN("memory allocation failed.\n");
+                break;
+            }
+
+            MultiByteToWideChar(CP_UTF8, 0, recognition_result_params.result_buf, -1, recognized_text, recognized_text_len);
+
+            if (SUCCEEDED(hr = session_find_constraint_by_string(impl, recognized_text, &hstring, &constraint)))
+            {
+                /* TODO: Send event. */
+
+                WindowsDeleteString(hstring);
+                ISpeechRecognitionConstraint_Release(constraint);
+            }
 
+            free(recognized_text);
             free(recognition_result_params.result_buf);
         }
         else

From 402a6ebd47b8d6a4d76a24cbc79de26a913afdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 30 May 2022 18:36:51 +0200
Subject: [PATCH 138/389] windows.media.speech: Send event on recognition
 success.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 368 ++++++++++++++++++++++++-
 1 file changed, 367 insertions(+), 1 deletion(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index 3d6d85336ef..7721764f351 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -30,6 +30,363 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(speech);
 
+struct recognition_result
+{
+    ISpeechRecognitionResult ISpeechRecognitionResult_iface;
+    ISpeechRecognitionResult2 ISpeechRecognitionResult2_iface;
+    LONG ref;
+
+    ISpeechRecognitionConstraint *constraint;
+    HSTRING text;
+};
+
+static inline struct recognition_result *impl_from_ISpeechRecognitionResult( ISpeechRecognitionResult *iface )
+{
+    return CONTAINING_RECORD(iface, struct recognition_result, ISpeechRecognitionResult_iface);
+}
+
+static HRESULT WINAPI recognition_result_QueryInterface( ISpeechRecognitionResult *iface, REFIID iid, void **out )
+{
+    struct recognition_result *impl = impl_from_ISpeechRecognitionResult(iface);
+
+    TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+    if (IsEqualGUID(iid, &IID_IUnknown) ||
+        IsEqualGUID(iid, &IID_IInspectable) ||
+        IsEqualGUID(iid, &IID_IAgileObject) ||
+        IsEqualGUID(iid, &IID_ISpeechRecognitionResult))
+    {
+        IInspectable_AddRef((*out = &impl->ISpeechRecognitionResult_iface));
+        return S_OK;
+    }
+
+    if (IsEqualGUID(iid, &IID_ISpeechRecognitionResult2))
+    {
+        IInspectable_AddRef((*out = &impl->ISpeechRecognitionResult2_iface));
+        return S_OK;
+    }
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+    *out = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI recognition_result_AddRef( ISpeechRecognitionResult *iface )
+{
+    struct recognition_result *impl = impl_from_ISpeechRecognitionResult(iface);
+    ULONG ref = InterlockedIncrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+    return ref;
+}
+
+static ULONG WINAPI recognition_result_Release( ISpeechRecognitionResult *iface )
+{
+    struct recognition_result *impl = impl_from_ISpeechRecognitionResult(iface);
+
+    ULONG ref = InterlockedDecrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+
+    if(!ref)
+    {
+        ISpeechRecognitionConstraint_Release(impl->constraint);
+        WindowsDeleteString(impl->text);
+        free(impl);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI recognition_result_GetIids( ISpeechRecognitionResult *iface, ULONG *iid_count, IID **iids )
+{
+    FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_GetRuntimeClassName( ISpeechRecognitionResult *iface, HSTRING *class_name )
+{
+    FIXME("iface %p, class_name %p stub!\n", iface, class_name);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_GetTrustLevel( ISpeechRecognitionResult *iface, TrustLevel *trust_level )
+{
+    FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_get_Status( ISpeechRecognitionResult *iface, SpeechRecognitionResultStatus *value )
+{
+    FIXME("iface %p, operation %p stub!\n", iface, value);
+    *value = SpeechRecognitionResultStatus_Success;
+    return S_OK;
+}
+
+static HRESULT WINAPI recognition_result_get_Text( ISpeechRecognitionResult *iface, HSTRING *value )
+{
+    struct recognition_result *impl = impl_from_ISpeechRecognitionResult(iface);
+    TRACE("iface %p, operation %p, text: %s.\n", iface, value, debugstr_hstring(impl->text));
+    return WindowsDuplicateString(impl->text, value);
+}
+
+static HRESULT WINAPI recognition_result_get_Confidence( ISpeechRecognitionResult *iface, SpeechRecognitionConfidence *value )
+{
+    FIXME("iface %p, operation %p semi stub!\n", iface, value);
+    *value = SpeechRecognitionConfidence_High;
+    return S_OK;
+}
+
+static HRESULT WINAPI recognition_result_get_SemanticInterpretation( ISpeechRecognitionResult *iface,
+                                                                     ISpeechRecognitionSemanticInterpretation **value )
+{
+    FIXME("iface %p, operation %p stub!\n", iface, value);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_GetAlternates( ISpeechRecognitionResult *iface,
+                                                        UINT32 max_amount,
+                                                        IVectorView_SpeechRecognitionResult **results )
+{
+    IVector_IInspectable *vector;
+    struct vector_iids constraints_iids =
+    {
+        .iterable = &IID_IVectorView_SpeechRecognitionResult,
+        .iterator = &IID_IVectorView_SpeechRecognitionResult,
+        .vector = &IID_IVector_IInspectable,
+        .view = &IID_IVectorView_SpeechRecognitionResult,
+    };
+
+    FIXME("iface %p, max_amount %u, results %p stub!\n", iface, max_amount, results);
+
+    vector_inspectable_create(&constraints_iids, (IVector_IInspectable **)&vector);
+    IVector_IInspectable_GetView(vector, (IVectorView_IInspectable **)results);
+    IVector_IInspectable_Release(vector);
+    return S_OK;
+}
+
+static HRESULT WINAPI recognition_result_get_Constraint( ISpeechRecognitionResult *iface, ISpeechRecognitionConstraint **value )
+{
+    struct recognition_result *impl = impl_from_ISpeechRecognitionResult(iface);
+    TRACE("iface %p, operation %p.\n", iface, value);
+    ISpeechRecognitionConstraint_AddRef((*value = impl->constraint));
+    return S_OK;
+}
+
+static HRESULT WINAPI recognition_result_get_RulePath( ISpeechRecognitionResult *iface, IVectorView_HSTRING **value )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_get_RawConfidence( ISpeechRecognitionResult *iface, DOUBLE *value )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+static const struct ISpeechRecognitionResultVtbl recognition_result_vtbl =
+{
+    /* IUnknown methods */
+    recognition_result_QueryInterface,
+    recognition_result_AddRef,
+    recognition_result_Release,
+    /* IInspectable methods */
+    recognition_result_GetIids,
+    recognition_result_GetRuntimeClassName,
+    recognition_result_GetTrustLevel,
+    /* ISpeechRecognitionResult methods */
+    recognition_result_get_Status,
+    recognition_result_get_Text,
+    recognition_result_get_Confidence,
+    recognition_result_get_SemanticInterpretation,
+    recognition_result_GetAlternates,
+    recognition_result_get_Constraint,
+    recognition_result_get_RulePath,
+    recognition_result_get_RawConfidence
+};
+
+DEFINE_IINSPECTABLE(recognition_result2, ISpeechRecognitionResult2, struct recognition_result, ISpeechRecognitionResult_iface)
+
+static HRESULT WINAPI recognition_result2_get_PhraseStartTime( ISpeechRecognitionResult2 *iface, DateTime *value )
+{
+    DateTime dt = { .UniversalTime = 0 };
+    FIXME("iface %p, value %p stub!\n", iface, value);
+    *value = dt;
+    return S_OK;
+}
+
+
+static HRESULT WINAPI recognition_result2_get_PhraseDuration( ISpeechRecognitionResult2 *iface, TimeSpan *value )
+{
+    TimeSpan ts = { .Duration = 50000000LL }; /* Use 5 seconds as stub value. */
+    FIXME("iface %p, value %p stub!\n", iface, value);
+    *value = ts;
+    return S_OK;
+}
+
+static const struct ISpeechRecognitionResult2Vtbl recognition_result2_vtbl =
+{
+    /* IUnknown methods */
+    recognition_result2_QueryInterface,
+    recognition_result2_AddRef,
+    recognition_result2_Release,
+    /* IInspectable methods */
+    recognition_result2_GetIids,
+    recognition_result2_GetRuntimeClassName,
+    recognition_result2_GetTrustLevel,
+    /* ISpeechRecognitionResult2 methods */
+    recognition_result2_get_PhraseStartTime,
+    recognition_result2_get_PhraseDuration
+};
+
+static HRESULT WINAPI recognition_result_create( ISpeechRecognitionConstraint *constraint,
+                                                 HSTRING result_text,
+                                                 ISpeechRecognitionResult **out )
+{
+    struct recognition_result *impl;
+
+    TRACE("out %p.\n", out);
+
+    if (!(impl = calloc(1, sizeof(*impl))))
+    {
+        *out = NULL;
+        return E_OUTOFMEMORY;
+    }
+
+    impl->ISpeechRecognitionResult_iface.lpVtbl = &recognition_result_vtbl;
+    impl->ISpeechRecognitionResult2_iface.lpVtbl = &recognition_result2_vtbl;
+    impl->ref = 1;
+
+    if (constraint) ISpeechRecognitionConstraint_AddRef((impl->constraint = constraint));
+    WindowsDuplicateString(result_text, &impl->text);
+
+    *out = &impl->ISpeechRecognitionResult_iface;
+
+    TRACE("created %p.\n", *out);
+
+    return S_OK;
+}
+
+struct recognition_result_event_args
+{
+    ISpeechContinuousRecognitionResultGeneratedEventArgs ISpeechContinuousRecognitionResultGeneratedEventArgs_iface;
+    LONG ref;
+
+    ISpeechRecognitionResult *result;
+};
+
+static inline struct recognition_result_event_args *impl_from_ISpeechContinuousRecognitionResultGeneratedEventArgs( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface )
+{
+    return CONTAINING_RECORD(iface, struct recognition_result_event_args, ISpeechContinuousRecognitionResultGeneratedEventArgs_iface);
+}
+
+static HRESULT WINAPI recognition_result_event_args_QueryInterface( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface, REFIID iid, void **out )
+{
+    struct recognition_result_event_args *impl = impl_from_ISpeechContinuousRecognitionResultGeneratedEventArgs(iface);
+
+    TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+    if (IsEqualGUID(iid, &IID_IUnknown) ||
+        IsEqualGUID(iid, &IID_IInspectable) ||
+        IsEqualGUID(iid, &IID_IAgileObject) ||
+        IsEqualGUID(iid, &IID_ISpeechContinuousRecognitionResultGeneratedEventArgs))
+    {
+        IInspectable_AddRef((*out = &impl->ISpeechContinuousRecognitionResultGeneratedEventArgs_iface));
+        return S_OK;
+    }
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+    *out = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI recognition_result_event_args_AddRef( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface )
+{
+    struct recognition_result_event_args *impl = impl_from_ISpeechContinuousRecognitionResultGeneratedEventArgs(iface);
+    ULONG ref = InterlockedIncrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+    return ref;
+}
+
+static ULONG WINAPI recognition_result_event_args_Release( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface )
+{
+    struct recognition_result_event_args *impl = impl_from_ISpeechContinuousRecognitionResultGeneratedEventArgs(iface);
+
+    ULONG ref = InterlockedDecrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+
+    if (!ref)
+    {
+        if (impl->result) ISpeechRecognitionResult_Release(impl->result);
+        free(impl);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI recognition_result_event_args_GetIids( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface, ULONG *iid_count, IID **iids )
+{
+    FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_event_args_GetRuntimeClassName( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface, HSTRING *class_name )
+{
+    FIXME("iface %p, class_name %p stub!\n", iface, class_name);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_event_args_GetTrustLevel( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface, TrustLevel *trust_level )
+{
+    FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI recognition_result_event_args_get_Result( ISpeechContinuousRecognitionResultGeneratedEventArgs *iface,
+                                                                ISpeechRecognitionResult **value )
+{
+    struct recognition_result_event_args *impl = impl_from_ISpeechContinuousRecognitionResultGeneratedEventArgs(iface);
+    FIXME("iface %p value %p stub!\n", iface, value);
+    ISpeechRecognitionResult_AddRef((*value = impl->result));
+    return S_OK;
+}
+
+static const struct ISpeechContinuousRecognitionResultGeneratedEventArgsVtbl recognition_result_event_args_vtbl =
+{
+    /* IUnknown methods */
+    recognition_result_event_args_QueryInterface,
+    recognition_result_event_args_AddRef,
+    recognition_result_event_args_Release,
+    /* IInspectable methods */
+    recognition_result_event_args_GetIids,
+    recognition_result_event_args_GetRuntimeClassName,
+    recognition_result_event_args_GetTrustLevel,
+    /* ISpeechContinuousRecognitionResultGeneratedEventArgs methods */
+    recognition_result_event_args_get_Result
+};
+
+static HRESULT WINAPI recognition_result_event_args_create( ISpeechRecognitionResult *result,
+                                                            ISpeechContinuousRecognitionResultGeneratedEventArgs **out )
+{
+    struct recognition_result_event_args *impl;
+
+    TRACE("out %p.\n", out);
+
+    if (!(impl = calloc(1, sizeof(*impl))))
+    {
+        *out = NULL;
+        return E_OUTOFMEMORY;
+    }
+
+    impl->ISpeechContinuousRecognitionResultGeneratedEventArgs_iface.lpVtbl = &recognition_result_event_args_vtbl;
+    impl->ref = 1;
+    if (result) ISpeechRecognitionResult_AddRef((impl->result = result));
+
+    *out = &impl->ISpeechContinuousRecognitionResultGeneratedEventArgs_iface;
+
+    TRACE("created %p.\n", *out);
+    return S_OK;
+}
+
 /*
  *
  * ISpeechRecognitionCompilationResult
@@ -282,7 +639,9 @@ static DWORD CALLBACK session_worker_thread_cb( void *args )
     struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface);
     struct speech_get_recognition_result_params recognition_result_params;
     struct speech_recognize_audio_params recognize_audio_params;
+    ISpeechContinuousRecognitionResultGeneratedEventArgs *event_args;
     ISpeechRecognitionConstraint *constraint;
+    ISpeechRecognitionResult *result;
     BOOLEAN running = TRUE, paused = FALSE;
     UINT32 frame_count, tmp_buf_size;
     BYTE *audio_buf, *tmp_buf = NULL;
@@ -408,8 +767,15 @@ static DWORD CALLBACK session_worker_thread_cb( void *args )
 
             if (SUCCEEDED(hr = session_find_constraint_by_string(impl, recognized_text, &hstring, &constraint)))
             {
-                /* TODO: Send event. */
+                recognition_result_create(constraint, hstring, &result);
+                recognition_result_event_args_create(result, &event_args);
+
+                typed_event_handlers_notify(&impl->result_handlers,
+                                            (IInspectable *)&impl->ISpeechContinuousRecognitionSession_iface,
+                                            (IInspectable *)event_args);
 
+                ISpeechContinuousRecognitionResultGeneratedEventArgs_Release(event_args);
+                ISpeechRecognitionResult_Release(result);
                 WindowsDeleteString(hstring);
                 ISpeechRecognitionConstraint_Release(constraint);
             }

From 03cb57504cb46a2517276d6c464f59837a8a573f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 30 May 2022 18:37:41 +0200
Subject: [PATCH 139/389] windows.media.speech: Add
 ISpeechRecognitionSemanticInterpretation stub.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 112 ++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 1 deletion(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index 7721764f351..af66a783e78 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -30,6 +30,116 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(speech);
 
+struct semantic_interpretation
+{
+    ISpeechRecognitionSemanticInterpretation ISpeechRecognitionSemanticInterpretation_iface;
+    LONG ref;
+};
+
+static inline struct semantic_interpretation *impl_from_ISpeechRecognitionSemanticInterpretation( ISpeechRecognitionSemanticInterpretation *iface )
+{
+    return CONTAINING_RECORD(iface, struct semantic_interpretation, ISpeechRecognitionSemanticInterpretation_iface);
+}
+
+HRESULT WINAPI semantic_interpretation_QueryInterface( ISpeechRecognitionSemanticInterpretation *iface, REFIID iid, void **out )
+{
+    struct semantic_interpretation *impl = impl_from_ISpeechRecognitionSemanticInterpretation(iface);
+
+    TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+    if (IsEqualGUID(iid, &IID_IUnknown) ||
+        IsEqualGUID(iid, &IID_IInspectable) ||
+        IsEqualGUID(iid, &IID_ISpeechRecognitionSemanticInterpretation))
+    {
+        IInspectable_AddRef((*out = &impl->ISpeechRecognitionSemanticInterpretation_iface));
+        return S_OK;
+    }
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+    *out = NULL;
+    return E_NOINTERFACE;
+}
+
+ULONG WINAPI semantic_interpretation_AddRef( ISpeechRecognitionSemanticInterpretation *iface )
+{
+    struct semantic_interpretation *impl = impl_from_ISpeechRecognitionSemanticInterpretation(iface);
+    ULONG ref = InterlockedIncrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+    return ref;
+}
+
+ULONG WINAPI semantic_interpretation_Release( ISpeechRecognitionSemanticInterpretation *iface )
+{
+    struct semantic_interpretation *impl = impl_from_ISpeechRecognitionSemanticInterpretation(iface);
+
+    ULONG ref = InterlockedDecrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+
+    if(!ref)
+        free(impl);
+
+    return ref;
+}
+
+HRESULT WINAPI semantic_interpretation_GetIids( ISpeechRecognitionSemanticInterpretation *iface, ULONG *iid_count, IID **iids )
+{
+    FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI semantic_interpretation_GetRuntimeClassName( ISpeechRecognitionSemanticInterpretation *iface, HSTRING *class_name )
+{
+    FIXME("iface %p, class_name %p stub!\n", iface, class_name);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI semantic_interpretation_GetTrustLevel( ISpeechRecognitionSemanticInterpretation *iface, TrustLevel *trust_level )
+{
+    FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI semantic_interpretation_get_Properties( ISpeechRecognitionSemanticInterpretation *iface, IMapView_HSTRING_IVectorView_HSTRING **value )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+static const struct ISpeechRecognitionSemanticInterpretationVtbl semantic_interpretation_vtbl =
+{
+    /* IUnknown methods */
+    semantic_interpretation_QueryInterface,
+    semantic_interpretation_AddRef,
+    semantic_interpretation_Release,
+    /* IInspectable methods */
+    semantic_interpretation_GetIids,
+    semantic_interpretation_GetRuntimeClassName,
+    semantic_interpretation_GetTrustLevel,
+    /* ISpeechRecognitionSemanticInterpretation methods */
+    semantic_interpretation_get_Properties
+};
+
+
+static HRESULT semantic_interpretation_create( ISpeechRecognitionSemanticInterpretation **out )
+{
+    struct semantic_interpretation *impl;
+
+    TRACE("out %p.\n", out);
+
+    if (!(impl = calloc(1, sizeof(*impl))))
+    {
+        *out = NULL;
+        return E_OUTOFMEMORY;
+    }
+
+    impl->ISpeechRecognitionSemanticInterpretation_iface.lpVtbl = &semantic_interpretation_vtbl;
+    impl->ref = 1;
+
+    *out = &impl->ISpeechRecognitionSemanticInterpretation_iface;
+    TRACE("created %p\n", *out);
+    return S_OK;
+}
+
 struct recognition_result
 {
     ISpeechRecognitionResult ISpeechRecognitionResult_iface;
@@ -139,7 +249,7 @@ static HRESULT WINAPI recognition_result_get_SemanticInterpretation( ISpeechReco
                                                                      ISpeechRecognitionSemanticInterpretation **value )
 {
     FIXME("iface %p, operation %p stub!\n", iface, value);
-    return E_NOTIMPL;
+    return semantic_interpretation_create(value);
 }
 
 static HRESULT WINAPI recognition_result_GetAlternates( ISpeechRecognitionResult *iface,

From fea0e6d4bfc37611a26eb97957e605f9f55d3d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 20 Feb 2024 09:40:32 +0100
Subject: [PATCH 140/389] HACK: windows.media.speech: Stub
 semantic_interpretation_get_Properties.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 134 ++++++++++++++++++++++++-
 1 file changed, 133 insertions(+), 1 deletion(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index af66a783e78..b35fa692d2f 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -30,6 +30,138 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(speech);
 
+struct map_view_hstring_vector_view_hstring
+{
+    IMapView_HSTRING_IVectorView_HSTRING IMapView_HSTRING_IVectorView_HSTRING_iface;
+    LONG ref;
+};
+
+static inline struct map_view_hstring_vector_view_hstring *impl_from_IMapView_HSTRING_IVectorView_HSTRING( IMapView_HSTRING_IVectorView_HSTRING *iface )
+{
+    return CONTAINING_RECORD(iface, struct map_view_hstring_vector_view_hstring, IMapView_HSTRING_IVectorView_HSTRING_iface);
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_QueryInterface( IMapView_HSTRING_IVectorView_HSTRING *iface, REFIID iid, void **out )
+{
+    struct map_view_hstring_vector_view_hstring *impl = impl_from_IMapView_HSTRING_IVectorView_HSTRING(iface);
+
+    TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+    if (IsEqualGUID(iid, &IID_IUnknown) ||
+        IsEqualGUID(iid, &IID_IInspectable) ||
+        IsEqualGUID(iid, &IID_IMapView_HSTRING_IVectorView_HSTRING))
+    {
+        IInspectable_AddRef((*out = &impl->IMapView_HSTRING_IVectorView_HSTRING_iface));
+        return S_OK;
+    }
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+    *out = NULL;
+    return E_NOINTERFACE;
+}
+
+ULONG WINAPI map_view_hstring_vector_view_hstring_AddRef( IMapView_HSTRING_IVectorView_HSTRING *iface )
+{
+    struct map_view_hstring_vector_view_hstring *impl = impl_from_IMapView_HSTRING_IVectorView_HSTRING(iface);
+    ULONG ref = InterlockedIncrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+    return ref;
+}
+
+ULONG WINAPI map_view_hstring_vector_view_hstring_Release( IMapView_HSTRING_IVectorView_HSTRING *iface )
+{
+    struct map_view_hstring_vector_view_hstring *impl = impl_from_IMapView_HSTRING_IVectorView_HSTRING(iface);
+
+    ULONG ref = InterlockedDecrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+
+    if(!ref)
+        free(impl);
+
+    return ref;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_GetIids( IMapView_HSTRING_IVectorView_HSTRING *iface, ULONG *iidCount, IID **iids )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_GetRuntimeClassName( IMapView_HSTRING_IVectorView_HSTRING *iface, HSTRING *className )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_GetTrustLevel( IMapView_HSTRING_IVectorView_HSTRING *iface, TrustLevel *trustLevel )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_Lookup( IMapView_HSTRING_IVectorView_HSTRING *iface, HSTRING key, IVectorView_HSTRING **value )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_get_Size( IMapView_HSTRING_IVectorView_HSTRING *iface, unsigned int *size )
+{
+    FIXME("iface %p stub!\n", iface);
+    *size = 0;
+    return S_OK;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_HasKey( IMapView_HSTRING_IVectorView_HSTRING *iface, HSTRING key, boolean *found )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI map_view_hstring_vector_view_hstring_Split( IMapView_HSTRING_IVectorView_HSTRING *iface, IMapView_HSTRING_IVectorView_HSTRING **first, IMapView_HSTRING_IVectorView_HSTRING **second )
+{
+    FIXME("iface %p stub!\n", iface);
+    return E_NOTIMPL;
+}
+
+static const struct IMapView_HSTRING_IVectorView_HSTRINGVtbl map_view_hstring_vector_view_hstring_vtbl =
+{
+    /* IUnknown methods */
+    map_view_hstring_vector_view_hstring_QueryInterface,
+    map_view_hstring_vector_view_hstring_AddRef,
+    map_view_hstring_vector_view_hstring_Release,
+    /* IInspectable methods */
+    map_view_hstring_vector_view_hstring_GetIids,
+    map_view_hstring_vector_view_hstring_GetRuntimeClassName,
+    map_view_hstring_vector_view_hstring_GetTrustLevel,
+    /* IMapView<HSTRING,IVectorView<HSTRING >* > methods */
+    map_view_hstring_vector_view_hstring_Lookup,
+    map_view_hstring_vector_view_hstring_get_Size,
+    map_view_hstring_vector_view_hstring_HasKey,
+    map_view_hstring_vector_view_hstring_Split
+};
+
+
+static HRESULT map_view_hstring_vector_view_hstring_create( IMapView_HSTRING_IVectorView_HSTRING **out )
+{
+    struct map_view_hstring_vector_view_hstring *impl;
+
+    TRACE("out %p.\n", out);
+
+    if (!(impl = calloc(1, sizeof(*impl))))
+    {
+        *out = NULL;
+        return E_OUTOFMEMORY;
+    }
+
+    impl->IMapView_HSTRING_IVectorView_HSTRING_iface.lpVtbl = &map_view_hstring_vector_view_hstring_vtbl;
+    impl->ref = 1;
+
+    *out = &impl->IMapView_HSTRING_IVectorView_HSTRING_iface;
+    TRACE("created %p\n", *out);
+    return S_OK;
+}
+
 struct semantic_interpretation
 {
     ISpeechRecognitionSemanticInterpretation ISpeechRecognitionSemanticInterpretation_iface;
@@ -102,7 +234,7 @@ HRESULT WINAPI semantic_interpretation_GetTrustLevel( ISpeechRecognitionSemantic
 HRESULT WINAPI semantic_interpretation_get_Properties( ISpeechRecognitionSemanticInterpretation *iface, IMapView_HSTRING_IVectorView_HSTRING **value )
 {
     FIXME("iface %p stub!\n", iface);
-    return E_NOTIMPL;
+    return map_view_hstring_vector_view_hstring_create(value);
 }
 
 static const struct ISpeechRecognitionSemanticInterpretationVtbl semantic_interpretation_vtbl =

From 8d38a0bf8106f9e7c8558f883d037b335bbda906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Tue, 28 Feb 2023 16:11:36 +0100
Subject: [PATCH 141/389] WIP: windows.media.speech: Implement grammar.

CW-Bug-Id: #20134
---
 dlls/windows.media.speech/recognizer.c | 106 ++++++++++++++++++++++++-
 dlls/windows.media.speech/unixlib.c    |  61 +++++++++++++-
 dlls/windows.media.speech/unixlib.h    |   2 +
 3 files changed, 164 insertions(+), 5 deletions(-)

diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c
index b35fa692d2f..c898ea7723f 100644
--- a/dlls/windows.media.speech/recognizer.c
+++ b/dlls/windows.media.speech/recognizer.c
@@ -1489,7 +1489,7 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec
     return E_NOTIMPL;
 }
 
-static HRESULT recognizer_create_unix_instance( struct session *session )
+static HRESULT recognizer_create_unix_instance( struct session *session, const char **grammar, UINT32 grammar_size )
 {
     struct speech_create_recognizer_params create_params = { 0 };
     WCHAR locale[LOCALE_NAME_MAX_LENGTH];
@@ -1506,6 +1506,8 @@ static HRESULT recognizer_create_unix_instance( struct session *session )
         return HRESULT_FROM_WIN32(GetLastError());
 
     create_params.sample_rate = (FLOAT)session->capture_wfx.nSamplesPerSec;
+    create_params.grammar = grammar;
+    create_params.grammar_size = grammar_size;
 
     if ((status = WINE_UNIX_CALL(unix_speech_create_recognizer, &create_params)))
     {
@@ -1522,11 +1524,109 @@ static HRESULT recognizer_compile_constraints_async( IInspectable *invoker, IIns
 {
     struct recognizer *impl = impl_from_ISpeechRecognizer((ISpeechRecognizer *)invoker);
     struct session *session = impl_from_ISpeechContinuousRecognitionSession(impl->session);
+    struct speech_release_recognizer_params release_params;
+    ISpeechRecognitionListConstraint *list_constraint;
+    IIterable_IInspectable *constraints_iterable;
+    IIterator_IInspectable *constraints_iterator;
+    ISpeechRecognitionConstraint *constraint;
+    IIterable_HSTRING *commands_iterable;
+    IIterator_HSTRING *commands_iterator;
+    BOOLEAN has_constraint, has_command;
+    IVector_HSTRING *commands;
+    const WCHAR *command_str;
+    UINT32 grammar_size = 0, i = 0;
+    char **grammar = NULL;
+    HSTRING command;
+    UINT32 size = 0;
     HRESULT hr;
 
-    if (FAILED(hr = recognizer_create_unix_instance(session)))
+    if (FAILED(hr = IVector_ISpeechRecognitionConstraint_QueryInterface(session->constraints, &IID_IIterable_ISpeechRecognitionConstraint, (void **)&constraints_iterable)))
+        return hr;
+
+    if (FAILED(hr = IIterable_IInspectable_First(constraints_iterable, &constraints_iterator)))
+    {
+        IIterable_IInspectable_Release(constraints_iterable);
+        return hr;
+    }
+
+    for (hr = IIterator_IInspectable_get_HasCurrent(constraints_iterator, &has_constraint); SUCCEEDED(hr) && has_constraint; hr = IIterator_IInspectable_MoveNext(constraints_iterator, &has_constraint))
+    {
+        list_constraint = NULL;
+        commands_iterable = NULL;
+        commands_iterator = NULL;
+        commands = NULL;
+
+        if (FAILED(IIterator_IInspectable_get_Current(constraints_iterator, (IInspectable **)&constraint)))
+            goto skip;
+
+        if (FAILED(ISpeechRecognitionConstraint_QueryInterface(constraint, &IID_ISpeechRecognitionListConstraint, (void**)&list_constraint)))
+            goto skip;
+
+        if (FAILED(ISpeechRecognitionListConstraint_get_Commands(list_constraint, &commands)))
+            goto skip;
+
+        if (FAILED(IVector_HSTRING_QueryInterface(commands, &IID_IIterable_HSTRING, (void **)&commands_iterable)))
+            goto skip;
+
+        if (FAILED(IIterable_HSTRING_First(commands_iterable, &commands_iterator)))
+            goto skip;
+
+        if (FAILED(IVector_HSTRING_get_Size(commands, &size)))
+            goto skip;
+
+        grammar_size += size;
+        grammar = realloc(grammar, grammar_size * sizeof(char *));
+
+        for (hr = IIterator_HSTRING_get_HasCurrent(commands_iterator, &has_command); SUCCEEDED(hr) && has_command; hr = IIterator_HSTRING_MoveNext(commands_iterator, &has_command))
+        {
+            if (FAILED(IIterator_HSTRING_get_Current(commands_iterator, &command)))
+                continue;
+
+            command_str = WindowsGetStringRawBuffer(command, NULL);
+
+            if (command_str)
+            {
+                WCHAR *wstr = wcsdup(command_str);
+                size_t len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, grammar[i], 0, NULL, NULL);
+                grammar[i] = malloc(len * sizeof(char));
+
+                CharLowerW(wstr);
+                WideCharToMultiByte(CP_UTF8, 0, wstr, -1, grammar[i], len, NULL, NULL);
+                free(wstr);
+                i++;
+            }
+
+            WindowsDeleteString(command);
+        }
+
+skip:
+        if (commands_iterator) IIterator_HSTRING_Release(commands_iterator);
+        if (commands_iterable) IIterable_HSTRING_Release(commands_iterable);
+        if (commands) IVector_HSTRING_Release(commands);
+
+        if (list_constraint) ISpeechRecognitionListConstraint_Release(list_constraint);
+        if (constraint) ISpeechRecognitionConstraint_Release(constraint);
+    }
+
+    IIterator_IInspectable_Release(constraints_iterator);
+    IIterable_IInspectable_Release(constraints_iterable);
+
+    if (session->unix_handle)
+    {
+        release_params.handle = session->unix_handle;
+        WINE_UNIX_CALL(unix_speech_release_recognizer, &release_params);
+        session->unix_handle = 0;
+    }
+
+    hr = recognizer_create_unix_instance(session, (const char **)grammar, grammar_size);
+
+    for(i = 0; i < grammar_size; ++i)
+        free(grammar[i]);
+    free(grammar);
+
+    if (FAILED(hr))
     {
-        WARN("Failed to created recognizer instance.\n");
+        WARN("Failed to created recognizer instance with grammar.\n");
         return compilation_result_create(SpeechRecognitionResultStatus_GrammarCompilationFailure, (ISpeechRecognitionCompilationResult **) result);
     }
     else return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result);
diff --git a/dlls/windows.media.speech/unixlib.c b/dlls/windows.media.speech/unixlib.c
index c41bb4cc445..d8f59b99b76 100644
--- a/dlls/windows.media.speech/unixlib.c
+++ b/dlls/windows.media.speech/unixlib.c
@@ -58,6 +58,7 @@ static void *vosk_handle;
 MAKE_FUNCPTR(vosk_model_new);
 MAKE_FUNCPTR(vosk_model_free);
 MAKE_FUNCPTR(vosk_recognizer_new);
+MAKE_FUNCPTR(vosk_recognizer_new_grm);
 MAKE_FUNCPTR(vosk_recognizer_free);
 MAKE_FUNCPTR(vosk_recognizer_accept_waveform);
 MAKE_FUNCPTR(vosk_recognizer_final_result);
@@ -80,6 +81,8 @@ static NTSTATUS process_attach( void *args )
         goto error; \
     }
     LOAD_FUNCPTR(vosk_model_new)
+    LOAD_FUNCPTR(vosk_recognizer_new)
+    LOAD_FUNCPTR(vosk_recognizer_new_grm)
     LOAD_FUNCPTR(vosk_model_free)
     LOAD_FUNCPTR(vosk_recognizer_new)
     LOAD_FUNCPTR(vosk_recognizer_free)
@@ -225,12 +228,58 @@ static NTSTATUS find_model_by_locale( const char *locale, VoskModel **model )
     return status;
 }
 
+static NTSTATUS grammar_to_json_array(const char **grammar, UINT32 grammar_size, const char **array)
+{
+    size_t buf_size = strlen("[]") + 1, len;
+    char *buf;
+    UINT32 i;
+
+    for (i = 0; i < grammar_size; ++i)
+    {
+        buf_size += strlen(grammar[i]) + 4; /* (4) - two double quotes, a comma and a space */
+    }
+
+    if (!(buf = malloc(buf_size)))
+        return STATUS_NO_MEMORY;
+
+    *array = buf;
+
+    *buf = '[';
+    buf++;
+
+    for (i = 0; i < grammar_size; ++i)
+    {
+        *buf = '\"';
+        buf++;
+        len = strlen(grammar[i]);
+        memcpy(buf, grammar[i], len);
+        buf += len;
+        *buf = '\"';
+        buf++;
+        if (i < (grammar_size - 1))
+        {
+            *buf = ',';
+            buf++;
+            *buf = ' ';
+            buf++;
+        }
+    }
+
+    *buf = ']';
+    buf++;
+    *buf = '\0';
+
+    TRACE("created json array %s.\n", debugstr_a(*array));
+    return STATUS_SUCCESS;
+}
+
 static NTSTATUS speech_create_recognizer( void *args )
 {
     struct speech_create_recognizer_params *params = args;
     VoskRecognizer *recognizer = NULL;
     VoskModel *model = NULL;
     NTSTATUS status = STATUS_SUCCESS;
+    const char *grammar_json;
 
     TRACE("args %p.\n", args);
 
@@ -240,8 +289,16 @@ static NTSTATUS speech_create_recognizer( void *args )
     if ((status = find_model_by_locale(params->locale, &model)))
         return status;
 
-    if (!(recognizer = p_vosk_recognizer_new(model, params->sample_rate)))
-        status = STATUS_UNSUCCESSFUL;
+    if (params->grammar && grammar_to_json_array(params->grammar, params->grammar_size, &grammar_json) == STATUS_SUCCESS)
+    {
+        if (!(recognizer = p_vosk_recognizer_new_grm(model, params->sample_rate, grammar_json)))
+                status = STATUS_UNSUCCESSFUL;
+    }
+    else
+    {
+        if (!(recognizer = p_vosk_recognizer_new(model, params->sample_rate)))
+                status = STATUS_UNSUCCESSFUL;
+    }
 
     /* VoskModel is reference-counted.  A VoskRecognizer keeps a reference to its model. */
     p_vosk_model_free(model);
diff --git a/dlls/windows.media.speech/unixlib.h b/dlls/windows.media.speech/unixlib.h
index a07d76705d5..ad2fab738b9 100644
--- a/dlls/windows.media.speech/unixlib.h
+++ b/dlls/windows.media.speech/unixlib.h
@@ -37,6 +37,8 @@ struct speech_create_recognizer_params
     speech_recognizer_handle handle;
     CHAR locale[LOCALE_NAME_MAX_LENGTH];
     FLOAT sample_rate;
+    const char **grammar;
+    unsigned int grammar_size;
 };
 
 struct speech_release_recognizer_params

From 50754d3f3d30de5c61d551a5815e792ec7992218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Tue, 28 Feb 2023 22:06:23 +0100
Subject: [PATCH 142/389] HACK: windows.media.speech/tests: Add tests for
 manual recognition testing.

Speak during the delay, to test the code.

CW-Bug-Id: #20134
---
 dlls/windows.media.speech/tests/speech.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c
index 743955ab9bd..a6c7d56e1e1 100644
--- a/dlls/windows.media.speech/tests/speech.c
+++ b/dlls/windows.media.speech/tests/speech.c
@@ -202,7 +202,23 @@ HRESULT WINAPI recognition_result_handler_Invoke( IHandler_RecognitionResult *if
                                                   ISpeechContinuousRecognitionSession *sender,
                                                   ISpeechContinuousRecognitionResultGeneratedEventArgs *args )
 {
-    trace("iface %p, sender %p, args %p.\n", iface, sender, args);
+    ISpeechRecognitionResult *result;
+    HSTRING hstring;
+    HRESULT hr;
+
+    if (!args) return S_OK;
+
+    hr = ISpeechContinuousRecognitionResultGeneratedEventArgs_get_Result(args, &result);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+    hr = ISpeechRecognitionResult_get_Text(result, &hstring);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+    trace("iface %p, sender %p, args %p, text %s.\n", iface, sender, args, debugstr_w(WindowsGetStringRawBuffer(hstring, NULL)));
+
+    WindowsDeleteString(hstring);
+    ISpeechRecognitionResult_Release(result);
+
     return S_OK;
 }
 
@@ -1702,7 +1718,7 @@ static void test_Recognition(void)
     static const WCHAR *list_constraint_name = L"Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint";
     static const WCHAR *recognizer_name = L"Windows.Media.SpeechRecognition.SpeechRecognizer";
     static const WCHAR *speech_constraint_tag = L"test_message";
-    static const WCHAR *speech_constraints[] = { L"This is a test.", L"Number 5!", L"What time is it?" };
+    static const WCHAR *speech_constraints[] = { L"This is a test", L"Number 5", L"What time is it" };
     ISpeechRecognitionListConstraintFactory *listconstraint_factory = NULL;
     IAsyncOperation_SpeechRecognitionCompilationResult *operation = NULL;
     IVector_ISpeechRecognitionConstraint *constraints = NULL;
@@ -1865,6 +1881,8 @@ static void test_Recognition(void)
     ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr);
     ok(recog_state == SpeechRecognizerState_Capturing || broken(recog_state == SpeechRecognizerState_Idle), "recog_state was %u.\n", recog_state);
 
+
+    Sleep(10000);
     /*
      * TODO: Use a loopback device together with prerecorded audio files to test the recognizer's functionality.
      */

From 00f6b2f3746e6a9a08184a1af12ad31c5dbe46cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Tue, 7 Mar 2023 15:31:08 +0100
Subject: [PATCH 143/389] HACK: windows.media.speech: Load Vosk models from
 Phasmophobia.

CW-Bug-Id: #20134
---
 dlls/windows.media.speech/unixlib.c | 67 +++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/dlls/windows.media.speech/unixlib.c b/dlls/windows.media.speech/unixlib.c
index d8f59b99b76..33f16e652e8 100644
--- a/dlls/windows.media.speech/unixlib.c
+++ b/dlls/windows.media.speech/unixlib.c
@@ -119,13 +119,55 @@ static inline VoskRecognizer *vosk_recognizer_from_handle( speech_recognizer_han
     return (VoskRecognizer *)(UINT_PTR)handle;
 }
 
+static const char* map_lang_to_phasmophobia_dir(const char* lang, size_t len)
+{
+    if (!strncmp(lang, "ar", len))
+        return "Arabic";
+    if (!strncmp(lang, "ca", len))
+        return "Catalan";
+    if (!strncmp(lang, "zn", len))
+        return "Chinese";
+    if (!strncmp(lang, "cs", len))
+        return "Czech";
+    if (!strncmp(lang, "nl", len))
+        return "Dutch";
+    if (!strncmp(lang, "en", len))
+        return "English";
+    if (!strncmp(lang, "fr", len))
+        return "French";
+    if (!strncmp(lang, "de", len))
+        return "German";
+    if (!strncmp(lang, "de", len))
+        return "German";
+    if (!strncmp(lang, "el", len))
+        return "Greek";
+    if (!strncmp(lang, "it", len))
+        return "Italian";
+    if (!strncmp(lang, "ja", len))
+        return "Japanese";
+    if (!strncmp(lang, "pt", len))
+        return "Portuguese";
+    if (!strncmp(lang, "ru", len))
+        return "Russian";
+    if (!strncmp(lang, "es", len))
+        return "Spanish";
+    if (!strncmp(lang, "sw", len))
+        return "Swedish";
+    if (!strncmp(lang, "tr", len))
+        return "Turkish";
+    if (!strncmp(lang, "uk", len))
+        return "Ukrainian";
+
+    return "";
+}
+
 static NTSTATUS find_model_by_locale_and_path( const char *path, const char *locale, VoskModel **model )
 {
     static const char *vosk_model_identifier_small = "vosk-model-small-";
     static const char *vosk_model_identifier = "vosk-model-";
     size_t ident_small_len = strlen(vosk_model_identifier_small);
     size_t ident_len = strlen(vosk_model_identifier);
-    char *ent_name, *model_path, *best_match, *delim;
+    char *ent_name, *model_path, *best_match, *delim, *appid = getenv("SteamAppId"), *str = NULL;
     NTSTATUS status = STATUS_UNSUCCESSFUL;
     struct dirent *dirent;
     size_t path_len, len;
@@ -152,7 +194,7 @@ static NTSTATUS find_model_by_locale_and_path( const char *path, const char *loc
             ent_name += ident_small_len;
         else if (!strncmp(ent_name, vosk_model_identifier, ident_len))
             ent_name += ident_len;
-        else
+        else if (strcmp(appid, "739630") != 0)
             continue;
 
         /*
@@ -168,6 +210,12 @@ static NTSTATUS find_model_by_locale_and_path( const char *path, const char *loc
 
         if (!best_match && !strncmp(ent_name, locale, delim - locale))
             best_match = strdup(dirent->d_name);
+
+        if (!best_match && !strcmp(appid, "739630"))
+        {
+            if ((str = (char *)map_lang_to_phasmophobia_dir(locale, delim - locale)))
+                best_match = strdup(str);
+        }
     }
 
     closedir(dir);
@@ -198,7 +246,7 @@ static NTSTATUS find_model_by_locale_and_path( const char *path, const char *loc
 static NTSTATUS find_model_by_locale( const char *locale, VoskModel **model )
 {
     const char *suffix = NULL;
-    char *env, *path = NULL;
+    char *env, *path = NULL, *appid = getenv("SteamAppId");
     NTSTATUS status;
 
     TRACE("locale %s, model %p.\n", debugstr_a(locale), model);
@@ -225,6 +273,19 @@ static NTSTATUS find_model_by_locale( const char *locale, VoskModel **model )
     status = find_model_by_locale_and_path(path, locale, model);
     free(path);
 
+    /* Hack to load Vosk models from Phasmophobia, so they don't need to be downloaded separately.*/
+    if (status && appid && !strcmp(appid, "739630") && (env = getenv("PWD")))
+    {
+        suffix = "/Phasmophobia_Data/StreamingAssets/LanguageModels";
+
+        if (!(path = malloc(strlen(env) + strlen(suffix) + 1)))
+            return STATUS_NO_MEMORY;
+
+        sprintf(path, "%s%s", env, suffix);
+        status = find_model_by_locale_and_path(path, locale, model);
+        free(path);
+    }
+
     return status;
 }
 

From 93c632281640dc516bfee6092498c55f760df26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Tue, 7 Mar 2023 16:36:36 +0100
Subject: [PATCH 144/389] windows.media.speech: Suppress verbose Unixlib
 traces.

CW-Bug-Id: #20134
---
 dlls/windows.media.speech/unixlib.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dlls/windows.media.speech/unixlib.c b/dlls/windows.media.speech/unixlib.c
index 33f16e652e8..55e48a550ff 100644
--- a/dlls/windows.media.speech/unixlib.c
+++ b/dlls/windows.media.speech/unixlib.c
@@ -330,7 +330,6 @@ static NTSTATUS grammar_to_json_array(const char **grammar, UINT32 grammar_size,
     buf++;
     *buf = '\0';
 
-    TRACE("created json array %s.\n", debugstr_a(*array));
     return STATUS_SUCCESS;
 }
 
@@ -408,8 +407,6 @@ static NTSTATUS speech_get_recognition_result( void* args )
     static char *last_result = NULL;
     const char *tmp = NULL;
 
-    TRACE("args %p.\n", args);
-
     if (!vosk_handle)
         return STATUS_NOT_SUPPORTED;
 
@@ -430,7 +427,6 @@ static NTSTATUS speech_get_recognition_result( void* args )
 
             last_result = (char *)tmp;
             last_result_len = strlen(last_result);
-            TRACE("last_result %s.\n", debugstr_a(last_result));
         }
         else return STATUS_NOT_FOUND;
     }

From 27e322103ca311a3d05cf4f5caab70636da8c15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 7 Dec 2023 11:49:06 +0100
Subject: [PATCH 145/389] winegstreamer: Register more VIDEO_EFFECT DMO
 classes.

CW-Bug-Id: #20427
---
 dlls/winegstreamer/mfplat.c | 33 +++++++++++++++++++++++++++++++++
 include/wmcodecdsp.idl      | 15 +++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index a4cf2dfcd99..0e77afde3d3 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -444,6 +444,39 @@ HRESULT mfplat_DllRegisterServer(void)
             ARRAY_SIZE(resampler_types),
             resampler_types,
         },
+        {
+            CLSID_CFrameRateConvertDmo,
+            MFT_CATEGORY_VIDEO_EFFECT,
+            L"Frame Rate Converter",
+            MFT_ENUM_FLAG_SYNCMFT,
+            /* FIXME: check the actual media types */
+            ARRAY_SIZE(color_convert_input_types),
+            color_convert_input_types,
+            ARRAY_SIZE(color_convert_output_types),
+            color_convert_output_types,
+        },
+        {
+            CLSID_CResizerDMO,
+            MFT_CATEGORY_VIDEO_EFFECT,
+            L"Resizer MFT",
+            MFT_ENUM_FLAG_SYNCMFT,
+            /* FIXME: check the actual media types */
+            ARRAY_SIZE(color_convert_input_types),
+            color_convert_input_types,
+            ARRAY_SIZE(color_convert_output_types),
+            color_convert_output_types,
+        },
+        {
+            CLSID_CColorControlDmo,
+            MFT_CATEGORY_VIDEO_EFFECT,
+            L"Color Control",
+            MFT_ENUM_FLAG_SYNCMFT,
+            /* FIXME: check the actual media types */
+            ARRAY_SIZE(color_convert_input_types),
+            color_convert_input_types,
+            ARRAY_SIZE(color_convert_output_types),
+            color_convert_output_types,
+        },
         {
             CLSID_CColorConvertDMO,
             MFT_CATEGORY_VIDEO_EFFECT,
diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl
index a6f350ea2fc..7e91015f19e 100644
--- a/include/wmcodecdsp.idl
+++ b/include/wmcodecdsp.idl
@@ -72,6 +72,21 @@ coclass CWMAEncMediaObject {}
 ]
 coclass AACMFTEncoder {}
 
+[
+    uuid(01f36ce2-0907-4d8b-979d-f151be91c883)
+]
+coclass CFrameRateConvertDmo {}
+
+[
+    uuid(1ea1ea14-48f4-4054-ad1a-e8aee10ac805)
+]
+coclass CResizerDMO {}
+
+[
+    uuid(798059f0-89ca-4160-b325-aeb48efe4f9a)
+]
+coclass CColorControlDmo {}
+
 [
     uuid(98230571-0087-4204-b020-3282538e57d3)
 ]

From a7657b93413d541d94bdeda45a699a9526d961ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 7 Dec 2023 11:49:49 +0100
Subject: [PATCH 146/389] HACK: winegstreamer: Register the video processor MFT
 as a decoder.

CW-Bug-Id: #20427
---
 dlls/winegstreamer/mfplat.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 0e77afde3d3..0c2e37abe8a 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -507,6 +507,19 @@ HRESULT mfplat_DllRegisterServer(void)
             ARRAY_SIZE(video_decoder_output_types),
             video_decoder_output_types,
         },
+        {
+            /* HACK: Register the video processor as a decoder too as
+             * the media source currently always decodes.
+             */
+            CLSID_VideoProcessorMFT,
+            MFT_CATEGORY_VIDEO_DECODER,
+            L"Null Decoder",
+            MFT_ENUM_FLAG_SYNCMFT,
+            ARRAY_SIZE(video_processor_input_types),
+            video_processor_input_types,
+            ARRAY_SIZE(video_processor_output_types),
+            video_processor_output_types,
+        },
     };
 
     unsigned int i;

From 460715d32235ae3b21be6888ea888f547d1a50e0 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 15 Feb 2024 12:41:28 -0600
Subject: [PATCH 147/389] powershell: Read input command from stdin.

CW-Bug-Id: #23416
---
 programs/powershell/main.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/programs/powershell/main.c b/programs/powershell/main.c
index eb9a64ff0ec..25a4d13d340 100644
--- a/programs/powershell/main.c
+++ b/programs/powershell/main.c
@@ -24,10 +24,25 @@ int __cdecl wmain(int argc, WCHAR *argv[])
 {
     int i;
 
-    WINE_FIXME("stub:");
+    WINE_FIXME("stub.\n");
     for (i = 0; i < argc; i++)
-        WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
-    WINE_FIXME("\n");
+    {
+        WINE_FIXME("argv[%d] %s\n", i, wine_dbgstr_w(argv[i]));
+        if (!wcsicmp(argv[i], L"-command") && i < argc - 1 && !wcscmp(argv[i + 1], L"-"))
+        {
+            char command[4096], *p;
 
+            ++i;
+            while (fgets(command, sizeof(command), stdin))
+            {
+                WINE_FIXME("command %s.\n", debugstr_a(command));
+                p = command;
+                while (*p && !isspace(*p)) ++p;
+                *p = 0;
+                if (!stricmp(command, "exit"))
+                    break;
+            }
+        }
+    }
     return 0;
 }

From 2f075843d6131f4def5fa350b3d7923a91edc913 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 30 Jan 2024 12:31:39 -0600
Subject: [PATCH 148/389] ntdll: HACK: Disable kernel write watches for BDO.

CW-Bug-Id: #23322
---
 dlls/ntdll/unix/loader.c       |  4 ++--
 dlls/ntdll/unix/unix_private.h |  2 +-
 dlls/ntdll/unix/virtual.c      | 15 +++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index b7d1f677203..8e70e882191 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -2278,7 +2278,7 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo
     main_envp = environ;
 
     init_paths( argv );
-    virtual_init();
+    virtual_init( argc, argv );
     init_environment();
 
 #ifdef __i386__
@@ -2525,7 +2525,7 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] )
     set_max_limit( RLIMIT_NICE );
 #endif
 
-    virtual_init();
+    virtual_init( argc, argv );
     init_environment();
 
 #ifdef __APPLE__
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index cf6b9ab0c53..57bf0cdfd05 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -245,7 +245,7 @@ extern NTSTATUS system_time_precise( void *args );
 extern void *steamclient_handle_fault( LPCVOID addr, DWORD err );
 extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags );
 extern void *anon_mmap_alloc( size_t size, int prot );
-extern void virtual_init(void);
+extern void virtual_init( int argc, char *argv[] );
 extern ULONG_PTR get_system_affinity_mask(void);
 extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 );
 extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size,
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index b3535c8a8df..ba2fe258ede 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -3398,17 +3398,25 @@ static void *alloc_virtual_heap( SIZE_T size )
     return anon_mmap_alloc( size, PROT_READ | PROT_WRITE );
 }
 
+static int disable_kernel_ww( int argc, char *argv[] )
+{
+    const char *env_var;
+
+    if ((env_var = getenv("WINE_DISABLE_KERNEL_WRITEWATCH"))) return !!atoi(env_var);
+    if (argc > 1 && argv && argv[1] && strstr( argv[1], "blackdesert64.exe" )) return 1;
+    return 0;
+}
+
 /***********************************************************************
  *           virtual_init
  */
-void virtual_init(void)
+void virtual_init( int argc, char *argv[] )
 {
     const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" );
     const char *preload = getenv( "WINEPRELOADRESERVE" );
     size_t size;
     int i;
     pthread_mutexattr_t attr;
-    const char *env_var;
 
     pthread_mutexattr_init( &attr );
     pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );
@@ -3422,8 +3430,7 @@ void virtual_init(void)
     host_addr_space_limit = address_space_limit;
 #endif
 
-    if (!((env_var = getenv("WINE_DISABLE_KERNEL_WRITEWATCH")) && atoi(env_var))
-            && (pagemap_reset_fd = open("/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC)) != -1)
+    if (!disable_kernel_ww( argc, argv ) && (pagemap_reset_fd = open("/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC)) != -1)
     {
         use_kernel_writewatch = TRUE;
         if ((pagemap_fd = open("/proc/self/pagemap", O_RDONLY | O_CLOEXEC)) == -1)

From 55717132d52e0d3e8fc70dcbebff977acbaf8591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= <besentv@gmail.com>
Date: Mon, 13 Mar 2023 21:28:03 +0100
Subject: [PATCH 149/389] mfmediaengine: Return S_OK in SetBalance().

---
 dlls/mfmediaengine/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index baa6e8540ff..3e05626f238 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -2588,7 +2588,7 @@ static HRESULT WINAPI media_engine_SetBalance(IMFMediaEngineEx *iface, double ba
 {
     FIXME("%p, %f stub.\n", iface, balance);
 
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static BOOL WINAPI media_engine_IsPlaybackRateSupported(IMFMediaEngineEx *iface, double rate)

From a4cf21c6f78639f60aa3af69de4cac9d0468f13f Mon Sep 17 00:00:00 2001
From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Date: Sat, 17 Feb 2024 22:11:43 +0900
Subject: [PATCH 150/389] ntdll: Don't leak objattr allocation in
 NtCreateSemaphore.

https://github.com/ValveSoftware/wine/pull/219
---
 dlls/ntdll/unix/sync.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index ed30388b026..dd08632e21c 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -272,7 +272,6 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
 
     *handle = 0;
     if (max <= 0 || initial < 0 || initial > max) return STATUS_INVALID_PARAMETER;
-    if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
 
     if (do_fsync())
         return fsync_create_semaphore( handle, access, attr, initial, max );
@@ -280,6 +279,8 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
     if (do_esync())
         return esync_create_semaphore( handle, access, attr, initial, max );
 
+    if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
+
     SERVER_START_REQ( create_semaphore )
     {
         req->access  = access;

From 1f5128360cf30378a8b13ef62fdc260d42d636a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 20 Feb 2024 11:52:03 +0100
Subject: [PATCH 151/389] fixup! winebus: Disable SDL2.30 new behavior for the
 SDL unix backend.

---
 dlls/winebus.sys/bus_sdl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 2e8fadb43d3..f37c2593f2b 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -115,7 +115,7 @@ MAKE_FUNCPTR(SDL_RegisterEvents);
 MAKE_FUNCPTR(SDL_PushEvent);
 MAKE_FUNCPTR(SDL_GetTicks);
 MAKE_FUNCPTR(SDL_LogSetPriority);
-MAKE_FUNCPTR(SDL_SetHint);
+MAKE_FUNCPTR(SDL_SetHintWithPriority);
 static int (*pSDL_JoystickRumble)(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms);
 static int (*pSDL_JoystickRumbleTriggers)(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms);
 static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick);
@@ -1197,7 +1197,7 @@ NTSTATUS sdl_bus_init(void *args)
     LOAD_FUNCPTR(SDL_PushEvent);
     LOAD_FUNCPTR(SDL_GetTicks);
     LOAD_FUNCPTR(SDL_LogSetPriority);
-    LOAD_FUNCPTR(SDL_SetHint);
+    LOAD_FUNCPTR(SDL_SetHintWithPriority);
 #undef LOAD_FUNCPTR
     pSDL_JoystickRumble = dlsym(sdl_handle, "SDL_JoystickRumble");
     pSDL_JoystickRumbleTriggers = dlsym(sdl_handle, "SDL_JoystickRumbleTriggers");
@@ -1209,7 +1209,7 @@ NTSTATUS sdl_bus_init(void *args)
 
     /* CW-Bug-Id: #23185: Disable SDL 2.30 new behavior, we need the steam virtual
      * controller name to figure which slot number it represents. */
-    pSDL_SetHint("SteamVirtualGamepadInfo", "");
+    pSDL_SetHintWithPriority("SteamVirtualGamepadInfo", "", SDL_HINT_OVERRIDE);
 
     if (pSDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0)
     {

From 63fafa548181dc474fdd5f6c0b925cb82e33cb9a Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 20 Feb 2024 16:03:44 -0600
Subject: [PATCH 152/389] winhttp: Mind read size when skipping async read in
 WinHttpReadData().

CW-Bug-Id: #21085
---
 dlls/winhttp/request.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 29b30fc2583..c75d6fd513f 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -3062,9 +3062,11 @@ static DWORD query_data_ready( struct request *request )
     return count;
 }
 
-static BOOL skip_async_queue( struct request *request, BOOL *wont_block )
+static BOOL skip_async_queue( struct request *request, BOOL *wont_block, DWORD to_read )
 {
-    *wont_block = end_of_read_data( request ) || query_data_ready( request );
+    if (!request->read_chunked)
+        to_read = min( to_read, request->content_length - request->content_read );
+    *wont_block = end_of_read_data( request ) || query_data_ready( request ) >= to_read;
     return request->hdr.recursion_count < 3 && *wont_block;
 }
 
@@ -3133,7 +3135,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
         return FALSE;
     }
 
-    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block ))
+    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block, 1 ))
     {
         ret = query_data_available( request, available, async );
     }
@@ -3229,7 +3231,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
         return FALSE;
     }
 
-    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block ))
+    if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block, to_read ))
     {
         ret = read_data( request, buffer, to_read, read, async );
     }

From 505f4dface671ca3a07ad7fc6eee818709a4b419 Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 20 Feb 2024 22:39:56 -0300
Subject: [PATCH 153/389] HACK: gdiplus: Add HDC parameter back to gdi+
 internal functions.

This reverts commit e8babc9c97f8d5d7ea41c52e10bd6a8e0a2aa976
(Replace HDC with GpGraphics in parameters.) without having
to revert the font linking implementation. This is due to
graphics->hdc member being NULL when the GpGraphics object
is created with GdipGetImageGraphicsContext, so we need to
be able to pass a temporal HDC object when graphics->hdc is null.
---
 dlls/gdiplus/gdiplus_private.h |  4 +--
 dlls/gdiplus/graphics.c        | 52 +++++++++++++++++-----------------
 dlls/gdiplus/graphicspath.c    |  8 +++---
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 2b5dbee43e9..95d19080ff1 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -620,13 +620,13 @@ struct gdip_font_link_info {
 };
 
 
-typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics,
+typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *sections,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data);
 
-GpStatus gdip_format_string(GpGraphics *graphics,
+GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data);
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 707fa55cfda..4b942bfaa09 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5163,7 +5163,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w
 }
 
 /* Populates gdip_font_link_info struct based on the base_font and input string */
-static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font,
+static void generate_font_link_info(GpGraphics *graphics, HDC hdc, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font,
                                     struct gdip_font_link_info *font_link_info)
 {
     IUnknown *unk;
@@ -5182,7 +5182,7 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l
     IUnknown_Release(unk);
 
     get_font_hfont(graphics, base_font, NULL, &hfont, NULL, NULL);
-    IMLangFontLink_GetFontCodePages(iMLFL, graphics->hdc, hfont, &font_codepages);
+    IMLangFontLink_GetFontCodePages(iMLFL, hdc, hfont, &font_codepages);
 
     while (progress < length)
     {
@@ -5197,10 +5197,10 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l
         }
         else
         {
-            IMLangFontLink_MapFont(iMLFL, graphics->hdc, string_codepages, hfont, &map_hfont);
-            old_font = SelectObject(graphics->hdc, map_hfont);
-            GdipCreateFontFromDC(graphics->hdc, &gpfont);
-            SelectObject(graphics->hdc, old_font);
+            IMLangFontLink_MapFont(iMLFL, hdc, string_codepages, hfont, &map_hfont);
+            old_font = SelectObject(hdc, map_hfont);
+            GdipCreateFontFromDC(hdc, &gpfont);
+            SelectObject(hdc, old_font);
             IMLangFontLink_ReleaseFont(iMLFL, map_hfont);
             section->font = gpfont;
         }
@@ -5214,7 +5214,7 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l
     IMLangFontLink_Release(iMLFL);
 }
 
-static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, LPCWSTR string,
+static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, HDC hdc, LPCWSTR string,
                                             INT index, int length, int max_ext, LPINT fit, SIZE *size)
 {
     DWORD to_measure_length;
@@ -5236,9 +5236,9 @@ static void font_link_get_text_extent_point(struct gdip_font_link_info *font_lin
         to_measure_length = min(length - (i - index), section->end - i);
 
         get_font_hfont(graphics, section->font, NULL, &hfont, NULL, NULL);
-        oldhfont = SelectObject(graphics->hdc, hfont);
-        GetTextExtentExPointW(graphics->hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
-        SelectObject(graphics->hdc, oldhfont);
+        oldhfont = SelectObject(hdc, hfont);
+        GetTextExtentExPointW(hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
+        SelectObject(hdc, oldhfont);
         DeleteObject(hfont);
 
         max_ext -= sizeaux.cx;
@@ -5266,7 +5266,7 @@ static void release_font_link_info(struct gdip_font_link_info *font_link_info)
     }
 }
 
-GpStatus gdip_format_string(GpGraphics *graphics,
+GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data)
@@ -5348,10 +5348,10 @@ GpStatus gdip_format_string(GpGraphics *graphics,
 
     halign = format->align;
 
-    generate_font_link_info(graphics, stringdup, length, font, &font_link_info);
+    generate_font_link_info(graphics, hdc, stringdup, length, font, &font_link_info);
 
     while(sum < length){
-        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size);
+        font_link_get_text_extent_point(&font_link_info, graphics, hdc, stringdup, sum, length - sum, nwidth, &fit, &size);
         fitcpy = fit;
 
         if(fit == 0)
@@ -5399,7 +5399,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
         else
             lineend = fit;
 
-        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size);
+        font_link_get_text_extent_point(&font_link_info, graphics, hdc, stringdup, sum, lineend, nwidth, &j, &size);
 
         bounds.Width = size.cx;
 
@@ -5432,7 +5432,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
             if (hotkeyprefix_offsets[hotkeyprefix_end_pos] >= sum + lineend)
                 break;
 
-        stat = callback(graphics, stringdup, sum, lineend,
+        stat = callback(graphics, hdc, stringdup, sum, lineend,
             &font_link_info, rect, format, lineno, &bounds,
             &hotkeyprefix_offsets[hotkeyprefix_pos],
             hotkeyprefix_end_pos-hotkeyprefix_pos, user_data);
@@ -5499,7 +5499,7 @@ struct measure_ranges_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_ranges_callback(GpGraphics *graphics,
+static GpStatus measure_ranges_callback(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT index, INT length,
     struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
@@ -5522,10 +5522,10 @@ static GpStatus measure_ranges_callback(GpGraphics *graphics,
             range_rect.Y = bounds->Y / args->rel_height;
             range_rect.Height = bounds->Height / args->rel_height;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_start - index, INT_MAX, NULL, &range_size);
+            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, range_start - index, INT_MAX, NULL, &range_size);
             range_rect.X = (bounds->X + range_size.cx) / args->rel_width;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_end - index, INT_MAX, NULL, &range_size);
+            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, range_end - index, INT_MAX, NULL, &range_size);
             range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X;
 
             stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion);
@@ -5602,7 +5602,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
 
     gdi_transform_acquire(graphics);
 
-    stat = gdip_format_string(graphics, string, length, font, &scaled_rect, stringFormat,
+    stat = gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, stringFormat,
         (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5623,7 +5623,7 @@ struct measure_string_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_string_callback(GpGraphics *graphics,
+static GpStatus measure_string_callback(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT index, INT length,
     struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
@@ -5726,7 +5726,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
 
     gdi_transform_acquire(graphics);
 
-    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE,
         measure_string_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5751,7 +5751,7 @@ struct draw_string_args {
     REAL x, y, rel_width, rel_height, ascent;
 };
 
-static GpStatus draw_string_callback(GpGraphics *graphics,
+static GpStatus draw_string_callback(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT index, INT length,
     struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
@@ -5775,7 +5775,7 @@ static GpStatus draw_string_callback(GpGraphics *graphics,
 
         to_draw_length = min(length - (i - index), section->end - i);
         TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == font_link_info->base_font ? "base font" : "map");
-        font_link_get_text_extent_point(font_link_info, graphics, string, i, to_draw_length, 0, NULL, &size);
+        font_link_get_text_extent_point(font_link_info, graphics, hdc, string, i, to_draw_length, 0, NULL, &size);
         stat = draw_driver_string(graphics, &string[i], to_draw_length,
             section->font, format, args->brush, &position,
             DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
@@ -5801,10 +5801,10 @@ static GpStatus draw_string_callback(GpGraphics *graphics,
             SIZE text_size;
             INT ofs = underlined_indexes[i] - index;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, ofs, INT_MAX, NULL, &text_size);
             start_x = text_size.cx / args->rel_width;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs+1, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, ofs+1, INT_MAX, NULL, &text_size);
             end_x = text_size.cx / args->rel_width;
 
             GdipFillRectangle(graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
@@ -5918,7 +5918,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
     GetTextMetricsW(hdc, &textmetric);
     args.ascent = textmetric.tmAscent / rel_height;
 
-    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE,
         draw_string_callback, &args);
 
     gdi_transform_release(graphics);
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 20e0787de16..0d1cfb2f9c5 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -949,7 +949,7 @@ struct format_string_args
     float ascent;
 };
 
-static GpStatus format_string_callback(GpGraphics *graphics,
+static GpStatus format_string_callback(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
@@ -975,7 +975,7 @@ static GpStatus format_string_callback(GpGraphics *graphics,
         TTPOLYGONHEADER *ph = NULL, *origph;
         char *start;
         DWORD len, ofs = 0;
-        len = GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
+        len = GetGlyphOutlineW(hdc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
         if (len == GDI_ERROR)
         {
             status = GenericError;
@@ -989,7 +989,7 @@ static GpStatus format_string_callback(GpGraphics *graphics,
             status = OutOfMemory;
             break;
         }
-        GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, len, start, &identity);
+        GetGlyphOutlineW(hdc, string[i], GGO_BEZIER, &gm, len, start, &identity);
 
         ofs = 0;
         while (ofs < len)
@@ -1117,7 +1117,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     args.maxY = 0;
     args.scale = emSize / native_height;
     args.ascent = textmetric.tmAscent * args.scale;
-    status = gdip_format_string(graphics, string, length, NULL, &scaled_layout_rect,
+    status = gdip_format_string(graphics, dc, string, length, NULL, &scaled_layout_rect,
                                 format, TRUE, format_string_callback, &args);
 
     DeleteDC(dc);

From 657b2f1cae99a7e593eea433a7f6282f3539a5b4 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Mon, 22 Jan 2024 16:35:45 -0500
Subject: [PATCH 154/389] sapi: Create a new engine only when needed in
 ISpVoice.

Instead of creating the TTS voice engine directly in SetVoice, we save
the specified voice token, and only create them in ISpVoice::Speak when
necessary.

(cherry picked from commit 2a56d4e6e9803183873aa84be29eab1f1ce8acc3)
---
 dlls/sapi/tts.c | 75 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 410a57b4bfc..c2e36fc274d 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -43,6 +43,7 @@ struct speech_voice
     LONG ref;
 
     ISpStreamFormat *output;
+    ISpObjectToken *engine_token;
     ISpTTSEngine *engine;
     LONG cur_stream_num;
     DWORD actions;
@@ -163,6 +164,7 @@ static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface)
     {
         async_cancel_queue(&This->queue);
         if (This->output) ISpStreamFormat_Release(This->output);
+        if (This->engine_token) ISpObjectToken_Release(This->engine_token);
         if (This->engine) ISpTTSEngine_Release(This->engine);
         DeleteCriticalSection(&This->cs);
 
@@ -660,7 +662,7 @@ static HRESULT WINAPI spvoice_Resume(ISpVoice *iface)
 static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token)
 {
     struct speech_voice *This = impl_from_ISpVoice(iface);
-    ISpTTSEngine *engine;
+    WCHAR *id = NULL, *old_id = NULL;
     HRESULT hr;
 
     TRACE("(%p, %p).\n", iface, token);
@@ -673,27 +675,37 @@ static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token)
     else
         ISpObjectToken_AddRef(token);
 
-    hr = ISpObjectToken_CreateInstance(token, NULL, CLSCTX_ALL, &IID_ISpTTSEngine, (void **)&engine);
-    ISpObjectToken_Release(token);
-    if (FAILED(hr))
-        return hr;
-
     EnterCriticalSection(&This->cs);
 
+    if (This->engine_token &&
+        SUCCEEDED(ISpObjectToken_GetId(token, &id)) &&
+        SUCCEEDED(ISpObjectToken_GetId(This->engine_token, &old_id)) &&
+        !wcscmp(id, old_id))
+    {
+        ISpObjectToken_Release(token);
+        goto done;
+    }
+
+    if (This->engine_token)
+        ISpObjectToken_Release(This->engine_token);
+    This->engine_token = token;
+
     if (This->engine)
+    {
         ISpTTSEngine_Release(This->engine);
-    This->engine = engine;
+        This->engine = NULL;
+    }
 
+done:
     LeaveCriticalSection(&This->cs);
-
+    CoTaskMemFree(id);
+    CoTaskMemFree(old_id);
     return S_OK;
 }
 
 static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token)
 {
     struct speech_voice *This = impl_from_ISpVoice(iface);
-    ISpObjectWithToken *engine_token_iface;
-    HRESULT hr;
 
     TRACE("(%p, %p).\n", iface, token);
 
@@ -702,21 +714,18 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token)
 
     EnterCriticalSection(&This->cs);
 
-    if (!This->engine)
+    if (!This->engine_token)
     {
         LeaveCriticalSection(&This->cs);
         return create_default_token(SPCAT_VOICES, token);
     }
 
-    if (SUCCEEDED(hr = ISpTTSEngine_QueryInterface(This->engine, &IID_ISpObjectWithToken, (void **)&engine_token_iface)))
-    {
-        hr = ISpObjectWithToken_GetObjectToken(engine_token_iface, token);
-        ISpObjectWithToken_Release(engine_token_iface);
-    }
+    ISpObjectToken_AddRef(This->engine_token);
+    *token = This->engine_token;
 
     LeaveCriticalSection(&This->cs);
 
-    return hr;
+    return S_OK;
 }
 
 struct async_result
@@ -731,6 +740,7 @@ struct speak_task
     struct async_result *result;
 
     struct speech_voice *voice;
+    ISpTTSEngine *engine;
     SPVTEXTFRAG *frag_list;
     ISpTTSEngineSite *site;
     DWORD flags;
@@ -773,7 +783,6 @@ static void speak_proc(struct async_task *task)
     struct speech_voice *This = speak_task->voice;
     GUID fmtid;
     WAVEFORMATEX *wfx = NULL;
-    ISpTTSEngine *engine = NULL;
     ISpAudio *audio = NULL;
     HRESULT hr;
 
@@ -794,8 +803,6 @@ static void speak_proc(struct async_task *task)
         ERR("failed setting output format: %#lx.\n", hr);
         goto done;
     }
-    engine = This->engine;
-    ISpTTSEngine_AddRef(engine);
 
     if (SUCCEEDED(ISpStreamFormat_QueryInterface(This->output, &IID_ISpAudio, (void **)&audio)))
         ISpAudio_SetState(audio, SPAS_RUN, 0);
@@ -804,7 +811,7 @@ static void speak_proc(struct async_task *task)
 
     LeaveCriticalSection(&This->cs);
 
-    hr = ISpTTSEngine_Speak(engine, speak_task->flags, &fmtid, wfx, speak_task->frag_list, speak_task->site);
+    hr = ISpTTSEngine_Speak(speak_task->engine, speak_task->flags, &fmtid, wfx, speak_task->frag_list, speak_task->site);
     if (SUCCEEDED(hr))
     {
         ISpStreamFormat_Commit(This->output, STGC_DEFAULT);
@@ -821,7 +828,7 @@ static void speak_proc(struct async_task *task)
         ISpAudio_Release(audio);
     }
     CoTaskMemFree(wfx);
-    if (engine) ISpTTSEngine_Release(engine);
+    ISpTTSEngine_Release(speak_task->engine);
     free(speak_task->frag_list);
     ISpTTSEngineSite_Release(speak_task->site);
 
@@ -838,6 +845,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR
 {
     struct speech_voice *This = impl_from_ISpVoice(iface);
     ISpTTSEngineSite *site = NULL;
+    ISpTTSEngine *engine = NULL;
     SPVTEXTFRAG *frag;
     struct speak_task *speak_task = NULL;
     struct async_result *result = NULL;
@@ -891,12 +899,28 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR
             return hr;
     }
 
-    if (!This->engine)
+    EnterCriticalSection(&This->cs);
+
+    if (!This->engine_token)
     {
-        /* Create a new engine with the default voice. */
+        /* Set the engine token to default. */
         if (FAILED(hr = ISpVoice_SetVoice(iface, NULL)))
+        {
+            LeaveCriticalSection(&This->cs);
             return hr;
+        }
     }
+    if (!This->engine &&
+        FAILED(hr = ISpObjectToken_CreateInstance(This->engine_token, NULL, CLSCTX_ALL, &IID_ISpTTSEngine, (void **)&This->engine)))
+    {
+        LeaveCriticalSection(&This->cs);
+        ERR("Failed to create engine: %#lx.\n", hr);
+        return hr;
+    }
+    engine = This->engine;
+    ISpTTSEngine_AddRef(engine);
+
+    LeaveCriticalSection(&This->cs);
 
     if (!(frag = malloc(sizeof(*frag) + contents_size)))
         return E_OUTOFMEMORY;
@@ -920,6 +944,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR
     speak_task->task.proc = speak_proc;
     speak_task->result    = NULL;
     speak_task->voice     = This;
+    speak_task->engine    = engine;
     speak_task->frag_list = frag;
     speak_task->site      = site;
     speak_task->flags     = flags & SPF_NLP_SPEAK_PUNC;
@@ -958,6 +983,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR
 
 fail:
     if (site) ISpTTSEngineSite_Release(site);
+    if (engine) ISpTTSEngine_Release(engine);
     free(frag);
     free(speak_task);
     if (result)
@@ -1397,6 +1423,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj)
     This->ref = 1;
 
     This->output = NULL;
+    This->engine_token = NULL;
     This->engine = NULL;
     This->cur_stream_num = 0;
     This->actions = SPVES_CONTINUE;

From 59ca532e59bfbb899f923a4e3ccf0f888de8fabc Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Fri, 2 Feb 2024 01:58:10 -0500
Subject: [PATCH 155/389] sapi: Add ISpeechObjectToken stub.

(cherry picked from commit c45bedbf23ddf619b2aa034e843dc010f47b4f58)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c |  27 +++++
 dlls/sapi/token.c       | 225 ++++++++++++++++++++++++++++++++++++++--
 include/sapi.idl        |   2 +-
 3 files changed, 247 insertions(+), 7 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index a7d164389d9..0fe142f89a8 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -604,6 +604,8 @@ static void test_object_token(void)
     static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Wine\\Winetest\\sapi\\TestToken";
 
     ISpObjectToken *token;
+    IDispatch *disp;
+    ISpeechObjectToken *speech_token;
     ISpDataKey *sub_key;
     HRESULT hr;
     LPWSTR tempW, token_id;
@@ -611,6 +613,31 @@ static void test_object_token(void)
     DWORD regid;
     IUnknown *obj;
 
+    hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpObjectToken, (void **)&token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectToken_QueryInterface( token, &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = ISpObjectToken_QueryInterface( token, &IID_ISpeechObjectToken, (void **)&speech_token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectToken_Release( speech_token );
+
+    ISpObjectToken_Release( token );
+
+    hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpeechObjectToken, (void **)&speech_token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectToken_Release( speech_token );
+
+
     hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
                            &IID_ISpObjectToken, (void **)&token );
     ok( hr == S_OK, "got %08lx\n", hr );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index f599bdb6b14..fd4efb9a95a 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -51,6 +51,7 @@ static struct data_key *impl_from_ISpRegDataKey( ISpRegDataKey *iface )
 struct object_token
 {
     ISpObjectToken ISpObjectToken_iface;
+    ISpeechObjectToken ISpeechObjectToken_iface;
     LONG ref;
 
     ISpRegDataKey *data_key;
@@ -62,6 +63,11 @@ static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface )
     return CONTAINING_RECORD( iface, struct object_token, ISpObjectToken_iface );
 }
 
+static struct object_token *impl_from_ISpeechObjectToken( ISpeechObjectToken *iface )
+{
+    return CONTAINING_RECORD( iface, struct object_token, ISpeechObjectToken_iface );
+}
+
 static HRESULT WINAPI data_key_QueryInterface( ISpRegDataKey *iface, REFIID iid, void **obj )
 {
     struct data_key *This = impl_from_ISpRegDataKey( iface );
@@ -1160,15 +1166,19 @@ static HRESULT WINAPI token_QueryInterface( ISpObjectToken *iface,
     if (IsEqualIID( iid, &IID_IUnknown ) ||
         IsEqualIID( iid, &IID_ISpDataKey ) ||
         IsEqualIID( iid, &IID_ISpObjectToken ))
+        *obj = &This->ISpObjectToken_iface;
+    else if (IsEqualIID( iid, &IID_IDispatch ) ||
+             IsEqualIID( iid, &IID_ISpeechObjectToken ))
+        *obj = &This->ISpeechObjectToken_iface;
+    else
     {
-        ISpObjectToken_AddRef( iface );
-        *obj = iface;
-        return S_OK;
+        *obj = NULL;
+        FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
+        return E_NOINTERFACE;
     }
 
-    FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
-    *obj = NULL;
-    return E_NOINTERFACE;
+    IUnknown_AddRef( (IUnknown *)*obj );
+    return S_OK;
 }
 
 static ULONG WINAPI token_AddRef( ISpObjectToken *iface )
@@ -1495,6 +1505,208 @@ const struct ISpObjectTokenVtbl token_vtbl =
     token_MatchesAttributes
 };
 
+static HRESULT WINAPI speech_token_QueryInterface( ISpeechObjectToken *iface,
+                                                   REFIID iid, void **obj )
+{
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+
+    TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
+
+    return ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj );
+}
+
+static ULONG WINAPI speech_token_AddRef( ISpeechObjectToken *iface )
+{
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectToken_AddRef( &This->ISpObjectToken_iface );
+}
+
+static ULONG WINAPI speech_token_Release( ISpeechObjectToken *iface )
+{
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectToken_Release( &This->ISpObjectToken_iface );
+}
+
+static HRESULT WINAPI speech_token_GetTypeInfoCount( ISpeechObjectToken *iface,
+                                                     UINT *count )
+{
+
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetTypeInfo( ISpeechObjectToken *iface,
+                                                UINT index,
+                                                LCID lcid,
+                                                ITypeInfo **type_info )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetIDsOfNames( ISpeechObjectToken *iface,
+                                                  REFIID iid,
+                                                  LPOLESTR *names,
+                                                  UINT count,
+                                                  LCID lcid,
+                                                  DISPID *dispids )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_Invoke( ISpeechObjectToken *iface,
+                                           DISPID dispid,
+                                           REFIID iid,
+                                           LCID lcid,
+                                           WORD flags,
+                                           DISPPARAMS *params,
+                                           VARIANT *result,
+                                           EXCEPINFO *excepinfo,
+                                           UINT *argerr )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_get_Id( ISpeechObjectToken *iface,
+                                           BSTR *id )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_get_DataKey( ISpeechObjectToken *iface,
+                                                ISpeechDataKey **key )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_get_Category( ISpeechObjectToken *iface,
+                                                ISpeechObjectTokenCategory **cat )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetDescription( ISpeechObjectToken *iface,
+                                                   LONG locale, BSTR *desc )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_SetId( ISpeechObjectToken *iface,
+                                          BSTR id, BSTR category_id,
+                                          VARIANT_BOOL create )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetAttribute( ISpeechObjectToken *iface,
+                                                 BSTR name, BSTR *value )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_CreateInstance( ISpeechObjectToken *iface,
+                                                   IUnknown *outer,
+                                                   SpeechTokenContext clsctx,
+                                                   IUnknown **object )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_Remove( ISpeechObjectToken *iface,
+                                           BSTR clsid )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetStorageFileName( ISpeechObjectToken *iface,
+                                                       BSTR clsid,
+                                                       BSTR key,
+                                                       BSTR name,
+                                                       SpeechTokenShellFolder folder,
+                                                       BSTR *path )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_RemoveStorageFileName( ISpeechObjectToken *iface,
+                                                          BSTR clsid,
+                                                          BSTR key,
+                                                          VARIANT_BOOL remove )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_IsUISupported( ISpeechObjectToken *iface,
+                                                  const BSTR type,
+                                                  const VARIANT *data,
+                                                  IUnknown *object,
+                                                  VARIANT_BOOL *supported )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_DisplayUI( ISpeechObjectToken *iface,
+                                              LONG hwnd,
+                                              BSTR title,
+                                              const BSTR type,
+                                              const VARIANT *data,
+                                              IUnknown *object )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_MatchesAttributes( ISpeechObjectToken *iface,
+                                                      const BSTR attributes,
+                                                      VARIANT_BOOL *matches )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+const struct ISpeechObjectTokenVtbl speech_token_vtbl =
+{
+    speech_token_QueryInterface,
+    speech_token_AddRef,
+    speech_token_Release,
+    speech_token_GetTypeInfoCount,
+    speech_token_GetTypeInfo,
+    speech_token_GetIDsOfNames,
+    speech_token_Invoke,
+    speech_token_get_Id,
+    speech_token_get_DataKey,
+    speech_token_get_Category,
+    speech_token_GetDescription,
+    speech_token_SetId,
+    speech_token_GetAttribute,
+    speech_token_CreateInstance,
+    speech_token_Remove,
+    speech_token_GetStorageFileName,
+    speech_token_RemoveStorageFileName,
+    speech_token_IsUISupported,
+    speech_token_DisplayUI,
+    speech_token_MatchesAttributes
+};
+
 HRESULT token_create( IUnknown *outer, REFIID iid, void **obj )
 {
     struct object_token *This = malloc( sizeof(*This) );
@@ -1502,6 +1714,7 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj )
 
     if (!This) return E_OUTOFMEMORY;
     This->ISpObjectToken_iface.lpVtbl = &token_vtbl;
+    This->ISpeechObjectToken_iface.lpVtbl = &speech_token_vtbl;
     This->ref = 1;
 
     This->data_key = NULL;
diff --git a/include/sapi.idl b/include/sapi.idl
index 16b8348d73b..6a593eb6b18 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -1293,7 +1293,7 @@ library SpeechLib
     coclass SpObjectToken
     {
         interface ISpObjectToken;
-        [default] interface ISpDataKey;
+        [default] interface ISpeechObjectToken;
     }
 
     [

From 3b57da5af2702c71b2964e87bd84e509fd359911 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Fri, 2 Feb 2024 02:19:38 -0500
Subject: [PATCH 156/389] sapi: Add ISpeechObjectTokens stub.

(cherry picked from commit ca6f3a7af87ded6f54c23aa5a983bbe9ee74667f)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c |  30 ++++++++++
 dlls/sapi/token.c       | 129 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 153 insertions(+), 6 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 0fe142f89a8..9350c304e41 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -246,12 +246,42 @@ static void test_token_enum(void)
 {
     ISpObjectTokenEnumBuilder *token_enum;
     HRESULT hr;
+    IDispatch *disp;
+    ISpeechObjectTokens *speech_tokens;
     ISpObjectToken *tokens[5];
     ISpObjectToken *out_tokens[5];
     WCHAR token_id[MAX_PATH];
     ULONG count;
     int i;
 
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum,
+                                                   &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum,
+                                                   &IID_ISpeechObjectTokens,
+                                                   (void **)&speech_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectTokens_Release( speech_tokens );
+
+    ISpObjectTokenEnumBuilder_Release( token_enum );
+
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpeechObjectTokens, (void **)&speech_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectTokens_Release( speech_tokens );
+
+
     hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
                            &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
     ok( hr == S_OK, "got %08lx\n", hr );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index fd4efb9a95a..4688e6a07b9 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -579,6 +579,7 @@ struct token_with_score
 struct token_enum
 {
     ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface;
+    ISpeechObjectTokens ISpeechObjectTokens_iface;
     LONG ref;
 
     BOOL init;
@@ -593,6 +594,11 @@ static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnu
     return CONTAINING_RECORD( iface, struct token_enum, ISpObjectTokenEnumBuilder_iface );
 }
 
+static struct token_enum *impl_from_ISpeechObjectTokens( ISpeechObjectTokens *iface )
+{
+    return CONTAINING_RECORD( iface, struct token_enum, ISpeechObjectTokens_iface );
+}
+
 static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface,
                                                  LPCWSTR req, LPCWSTR opt,
                                                  IEnumSpObjectTokens **enum_tokens )
@@ -765,15 +771,19 @@ static HRESULT WINAPI token_enum_QueryInterface( ISpObjectTokenEnumBuilder *ifac
     if (IsEqualIID( iid, &IID_IUnknown ) ||
         IsEqualIID( iid, &IID_IEnumSpObjectTokens ) ||
         IsEqualIID( iid, &IID_ISpObjectTokenEnumBuilder ))
+        *obj = &This->ISpObjectTokenEnumBuilder_iface;
+    else if (IsEqualIID( iid, &IID_IDispatch ) ||
+             IsEqualIID( iid, &IID_ISpeechObjectTokens ))
+        *obj = &This->ISpeechObjectTokens_iface;
+    else
     {
-        ISpObjectTokenEnumBuilder_AddRef( iface );
-        *obj = iface;
-        return S_OK;
+        *obj = NULL;
+        FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
+        return E_NOINTERFACE;
     }
 
-    FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
-    *obj = NULL;
-    return E_NOINTERFACE;
+    IUnknown_AddRef( (IUnknown *)*obj );
+    return S_OK;
 }
 
 static ULONG WINAPI token_enum_AddRef( ISpObjectTokenEnumBuilder *iface )
@@ -1135,6 +1145,112 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl =
     token_enum_Sort
 };
 
+static HRESULT WINAPI speech_tokens_QueryInterface( ISpeechObjectTokens *iface,
+                                                    REFIID iid, void **obj )
+{
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
+
+    return ISpObjectTokenEnumBuilder_QueryInterface(
+        &This->ISpObjectTokenEnumBuilder_iface, iid, obj );
+}
+
+static ULONG WINAPI speech_tokens_AddRef( ISpeechObjectTokens *iface )
+{
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectTokenEnumBuilder_AddRef( &This->ISpObjectTokenEnumBuilder_iface );
+}
+
+static ULONG WINAPI speech_tokens_Release( ISpeechObjectTokens *iface )
+{
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectTokenEnumBuilder_Release( &This->ISpObjectTokenEnumBuilder_iface );
+}
+
+static HRESULT WINAPI speech_tokens_GetTypeInfoCount( ISpeechObjectTokens *iface,
+                                                      UINT *count )
+{
+
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_GetTypeInfo( ISpeechObjectTokens *iface,
+                                                 UINT index,
+                                                 LCID lcid,
+                                                 ITypeInfo **type_info )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_GetIDsOfNames( ISpeechObjectTokens *iface,
+                                                   REFIID iid,
+                                                   LPOLESTR *names,
+                                                   UINT count,
+                                                   LCID lcid,
+                                                   DISPID *dispids )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_Invoke( ISpeechObjectTokens *iface,
+                                            DISPID dispid,
+                                            REFIID iid,
+                                            LCID lcid,
+                                            WORD flags,
+                                            DISPPARAMS *params,
+                                            VARIANT *result,
+                                            EXCEPINFO *excepinfo,
+                                            UINT *argerr )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_get_Count( ISpeechObjectTokens *iface,
+                                               LONG *count )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface,
+                                          LONG index, ISpeechObjectToken **token )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_get__NewEnum( ISpeechObjectTokens *iface,
+                                                  IUnknown **new_enum )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static const ISpeechObjectTokensVtbl speech_tokens_vtbl =
+{
+    speech_tokens_QueryInterface,
+    speech_tokens_AddRef,
+    speech_tokens_Release,
+    speech_tokens_GetTypeInfoCount,
+    speech_tokens_GetTypeInfo,
+    speech_tokens_GetIDsOfNames,
+    speech_tokens_Invoke,
+    speech_tokens_get_Count,
+    speech_tokens_Item,
+    speech_tokens_get__NewEnum
+};
+
 HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj )
 {
     struct token_enum *This = malloc( sizeof(*This) );
@@ -1142,6 +1258,7 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj )
 
     if (!This) return E_OUTOFMEMORY;
     This->ISpObjectTokenEnumBuilder_iface.lpVtbl = &token_enum_vtbl;
+    This->ISpeechObjectTokens_iface.lpVtbl = &speech_tokens_vtbl;
     This->ref = 1;
     This->req = NULL;
     This->opt = NULL;

From 0ce4abd8f1a96d7bdbe402f2b20d2fcbd7aeaba3 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Fri, 2 Feb 2024 14:24:34 -0500
Subject: [PATCH 157/389] sapi: Add stub implementation for
 ISpeechObjectTokens::get__NewEnum.

(cherry picked from commit 26498d93cf9354237eef3ef5a2b3612527068923)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c |  26 +++++++++
 dlls/sapi/token.c       | 117 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 9350c304e41..543b19ec69a 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -248,6 +248,8 @@ static void test_token_enum(void)
     HRESULT hr;
     IDispatch *disp;
     ISpeechObjectTokens *speech_tokens;
+    IUnknown *unk;
+    IEnumVARIANT *enumvar;
     ISpObjectToken *tokens[5];
     ISpObjectToken *out_tokens[5];
     WCHAR token_id[MAX_PATH];
@@ -348,6 +350,30 @@ static void test_token_enum(void)
                            &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
     ok( hr == S_OK, "got %08lx\n", hr );
 
+    hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum,
+                                                   &IID_ISpeechObjectTokens,
+                                                   (void **)&speech_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectTokenEnumBuilder_SetAttribs( token_enum, NULL, NULL );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    hr = ISpObjectTokenEnumBuilder_AddTokens( token_enum, 3, tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpeechObjectTokens_get__NewEnum( speech_tokens, &unk );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    hr = IUnknown_QueryInterface( unk, &IID_IEnumVARIANT, (void **)&enumvar );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IUnknown_Release( unk );
+    IEnumVARIANT_Release( enumvar );
+
+    ISpeechObjectTokens_Release( speech_tokens );
+    ISpObjectTokenEnumBuilder_Release( token_enum );
+
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
     /* Vendor attribute must exist */
     hr = ISpObjectTokenEnumBuilder_SetAttribs( token_enum, L"Vendor", NULL );
     ok( hr == S_OK, "got %08lx\n", hr );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index 4688e6a07b9..53b64a4383f 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -599,6 +599,20 @@ static struct token_enum *impl_from_ISpeechObjectTokens( ISpeechObjectTokens *if
     return CONTAINING_RECORD( iface, struct token_enum, ISpeechObjectTokens_iface );
 }
 
+struct enum_var
+{
+    IEnumVARIANT IEnumVARIANT_iface;
+    LONG ref;
+
+    ISpObjectTokenEnumBuilder *token_enum;
+    ULONG index;
+};
+
+static struct enum_var *impl_from_IEnumVARIANT( IEnumVARIANT *iface )
+{
+    return CONTAINING_RECORD( iface, struct enum_var, IEnumVARIANT_iface );
+}
+
 static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface,
                                                  LPCWSTR req, LPCWSTR opt,
                                                  IEnumSpObjectTokens **enum_tokens )
@@ -1145,6 +1159,86 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl =
     token_enum_Sort
 };
 
+static HRESULT WINAPI enum_var_QueryInterface( IEnumVARIANT *iface,
+                                               REFIID iid, void **obj )
+{
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+
+    TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
+
+    if (IsEqualIID( iid, &IID_IUnknown ) ||
+        IsEqualIID( iid, &IID_IEnumVARIANT ))
+    {
+        IEnumVARIANT_AddRef( iface );
+        *obj = iface;
+        return S_OK;
+    }
+
+    *obj = NULL;
+    FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI enum_var_AddRef( IEnumVARIANT *iface )
+{
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+    ULONG ref = InterlockedIncrement( &This->ref );
+
+    TRACE( "(%p) ref = %lu\n", This, ref );
+    return ref;
+}
+
+static ULONG WINAPI enum_var_Release( IEnumVARIANT *iface )
+{
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+    ULONG ref = InterlockedDecrement( &This->ref );
+
+    TRACE( "(%p) ref = %lu\n", This, ref );
+
+    if (!ref)
+    {
+        ISpObjectTokenEnumBuilder_Release( This->token_enum );
+        free( This );
+    }
+    return ref;
+}
+
+static HRESULT WINAPI enum_var_Next( IEnumVARIANT *iface, ULONG count,
+                                     VARIANT *vars, ULONG *fetched )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_var_Skip( IEnumVARIANT *iface, ULONG count )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_var_Reset( IEnumVARIANT *iface )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_var_Clone( IEnumVARIANT *iface, IEnumVARIANT **new_enum )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static const IEnumVARIANTVtbl enum_var_vtbl =
+{
+    enum_var_QueryInterface,
+    enum_var_AddRef,
+    enum_var_Release,
+    enum_var_Next,
+    enum_var_Skip,
+    enum_var_Reset,
+    enum_var_Clone
+};
+
 static HRESULT WINAPI speech_tokens_QueryInterface( ISpeechObjectTokens *iface,
                                                     REFIID iid, void **obj )
 {
@@ -1233,8 +1327,27 @@ static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface,
 static HRESULT WINAPI speech_tokens_get__NewEnum( ISpeechObjectTokens *iface,
                                                   IUnknown **new_enum )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    struct enum_var *enum_var;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%p)\n", iface, new_enum );
+
+    if (!new_enum) return E_POINTER;
+    if (!(enum_var = malloc( sizeof(*enum_var) ))) return E_OUTOFMEMORY;
+
+    enum_var->IEnumVARIANT_iface.lpVtbl = &enum_var_vtbl;
+    enum_var->ref = 1;
+    enum_var->index = 0;
+    if (FAILED(hr = ISpeechObjectTokens_QueryInterface( iface, &IID_ISpObjectTokenEnumBuilder,
+                                                       (void **)&enum_var->token_enum )))
+    {
+        free( enum_var );
+        return hr;
+    }
+
+    *new_enum = (IUnknown *)&enum_var->IEnumVARIANT_iface;
+
+    return S_OK;
 }
 
 static const ISpeechObjectTokensVtbl speech_tokens_vtbl =

From ca12f61088cc6e8841da7265942e067ea6fad40c Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Thu, 8 Feb 2024 20:20:36 -0500
Subject: [PATCH 158/389] sapi: Implement ISpeechObjectToken::GetDescription.

(cherry picked from commit b6c1760727dae433570ef0dffb985c751d4dc0bc)

CW-Bug-Id: #22520
---
 dlls/sapi/Makefile.in       |  2 +-
 dlls/sapi/tests/Makefile.in |  2 +-
 dlls/sapi/tests/token.c     | 58 +++++++++++++++++++++++++++++++++++--
 dlls/sapi/token.c           | 23 +++++++++++++--
 4 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index 008d0f74545..24a1e055766 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = sapi.dll
-IMPORTS   = uuid ole32 user32 advapi32
+IMPORTS   = uuid ole32 oleaut32 user32 advapi32
 DELAYIMPORTS = winmm
 
 SOURCES = \
diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in
index 4c107d5e994..4e792f2daae 100644
--- a/dlls/sapi/tests/Makefile.in
+++ b/dlls/sapi/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = sapi.dll
-IMPORTS   = ole32 user32 advapi32 winmm
+IMPORTS   = ole32 oleaut32 user32 advapi32 winmm
 
 SOURCES = \
 	automation.c \
diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 543b19ec69a..a651eb47c62 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -657,7 +657,7 @@ static IClassFactory test_class_cf = { &ClassFactoryVtbl };
 
 static void test_object_token(void)
 {
-    static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Wine\\Winetest\\sapi\\TestToken";
+    static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Winetest\\sapi\\TestToken";
 
     ISpObjectToken *token;
     IDispatch *disp;
@@ -665,6 +665,7 @@ static void test_object_token(void)
     ISpDataKey *sub_key;
     HRESULT hr;
     LPWSTR tempW, token_id;
+    BSTR tempB;
     ISpObjectTokenCategory *cat;
     DWORD regid;
     IUnknown *obj;
@@ -863,11 +864,64 @@ static void test_object_token(void)
         CoTaskMemFree( tempW );
     }
 
+    hr = ISpObjectToken_SetStringValue( token, L"409", L"409 - TestToken" );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    hr = ISpObjectToken_SetStringValue( token, L"407", L"407 - TestToken" );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    hr = ISpObjectToken_SetStringValue( token, L"E40C", L"E40C - TestToken" );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectToken_QueryInterface( token, &IID_ISpeechObjectToken, (void **)&speech_token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0x409, NULL );
+    ok( hr == E_POINTER, "got %08lx\n", hr );
+
+    tempB = NULL;
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0x409, &tempB );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( tempB && !wcscmp( tempB, L"409 - TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
+    SysFreeString( tempB );
+
+    tempB = NULL;
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0x10407, &tempB );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( tempB && !wcscmp( tempB, L"407 - TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
+    SysFreeString( tempB );
+
+    tempB = NULL;
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0xE40C, &tempB );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( tempB && !wcscmp( tempB, L"E40C - TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
+    SysFreeString( tempB );
+
+    tempB = (BSTR)0xdeadbeef;
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0x406, &tempB );
+    ok( hr == SPERR_NOT_FOUND, "got %08lx\n", hr );
+    ok( tempB == (BSTR)0xdeadbeef || broken(tempB == NULL) /* < win7 */, "got %p\n", tempB );
+
+    hr = ISpObjectToken_SetStringValue( token, NULL, L"TestToken" );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    tempB = NULL;
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0x406, &tempB );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
+    SysFreeString( tempB );
+
+    tempB = NULL;
+    hr = ISpeechObjectToken_GetDescription( speech_token, 0x0, &tempB );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
+    SysFreeString( tempB );
+
+    ISpeechObjectToken_Release( speech_token );
+
     ISpObjectToken_Release( test_class_token );
     IUnknown_Release( obj );
     ISpObjectToken_Release( token );
 
-    RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" );
+    RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Winetest\\sapi" );
 }
 
 START_TEST(token)
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index 53b64a4383f..e5d87505e34 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -1829,8 +1829,27 @@ static HRESULT WINAPI speech_token_get_Category( ISpeechObjectToken *iface,
 static HRESULT WINAPI speech_token_GetDescription( ISpeechObjectToken *iface,
                                                    LONG locale, BSTR *desc )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+    WCHAR langid[5];
+    WCHAR *desc_wstr = NULL;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%#lx %p)\n", This, locale, desc );
+
+    if (!desc) return E_POINTER;
+
+    swprintf( langid, ARRAY_SIZE( langid ), L"%X", LANGIDFROMLCID( locale ) );
+
+    hr = ISpObjectToken_GetStringValue( &This->ISpObjectToken_iface, langid, &desc_wstr );
+    if (hr == SPERR_NOT_FOUND)
+        hr = ISpObjectToken_GetStringValue( &This->ISpObjectToken_iface, NULL, &desc_wstr );
+    if (FAILED(hr))
+        return hr;
+
+    *desc = SysAllocString( desc_wstr );
+
+    CoTaskMemFree( desc_wstr );
+    return *desc ? S_OK : E_OUTOFMEMORY;
 }
 
 static HRESULT WINAPI speech_token_SetId( ISpeechObjectToken *iface,

From 9fbf40b45aae057ecf1257faff914577b5e9cf75 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Wed, 7 Feb 2024 20:01:11 -0500
Subject: [PATCH 159/389] sapi: Implement ISpeechObjectToken::Invoke.

(cherry picked from commit 001d1a4319dfb46a4383758a446203350c91edc1)

CW-Bug-Id: #22520
---
 dlls/sapi/Makefile.in    |  1 +
 dlls/sapi/dispatch.c     | 85 ++++++++++++++++++++++++++++++++++++++++
 dlls/sapi/sapi_private.h |  9 +++++
 dlls/sapi/tests/token.c  | 20 ++++++++++
 dlls/sapi/token.c        | 14 ++++++-
 5 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 dlls/sapi/dispatch.c

diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index 24a1e055766..a6c4d86037e 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -5,6 +5,7 @@ DELAYIMPORTS = winmm
 SOURCES = \
 	async.c \
 	automation.c \
+	dispatch.c \
 	main.c \
 	mmaudio.c \
 	resource.c \
diff --git a/dlls/sapi/dispatch.c b/dlls/sapi/dispatch.c
new file mode 100644
index 00000000000..df0c6c9bf9c
--- /dev/null
+++ b/dlls/sapi/dispatch.c
@@ -0,0 +1,85 @@
+/*
+ * ITypeInfo cache for IDispatch
+ *
+ * Copyright 2019 Zebediah Figura
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "wine/debug.h"
+
+#define COBJMACROS
+
+#include "objbase.h"
+#include "sapiddk.h"
+
+#include "sapi_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(sapi);
+
+static ITypeLib *typelib;
+static ITypeInfo *typeinfos[last_tid];
+
+static REFIID tid_id[] =
+{
+    &IID_ISpeechObjectToken,
+};
+
+HRESULT get_typeinfo(enum type_id tid, ITypeInfo **ret)
+{
+    HRESULT hr;
+
+    if (!typelib)
+    {
+        ITypeLib *tl;
+
+        hr = LoadRegTypeLib(&LIBID_SpeechLib, 5, 4, LOCALE_SYSTEM_DEFAULT, &tl);
+        if (FAILED(hr))
+        {
+            ERR("Failed to load typelib, hr %#lx.\n", hr);
+            return hr;
+        }
+        if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL))
+            ITypeLib_Release(tl);
+    }
+    if (!typeinfos[tid])
+    {
+        ITypeInfo *typeinfo;
+
+        hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_id[tid], &typeinfo);
+        if (FAILED(hr))
+        {
+            ERR("Failed to get type info for %s, hr %#lx.\n", debugstr_guid(tid_id[tid]), hr);
+            return hr;
+        }
+        if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), typeinfo, NULL))
+            ITypeInfo_Release(typeinfo);
+    }
+    ITypeInfo_AddRef(*ret = typeinfos[tid]);
+    return S_OK;
+}
+
+void release_typelib(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < ARRAY_SIZE(typeinfos); ++i)
+    {
+        if (typeinfos[i])
+            ITypeInfo_Release(typeinfos[i]);
+    }
+    if (typelib)
+        ITypeLib_Release(typelib);
+}
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index f6a5e966461..9a3c92cc4dc 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -52,3 +52,12 @@ HRESULT mmaudio_out_create( IUnknown *outer, REFIID iid, void **obj );
 HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj );
 HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj );
 HRESULT token_create( IUnknown *outer, REFIID iid, void **obj );
+
+enum type_id
+{
+    ISpeechObjectToken_tid,
+    last_tid
+};
+
+HRESULT get_typeinfo( enum type_id tid, ITypeInfo **typeinfo );
+void release_typelib( void );
diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index a651eb47c62..ec8a101fea4 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -26,6 +26,8 @@
 
 #include "wine/test.h"
 
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+
 static void test_data_key(void)
 {
     ISpRegDataKey *data_key;
@@ -669,6 +671,8 @@ static void test_object_token(void)
     ISpObjectTokenCategory *cat;
     DWORD regid;
     IUnknown *obj;
+    DISPPARAMS params;
+    VARIANT arg, ret;
 
     hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
                            &IID_ISpObjectToken, (void **)&token );
@@ -915,6 +919,22 @@ static void test_object_token(void)
     ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
     SysFreeString( tempB );
 
+    memset( &params, 0, sizeof(params) );
+    params.cArgs = 1;
+    params.cNamedArgs = 0;
+    params.rgvarg = &arg;
+    VariantInit( &arg );
+    V_VT( &arg ) = VT_I4;
+    V_I4( &arg ) = 0x409;
+    VariantInit( &ret );
+    hr = ISpeechObjectToken_Invoke( speech_token, DISPID_SOTGetDescription, &IID_NULL,
+                                    0, DISPATCH_METHOD, &params, &ret, NULL, NULL );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( V_VT( &ret ) == VT_BSTR, "got %#x\n", V_VT( &ret ) );
+    ok( V_BSTR( &ret ) && !wcscmp( V_BSTR( &ret ), L"409 - TestToken" ),
+        "got %s\n", wine_dbgstr_w( V_BSTR( &ret ) ) );
+    VariantClear( &ret );
+
     ISpeechObjectToken_Release( speech_token );
 
     ISpObjectToken_Release( test_class_token );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index e5d87505e34..c8cb806bbae 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -1801,8 +1801,18 @@ static HRESULT WINAPI speech_token_Invoke( ISpeechObjectToken *iface,
                                            EXCEPINFO *excepinfo,
                                            UINT *argerr )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    ITypeInfo *ti;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%ld %s %#lx %#x %p %p %p %p)\n", iface, dispid,
+           debugstr_guid( iid ), lcid, flags, params, result, excepinfo, argerr );
+
+    if (FAILED(hr = get_typeinfo( ISpeechObjectToken_tid, &ti )))
+        return hr;
+    hr = ITypeInfo_Invoke( ti, iface, dispid, flags, params, result, excepinfo, argerr );
+    ITypeInfo_Release( ti );
+
+    return hr;
 }
 
 static HRESULT WINAPI speech_token_get_Id( ISpeechObjectToken *iface,

From 6b4b57bb5b164aa21155567ce004c6bfba06e149 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Sun, 11 Feb 2024 14:21:50 -0500
Subject: [PATCH 160/389] sapi: Implement ISpeechObjectToken::GetIDsOfNames.

(cherry picked from commit 59a7ee1a2cf8b0b399e3c4201706197b7b035224)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c |  7 +++++++
 dlls/sapi/token.c       | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index ec8a101fea4..6265cde2bc3 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -660,6 +660,7 @@ static IClassFactory test_class_cf = { &ClassFactoryVtbl };
 static void test_object_token(void)
 {
     static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Winetest\\sapi\\TestToken";
+    static const WCHAR *get_description = L"GetDescription";
 
     ISpObjectToken *token;
     IDispatch *disp;
@@ -671,6 +672,7 @@ static void test_object_token(void)
     ISpObjectTokenCategory *cat;
     DWORD regid;
     IUnknown *obj;
+    DISPID dispid;
     DISPPARAMS params;
     VARIANT arg, ret;
 
@@ -919,6 +921,11 @@ static void test_object_token(void)
     ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) );
     SysFreeString( tempB );
 
+    dispid = 0xdeadbeef;
+    hr = ISpeechObjectToken_GetIDsOfNames( speech_token, &IID_NULL, (WCHAR **)&get_description, 1, 0x409, &dispid );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( dispid == DISPID_SOTGetDescription, "got %08lx\n", dispid );
+
     memset( &params, 0, sizeof(params) );
     params.cArgs = 1;
     params.cNamedArgs = 0;
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index c8cb806bbae..888da86d7a4 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -1787,8 +1787,18 @@ static HRESULT WINAPI speech_token_GetIDsOfNames( ISpeechObjectToken *iface,
                                                   LCID lcid,
                                                   DISPID *dispids )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    ITypeInfo *ti;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%s %p %u %#lx %p)\n",
+           iface, debugstr_guid( iid ), names, count, lcid, dispids );
+
+    if (FAILED(hr = get_typeinfo( ISpeechObjectToken_tid, &ti )))
+        return hr;
+    hr = ITypeInfo_GetIDsOfNames( ti, names, count, dispids );
+    ITypeInfo_Release( ti );
+
+    return hr;
 }
 
 static HRESULT WINAPI speech_token_Invoke( ISpeechObjectToken *iface,

From 858b749497d45c202082d53ae427ce6804fa1b4e Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Tue, 6 Feb 2024 16:37:07 -0500
Subject: [PATCH 161/389] sapi: Implement ISpeechObjectTokens::get_Count.

(cherry picked from commit 261d7c3de4af85f7b2269f5b0e2809f11a102894)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c | 5 +++++
 dlls/sapi/token.c       | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 6265cde2bc3..a68a0b7cd46 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -362,6 +362,11 @@ static void test_token_enum(void)
     hr = ISpObjectTokenEnumBuilder_AddTokens( token_enum, 3, tokens );
     ok( hr == S_OK, "got %08lx\n", hr );
 
+    count = 0xdeadbeef;
+    hr = ISpeechObjectTokens_get_Count( speech_tokens, (LONG *)&count );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( count == 3, "got %lu\n", count );
+
     hr = ISpeechObjectTokens_get__NewEnum( speech_tokens, &unk );
     ok( hr == S_OK, "got %08lx\n", hr );
     hr = IUnknown_QueryInterface( unk, &IID_IEnumVARIANT, (void **)&enumvar );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index 888da86d7a4..2cfc34304c9 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -1313,8 +1313,11 @@ static HRESULT WINAPI speech_tokens_Invoke( ISpeechObjectTokens *iface,
 static HRESULT WINAPI speech_tokens_get_Count( ISpeechObjectTokens *iface,
                                                LONG *count )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)->(%p)\n", This, count );
+
+    return ISpObjectTokenEnumBuilder_GetCount( &This->ISpObjectTokenEnumBuilder_iface, (ULONG *)count );
 }
 
 static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface,

From 09139f5a2c4725bcc6835da6696eaae545d530a0 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Tue, 6 Feb 2024 17:17:02 -0500
Subject: [PATCH 162/389] sapi: Implement IEnumVARIANT::Next for
 ISpeechObjectTokens.

(cherry picked from commit 6f2a0c412fb5d09cf40b13e773529f4b9acd9ad3)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c | 28 ++++++++++++++++++++++++++++
 dlls/sapi/token.c       | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index a68a0b7cd46..89cbb5150a4 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -256,6 +256,7 @@ static void test_token_enum(void)
     ISpObjectToken *out_tokens[5];
     WCHAR token_id[MAX_PATH];
     ULONG count;
+    VARIANT vars[3];
     int i;
 
     hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
@@ -372,6 +373,33 @@ static void test_token_enum(void)
     hr = IUnknown_QueryInterface( unk, &IID_IEnumVARIANT, (void **)&enumvar );
     ok( hr == S_OK, "got %08lx\n", hr );
     IUnknown_Release( unk );
+
+    V_VT( &vars[0] ) = VT_ILLEGAL;
+    V_DISPATCH( &vars[0] ) = (IDispatch *)0xdeadbeef;
+    hr = IEnumVARIANT_Next( enumvar, 1, vars, NULL );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( V_VT( &vars[0] ) == VT_DISPATCH, "got %#x\n", V_VT( &vars[0] ) );
+    ok( V_DISPATCH( &vars[0] ) != (IDispatch *)0xdeadbeef && V_DISPATCH( &vars[0] ) != NULL,
+        "got %p\n", V_DISPATCH( &vars[0] ) );
+    VariantClear( &vars[0] );
+
+    for ( i = 0; i < 3; i++ ) {
+        V_VT( &vars[i] ) = VT_ILLEGAL;
+        V_DISPATCH( &vars[i] ) = (IDispatch *)0xdeadbeef;
+    }
+    count = 0xdeadbeef;
+
+    hr = IEnumVARIANT_Next( enumvar, 3, vars, &count );
+    ok( hr == S_FALSE, "got %08lx\n", hr );
+    ok( count == 2, "got %lu\n", count );
+    for ( i = 0; i < 2; i++ ) {
+        ok( V_VT( &vars[i] ) == VT_DISPATCH, "got %#x\n", V_VT( &vars[i] ) );
+        ok( V_DISPATCH( &vars[i] ) != (IDispatch *)0xdeadbeef && V_DISPATCH( &vars[i] ) != NULL,
+            "got %p\n", V_DISPATCH( &vars[i] ) );
+        VariantClear( &vars[i] );
+    }
+    ok( V_VT( &vars[2] ) == VT_ILLEGAL, "got %#x\n", V_VT( &vars[2] ) );
+
     IEnumVARIANT_Release( enumvar );
 
     ISpeechObjectTokens_Release( speech_tokens );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index 2cfc34304c9..b7f78fe98bd 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -1206,8 +1206,41 @@ static ULONG WINAPI enum_var_Release( IEnumVARIANT *iface )
 static HRESULT WINAPI enum_var_Next( IEnumVARIANT *iface, ULONG count,
                                      VARIANT *vars, ULONG *fetched )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+    ULONG i, total;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%lu %p %p)\n", This, count, vars, fetched );
+
+    if (fetched) *fetched = 0;
+
+    if (FAILED(hr = ISpObjectTokenEnumBuilder_GetCount( This->token_enum, &total )))
+        return hr;
+
+    for ( i = 0; i < count && This->index < total; i++, This->index++ )
+    {
+        ISpObjectToken *token;
+        IDispatch *disp;
+
+        if (FAILED(hr = ISpObjectTokenEnumBuilder_Item( This->token_enum, This->index, &token )))
+            goto fail;
+
+        hr = ISpObjectToken_QueryInterface( token, &IID_IDispatch, (void **)&disp );
+        ISpObjectToken_Release( token );
+        if (FAILED(hr)) goto fail;
+
+        VariantInit( &vars[i] );
+        V_VT( &vars[i] ) = VT_DISPATCH;
+        V_DISPATCH( &vars[i] ) = disp;
+    }
+
+    if (fetched) *fetched = i;
+    return i == count ? S_OK : S_FALSE;
+
+fail:
+    while (i--)
+        VariantClear( &vars[i] );
+    return hr;
 }
 
 static HRESULT WINAPI enum_var_Skip( IEnumVARIANT *iface, ULONG count )

From bfcfe8645c16700d346aa9a80c5fe5ccb2500f11 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Sun, 11 Feb 2024 00:29:46 -0500
Subject: [PATCH 163/389] sapi: Implement ISpeechObjectTokens::Invoke.

(cherry picked from commit 6e8d4508048941015e62c42372a584d9e0dd4931)

CW-Bug-Id: #22520
---
 dlls/sapi/dispatch.c     |  1 +
 dlls/sapi/sapi_private.h |  1 +
 dlls/sapi/tests/token.c  | 11 ++++++++++-
 dlls/sapi/token.c        | 14 ++++++++++++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/dlls/sapi/dispatch.c b/dlls/sapi/dispatch.c
index df0c6c9bf9c..731ae9ae48f 100644
--- a/dlls/sapi/dispatch.c
+++ b/dlls/sapi/dispatch.c
@@ -35,6 +35,7 @@ static ITypeInfo *typeinfos[last_tid];
 static REFIID tid_id[] =
 {
     &IID_ISpeechObjectToken,
+    &IID_ISpeechObjectTokens,
 };
 
 HRESULT get_typeinfo(enum type_id tid, ITypeInfo **ret)
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index 9a3c92cc4dc..55e1460ad38 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -56,6 +56,7 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj );
 enum type_id
 {
     ISpeechObjectToken_tid,
+    ISpeechObjectTokens_tid,
     last_tid
 };
 
diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 89cbb5150a4..6d2c40ea154 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -256,7 +256,8 @@ static void test_token_enum(void)
     ISpObjectToken *out_tokens[5];
     WCHAR token_id[MAX_PATH];
     ULONG count;
-    VARIANT vars[3];
+    VARIANT vars[3], ret;
+    DISPPARAMS params;
     int i;
 
     hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
@@ -402,6 +403,14 @@ static void test_token_enum(void)
 
     IEnumVARIANT_Release( enumvar );
 
+    memset( &params, 0, sizeof(params) );
+    VariantInit( &ret );
+    hr = ISpeechObjectTokens_Invoke( speech_tokens, DISPID_SOTsCount, &IID_NULL, 0,
+                                     DISPATCH_PROPERTYGET, &params, &ret, NULL, NULL );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( V_VT( &ret ) == VT_I4, "got %#x\n", V_VT( &ret ) );
+    ok( V_I4( &ret ) == 3, "got %ld\n", V_I4( &ret ) );
+
     ISpeechObjectTokens_Release( speech_tokens );
     ISpObjectTokenEnumBuilder_Release( token_enum );
 
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index b7f78fe98bd..ad8163c9567 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -1339,8 +1339,18 @@ static HRESULT WINAPI speech_tokens_Invoke( ISpeechObjectTokens *iface,
                                             EXCEPINFO *excepinfo,
                                             UINT *argerr )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    ITypeInfo *ti;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%ld %s %#lx %#x %p %p %p %p)\n", iface, dispid,
+           debugstr_guid( iid ), lcid, flags, params, result, excepinfo, argerr );
+
+    if (FAILED(hr = get_typeinfo( ISpeechObjectTokens_tid, &ti )))
+        return hr;
+    hr = ITypeInfo_Invoke( ti, iface, dispid, flags, params, result, excepinfo, argerr );
+    ITypeInfo_Release( ti );
+
+    return hr;
 }
 
 static HRESULT WINAPI speech_tokens_get_Count( ISpeechObjectTokens *iface,

From 39099ad835cd272cfb4fe69d3c385035c33b5903 Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Wed, 14 Feb 2024 20:07:41 -0500
Subject: [PATCH 164/389] sapi: Free typelib on DLL detach.

(cherry picked from commit afac7d7e3ffc67c3575512634fd757f81ce839b8)
---
 dlls/sapi/main.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c
index 108db7d13d8..8adcc7449fb 100644
--- a/dlls/sapi/main.c
+++ b/dlls/sapi/main.c
@@ -145,3 +145,21 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
 
     return IClassFactory_QueryInterface( cf, iid, obj );
 }
+
+/******************************************************************
+ *             DllMain
+ */
+BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved )
+{
+    switch (reason)
+    {
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls( hinst );
+        break;
+    case DLL_PROCESS_DETACH:
+        if (reserved) break;
+        release_typelib();
+	break;
+    }
+    return TRUE;
+}

From ec589a5bed84edcac3de1951912823b65acd8c3f Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 16 Feb 2024 14:28:42 -0500
Subject: [PATCH 165/389] sapi: Implement ISpeechVoice::Speak.

(cherry picked from commit 5243f2e82cace7234a66e2036146a32f7aa62d80)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c | 9 +++++++++
 dlls/sapi/tts.c       | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 38ec1d31bfc..87711eac61a 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -431,6 +431,7 @@ static void test_spvoice(void)
     ULONG stream_num;
     DWORD regid;
     DWORD start, duration;
+    ISpeechVoice *speech_voice;
     HRESULT hr;
 
     if (waveOutGetNumDevs() == 0) {
@@ -681,6 +682,14 @@ static void test_spvoice(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     ok(duration < 300, "took %lu ms.\n", duration);
 
+    hr = ISpVoice_QueryInterface(voice, &IID_ISpeechVoice, (void **)&speech_voice);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+
+    hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+
+    ISpeechVoice_Release(speech_voice);
+
 done:
     reset_engine_params(&test_engine);
     ISpVoice_Release(voice);
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index c2e36fc274d..e719a544a01 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -357,9 +357,11 @@ static HRESULT WINAPI speech_voice_get_SynchronousSpeakTimeout(ISpeechVoice *ifa
 
 static HRESULT WINAPI speech_voice_Speak(ISpeechVoice *iface, BSTR text, SpeechVoiceSpeakFlags flags, LONG *number)
 {
-    FIXME("(%p, %s, %#x, %p): stub.\n", iface, debugstr_w(text), flags, number);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
 
-    return E_NOTIMPL;
+    TRACE("(%p, %s, %#x, %p).\n", iface, debugstr_w(text), flags, number);
+
+    return ISpVoice_Speak(&This->ISpVoice_iface, text, flags, (ULONG *)number);
 }
 
 static HRESULT WINAPI speech_voice_SpeakStream(ISpeechVoice *iface, ISpeechBaseStream *stream,

From fe1772d3dab7fa06ba15b7b23514543104c5e70b Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 16 Feb 2024 17:08:18 -0500
Subject: [PATCH 166/389] sapi: Handle zero-length attributes correctly in
 ISpObjectTokenCategory::EnumTokens.

(cherry picked from commit 4bbfd838983505ce4120ebfe94899049b071fbb8)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/token.c | 10 ++++++++++
 dlls/sapi/token.c       |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 6d2c40ea154..c7067718c45 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -205,6 +205,16 @@ static void test_token_category(void)
 
     IEnumSpObjectTokens_Release( enum_tokens );
 
+    hr = ISpObjectTokenCategory_EnumTokens( cat, L"", NULL, &enum_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    count = 0xdeadbeef;
+    hr = IEnumSpObjectTokens_GetCount( enum_tokens, &count );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( count == 5, "got %lu\n", count );
+
+    IEnumSpObjectTokens_Release( enum_tokens );
+
     hr = ISpObjectTokenCategory_EnumTokens( cat, L"Language=409", NULL, &enum_tokens );
     ok( hr == S_OK, "got %08lx\n", hr );
 
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index ad8163c9567..65d35dc96ff 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -947,7 +947,7 @@ static HRESULT score_attributes( ISpObjectToken *token, const WCHAR *attrs,
     unsigned int i, j;
     HRESULT hr;
 
-    if (!attrs)
+    if (!attrs || !*attrs)
     {
         *score = 1;
         return S_OK;

From c843bc964d87a9c248a69d407e522144f9b4136a Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Thu, 15 Feb 2024 17:13:55 -0500
Subject: [PATCH 167/389] sapi: Introduce create_token_category helper in tts.

(cherry picked from commit 0f8b59a245bc85e45c0fc8987d6f42794165c4d3)

CW-Bug-Id: #22520
---
 dlls/sapi/tts.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index e719a544a01..381558659b8 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -82,6 +82,15 @@ static inline struct tts_engine_site *impl_from_ISpTTSEngineSite(ISpTTSEngineSit
     return CONTAINING_RECORD(iface, struct tts_engine_site, ISpTTSEngineSite_iface);
 }
 
+static HRESULT create_token_category(const WCHAR *cat_id, ISpObjectTokenCategory **cat)
+{
+    HRESULT hr;
+    if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER,
+                                     &IID_ISpObjectTokenCategory, (void **)cat)))
+        return hr;
+    return ISpObjectTokenCategory_SetId(*cat, cat_id, FALSE);
+}
+
 static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token)
 {
     ISpObjectTokenCategory *cat;
@@ -90,17 +99,13 @@ static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token)
 
     TRACE("(%s, %p).\n", debugstr_w(cat_id), token);
 
-    if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER,
-                                     &IID_ISpObjectTokenCategory, (void **)&cat)))
+    if (FAILED(hr = create_token_category(cat_id, &cat)))
         return hr;
 
-    if (FAILED(hr = ISpObjectTokenCategory_SetId(cat, cat_id, FALSE)) ||
-        FAILED(hr = ISpObjectTokenCategory_GetDefaultTokenId(cat, &default_token_id)))
-    {
-        ISpObjectTokenCategory_Release(cat);
-        return hr;
-    }
+    hr = ISpObjectTokenCategory_GetDefaultTokenId(cat, &default_token_id);
     ISpObjectTokenCategory_Release(cat);
+    if (FAILED(hr))
+        return hr;
 
     if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
                                      &IID_ISpObjectToken, (void **)token)))

From 4fdd8adf560a7a0bd9c95b59bcfbf4e79fec031e Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 16 Feb 2024 15:21:28 -0500
Subject: [PATCH 168/389] sapi: Implement ISpeechVoice::GetVoices.

(cherry picked from commit 62aec0318b958655a86d25a8baad8b37525fa564)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c | 31 +++++++++++++++++++++++++++++--
 dlls/sapi/tts.c       | 21 +++++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 87711eac61a..8f88d74b9ef 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -416,7 +416,7 @@ static IClassFactory test_engine_cf = { &ClassFactoryVtbl };
 
 static void test_spvoice(void)
 {
-    static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Wine\\Winetest\\sapi\\tts\\TestEngine";
+    static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\\Voices\\Tokens\\WinetestVoice";
     static const WCHAR test_text[] = L"Hello! This is a test sentence.";
 
     ISpVoice *voice;
@@ -432,6 +432,9 @@ static void test_spvoice(void)
     DWORD regid;
     DWORD start, duration;
     ISpeechVoice *speech_voice;
+    ISpeechObjectTokens *speech_tokens;
+    LONG count;
+    BSTR req = NULL, opt = NULL;
     HRESULT hr;
 
     if (waveOutGetNumDevs() == 0) {
@@ -439,6 +442,8 @@ static void test_spvoice(void)
         return;
     }
 
+    RegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\WinetestVoice");
+
     check_apttype();
     ok(test_apt_data.type == APTTYPE_UNITIALIZED, "got apt type %d.\n", test_apt_data.type);
 
@@ -588,6 +593,7 @@ static void test_spvoice(void)
     hr = ISpObjectToken_CreateKey(token, L"Attributes", &attrs_key);
     ok(hr == S_OK, "got %#lx.\n", hr);
     ISpDataKey_SetStringValue(attrs_key, L"Language", L"409");
+    ISpDataKey_SetStringValue(attrs_key, L"Vendor", L"Winetest");
     ISpDataKey_Release(attrs_key);
 
     hr = ISpVoice_SetVoice(voice, token);
@@ -685,6 +691,25 @@ static void test_spvoice(void)
     hr = ISpVoice_QueryInterface(voice, &IID_ISpeechVoice, (void **)&speech_voice);
     ok(hr == S_OK, "got %#lx.\n", hr);
 
+    count = -1;
+    hr = ISpeechVoice_GetVoices(speech_voice, NULL, NULL, &speech_tokens);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ISpeechObjectTokens_get_Count(speech_tokens, &count);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(count > 0, "got %ld.\n", count);
+    ISpeechObjectTokens_Release(speech_tokens);
+
+    req = SysAllocString(L"Vendor=Winetest");
+    opt = SysAllocString(L"Language=409;Gender=Male");
+
+    count = 0xdeadbeef;
+    hr = ISpeechVoice_GetVoices(speech_voice, req, opt, &speech_tokens);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ISpeechObjectTokens_get_Count(speech_tokens, &count);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(count == 1, "got %ld.\n", count);
+    ISpeechObjectTokens_Release(speech_tokens);
+
     hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
     ok(hr == S_OK, "got %#lx.\n", hr);
 
@@ -695,8 +720,10 @@ static void test_spvoice(void)
     ISpVoice_Release(voice);
     ISpObjectToken_Release(token);
     ISpMMSysAudio_Release(audio_out);
+    SysFreeString(req);
+    SysFreeString(opt);
 
-    RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" );
+    RegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\WinetestVoice");
 }
 
 START_TEST(tts)
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 381558659b8..6fe01373e56 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -401,9 +401,26 @@ static HRESULT WINAPI speech_voice_Skip(ISpeechVoice *iface, const BSTR type, LO
 static HRESULT WINAPI speech_voice_GetVoices(ISpeechVoice *iface, BSTR required, BSTR optional,
                                              ISpeechObjectTokens **tokens)
 {
-    FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens);
 
-    return E_NOTIMPL;
+    ISpObjectTokenCategory *cat;
+    IEnumSpObjectTokens *token_enum;
+    HRESULT hr;
+
+    TRACE("(%p, %s, %s, %p).\n", iface, debugstr_w(required), debugstr_w(optional), tokens);
+
+    if (!tokens) return E_POINTER;
+
+    if (FAILED(hr = create_token_category(SPCAT_VOICES, &cat)))
+        return hr;
+
+    if (SUCCEEDED(hr = ISpObjectTokenCategory_EnumTokens(cat, required, optional, &token_enum)))
+    {
+        hr = IEnumSpObjectTokens_QueryInterface(token_enum, &IID_ISpeechObjectTokens, (void **)tokens);
+        IEnumSpObjectTokens_Release(token_enum);
+    }
+
+    ISpObjectTokenCategory_Release(cat);
+    return hr;
 }
 
 static HRESULT WINAPI speech_voice_GetAudioOutputs(ISpeechVoice *iface, BSTR required, BSTR optional,

From 26987b765930c7e9f44a1ada303525575883dd5e Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 16 Feb 2024 20:04:07 -0500
Subject: [PATCH 169/389] sapi: Implement ISpeechVoice::GetTypeInfoCount.

(cherry picked from commit 58087358d1038365c168772eeea9628f72c56df2)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c | 6 ++++++
 dlls/sapi/tts.c       | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 8f88d74b9ef..8f18934fce3 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -435,6 +435,7 @@ static void test_spvoice(void)
     ISpeechObjectTokens *speech_tokens;
     LONG count;
     BSTR req = NULL, opt = NULL;
+    UINT info_count;
     HRESULT hr;
 
     if (waveOutGetNumDevs() == 0) {
@@ -713,6 +714,11 @@ static void test_spvoice(void)
     hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
     ok(hr == S_OK, "got %#lx.\n", hr);
 
+    info_count = 0xdeadbeef;
+    hr = ISpeechVoice_GetTypeInfoCount(speech_voice, &info_count);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(info_count == 1, "got %u.\n", info_count);
+
     ISpeechVoice_Release(speech_voice);
 
 done:
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 6fe01373e56..2493a2804f2 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -179,11 +179,11 @@ static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface)
     return ref;
 }
 
-static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *info)
+static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *count)
 {
-    FIXME("(%p, %p): stub.\n", iface, info);
-
-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, count);
+    *count = 1;
+    return S_OK;
 }
 
 static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid,

From bffa5db35680f16b5a2a50b48509958aa402039f Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 16 Feb 2024 19:52:33 -0500
Subject: [PATCH 170/389] sapi: Implement ISpeechVoice::GetTypeInfo.

(cherry picked from commit dd083a6195df6b1b8a98940a76e6d2c7ae99b414)

CW-Bug-Id: #22520
---
 dlls/sapi/dispatch.c     |  1 +
 dlls/sapi/sapi_private.h |  1 +
 dlls/sapi/tests/tts.c    | 13 +++++++++++++
 dlls/sapi/tts.c          |  8 ++++----
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/dlls/sapi/dispatch.c b/dlls/sapi/dispatch.c
index 731ae9ae48f..c1f0e842788 100644
--- a/dlls/sapi/dispatch.c
+++ b/dlls/sapi/dispatch.c
@@ -36,6 +36,7 @@ static REFIID tid_id[] =
 {
     &IID_ISpeechObjectToken,
     &IID_ISpeechObjectTokens,
+    &IID_ISpeechVoice,
 };
 
 HRESULT get_typeinfo(enum type_id tid, ITypeInfo **ret)
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index 55e1460ad38..219436f88c1 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -57,6 +57,7 @@ enum type_id
 {
     ISpeechObjectToken_tid,
     ISpeechObjectTokens_tid,
+    ISpeechVoice_tid,
     last_tid
 };
 
diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 8f18934fce3..111d0a0bc6c 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -436,6 +436,8 @@ static void test_spvoice(void)
     LONG count;
     BSTR req = NULL, opt = NULL;
     UINT info_count;
+    ITypeInfo *typeinfo;
+    TYPEATTR *typeattr;
     HRESULT hr;
 
     if (waveOutGetNumDevs() == 0) {
@@ -719,6 +721,17 @@ static void test_spvoice(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     ok(info_count == 1, "got %u.\n", info_count);
 
+    typeinfo = NULL;
+    typeattr = NULL;
+    hr = ISpeechVoice_GetTypeInfo(speech_voice, 0, 0, &typeinfo);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(typeattr->typekind == TKIND_DISPATCH, "got %u.\n", typeattr->typekind);
+    ok(IsEqualGUID(&typeattr->guid, &IID_ISpeechVoice), "got %s.\n", wine_dbgstr_guid(&typeattr->guid));
+    ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr);
+    ITypeInfo_Release(typeinfo);
+
     ISpeechVoice_Release(speech_voice);
 
 done:
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 2493a2804f2..8e597252b31 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -186,12 +186,12 @@ static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *c
     return S_OK;
 }
 
-static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid,
+static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT index, LCID lcid,
                                                ITypeInfo **type_info)
 {
-    FIXME("(%p, %u, %lu, %p): stub.\n", iface, info, lcid, type_info);
-
-    return E_NOTIMPL;
+    TRACE("(%p, %u, %#lx, %p).\n", iface, index, lcid, type_info);
+    if (index != 0) return DISP_E_BADINDEX;
+    return get_typeinfo(ISpeechVoice_tid, type_info);
 }
 
 static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names,

From d3590aad2767229a433a9adeeb62f53f8630fc20 Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 16 Feb 2024 20:04:41 -0500
Subject: [PATCH 171/389] sapi: Implement ISpeechVoice::GetIDsOfNames.

(cherry picked from commit 9d044669f3a50fa154cbe4d1d804dee319dbbf09)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c |  7 +++++++
 dlls/sapi/tts.c       | 13 ++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 111d0a0bc6c..7566bd5c5cb 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -418,6 +418,7 @@ static void test_spvoice(void)
 {
     static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\\Voices\\Tokens\\WinetestVoice";
     static const WCHAR test_text[] = L"Hello! This is a test sentence.";
+    static const WCHAR *get_voices = L"GetVoices";
 
     ISpVoice *voice;
     IUnknown *dummy;
@@ -438,6 +439,7 @@ static void test_spvoice(void)
     UINT info_count;
     ITypeInfo *typeinfo;
     TYPEATTR *typeattr;
+    DISPID dispid;
     HRESULT hr;
 
     if (waveOutGetNumDevs() == 0) {
@@ -732,6 +734,11 @@ static void test_spvoice(void)
     ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr);
     ITypeInfo_Release(typeinfo);
 
+    dispid = 0xdeadbeef;
+    hr = ISpeechVoice_GetIDsOfNames(speech_voice, &IID_NULL, (WCHAR **)&get_voices, 1, 0x409, &dispid);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(dispid == DISPID_SVGetVoices, "got %#lx.\n", dispid);
+
     ISpeechVoice_Release(speech_voice);
 
 done:
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 8e597252b31..d08b0c5de22 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -195,11 +195,18 @@ static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT index,
 }
 
 static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names,
-                                                 UINT count, LCID lcid, DISPID *dispid)
+                                                 UINT count, LCID lcid, DISPID *dispids)
 {
-    FIXME("(%p, %s, %p, %u, %lu, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid);
+    ITypeInfo *typeinfo;
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("(%p, %s, %p, %u, %#lx, %p).\n", iface, debugstr_guid(riid), names, count, lcid, dispids);
+
+    if (FAILED(hr = get_typeinfo(ISpeechVoice_tid, &typeinfo)))
+        return hr;
+    hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispids);
+    ITypeInfo_Release(typeinfo);
+    return hr;
 }
 
 static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, REFIID riid, LCID lcid,

From fc74e4901ea50c7ae771cb96bcc3d775eff3e14c Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Sat, 17 Feb 2024 00:36:26 -0500
Subject: [PATCH 172/389] sapi: Implement ISpeechVoice::Invoke.

(cherry picked from commit c72f0ec0f06f19c5b1b443677702e867ee61f361)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c | 25 +++++++++++++++++++++++++
 dlls/sapi/tts.c       | 11 +++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 7566bd5c5cb..4d565b35294 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -440,6 +440,8 @@ static void test_spvoice(void)
     ITypeInfo *typeinfo;
     TYPEATTR *typeattr;
     DISPID dispid;
+    DISPPARAMS params;
+    VARIANT args[2], ret;
     HRESULT hr;
 
     if (waveOutGetNumDevs() == 0) {
@@ -739,6 +741,29 @@ static void test_spvoice(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     ok(dispid == DISPID_SVGetVoices, "got %#lx.\n", dispid);
 
+    memset(&params, 0, sizeof(params));
+    params.cArgs = 2;
+    params.cNamedArgs = 0;
+    params.rgvarg = args;
+    VariantInit(&args[0]);
+    VariantInit(&args[1]);
+    V_VT(&args[0]) = VT_BSTR;
+    V_VT(&args[1]) = VT_BSTR;
+    V_BSTR(&args[0]) = opt;
+    V_BSTR(&args[1]) = req;
+    VariantInit(&ret);
+    hr = ISpeechVoice_Invoke(speech_voice, dispid, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %#x.\n", V_VT(&ret));
+    hr = IDispatch_QueryInterface(V_DISPATCH(&ret), &IID_ISpeechObjectTokens, (void **)&speech_tokens);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    count = -1;
+    hr = ISpeechObjectTokens_get_Count(speech_tokens, &count);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(count == 1, "got %ld.\n", count);
+    ISpeechObjectTokens_Release(speech_tokens);
+    VariantClear(&ret);
+
     ISpeechVoice_Release(speech_voice);
 
 done:
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index d08b0c5de22..d22ffd7a0da 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -213,10 +213,17 @@ static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, RE
                                           WORD flags, DISPPARAMS *params, VARIANT *result,
                                           EXCEPINFO *excepinfo, UINT *argerr)
 {
-    FIXME("(%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid),
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE("(%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p).\n", iface, dispid, debugstr_guid(riid),
           lcid, flags, params, result, excepinfo, argerr);
 
-    return E_NOTIMPL;
+    if (FAILED(hr = get_typeinfo(ISpeechVoice_tid, &typeinfo)))
+        return hr;
+    hr = ITypeInfo_Invoke(typeinfo, iface, dispid, flags, params, result, excepinfo, argerr);
+    ITypeInfo_Release(typeinfo);
+    return hr;
 }
 
 static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceStatus **status)

From 55b78c56e0fc34e60e91ae9affcf8a0d30c4a2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 21 Feb 2024 17:25:37 +0100
Subject: [PATCH 173/389] winegstreamer/video_decoder: Reset sample timestamp
 on stream start.

CW-Bug-Id: #23248
---
 dlls/winegstreamer/video_decoder.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 95a014a46e0..18ac6c0858f 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -600,6 +600,10 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_
     case MFT_MESSAGE_COMMAND_FLUSH:
         return wg_transform_flush(decoder->wg_transform);
 
+    case MFT_MESSAGE_NOTIFY_START_OF_STREAM:
+        decoder->sample_time = 0;
+        return S_OK;
+
     default:
         FIXME("Ignoring message %#x.\n", message);
         return S_OK;

From 5a67ab8423d185442f93da138f12ae2bdf087182 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 20 Feb 2024 10:54:45 +0800
Subject: [PATCH 174/389] dsound/tests: Test that formats with more than two
 channels require WAVEFORMATEXTENSIBLE.

(cherry picked from commit b3ec5bc7ea3138d7fe8b6a1a5fa441ae305ab413)

CW-Bug-Id: #19927
---
 dlls/dsound/tests/dsound.c | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index 9656a458415..c957f3a8a4b 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -1481,6 +1481,51 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I
     fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
     rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf);
     ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
+
+    /* The following 4 tests show that formats with more than two channels require WAVEFORMATEXTENSIBLE */
+    wfx.wFormatTag = WAVE_FORMAT_PCM;
+    wfx.nChannels = 2;
+    wfx.nSamplesPerSec = 44100;
+    wfx.wBitsPerSample = 16;
+    wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8;
+    wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
+    rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf);
+    ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
+    IDirectSoundBuffer_Release(got_buf);
+
+    wfx.wFormatTag = WAVE_FORMAT_PCM;
+    wfx.nChannels = 4;
+    wfx.nSamplesPerSec = 44100;
+    wfx.wBitsPerSample = 16;
+    wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8;
+    wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
+    rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf);
+    todo_wine
+    ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc);
+
+    wfx.wFormatTag = WAVE_FORMAT_PCM;
+    wfx.nChannels = 6;
+    wfx.nSamplesPerSec = 44100;
+    wfx.wBitsPerSample = 16;
+    wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8;
+    wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
+    rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf);
+    todo_wine
+    ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc);
+
+    fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
+    fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+    fmtex.Format.nChannels = 6;
+    fmtex.Format.nSamplesPerSec = 44100;
+    fmtex.Format.wBitsPerSample = 16;
+    fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8;
+    fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign;
+    fmtex.Samples.wValidBitsPerSample = fmtex.Format.wBitsPerSample;
+    fmtex.dwChannelMask = KSAUDIO_SPEAKER_5POINT1;
+    fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+    rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX *)&fmtex, &got_buf);
+    ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
+    IDirectSoundBuffer_Release(got_buf);
 }
 
 static HRESULT test_invalid_fmts(LPGUID lpGuid)

From dda8157564bf82593f85fea75b5eedeb12b1c101 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 20 Feb 2024 11:04:13 +0800
Subject: [PATCH 175/389] dsound: Reject WAVEFORMATEX formats with more than
 two channels.

Formats with more than two channels require WAVEFORMATEXTENSIBLE according to tests.

Fix Viking: Battle for Asgard (211160) audio cracking in its intro video.

(cherry picked from commit 7c7b2e8e7e8c0be1a756e6d7c705b68017459e26)

CW-Bug-Id: #19927
---
 dlls/dsound/dsound.c       | 3 +++
 dlls/dsound/primary.c      | 3 +++
 dlls/dsound/tests/dsound.c | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index b1c0c76c367..247d1edcf6b 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -489,6 +489,9 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer(
             return DSERR_INVALIDPARAM;
         }
 
+        if (dsbd->lpwfxFormat->nChannels > 2 && dsbd->lpwfxFormat->wFormatTag != WAVE_FORMAT_EXTENSIBLE)
+            return DSERR_INVALIDPARAM;
+
         if (dsbd->lpwfxFormat->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
         {
             WAVEFORMATEXTENSIBLE *pwfxe = (WAVEFORMATEXTENSIBLE*)dsbd->lpwfxFormat;
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 8cfcd1d8a28..22cf475a674 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -538,6 +538,9 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe
 			return DSERR_INVALIDPARAM;
 	}
 
+        if (passed_fmt->nChannels > 2 && passed_fmt->wFormatTag != WAVE_FORMAT_EXTENSIBLE)
+            return DSERR_ALLOCATED;
+
 	/* **** */
 	AcquireSRWLockExclusive(&device->buffer_list_lock);
 	EnterCriticalSection(&(device->mixlock));
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index c957f3a8a4b..500bc19f655 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -1500,7 +1500,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I
     wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8;
     wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
     rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf);
-    todo_wine
     ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc);
 
     wfx.wFormatTag = WAVE_FORMAT_PCM;
@@ -1510,7 +1509,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I
     wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8;
     wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
     rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf);
-    todo_wine
     ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc);
 
     fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);

From e8b8d2f0213eca6129ff3e112626b3096692a688 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Thu, 22 Feb 2024 15:45:14 +0800
Subject: [PATCH 176/389] fixup! winex11.drv: Listen to RawMotion and
 RawButton* events in the desktop thread.

Fix 7be9a6ec breaks virtual desktop.

CW-Bug-Id: #18383
---
 dlls/winex11.drv/mouse.c       | 5 -----
 dlls/winex11.drv/window.c      | 3 +++
 dlls/winex11.drv/x11drv_main.c | 3 ---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 1c853e9393f..befc691263f 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -368,11 +368,6 @@ void X11DRV_XInput2_Enable( Display *display, Window window, long event_mask )
     mask.deviceid = XIAllMasterDevices;
     memset( mask_bits, 0, sizeof(mask_bits) );
 
-    if (NtUserGetWindowThread( NtUserGetDesktopWindow(), NULL ) == GetCurrentThreadId())
-        data->xi2_rawinput_only = TRUE;
-    else
-        data->xi2_rawinput_only = FALSE;
-
     /* FIXME: steam overlay doesn't like if we use XI2 for non-raw events */
 
     if (event_mask & PointerMotionMask)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index f355bb20c8c..db51152e1dc 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2488,6 +2488,9 @@ BOOL X11DRV_CreateWindow( HWND hwnd )
         struct x11drv_thread_data *data = x11drv_init_thread_data();
         XSetWindowAttributes attr;
 
+        data->xi2_rawinput_only = TRUE;
+        X11DRV_XInput2_Enable( data->display, None, PointerMotionMask | ButtonPressMask | ButtonReleaseMask );
+
         /* create the cursor clipping window */
         attr.override_redirect = TRUE;
         attr.event_mask = StructureNotifyMask | FocusChangeMask;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 2d3104c2641..19c41ea4945 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -932,9 +932,6 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
     if (use_xim) xim_thread_attach( data );
 
     X11DRV_XInput2_Init();
-    if (NtUserGetWindowThread( NtUserGetDesktopWindow(), NULL ) == GetCurrentThreadId())
-        X11DRV_XInput2_Enable( data->display, None, PointerMotionMask|ButtonPressMask|ButtonReleaseMask );
-
     return data;
 }
 

From 000724f6e503d5f5ca3712749a6aed96c1c29805 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 22 Feb 2024 09:42:41 -0600
Subject: [PATCH 177/389] amd_ags_x64: Implement multi draw instanced
 functions.

CW-Bug-Id: #22976
---
 dlls/amd_ags_x64/amd_ags_x64.spec   |   4 +-
 dlls/amd_ags_x64/amd_ags_x64_main.c | 104 ++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index 4dab7f1e892..9baeed9f69f 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -15,9 +15,9 @@
 @ stub agsDriverExtensionsDX11_GetMaxClipRects
 @ stub agsDriverExtensionsDX11_IASetPrimitiveTopology
 @ stdcall agsDriverExtensionsDX11_Init(ptr ptr long ptr)
-@ stub agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect() DX11_MultiDrawIndexedInstancedIndirect_impl
 @ stub agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect
-@ stub agsDriverExtensionsDX11_MultiDrawInstancedIndirect
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawInstancedIndirect() DX11_MultiDrawInstancedIndirect_impl
 @ stub agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect
 @ stub agsDriverExtensionsDX11_NotifyResourceBeginAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndAllAccess
diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index c402da755b0..c2baad77263 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -1126,6 +1126,7 @@ static void get_dx11_extensions_supported(ID3D11Device *device, AGSDX11Extension
 
     extensions->depthBoundsTest = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_DEPTH_BOUNDS);
     extensions->uavOverlap = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_BARRIER_CONTROL);
+    extensions->multiDrawIndirect = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_MULTI_DRAW_INDIRECT);
     extensions->UAVOverlapDeferredContexts = extensions->uavOverlap;
 
     ID3D11VkExtDevice_Release(ext_device);
@@ -1486,6 +1487,109 @@ __ASM_GLOBAL_FUNC( DX11_EndUAVOverlap_impl,
                    "jmp " __ASM_NAME("agsDriverExtensionsDX11_EndUAVOverlap_520") "\n\t"
                    "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_EndUAVOverlap") )
 
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect(AGSContext *context, ID3D11DeviceContext *dx_context,
+        unsigned int draw_count, ID3D11Buffer *buffer_for_args, unsigned int aligned_byte_offset_for_args,
+        unsigned int byte_stride_for_args)
+{
+    ID3D11VkExtContext *ext_context;
+
+    TRACE("context %p, dx_context %p, draw_count %u, buffer_for_args %p, aligned_byte_offset_for_args %u, byte_stride_for_args %u.\n",
+            context, dx_context, draw_count, buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+
+    if (!context || !dx_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+
+    if (!context->extensions.multiDrawIndirect)
+        return AGS_EXTENSION_NOT_SUPPORTED;
+
+    if (FAILED(ID3D11DeviceContext_QueryInterface(dx_context, &IID_ID3D11VkExtContext, (void **)&ext_context)))
+    {
+        TRACE("No ID3D11VkExtContext.\n");
+        return AGS_EXTENSION_NOT_SUPPORTED;
+    }
+
+    ID3D11VkExtContext_MultiDrawIndexedIndirect(ext_context, draw_count, buffer_for_args, aligned_byte_offset_for_args,
+            byte_stride_for_args);
+    ID3D11VkExtContext_Release(ext_context);
+    return AGS_SUCCESS;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect_520(AGSContext *context,
+        unsigned int draw_count, ID3D11Buffer *buffer_for_args, unsigned int aligned_byte_offset_for_args,
+        unsigned int byte_stride_for_args)
+{
+    if (!context || !context->d3d11_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+    return agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect(context, context->d3d11_context, draw_count,
+            buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+}
+
+C_ASSERT(AMD_AGS_VERSION_5_3_0 == 4);
+__ASM_GLOBAL_FUNC( DX11_MultiDrawIndexedInstancedIndirect_impl,
+                   "mov (%rcx),%eax\n\t" /* version */
+                   "cmp $4,%eax\n\t"
+                   "jge 1f\n\t"
+                   "jmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect_520") "\n\t"
+                   "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect") )
+
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawInstancedIndirect(AGSContext *context, ID3D11DeviceContext *dx_context,
+        unsigned int draw_count, ID3D11Buffer *buffer_for_args, unsigned int aligned_byte_offset_for_args,
+        unsigned int byte_stride_for_args)
+{
+    ID3D11VkExtContext *ext_context;
+
+    TRACE("context %p, dx_context %p, draw_count %u, buffer_for_args %p, aligned_byte_offset_for_args %u, byte_stride_for_args %u.\n",
+            context, dx_context, draw_count, buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+
+    if (!context || !dx_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+
+    if (!context->extensions.multiDrawIndirect)
+        return AGS_EXTENSION_NOT_SUPPORTED;
+
+    if (FAILED(ID3D11DeviceContext_QueryInterface(dx_context, &IID_ID3D11VkExtContext, (void **)&ext_context)))
+    {
+        TRACE("No ID3D11VkExtContext.\n");
+        return AGS_EXTENSION_NOT_SUPPORTED;
+    }
+
+    ID3D11VkExtContext_MultiDrawIndirect(ext_context, draw_count, buffer_for_args, aligned_byte_offset_for_args,
+            byte_stride_for_args);
+    ID3D11VkExtContext_Release(ext_context);
+    return AGS_SUCCESS;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawInstancedIndirect_520( AGSContext* context, unsigned int draw_count,
+        ID3D11Buffer *buffer_for_args, unsigned int aligned_byte_offset_for_args, unsigned int byte_stride_for_args)
+{
+    if (!context || !context->d3d11_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+    return agsDriverExtensionsDX11_MultiDrawInstancedIndirect(context, context->d3d11_context, draw_count,
+            buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+}
+
+C_ASSERT(AMD_AGS_VERSION_5_3_0 == 4);
+__ASM_GLOBAL_FUNC( DX11_MultiDrawInstancedIndirect_impl,
+                   "mov (%rcx),%eax\n\t" /* version */
+                   "cmp $4,%eax\n\t"
+                   "jge 1f\n\t"
+                   "jmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawInstancedIndirect_520") "\n\t"
+                   "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawInstancedIndirect") )
+
+
 AGSReturnCode WINAPI agsDriverExtensionsDX11_DestroyDevice_520(AGSContext *context, ID3D11Device* device,
         unsigned int *device_ref, ID3D11DeviceContext *device_context,
         unsigned int *context_ref)

From 6861e8c185d4f6471f5cd025530d40fcc30087d3 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 22 Feb 2024 10:50:03 -0600
Subject: [PATCH 178/389] amd_ags_x64: Implement multi draw instanced indirect
 count functions.

CW-Bug-Id: #22976
---
 dlls/amd_ags_x64/amd_ags_x64.spec   |   4 +-
 dlls/amd_ags_x64/amd_ags_x64_main.c | 130 ++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index 9baeed9f69f..edecba85e85 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -16,9 +16,9 @@
 @ stub agsDriverExtensionsDX11_IASetPrimitiveTopology
 @ stdcall agsDriverExtensionsDX11_Init(ptr ptr long ptr)
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect() DX11_MultiDrawIndexedInstancedIndirect_impl
-@ stub agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect() DX11_MultiDrawIndexedInstancedIndirectCountIndirect_impl
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawInstancedIndirect() DX11_MultiDrawInstancedIndirect_impl
-@ stub agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect() DX11_MultiDrawInstancedIndirectCountIndirect_impl
 @ stub agsDriverExtensionsDX11_NotifyResourceBeginAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndWrites
diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index c2baad77263..65926e54291 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -1127,6 +1127,7 @@ static void get_dx11_extensions_supported(ID3D11Device *device, AGSDX11Extension
     extensions->depthBoundsTest = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_DEPTH_BOUNDS);
     extensions->uavOverlap = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_BARRIER_CONTROL);
     extensions->multiDrawIndirect = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_MULTI_DRAW_INDIRECT);
+    extensions->multiDrawIndirectCountIndirect = !!ID3D11VkExtDevice_GetExtensionSupport(ext_device, D3D11_VK_EXT_MULTI_DRAW_INDIRECT_COUNT);
     extensions->UAVOverlapDeferredContexts = extensions->uavOverlap;
 
     ID3D11VkExtDevice_Release(ext_device);
@@ -1589,6 +1590,135 @@ __ASM_GLOBAL_FUNC( DX11_MultiDrawInstancedIndirect_impl,
                    "jmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawInstancedIndirect_520") "\n\t"
                    "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawInstancedIndirect") )
 
+static unsigned int get_max_draw_count(ID3D11Buffer *args, unsigned int offset, unsigned int stride, unsigned int size)
+{
+    D3D11_BUFFER_DESC desc;
+    unsigned int count;
+
+    ID3D11Buffer_GetDesc(args, &desc);
+    if (offset >= desc.ByteWidth)
+    {
+        WARN("offset %u, buffer size %u.\n", offset, desc.ByteWidth);
+        return 0;
+    }
+    count = (desc.ByteWidth - offset) / stride;
+    if (desc.ByteWidth - offset - count * stride >= size)
+        ++count;
+    if (!count)
+        WARN("zero count, buffer size %u, offset %u, stride %u, size %u.\n", desc.ByteWidth, offset, stride, size);
+    return count;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect(AGSContext *context, ID3D11DeviceContext *dx_context,
+        ID3D11Buffer *buffer_for_draw_count, unsigned int aligned_byte_offset_for_draw_count, ID3D11Buffer *buffer_for_args,
+        unsigned int aligned_byte_offset_for_args, unsigned int byte_stride_for_args)
+{
+    ID3D11VkExtContext *ext_context;
+    unsigned int max_draw_count;
+
+    TRACE("context %p, dx_context %p, count buffer %p, offset %u, args buffer %p, offset %u, stride %u.\n",
+            context, dx_context, buffer_for_draw_count, aligned_byte_offset_for_draw_count, buffer_for_args,
+            aligned_byte_offset_for_args, byte_stride_for_args);
+
+    if (!context || !dx_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+
+    if (!context->extensions.multiDrawIndirectCountIndirect)
+        return AGS_EXTENSION_NOT_SUPPORTED;
+
+    if (FAILED(ID3D11DeviceContext_QueryInterface(dx_context, &IID_ID3D11VkExtContext, (void **)&ext_context)))
+    {
+        TRACE("No ID3D11VkExtContext.\n");
+        return AGS_EXTENSION_NOT_SUPPORTED;
+    }
+
+    max_draw_count = get_max_draw_count(buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args, sizeof(D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS));
+    ID3D11VkExtContext_MultiDrawIndexedIndirectCount(ext_context, max_draw_count, buffer_for_draw_count, aligned_byte_offset_for_draw_count,
+            buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+    ID3D11VkExtContext_Release(ext_context);
+    return AGS_SUCCESS;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect_520(AGSContext *context,
+        ID3D11Buffer *buffer_for_draw_count, unsigned int aligned_byte_offset_for_draw_count, ID3D11Buffer *buffer_for_args,
+        unsigned int aligned_byte_offset_for_args, unsigned int byte_stride_for_args)
+{
+    if (!context || !context->d3d11_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+    return agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect(context, context->d3d11_context,
+            buffer_for_draw_count, aligned_byte_offset_for_draw_count,
+            buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+}
+
+C_ASSERT(AMD_AGS_VERSION_5_3_0 == 4);
+__ASM_GLOBAL_FUNC( DX11_MultiDrawIndexedInstancedIndirectCountIndirect_impl,
+                   "mov (%rcx),%eax\n\t" /* version */
+                   "cmp $4,%eax\n\t"
+                   "jge 1f\n\t"
+                   "jmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect_520") "\n\t"
+                   "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect") )
+
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect(AGSContext *context, ID3D11DeviceContext *dx_context,
+        ID3D11Buffer *buffer_for_draw_count, unsigned int aligned_byte_offset_for_draw_count, ID3D11Buffer *buffer_for_args,
+        unsigned int aligned_byte_offset_for_args, unsigned int byte_stride_for_args)
+{
+    ID3D11VkExtContext *ext_context;
+    unsigned int max_draw_count;
+
+    TRACE("context %p, dx_context %p, count buffer %p, offset %u, args buffer %p, offset %u, stride %u.\n",
+            context, dx_context, buffer_for_draw_count, aligned_byte_offset_for_draw_count, buffer_for_args,
+            aligned_byte_offset_for_args, byte_stride_for_args);
+
+    if (!context || !dx_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+
+    if (!context->extensions.multiDrawIndirectCountIndirect)
+        return AGS_EXTENSION_NOT_SUPPORTED;
+
+    if (FAILED(ID3D11DeviceContext_QueryInterface(dx_context, &IID_ID3D11VkExtContext, (void **)&ext_context)))
+    {
+        TRACE("No ID3D11VkExtContext.\n");
+        return AGS_EXTENSION_NOT_SUPPORTED;
+    }
+
+    max_draw_count = get_max_draw_count(buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args, sizeof(D3D11_DRAW_INSTANCED_INDIRECT_ARGS));
+    ID3D11VkExtContext_MultiDrawIndirectCount(ext_context, max_draw_count, buffer_for_draw_count, aligned_byte_offset_for_draw_count,
+            buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+    ID3D11VkExtContext_Release(ext_context);
+    return AGS_SUCCESS;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect_520(AGSContext *context,
+        ID3D11Buffer *buffer_for_draw_count, unsigned int aligned_byte_offset_for_draw_count, ID3D11Buffer *buffer_for_args,
+        unsigned int aligned_byte_offset_for_args, unsigned int byte_stride_for_args)
+{
+    if (!context || !context->d3d11_context)
+    {
+        WARN("Invalid arguments.\n");
+        return AGS_INVALID_ARGS;
+    }
+    return agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect(context, context->d3d11_context,
+            buffer_for_draw_count, aligned_byte_offset_for_draw_count,
+            buffer_for_args, aligned_byte_offset_for_args, byte_stride_for_args);
+}
+
+C_ASSERT(AMD_AGS_VERSION_5_3_0 == 4);
+__ASM_GLOBAL_FUNC( DX11_MultiDrawInstancedIndirectCountIndirect_impl,
+                   "mov (%rcx),%eax\n\t" /* version */
+                   "cmp $4,%eax\n\t"
+                   "jge 1f\n\t"
+                   "jmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect_520") "\n\t"
+                   "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect") )
 
 AGSReturnCode WINAPI agsDriverExtensionsDX11_DestroyDevice_520(AGSContext *context, ID3D11Device* device,
         unsigned int *device_ref, ID3D11DeviceContext *device_context,

From 322b88ed403eff9ccc6123d86221493e4dc615c6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 23 Feb 2024 19:13:16 -0600
Subject: [PATCH 179/389] nsiproxy.sys: Fix ipv6 route table parsing on Linux.

CW-Bug-Id: #23640
---
 dlls/nsiproxy.sys/ip.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c
index fe49caa6e57..09f033ac634 100644
--- a/dlls/nsiproxy.sys/ip.c
+++ b/dlls/nsiproxy.sys/ip.c
@@ -1544,7 +1544,7 @@ struct in6_addr str_to_in6_addr(char *nptr, char **endptr)
 
     for (int i = 0; i < sizeof(ret); i++)
     {
-        if (!isxdigit( *nptr ) || !isxdigit( *nptr + 1 ))
+        if (!isxdigit( *nptr ) || !isxdigit( *(nptr + 1) ))
         {
             /* invalid hex string */
             if (endptr) *endptr = nptr;
@@ -1574,7 +1574,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
 
 #ifdef __linux__
     {
-        char buf[512], *ptr;
+        char buf[512], *ptr, *end;
         UINT rtf_flags;
         FILE *fp;
 
@@ -1582,9 +1582,6 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
 
         while ((ptr = fgets( buf, sizeof(buf), fp )))
         {
-            while (!isspace( *ptr )) ptr++;
-            *ptr++ = '\0';
-
             entry.prefix = str_to_in6_addr( ptr, &ptr );
             entry.prefix_len = strtoul( ptr + 1, &ptr, 16 );
             str_to_in6_addr( ptr + 1, &ptr ); /* source network, skip */
@@ -1597,6 +1594,10 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
             entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL;
             entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32;
 
+            while (isspace( *ptr )) ptr++;
+            end = ptr;
+            while (*end && !isspace(*end)) ++end;
+            *end = 0;
             if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue;
             if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue;
 

From 11a9ad1bba9ef06a33da0a44126d37d83f38c49b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 23 Feb 2024 17:49:43 -0600
Subject: [PATCH 180/389] iphlpapi: Partially fill Ipv4 / Ipv6 metric in
 GetAdaptersAddresses().

CW-Bug-Id: #23640
---
 dlls/iphlpapi/iphlpapi_main.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 9c7582b71fb..207c2ae20d0 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -993,6 +993,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG
 {
     struct nsi_ipv4_forward_key *key4;
     struct nsi_ipv6_forward_key *key6;
+    struct nsi_ip_forward_rw *rw;
     IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next;
     IP_ADAPTER_PREFIX *prefix, **prefix_next;
     DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6);
@@ -1002,11 +1003,14 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG
     void *key;
 
     err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_FORWARD_TABLE, &key, key_size,
-                                  NULL, 0, NULL, 0, NULL, 0, &count, 0 );
+                                  (void **)&rw, sizeof(*rw), NULL, 0, NULL, 0, &count, 0 );
     if (err) return err;
 
     while (aa)
     {
+        if (family == AF_INET) aa->Ipv4Metric = ~0u;
+        else                   aa->Ipv6Metric = ~0u;
+
         for (gw_next = &aa->FirstGatewayAddress; *gw_next; gw_next = &(*gw_next)->Next)
             ;
         for (prefix_next = &aa->FirstPrefix; *prefix_next; prefix_next = &(*prefix_next)->Next)
@@ -1019,6 +1023,12 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG
             luid = (family == AF_INET) ? &key4->luid : &key6->luid;
             if (luid->Value != aa->Luid.Value) continue;
 
+            if (rw[i].metric)
+            {
+                if (family == AF_INET) aa->Ipv4Metric = min( aa->Ipv4Metric, rw[i].metric );
+                else                   aa->Ipv6Metric = min( aa->Ipv6Metric, rw[i].metric );
+            }
+
             if (flags & GAA_FLAG_INCLUDE_GATEWAYS)
             {
                 memset( &sockaddr, 0, sizeof(sockaddr) );
@@ -1103,7 +1113,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG
     }
 
 err:
-    NsiFreeTable( key, NULL, NULL, NULL );
+    NsiFreeTable( key, rw, NULL, NULL );
     return err;
 }
 
@@ -1269,11 +1279,8 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD
         if (err) goto err;
     }
 
-    if (flags & (GAA_FLAG_INCLUDE_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX))
-    {
-        err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags );
-        if (err) goto err;
-    }
+    err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags );
+    if (err) goto err;
 
     err = dns_info_alloc( aa, family, flags );
     if (err) goto err;

From 13a01f89a68fac414ea2bf65155afd80dd45a788 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 13:22:41 -0600
Subject: [PATCH 181/389] Revert "win32u: Use font AA flags when querying glyph
 outline with GGO_METRICS."

This reverts commit 7a433892887fb907c94d67ccbb018ccfae08d25f.

CW-Bug-Id: #23452
---
 dlls/win32u/freetype.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index b6f85bf2594..558adb69f9d 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -3469,7 +3469,6 @@ static UINT freetype_get_glyph_outline( struct gdi_font *font, UINT glyph, UINT
     FT_Int load_flags;
     FT_Matrix transform_matrices[3], *matrices = NULL;
     BOOL vertical_metrics;
-    UINT effective_format = format;
 
     TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat);
 
@@ -3479,22 +3478,14 @@ static UINT freetype_get_glyph_outline( struct gdi_font *font, UINT glyph, UINT
 
     matrices = get_transform_matrices( font, tategaki, lpmat, transform_matrices );
 
-    if ((format & ~GGO_GLYPH_INDEX) == GGO_METRICS)
-        effective_format = font->aa_flags | (format & GGO_GLYPH_INDEX);
     vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face));
     /* there is a freetype bug where vertical metrics are only
        properly scaled and correct in 2.4.0 or greater */
     if (vertical_metrics && FT_SimpleVersion < FT_VERSION_VALUE(2, 4, 0))
         vertical_metrics = FALSE;
-    load_flags = get_load_flags(effective_format, vertical_metrics, !!matrices);
+    load_flags = get_load_flags(format, vertical_metrics, !!matrices);
 
     err = pFT_Load_Glyph(ft_face, glyph, load_flags);
-    if (err && format != effective_format)
-    {
-        WARN("Failed to load glyph %#x, retrying with GGO_METRICS. Error %#x.\n", glyph, err);
-        load_flags = get_load_flags(effective_format, vertical_metrics, !!matrices);
-        err = pFT_Load_Glyph(ft_face, glyph, load_flags);
-    }
     if (err && !(load_flags & FT_LOAD_NO_HINTING))
     {
         WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph, err);

From c0cf13bdc9fc1f61fe66196a66932894067a0368 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 13:22:43 -0600
Subject: [PATCH 182/389] Revert "win32u: Store effective AA flags in
 gdi_font."

This reverts commit d098d5cf8708edb184f221acb4c19d496b64fa14.

CW-Bug-Id: #23452
---
 dlls/win32u/font.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index 6094ea0261b..c5cf09f56f7 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -4689,7 +4689,6 @@ static HFONT font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )
                     *aa_flags = font_smoothing;
             }
             *aa_flags = font_funcs->get_aa_flags( font, *aa_flags, antialias_fakes );
-            font->aa_flags = *aa_flags;
         }
         TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), (int)lf.lfHeight, *aa_flags );
         pthread_mutex_unlock( &font_lock );

From f027a1bd2483b978f019b2d0929e66f996d7c50f Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 13:37:03 -0600
Subject: [PATCH 183/389] win32u: Store effective AA flags in font_physdev.

CW-Bug-Id: #22992
---
 dlls/win32u/font.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index c5cf09f56f7..48e839a47f3 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -55,6 +55,7 @@ struct font_physdev
 {
     struct gdi_physdev dev;
     struct gdi_font   *font;
+    UINT               aa_flags;
 };
 
 static inline struct font_physdev *get_font_dev( PHYSDEV dev )
@@ -4689,6 +4690,7 @@ static HFONT font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )
                     *aa_flags = font_smoothing;
             }
             *aa_flags = font_funcs->get_aa_flags( font, *aa_flags, antialias_fakes );
+            physdev->aa_flags = *aa_flags;
         }
         TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), (int)lf.lfHeight, *aa_flags );
         pthread_mutex_unlock( &font_lock );

From 333aef5880cf0fe770c7dd66e7d0c58a89102c85 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 15 Nov 2023 21:30:12 -0600
Subject: [PATCH 184/389] win32u: Use font AA flags when querying glyph outline
 with GGO_METRICS.

CW-Bug-Id: #22992
---
 dlls/win32u/font.c          | 16 ++++++++--------
 dlls/win32u/freetype.c      | 13 +++++++++++--
 dlls/win32u/ntgdi_private.h |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index 48e839a47f3..08060e0a9b7 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -3851,7 +3851,7 @@ static UINT get_glyph_index_linked( struct gdi_font **font, UINT glyph )
 
 static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format,
                                 GLYPHMETRICS *gm_ret, ABC *abc_ret, DWORD buflen, void *buf,
-                                const MAT2 *mat )
+                                const MAT2 *mat, UINT aa_flags )
 {
     GLYPHMETRICS gm;
     ABC abc;
@@ -3885,7 +3885,7 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format,
     if (format == GGO_METRICS && !mat && get_gdi_font_glyph_metrics( font, index, &gm, &abc ))
         goto done;
 
-    ret = font_funcs->get_glyph_outline( font, index, format, &gm, &abc, buflen, buf, mat, tategaki );
+    ret = font_funcs->get_glyph_outline( font, index, format, &gm, &abc, buflen, buf, mat, tategaki, aa_flags );
     if (ret == GDI_ERROR) return ret;
 
     if (format == GGO_METRICS && !mat)
@@ -3934,7 +3934,7 @@ static BOOL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, WCHAR *c
     for (i = 0; i < count; i++)
     {
         c = chars ? chars[i] : first + i;
-        get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &buffer[i], 0, NULL, NULL );
+        get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &buffer[i], 0, NULL, NULL, physdev->aa_flags );
     }
     pthread_mutex_unlock( &font_lock );
     return TRUE;
@@ -3960,7 +3960,7 @@ static BOOL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, WORD *g
     pthread_mutex_lock( &font_lock );
     for (c = 0; c < count; c++, buffer++)
         get_glyph_outline( physdev->font, gi ? gi[c] : first + c, GGO_METRICS | GGO_GLYPH_INDEX,
-                           NULL, buffer, 0, NULL, NULL );
+                           NULL, buffer, 0, NULL, NULL, physdev->aa_flags );
     pthread_mutex_unlock( &font_lock );
     return TRUE;
 }
@@ -3987,7 +3987,7 @@ static BOOL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, const WCHAR
     for (i = 0; i < count; i++)
     {
         c = chars ? chars[i] : i + first;
-        if (get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &abc, 0, NULL, NULL ) == GDI_ERROR)
+        if (get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &abc, 0, NULL, NULL, physdev->aa_flags ) == GDI_ERROR)
             buffer[i] = 0;
         else
             buffer[i] = abc.abcA + abc.abcB + abc.abcC;
@@ -4166,7 +4166,7 @@ static DWORD font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format,
         return dev->funcs->pGetGlyphOutline( dev, glyph, format, gm, buflen, buf, mat );
     }
     pthread_mutex_lock( &font_lock );
-    ret = get_glyph_outline( physdev->font, glyph, format, gm, NULL, buflen, buf, mat );
+    ret = get_glyph_outline( physdev->font, glyph, format, gm, NULL, buflen, buf, mat, physdev->aa_flags );
     pthread_mutex_unlock( &font_lock );
     return ret;
 }
@@ -4346,7 +4346,7 @@ static BOOL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT count,
     pthread_mutex_lock( &font_lock );
     for (i = pos = 0; i < count; i++)
     {
-        get_glyph_outline( physdev->font, str[i], GGO_METRICS, NULL, &abc, 0, NULL, NULL );
+        get_glyph_outline( physdev->font, str[i], GGO_METRICS, NULL, &abc, 0, NULL, NULL, physdev->aa_flags );
         pos += abc.abcA + abc.abcB + abc.abcC;
         dxs[i] = pos;
     }
@@ -4376,7 +4376,7 @@ static BOOL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT co
     for (i = pos = 0; i < count; i++)
     {
         get_glyph_outline( physdev->font, indices[i], GGO_METRICS | GGO_GLYPH_INDEX,
-                           NULL, &abc, 0, NULL, NULL );
+                           NULL, &abc, 0, NULL, NULL, physdev->aa_flags );
         pos += abc.abcA + abc.abcB + abc.abcC;
         dxs[i] = pos;
     }
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index 558adb69f9d..880b1f8603b 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -3459,7 +3459,7 @@ static FT_Int get_load_flags( UINT format, BOOL vertical_metrics, BOOL force_no_
  */
 static UINT freetype_get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format,
                                         GLYPHMETRICS *lpgm, ABC *abc, UINT buflen, void *buf,
-                                        const MAT2 *lpmat, BOOL tategaki )
+                                        const MAT2 *lpmat, BOOL tategaki, UINT aa_flags )
 {
     struct gdi_font *base_font = font->base_font ? font->base_font : font;
     FT_Face ft_face = get_ft_face( font );
@@ -3469,6 +3469,7 @@ static UINT freetype_get_glyph_outline( struct gdi_font *font, UINT glyph, UINT
     FT_Int load_flags;
     FT_Matrix transform_matrices[3], *matrices = NULL;
     BOOL vertical_metrics;
+    UINT effective_format = format;
 
     TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat);
 
@@ -3478,14 +3479,22 @@ static UINT freetype_get_glyph_outline( struct gdi_font *font, UINT glyph, UINT
 
     matrices = get_transform_matrices( font, tategaki, lpmat, transform_matrices );
 
+    if (aa_flags && (format & ~GGO_GLYPH_INDEX) == GGO_METRICS)
+        effective_format = aa_flags | (format & GGO_GLYPH_INDEX);
     vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face));
     /* there is a freetype bug where vertical metrics are only
        properly scaled and correct in 2.4.0 or greater */
     if (vertical_metrics && FT_SimpleVersion < FT_VERSION_VALUE(2, 4, 0))
         vertical_metrics = FALSE;
-    load_flags = get_load_flags(format, vertical_metrics, !!matrices);
+    load_flags = get_load_flags(effective_format, vertical_metrics, !!matrices);
 
     err = pFT_Load_Glyph(ft_face, glyph, load_flags);
+    if (err && format != effective_format)
+    {
+        WARN("Failed to load glyph %#x, retrying with GGO_METRICS. Error %#x.\n", glyph, err);
+        load_flags = get_load_flags(effective_format, vertical_metrics, !!matrices);
+        err = pFT_Load_Glyph(ft_face, glyph, load_flags);
+    }
     if (err && !(load_flags & FT_LOAD_NO_HINTING))
     {
         WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph, err);
diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h
index 5c4f8279c87..eb82df750ba 100644
--- a/dlls/win32u/ntgdi_private.h
+++ b/dlls/win32u/ntgdi_private.h
@@ -327,7 +327,7 @@ struct font_backend_funcs
     UINT  (*get_default_glyph)( struct gdi_font *gdi_font );
     UINT  (*get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format,
                                 GLYPHMETRICS *gm, ABC *abc, UINT buflen, void *buf,
-                                const MAT2 *mat, BOOL tategaki );
+                                const MAT2 *mat, BOOL tategaki, UINT aa_flags );
     UINT  (*get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs );
     BOOL  (*get_char_width_info)( struct gdi_font *font, struct char_width_info *info );
     BOOL  (*set_outline_text_metrics)( struct gdi_font *font );

From 73003ac0feb429f100ad7ada1cce3222f87fc986 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 19:33:28 -0600
Subject: [PATCH 185/389] faudio: Take lock before accessing list in
 LinkedList_RemoveEntry().

CW-Bug-Id: #23472
---
 libs/faudio/src/FAudio_internal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/faudio/src/FAudio_internal.c b/libs/faudio/src/FAudio_internal.c
index f0d46cfa4b6..7ce57d52a16 100644
--- a/libs/faudio/src/FAudio_internal.c
+++ b/libs/faudio/src/FAudio_internal.c
@@ -212,9 +212,9 @@ void LinkedList_RemoveEntry(
 	FAudioFreeFunc pFree
 ) {
 	LinkedList *latest, *prev;
+	FAudio_PlatformLockMutex(lock);
 	latest = *start;
 	prev = latest;
-	FAudio_PlatformLockMutex(lock);
 	while (latest != NULL)
 	{
 		if (latest->entry == toRemove)

From d497be23aa6940fcb269831cf3f92bc76e3f0444 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 19:34:12 -0600
Subject: [PATCH 186/389] faudio: Don't destroy voice when it is output to
 other voices.

CW-Bug-Id: #23472
---
 libs/faudio/include/FAudio.h |  2 +-
 libs/faudio/src/FAudio.c     | 61 +++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h
index 1a873ca2064..1994cd7543b 100644
--- a/libs/faudio/include/FAudio.h
+++ b/libs/faudio/include/FAudio.h
@@ -1062,7 +1062,7 @@ FAUDIOAPI void FAudioVoice_GetOutputMatrix(
 );
 
 /* Removes this voice from the audio graph and frees memory. */
-FAUDIOAPI void FAudioVoice_DestroyVoice(FAudioVoice *voice);
+FAUDIOAPI uint32_t FAudioVoice_DestroyVoice(FAudioVoice *voice);
 
 /* FAudioSourceVoice Interface */
 
diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c
index 9366ad58208..2bb1c1fd40d 100644
--- a/libs/faudio/src/FAudio.c
+++ b/libs/faudio/src/FAudio.c
@@ -2265,11 +2265,69 @@ void FAudioVoice_GetOutputMatrix(
 	LOG_API_EXIT(voice->audio)
 }
 
-void FAudioVoice_DestroyVoice(FAudioVoice *voice)
+static uint32_t check_for_sends_to_voice(FAudioVoice *voice)
+{
+	FAudio *audio = voice->audio;
+	uint32_t ret = 1;
+	FAudioSourceVoice *source;
+	FAudioSubmixVoice *submix;
+	LinkedList *list;
+	uint32_t i;
+
+	FAudio_PlatformLockMutex(audio->sourceLock);
+	list = audio->sources;
+	while (list != NULL)
+	{
+		source = (FAudioSourceVoice*) list->entry;
+		for (i = 0; i < source->sends.SendCount; i += 1)
+			if (source->sends.pSends[i].pOutputVoice == voice)
+			{
+				ret = 0;
+				break;
+			}
+		if (!ret)
+			break;
+		list = list->next;
+	}
+	FAudio_PlatformUnlockMutex(audio->sourceLock);
+
+	if (!ret)
+        return ret;
+
+	FAudio_PlatformLockMutex(audio->submixLock);
+	list = audio->submixes;
+	while (list != NULL)
+	{
+		submix = (FAudioSubmixVoice*) list->entry;
+		for (i = 0; i < submix->sends.SendCount; i += 1)
+			if (submix->sends.pSends[i].pOutputVoice == voice)
+			{
+				ret = 0;
+				break;
+			}
+		list = list->next;
+	}
+	FAudio_PlatformUnlockMutex(audio->submixLock);
+
+	return ret;
+}
+
+uint32_t FAudioVoice_DestroyVoice(FAudioVoice *voice)
 {
 	uint32_t i;
 	LOG_API_ENTER(voice->audio)
 
+	if (!check_for_sends_to_voice(voice))
+	{
+		LOG_ERROR(
+			voice->audio,
+			"Voice %p is an output for other voice(s)",
+			voice
+		)
+		LOG_API_EXIT(voice->audio)
+		return 0;
+	}
+
 	/* TODO: Check for dependencies and remove from audio graph first! */
 	FAudio_OPERATIONSET_ClearAllForVoice(voice);
 
@@ -2443,6 +2501,7 @@ void FAudioVoice_DestroyVoice(FAudioVoice *voice)
 	LOG_API_EXIT(voice->audio)
 	FAudio_Release(voice->audio);
 	voice->audio->pFree(voice);
+	return 1;
 }
 
 /* FAudioSourceVoice Interface */

From 431fdeb1e1537d04452a14c11df83569848b2a53 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 19:34:40 -0600
Subject: [PATCH 187/389] xaudio2: Check FAudioVoice_DestroyVoice result in
 destroy_voice().

CW-Bug-Id: #23472
---
 dlls/xaudio2_7/xaudio_dll.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index b821e9667b7..b1ef81b632e 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -499,7 +499,11 @@ static const FAudioEngineCallback FAudioEngineCallback_Vtbl = {
 
 static inline void destroy_voice(XA2VoiceImpl *This)
 {
-    FAudioVoice_DestroyVoice(This->faudio_voice);
+    if (!FAudioVoice_DestroyVoice(This->faudio_voice))
+    {
+        ERR("Destroying voice %p failed.\n", This);
+        return;
+    }
     free_effect_chain(This->effect_chain);
     This->effect_chain = NULL;
     This->in_use = FALSE;

From 448429cb322a68f0def96715e3756b59a324636b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 19:38:10 -0600
Subject: [PATCH 188/389] xaudio2/tests: Test destroying a voice which is an
 output to another one.

CW-Bug-Id: #23472
---
 dlls/xaudio2_7/tests/xaudio2.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c
index 2b3102d21fe..70d9ec78aee 100644
--- a/dlls/xaudio2_7/tests/xaudio2.c
+++ b/dlls/xaudio2_7/tests/xaudio2.c
@@ -837,7 +837,9 @@ static void test_submix(IXAudio2 *xa)
     HRESULT hr;
     IXAudio2MasteringVoice *master;
     XAUDIO2_VOICE_DETAILS details;
-    IXAudio2SubmixVoice *sub;
+    IXAudio2SubmixVoice *sub, *sub2;
+    XAUDIO2_SEND_DESCRIPTOR send_desc = { 0 };
+    XAUDIO2_VOICE_SENDS sends = {1, &send_desc };
 
     IXAudio2_StopEngine(xa);
 
@@ -855,6 +857,26 @@ static void test_submix(IXAudio2 *xa)
     ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels);
     ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate);
 
+    hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 0, NULL, NULL);
+    ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+
+    send_desc.pOutputVoice = (IXAudio2Voice *)sub2;
+    hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends);
+    ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+
+    IXAudio2SubmixVoice_DestroyVoice(sub2);
+    IXAudio2SubmixVoice_GetVoiceDetails(sub2, &details);
+
+    sends.SendCount = 0;
+    hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends);
+    ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+
+    IXAudio2SubmixVoice_DestroyVoice(sub2);
+    if (0)
+    {
+        IXAudio2SubmixVoice_GetVoiceDetails(sub2, &details);
+    }
+
     IXAudio2SubmixVoice_DestroyVoice(sub);
     IXAudio2MasteringVoice_DestroyVoice(master);
 }

From 0d86a4153947c2db1550dab1ca0a260ceeabf2c0 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 27 Feb 2024 21:27:44 -0600
Subject: [PATCH 189/389] kernelbase: Use KEY_WOW64_64KEY flag when 64 bit
 registry access is assumed.

CW-Bug-Id: #23481
---
 dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++
 dlls/kernelbase/registry.c     |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 30a79368c94..428dffed48d 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -2763,6 +2763,28 @@ static void test_redirection(void)
     RegCloseKey( root32 );
     RegCloseKey( root64 );
 
+    err = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\WOW6432Node\\test1\\test2", 0, NULL, 0,
+                              KEY_WRITE | KEY_WOW64_32KEY, NULL, &key, NULL );
+    ok(!err, "got %#lx.\n", err);
+    RegCloseKey(key);
+
+    err = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\test1\\test2", 0, NULL, 0, KEY_WRITE | KEY_WOW64_32KEY,
+                              NULL, &key, NULL );
+    ok(!err, "got %#lx.\n", err);
+    RegCloseKey(key);
+
+    err = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\test1\\test2", 0, KEY_WRITE | KEY_WOW64_32KEY, &key );
+    ok(!err, "got %#lx.\n", err);
+    RegCloseKey(key);
+
+    if (pRegDeleteTreeA)
+    {
+        err = pRegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\WOW6432Node\\test1");
+        ok(!err, "got %#lx.\n", err);
+        err = pRegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\test1");
+        ok(err == ERROR_FILE_NOT_FOUND, "got %#lx.\n", err);
+    }
+
     /* Software\Classes is shared/reflected so behavior is different */
 
     err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\Wine",
diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index a767d993254..dcdb1cf84eb 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -165,7 +165,7 @@ static HANDLE open_wow6432node( HANDLE key )
     attr.Attributes = 0;
     attr.SecurityDescriptor = NULL;
     attr.SecurityQualityOfService = NULL;
-    if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return key;
+    if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED | KEY_WOW64_64KEY, &attr, 0 )) return key;
     return ret;
 }
 
@@ -211,7 +211,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING *name, DWORD o
 static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWORD options, ACCESS_MASK access )
 {
     BOOL is_wow64_key = (is_win64 && (access & KEY_WOW64_32KEY)) || (is_wow64 && !(access & KEY_WOW64_64KEY));
-    ACCESS_MASK access_64 = access & ~KEY_WOW64_32KEY;
+    ACCESS_MASK access_64 = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY;
     DWORD i = 0, len = name->Length / sizeof(WCHAR);
     WCHAR *buffer = name->Buffer;
     UNICODE_STRING str;

From f55fa9a546b146c3a7444db5196e8b4a4f56ba4b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 28 Feb 2024 11:41:41 -0600
Subject: [PATCH 190/389] amd_ags_x64: Support v3.2.

CW-Bug-Id: #23474
---
 dlls/amd_ags_x64/amd_ags.h          | 17 ++++++++
 dlls/amd_ags_x64/amd_ags_x64.spec   |  3 ++
 dlls/amd_ags_x64/amd_ags_x64_main.c | 67 +++++++++++++++++++++++++++--
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/dlls/amd_ags_x64/amd_ags.h b/dlls/amd_ags_x64/amd_ags.h
index 8eab0732d5b..0116a527ba5 100644
--- a/dlls/amd_ags_x64/amd_ags.h
+++ b/dlls/amd_ags_x64/amd_ags.h
@@ -733,7 +733,24 @@ typedef union AGSConfiguration
     AGSConfiguration_520    agsConfiguration520;
 } AGSConfiguration;
 
+struct AGSGPUInfo_320
+{
+    int                     agsVersionMajor;                // Major field of Major.Minor.Patch AGS version number
+    int                     agsVersionMinor;                // Minor field of Major.Minor.Patch AGS version number
+    int                     agsVersionPatch;                // Patch field of Major.Minor.Patch AGS version number
+
+    ArchitectureVersion     architectureVersion;            // Set to Unknown if not AMD hardware
+    const char*             adapterString;                  // The adapter name string. NULL if not AMD hardware
+    int                     deviceId;                       // The device id
+    int                     revisionId;                     // The revision id
+
+    const char*             driverVersion;                  // The driver package version
 
+    int                     iNumCUs;                        // Number of GCN compute units. Zero if not GCN
+    int                     iCoreClock;                     // core clock speed at 100% power in MHz
+    int                     iMemoryClock;                   // memory clock speed at 100% power in MHz
+    float                   fTFlops;                        // Teraflops of GPU. Zero if not GCN. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
+};
 
 /// The top level GPU information returned from \ref agsInitialize
 struct AGSGPUInfo_403
diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index edecba85e85..bd2d2f6dceb 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -2,18 +2,21 @@
 @ stdcall agsDeInitialize(ptr)
 @ stdcall agsCheckDriverVersion(ptr long)
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_BeginUAVOverlap() DX11_BeginUAVOverlap_impl
+@ stub agsDriverExtensions_IASetPrimitiveTopology
 @ stub agsDriverExtensionsDX11_CreateBuffer
 @ stdcall agsDriverExtensionsDX11_CreateDevice(ptr ptr ptr ptr)
 @ stub agsDriverExtensionsDX11_CreateFromDevice
 @ stub agsDriverExtensionsDX11_CreateTexture1D
 @ stub agsDriverExtensionsDX11_CreateTexture2D
 @ stub agsDriverExtensionsDX11_CreateTexture3D
+@ stdcall agsDriverExtensions_DeInit(ptr)
 @ stdcall agsDriverExtensionsDX11_DeInit(ptr)
 @ stub agsDriverExtensionsDX11_Destroy
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_DestroyDevice()
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_EndUAVOverlap() DX11_EndUAVOverlap_impl
 @ stub agsDriverExtensionsDX11_GetMaxClipRects
 @ stub agsDriverExtensionsDX11_IASetPrimitiveTopology
+@ stdcall agsDriverExtensions_Init(ptr ptr ptr)
 @ stdcall agsDriverExtensionsDX11_Init(ptr ptr long ptr)
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect() DX11_MultiDrawIndexedInstancedIndirect_impl
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect() DX11_MultiDrawIndexedInstancedIndirectCountIndirect_impl
diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index 65926e54291..398c7317237 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -74,7 +74,7 @@ static const struct
 }
 amd_ags_info[AMD_AGS_VERSION_COUNT] =
 {
-    {AGS_MAKE_VERSION(4, 0, 0), AGS_MAKE_VERSION(4, 0, 3), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
+    {AGS_MAKE_VERSION(3, 2, 0), AGS_MAKE_VERSION(4, 0, 3), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
     {AGS_MAKE_VERSION(5, 0, 0), AGS_MAKE_VERSION(5, 0, 6), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
     {AGS_MAKE_VERSION(5, 1, 1), AGS_MAKE_VERSION(5, 1, 1), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
     {AGS_MAKE_VERSION(5, 2, 0), AGS_MAKE_VERSION(5, 2, 1), sizeof(AGSDeviceInfo_520), sizeof(AGSDX11ReturnedParams_520), 0},
@@ -364,13 +364,20 @@ static BOOL get_ags_version_from_resource(const WCHAR *filename, enum amd_ags_ve
     return TRUE;
 }
 
-static enum amd_ags_version guess_version_from_exports(HMODULE hnative)
+static enum amd_ags_version guess_version_from_exports(HMODULE hnative, int *ags_version)
 {
     /* Known DLL versions without version info:
      *  - An update to AGS 5.4.1 included an amd_ags_x64.dll with no file version info;
      *  - CoD: Modern Warfare Remastered (2017) ships dll without version info which is version 5.0.1
      *    (not tagged in AGSSDK history), compatible with 5.0.5.
      */
+    if (GetProcAddress(hnative, "agsDriverExtensions_Init"))
+    {
+        /* agsGetEyefinityConfigInfo was deprecated in 4.0.0 */
+        TRACE("agsDriverExtensions_Init found.\n");
+        *ags_version = AGS_MAKE_VERSION(3, 2, 2);
+        return AMD_AGS_VERSION_4_0_3;
+    }
     if (GetProcAddress(hnative, "agsGetEyefinityConfigInfo"))
     {
         /* agsGetEyefinityConfigInfo was deprecated in 5.0.0 */
@@ -440,7 +447,7 @@ static enum amd_ags_version determine_ags_version(int *ags_version)
         goto done;
     }
 
-    ret = guess_version_from_exports(hnative);
+    ret = guess_version_from_exports(hnative, ags_version);
 
 done:
     if (!*ags_version)
@@ -829,7 +836,47 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         return ret;
     }
 
-    if (object->version <= AMD_AGS_VERSION_4_0_3)
+    if (object->public_version <= AGS_MAKE_VERSION(3, 2, 2))
+    {
+        /* Unfortunately it doesn't look sanely possible to distinguish 3.2.2 and 3.2.0 versions, while in
+         * 3.2.2 radeonSoftwareVersion was added in the middle of the structure. So fill the shorter one
+         * to avoid out of bound write. */
+        struct AGSDeviceInfo_511 *devices = (struct AGSDeviceInfo_511 *)object->devices, *device;
+        struct AGSGPUInfo_320 *info = (struct AGSGPUInfo_320 *)gpu_info;
+        unsigned int i;
+
+        TRACE("filling AGSGPUInfo_320.\n");
+        if (!object->device_count)
+        {
+            ERR("No devices.\n");
+            agsDeInit(object);
+            return AGS_FAILURE;
+        }
+
+        for (i = 0; i < object->device_count; ++i)
+            if (devices[i].isPrimaryDevice)
+                break;
+        if (i == object->device_count)
+        {
+            WARN("No primary device, using first.\n");
+            i = 0;
+        }
+        device = &devices[i];
+        memset(info, 0, sizeof(*info));
+        info->agsVersionMajor = AGS_VER_MAJOR(object->public_version);
+        info->agsVersionMinor = AGS_VER_MINOR(object->public_version);
+        info->agsVersionPatch = AGS_VER_PATCH(object->public_version);
+        info->architectureVersion = device->architectureVersion;
+        info->adapterString = device->adapterString;
+        info->deviceId = device->deviceId;
+        info->revisionId = device->revisionId;
+        info->driverVersion = driver_version;
+        info->iNumCUs = device->numCUs;
+        info->iCoreClock = device->coreClock;
+        info->iMemoryClock = device->memoryClock;
+        info->fTFlops = device->teraFlops;
+    }
+    else if (object->version <= AMD_AGS_VERSION_4_0_3)
     {
         struct AGSDeviceInfo_511 *devices = (struct AGSDeviceInfo_511 *)object->devices, *device;
         struct AGSGPUInfo_403 *info = (struct AGSGPUInfo_403 *)gpu_info;
@@ -1303,6 +1350,13 @@ AGSReturnCode WINAPI agsDriverExtensionsDX11_Init( AGSContext *context, ID3D11De
     return AGS_SUCCESS;
 }
 
+AGSReturnCode WINAPI agsDriverExtensions_Init( AGSContext* context, ID3D11Device* device, unsigned int* extensionsSupported )
+{
+    TRACE("context %p, device %p, extensionsSupported %p.\n", context, device, extensionsSupported);
+
+    return agsDriverExtensionsDX11_Init(context, device, ~0u, extensionsSupported);
+}
+
 AGSReturnCode WINAPI agsDriverExtensionsDX11_DeInit( AGSContext* context )
 {
     TRACE("context %p.\n", context);
@@ -1316,6 +1370,11 @@ AGSReturnCode WINAPI agsDriverExtensionsDX11_DeInit( AGSContext* context )
     return AGS_SUCCESS;
 }
 
+AGSReturnCode WINAPI agsDriverExtensions_DeInit(AGSContext *context)
+{
+    return agsDriverExtensionsDX11_DeInit(context);
+}
+
 AGSReturnCode WINAPI agsDriverExtensionsDX12_Init( AGSContext* context, ID3D12Device* device, unsigned int* extensionsSupported )
 {
     FIXME("context %p, device %p, extensionsSupported %p stub.\n", context, device, extensionsSupported);

From a0e1f531dfe4e72999793d2e52ed1a8fb9534ca8 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 28 Feb 2024 14:08:00 -0600
Subject: [PATCH 191/389] amd_ags_x64: Support versions 3.0-3.1.

CW-Bug-Id: #23474
---
 dlls/amd_ags_x64/amd_ags.h          | 15 +++++++
 dlls/amd_ags_x64/amd_ags_x64.spec   |  1 +
 dlls/amd_ags_x64/amd_ags_x64_main.c | 68 +++++++++++++++++++++++++++--
 3 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/dlls/amd_ags_x64/amd_ags.h b/dlls/amd_ags_x64/amd_ags.h
index 0116a527ba5..f6e50cad8f3 100644
--- a/dlls/amd_ags_x64/amd_ags.h
+++ b/dlls/amd_ags_x64/amd_ags.h
@@ -733,6 +733,21 @@ typedef union AGSConfiguration
     AGSConfiguration_520    agsConfiguration520;
 } AGSConfiguration;
 
+struct AGSGPUInfo_311
+{
+    ArchitectureVersion     version;                        // Set to Unknown if not AMD hardware
+    const char*             adapterString;                  // The adapter name string. NULL if not AMD hardware
+    int                     deviceId;                       // The device id
+    int                     revisionId;                     // The revision id
+
+    const char*             driverVersion;                  // The driver package version
+
+    int                     iNumCUs;                        // Number of GCN compute units. Zero if not GCN
+    int                     iCoreClock;                     // core clock speed at 100% power in MHz
+    int                     iMemoryClock;                   // memory clock speed at 100% power in MHz
+    float                   fTFlops;                        // Teraflops of GPU. Zero if not GCN. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
+};
+
 struct AGSGPUInfo_320
 {
     int                     agsVersionMajor;                // Major field of Major.Minor.Patch AGS version number
diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index bd2d2f6dceb..a742c951709 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -49,3 +49,4 @@
 @ stdcall agsGetTotalGPUCount(ptr ptr)
 @ stdcall agsGetGPUMemorySize(ptr long ptr)
 @ stdcall agsGetEyefinityConfigInfo(ptr long ptr ptr ptr)
+@ stdcall agsDriverExtensions_SetCrossfireMode(ptr long)
diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index 398c7317237..961aca242f9 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -74,7 +74,7 @@ static const struct
 }
 amd_ags_info[AMD_AGS_VERSION_COUNT] =
 {
-    {AGS_MAKE_VERSION(3, 2, 0), AGS_MAKE_VERSION(4, 0, 3), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
+    {AGS_MAKE_VERSION(3, 1, 0), AGS_MAKE_VERSION(4, 0, 3), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
     {AGS_MAKE_VERSION(5, 0, 0), AGS_MAKE_VERSION(5, 0, 6), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
     {AGS_MAKE_VERSION(5, 1, 1), AGS_MAKE_VERSION(5, 1, 1), sizeof(AGSDeviceInfo_511), sizeof(AGSDX11ReturnedParams_511), 0},
     {AGS_MAKE_VERSION(5, 2, 0), AGS_MAKE_VERSION(5, 2, 1), sizeof(AGSDeviceInfo_520), sizeof(AGSDX11ReturnedParams_520), 0},
@@ -371,6 +371,13 @@ static enum amd_ags_version guess_version_from_exports(HMODULE hnative, int *ags
      *  - CoD: Modern Warfare Remastered (2017) ships dll without version info which is version 5.0.1
      *    (not tagged in AGSSDK history), compatible with 5.0.5.
      */
+    if (GetProcAddress(hnative, "agsDriverExtensions_SetCrossfireMode"))
+    {
+        /* agsDriverExtensions_SetCrossfireMode was deprecated in 3.2.0 */
+        TRACE("agsDriverExtensions_SetCrossfireMode found.\n");
+        *ags_version = AGS_MAKE_VERSION(3, 1, 1);
+        return AMD_AGS_VERSION_4_0_3;
+    }
     if (GetProcAddress(hnative, "agsDriverExtensions_Init"))
     {
         /* agsGetEyefinityConfigInfo was deprecated in 4.0.0 */
@@ -821,7 +828,7 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
 
     TRACE("context %p, config %p, gpu_info %p.\n", context, config, gpu_info);
 
-    if (!context || !gpu_info)
+    if (!context)
         return AGS_INVALID_ARGS;
 
     if (config)
@@ -836,7 +843,46 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         return ret;
     }
 
-    if (object->public_version <= AGS_MAKE_VERSION(3, 2, 2))
+    if (object->public_version <= AGS_MAKE_VERSION(3, 1, 1))
+    {
+        /* Unfortunately it doesn't look sanely possible to distinguish 3.1.1 and 3.1.0 versions, while in
+         * 3.1.0 radeonSoftwareVersion was present, removed in 3.1.1 and brought back in 3.2.2. */
+        struct AGSDeviceInfo_511 *devices = (struct AGSDeviceInfo_511 *)object->devices, *device;
+        /* config parameter was added in 3.2.0, so gpu_info is actually the second parameter. */
+        struct AGSGPUInfo_311 *info = (struct AGSGPUInfo_311 *)config;
+        unsigned int i;
+
+        if (!info)
+            return AGS_INVALID_ARGS;
+
+        TRACE("filling AGSGPUInfo_311.\n");
+        if (!object->device_count)
+        {
+            ERR("No devices.\n");
+            agsDeInit(object);
+            return AGS_FAILURE;
+        }
+
+        for (i = 0; i < object->device_count; ++i)
+            if (devices[i].isPrimaryDevice)
+                break;
+        if (i == object->device_count)
+        {
+            WARN("No primary device, using first.\n");
+            i = 0;
+        }
+        device = &devices[i];
+        memset(info, 0, sizeof(*info));
+        info->adapterString = device->adapterString;
+        info->deviceId = device->deviceId;
+        info->revisionId = device->revisionId;
+        info->driverVersion = driver_version;
+        info->iNumCUs = device->numCUs;
+        info->iCoreClock = device->coreClock;
+        info->iMemoryClock = device->memoryClock;
+        info->fTFlops = device->teraFlops;
+    }
+    else if (object->public_version <= AGS_MAKE_VERSION(3, 2, 2))
     {
         /* Unfortunately it doesn't look sanely possible to distinguish 3.2.2 and 3.2.0 versions, while in
          * 3.2.2 radeonSoftwareVersion was added in the middle of the structure. So fill the shorter one
@@ -845,6 +891,9 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         struct AGSGPUInfo_320 *info = (struct AGSGPUInfo_320 *)gpu_info;
         unsigned int i;
 
+        if (!gpu_info)
+            return AGS_INVALID_ARGS;
+
         TRACE("filling AGSGPUInfo_320.\n");
         if (!object->device_count)
         {
@@ -882,6 +931,9 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         struct AGSGPUInfo_403 *info = (struct AGSGPUInfo_403 *)gpu_info;
         unsigned int i;
 
+        if (!gpu_info)
+            return AGS_INVALID_ARGS;
+
         if (!object->device_count)
         {
             ERR("No devices.\n");
@@ -915,6 +967,9 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
     }
     else
     {
+        if (!gpu_info)
+            return AGS_INVALID_ARGS;
+
         memset(gpu_info, 0, sizeof(*gpu_info));
         gpu_info->agsVersionMajor = AGS_VER_MAJOR(object->public_version);
         gpu_info->agsVersionMinor = AGS_VER_MINOR(object->public_version);
@@ -1357,6 +1412,13 @@ AGSReturnCode WINAPI agsDriverExtensions_Init( AGSContext* context, ID3D11Device
     return agsDriverExtensionsDX11_Init(context, device, ~0u, extensionsSupported);
 }
 
+AGSReturnCode WINAPI agsDriverExtensions_SetCrossfireMode(AGSContext *context, AGSCrossfireMode mode)
+{
+    FIXME("context %p, mode %d stub.\n", context, mode);
+
+    return AGS_SUCCESS;
+}
+
 AGSReturnCode WINAPI agsDriverExtensionsDX11_DeInit( AGSContext* context )
 {
     TRACE("context %p.\n", context);

From b90040301ba80464061de5bac8453ace292b64e6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 28 Feb 2024 14:43:55 -0600
Subject: [PATCH 192/389] amd_ags_x64: Add
 agsDriverExtensionsDX11_SetDiskShaderCacheEnabled() stub.

CW-Bug-Id: #23474
---
 dlls/amd_ags_x64/amd_ags_x64.spec   | 2 +-
 dlls/amd_ags_x64/amd_ags_x64_main.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index a742c951709..3dcd52d5308 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -28,7 +28,7 @@
 @ stub agsDriverExtensionsDX11_NumPendingAsyncCompileJobs
 @ stub agsDriverExtensionsDX11_SetClipRects
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_SetDepthBounds() DX11_SetDepthBounds_impl
-@ stub agsDriverExtensionsDX11_SetDiskShaderCacheEnabled
+@ stdcall agsDriverExtensionsDX11_SetDiskShaderCacheEnabled(ptr long)
 @ stub agsDriverExtensionsDX11_SetMaxAsyncCompileThreadCount
 @ stub agsDriverExtensionsDX11_SetViewBroadcastMasks
 @ stub agsDriverExtensionsDX11_WriteBreadcrumb
diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index 961aca242f9..c605520632e 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -1888,3 +1888,9 @@ __ASM_GLOBAL_FUNC( agsDriverExtensionsDX11_DestroyDevice,
                    "jmp "     __ASM_NAME("agsDriverExtensionsDX11_DestroyDevice_511") "\n\t"
                    "1:\tjmp " __ASM_NAME("agsDriverExtensionsDX11_DestroyDevice_520") )
 #endif
+
+AGSReturnCode WINAPI agsDriverExtensionsDX11_SetDiskShaderCacheEnabled(AGSContext *context, int enable)
+{
+    FIXME("context %p, enable %d stub.\n", context, enable);
+    return AGS_SUCCESS;
+}

From b1f019e0a50bac41194caa55c245f60c964a26dd Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 27 Feb 2024 11:09:41 -0600
Subject: [PATCH 193/389] Revert "faudio: Don't destroy voice when it is output
 to other voices."

This reverts commit d497be23aa6940fcb269831cf3f92bc76e3f0444.
---
 libs/faudio/include/FAudio.h |  2 +-
 libs/faudio/src/FAudio.c     | 61 +-----------------------------------
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h
index 1994cd7543b..1a873ca2064 100644
--- a/libs/faudio/include/FAudio.h
+++ b/libs/faudio/include/FAudio.h
@@ -1062,7 +1062,7 @@ FAUDIOAPI void FAudioVoice_GetOutputMatrix(
 );
 
 /* Removes this voice from the audio graph and frees memory. */
-FAUDIOAPI uint32_t FAudioVoice_DestroyVoice(FAudioVoice *voice);
+FAUDIOAPI void FAudioVoice_DestroyVoice(FAudioVoice *voice);
 
 /* FAudioSourceVoice Interface */
 
diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c
index 2bb1c1fd40d..9366ad58208 100644
--- a/libs/faudio/src/FAudio.c
+++ b/libs/faudio/src/FAudio.c
@@ -2265,69 +2265,11 @@ void FAudioVoice_GetOutputMatrix(
 	LOG_API_EXIT(voice->audio)
 }
 
-static uint32_t check_for_sends_to_voice(FAudioVoice *voice)
-{
-	FAudio *audio = voice->audio;
-	uint32_t ret = 1;
-	FAudioSourceVoice *source;
-	FAudioSubmixVoice *submix;
-	LinkedList *list;
-	uint32_t i;
-
-	FAudio_PlatformLockMutex(audio->sourceLock);
-	list = audio->sources;
-	while (list != NULL)
-	{
-		source = (FAudioSourceVoice*) list->entry;
-		for (i = 0; i < source->sends.SendCount; i += 1)
-			if (source->sends.pSends[i].pOutputVoice == voice)
-			{
-				ret = 0;
-				break;
-			}
-		if (!ret)
-			break;
-		list = list->next;
-	}
-	FAudio_PlatformUnlockMutex(audio->sourceLock);
-
-	if (!ret)
-        return ret;
-
-	FAudio_PlatformLockMutex(audio->submixLock);
-	list = audio->submixes;
-	while (list != NULL)
-	{
-		submix = (FAudioSubmixVoice*) list->entry;
-		for (i = 0; i < submix->sends.SendCount; i += 1)
-			if (submix->sends.pSends[i].pOutputVoice == voice)
-			{
-				ret = 0;
-				break;
-			}
-		list = list->next;
-	}
-	FAudio_PlatformUnlockMutex(audio->submixLock);
-
-	return ret;
-}
-
-uint32_t FAudioVoice_DestroyVoice(FAudioVoice *voice)
+void FAudioVoice_DestroyVoice(FAudioVoice *voice)
 {
 	uint32_t i;
 	LOG_API_ENTER(voice->audio)
 
-	if (!check_for_sends_to_voice(voice))
-	{
-		LOG_ERROR(
-			voice->audio,
-			"Voice %p is an output for other voice(s)",
-			voice
-		)
-		LOG_API_EXIT(voice->audio)
-		return 0;
-	}
-
 	/* TODO: Check for dependencies and remove from audio graph first! */
 	FAudio_OPERATIONSET_ClearAllForVoice(voice);
 
@@ -2501,7 +2443,6 @@ uint32_t FAudioVoice_DestroyVoice(FAudioVoice *voice)
 	LOG_API_EXIT(voice->audio)
 	FAudio_Release(voice->audio);
 	voice->audio->pFree(voice);
-	return 1;
 }
 
 /* FAudioSourceVoice Interface */

From 3d9f50f785446bd1be7fa9eb404b184a87c2cf66 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 27 Feb 2024 11:09:53 -0600
Subject: [PATCH 194/389] Revert "xaudio2: Check FAudioVoice_DestroyVoice
 result in destroy_voice()."

This reverts commit 431fdeb1e1537d04452a14c11df83569848b2a53.
---
 dlls/xaudio2_7/xaudio_dll.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index b1ef81b632e..b821e9667b7 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -499,11 +499,7 @@ static const FAudioEngineCallback FAudioEngineCallback_Vtbl = {
 
 static inline void destroy_voice(XA2VoiceImpl *This)
 {
-    if (!FAudioVoice_DestroyVoice(This->faudio_voice))
-    {
-        ERR("Destroying voice %p failed.\n", This);
-        return;
-    }
+    FAudioVoice_DestroyVoice(This->faudio_voice);
     free_effect_chain(This->effect_chain);
     This->effect_chain = NULL;
     This->in_use = FALSE;

From a15d41172479dc04ac0ac0bf461132d6520aef5b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 28 Feb 2024 18:19:35 -0600
Subject: [PATCH 195/389] faudio: Don't destroy voice when it is output to
 other voices

(cherry-picked from FAudio commit c00b01caa6e3f0dce09af6676ff55936e97b451c)

CW-Bug-Id: #23472
---
 libs/faudio/include/FAudio.h |  5 +++
 libs/faudio/src/FAudio.c     | 68 +++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h
index 1a873ca2064..16837c39dbf 100644
--- a/libs/faudio/include/FAudio.h
+++ b/libs/faudio/include/FAudio.h
@@ -1064,6 +1064,11 @@ FAUDIOAPI void FAudioVoice_GetOutputMatrix(
 /* Removes this voice from the audio graph and frees memory. */
 FAUDIOAPI void FAudioVoice_DestroyVoice(FAudioVoice *voice);
 
+/*
+ * Returns S_OK on success and E_FAIL if voice could not be destroyed (e. g., because it is in use).
+ */
+FAUDIOAPI uint32_t FAudioVoice_DestroyVoiceSafeEXT(FAudioVoice *voice);
+
 /* FAudioSourceVoice Interface */
 
 /* Starts processing for a source voice.
diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c
index 9366ad58208..67cbfb770e4 100644
--- a/libs/faudio/src/FAudio.c
+++ b/libs/faudio/src/FAudio.c
@@ -2265,11 +2265,71 @@ void FAudioVoice_GetOutputMatrix(
 	LOG_API_EXIT(voice->audio)
 }
 
-void FAudioVoice_DestroyVoice(FAudioVoice *voice)
+static uint32_t check_for_sends_to_voice(FAudioVoice *voice)
 {
+	FAudio *audio = voice->audio;
+	uint32_t ret = 0;
+	FAudioSourceVoice *source;
+	FAudioSubmixVoice *submix;
+	LinkedList *list;
 	uint32_t i;
+
+	FAudio_PlatformLockMutex(audio->sourceLock);
+	list = audio->sources;
+	while (list != NULL)
+	{
+		source = (FAudioSourceVoice*) list->entry;
+		for (i = 0; i < source->sends.SendCount; i += 1)
+			if (source->sends.pSends[i].pOutputVoice == voice)
+			{
+				ret = 0x80004005; /* E_FAIL */
+				break;
+			}
+		if (ret)
+			break;
+		list = list->next;
+	}
+	FAudio_PlatformUnlockMutex(audio->sourceLock);
+
+	if (ret)
+		return ret;
+
+	FAudio_PlatformLockMutex(audio->submixLock);
+	list = audio->submixes;
+	while (list != NULL)
+	{
+		submix = (FAudioSubmixVoice*) list->entry;
+		for (i = 0; i < submix->sends.SendCount; i += 1)
+			if (submix->sends.pSends[i].pOutputVoice == voice)
+			{
+				ret = 0x80004005; /* E_FAIL */
+				break;
+			}
+		if (ret)
+			break;
+		list = list->next;
+	}
+	FAudio_PlatformUnlockMutex(audio->submixLock);
+
+	return ret;
+}
+
+uint32_t FAudioVoice_DestroyVoiceSafeEXT(FAudioVoice *voice)
+{
+	uint32_t i, ret;
 	LOG_API_ENTER(voice->audio)
 
+	if ((ret = check_for_sends_to_voice(voice)))
+	{
+		LOG_ERROR(
+			voice->audio,
+			"Voice %p is an output for other voice(s)",
+			voice
+		)
+		LOG_API_EXIT(voice->audio)
+		return ret;
+	}
+
 	/* TODO: Check for dependencies and remove from audio graph first! */
 	FAudio_OPERATIONSET_ClearAllForVoice(voice);
 
@@ -2443,6 +2503,12 @@ void FAudioVoice_DestroyVoice(FAudioVoice *voice)
 	LOG_API_EXIT(voice->audio)
 	FAudio_Release(voice->audio);
 	voice->audio->pFree(voice);
+	return 0;
+}
+
+void FAudioVoice_DestroyVoice(FAudioVoice *voice)
+{
+	FAudioVoice_DestroyVoiceSafeEXT(voice);
 }
 
 /* FAudioSourceVoice Interface */

From 4fb3f2e70942d84e99b8a32024cf75423c6cb3d7 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 26 Feb 2024 19:34:40 -0600
Subject: [PATCH 196/389] xaudio2: Use FAudioVoice_DestroyVoiceSafeEXT() result
 in destroy_voice().

CW-Bug-Id: #23472
---
 dlls/xaudio2_7/xaudio_dll.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index b821e9667b7..a58beb7b538 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -499,7 +499,11 @@ static const FAudioEngineCallback FAudioEngineCallback_Vtbl = {
 
 static inline void destroy_voice(XA2VoiceImpl *This)
 {
-    FAudioVoice_DestroyVoice(This->faudio_voice);
+    if (FAILED(FAudioVoice_DestroyVoiceSafeEXT(This->faudio_voice)))
+    {
+        ERR("Destroying voice %p failed.\n", This);
+        return;
+    }
     free_effect_chain(This->effect_chain);
     This->effect_chain = NULL;
     This->in_use = FALSE;

From 3a6319bd5469012e9617c2b84d0aebab757c9572 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <jzeng@codeweavers.com>
Date: Wed, 28 Feb 2024 00:59:28 -0600
Subject: [PATCH 197/389] wine.inf: Add a font replacement for Segoe UI.

CW-Bug-Id: #23020
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 7ce0638c7df..bcb4c80a4d1 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -603,6 +603,7 @@ HKLM,%FontsNT%,"Webdings (TrueType)",,"webdings.ttf"
 HKLM,%FontsNT%,"Wingdings (TrueType)",,"wingdings.ttf"
 HKCU,Software\Wine\Fonts\Replacements,"Palatino Linotype",,"Times New Roman"
 HKCU,Software\Wine\Fonts\Replacements,"Verdana",,"Times New Roman"
+HKCU,Software\Wine\Fonts\Replacements,"Segoe UI",,"Times New Roman"
 
 [MCI]
 HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll"

From cb977b5a5b369b623940810d24108f283b61d002 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Thu, 29 Feb 2024 17:17:11 +0200
Subject: [PATCH 198/389] amend! nsiproxy.sys: Fix ipv6 route table parsing on
 Linux.

nsiproxy.sys: Fix ipv6 route table parsing on Linux.

CW-Bug-Id: #23460

From 2f38ce9d95fe4cc0340c1f3987499b30405dabda Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Thu, 29 Feb 2024 17:18:19 +0200
Subject: [PATCH 199/389] amend! iphlpapi: Partially fill Ipv4 / Ipv6 metric in
 GetAdaptersAddresses().

iphlpapi: Partially fill Ipv4 / Ipv6 metric in GetAdaptersAddresses().

CW-Bug-Id: #23460

From f392d0687cb74f47dbfceb4a57b496191f183969 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 29 Feb 2024 20:02:48 -0600
Subject: [PATCH 200/389] fixup! ntdll: Read process memory on the client side
 in NtReadVirtualMemory().

CW-Bug-Id: #23456
---
 dlls/ntdll/unix/virtual.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index ba2fe258ede..97b55022c7a 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -6305,13 +6305,21 @@ NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buf
     int unix_pid;
     ssize_t ret;
 
-    SERVER_START_REQ( read_process_memory )
+    if (process == NtCurrentProcess())
     {
-        req->handle = wine_server_obj_handle( process );
-        status = wine_server_call( req );
-        unix_pid = reply->unix_pid;
+        unix_pid = getpid();
+        status = STATUS_SUCCESS;
+    }
+    else
+    {
+        SERVER_START_REQ( read_process_memory )
+        {
+            req->handle = wine_server_obj_handle( process );
+            status = wine_server_call( req );
+            unix_pid = reply->unix_pid;
+        }
+        SERVER_END_REQ;
     }
-    SERVER_END_REQ;
 
     if (status)
     {

From c651e01d987feca64d56e7f02bab5ca12e4eba6d Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 29 Feb 2024 22:21:25 -0600
Subject: [PATCH 201/389] amd_ags_x64: Add spec stubs for some v3.x functions.

CW-Bug-Id: #23474
---
 dlls/amd_ags_x64/amd_ags_x64.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index 3dcd52d5308..7c5e3fb8f69 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -4,11 +4,15 @@
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_BeginUAVOverlap() DX11_BeginUAVOverlap_impl
 @ stub agsDriverExtensions_IASetPrimitiveTopology
 @ stub agsDriverExtensionsDX11_CreateBuffer
+@ stub agsDriverExtensions_CreateBuffer
 @ stdcall agsDriverExtensionsDX11_CreateDevice(ptr ptr ptr ptr)
 @ stub agsDriverExtensionsDX11_CreateFromDevice
 @ stub agsDriverExtensionsDX11_CreateTexture1D
 @ stub agsDriverExtensionsDX11_CreateTexture2D
 @ stub agsDriverExtensionsDX11_CreateTexture3D
+@ stub agsDriverExtensions_CreateTexture1D
+@ stub agsDriverExtensions_CreateTexture2D
+@ stub agsDriverExtensions_CreateTexture3D
 @ stdcall agsDriverExtensions_DeInit(ptr)
 @ stdcall agsDriverExtensionsDX11_DeInit(ptr)
 @ stub agsDriverExtensionsDX11_Destroy
@@ -25,6 +29,9 @@
 @ stub agsDriverExtensionsDX11_NotifyResourceBeginAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndWrites
+@ stub agsDriverExtensions_NotifyResourceBeginAllAccess
+@ stub agsDriverExtensions_NotifyResourceEndAllAccess
+@ stub agsDriverExtensions_NotifyResourceEndWrites
 @ stub agsDriverExtensionsDX11_NumPendingAsyncCompileJobs
 @ stub agsDriverExtensionsDX11_SetClipRects
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_SetDepthBounds() DX11_SetDepthBounds_impl

From 42de3d209c2b30d3169caa70bb123fa6cd289797 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Mon, 4 Mar 2024 09:47:32 +0800
Subject: [PATCH 202/389] HACK: ntdll: Extend heap zero hack to private heaps.

Call of Juarez: Bound in Blood (21980) uses uninitialized memory from msvcr80.operator_new(), which
allocates memory from a private heap created specifically for MSVC runtime.

CW-Bug-Id: #23466
---
 dlls/ntdll/heap.c       | 4 ++++
 dlls/ntdll/loader.c     | 2 +-
 dlls/ntdll/ntdll_misc.h | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 7819f8bdfd7..981836f28a7 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -329,6 +329,7 @@ C_ASSERT( HEAP_MIN_LARGE_BLOCK_SIZE <= HEAP_INITIAL_GROW_SIZE );
 #define HEAP_CHECKING_ENABLED 0x80000000
 
 BOOL delay_heap_free = FALSE;
+BOOL heap_zero_hack = FALSE;
 
 static struct heap *process_heap;  /* main process heap */
 
@@ -1519,6 +1520,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T
     TRACE( "flags %#lx, addr %p, total_size %#Ix, commit_size %#Ix, unknown %p, definition %p\n",
            flags, addr, total_size, commit_size, unknown, definition );
 
+    if (heap_zero_hack)
+        flags |= HEAP_ZERO_MEMORY;
+
     flags &= ~(HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED);
     if (process_heap) flags |= HEAP_PRIVATE;
     if (!process_heap || !total_size || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE;
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 8ddd5c66022..8dfe4e21e10 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4478,7 +4478,7 @@ void loader_init( CONTEXT *context, void **entry )
         if (get_env( L"WINE_HEAP_ZERO_MEMORY", env_str, sizeof(env_str)) && env_str[0] == L'1')
         {
             ERR( "Enabling heap zero hack.\n" );
-            heap_flags |= HEAP_ZERO_MEMORY;
+            heap_zero_hack = TRUE;
         }
 
         peb->ProcessHeap        = RtlCreateHeap( heap_flags, NULL, 0, 0, NULL, NULL );
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 623acc1da00..af4d8b57348 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -48,6 +48,7 @@ extern UINT_PTR page_size;
 #endif
 
 extern BOOL delay_heap_free;
+extern BOOL heap_zero_hack;
 
 /* exceptions */
 extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context );

From 4c1fd4711e967c64b24a5834150f1131602afdda Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Mon, 4 Mar 2024 12:13:46 +0800
Subject: [PATCH 203/389] advapi32: Check NULL return key pointers when
 creating registry keys.

Fix Warlords Battlecry III (433280) crashes at launch.

CW-Bug-Id: #23484
---
 dlls/advapi32/registry.c   | 6 ++++++
 dlls/kernelbase/registry.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 85e883bdcc9..e3226c38d0a 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -70,6 +70,9 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override )
  */
 LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
 {
+    if (!phkResult)
+        return ERROR_INVALID_PARAMETER;
+
     return RegCreateKeyExW( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
                             MAXIMUM_ALLOWED, NULL, phkResult, NULL );
 }
@@ -82,6 +85,9 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
  */
 LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
 {
+    if (!phkResult)
+        return ERROR_INVALID_PARAMETER;
+
     return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
                             MAXIMUM_ALLOWED, NULL, phkResult, NULL );
 }
diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index dcdb1cf84eb..ee57a4acdd1 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -592,6 +592,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD
 {
     UNICODE_STRING nameW, classW;
 
+    if (!retkey) return ERROR_BADKEY;
     if (reserved) return ERROR_INVALID_PARAMETER;
     if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;
 
@@ -633,6 +634,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD
     ANSI_STRING nameA, classA;
     NTSTATUS status;
 
+    if (!retkey) return ERROR_BADKEY;
     if (reserved) return ERROR_INVALID_PARAMETER;
     if (!is_version_nt())
     {

From 53ea94e1ca8cb7de198ce89f7094e9966b92ecf6 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Mon, 4 Mar 2024 12:09:45 +0800
Subject: [PATCH 204/389] advapi32/tests: Test creating registry keys with a
 NULL return key pointer.

CW-Bug-Id: #23484
---
 dlls/advapi32/tests/registry.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 428dffed48d..ecfdbbe547e 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -1268,6 +1268,19 @@ static void test_reg_create_key(void)
     PACL key_acl;
     SECURITY_DESCRIPTOR *sd;
 
+    /* NULL return key check */
+    ret = RegCreateKeyA(hkey_main, "Subkey1", NULL);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %ld.\n", ret);
+
+    ret = RegCreateKeyW(hkey_main, L"Subkey1", NULL);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %ld.\n", ret);
+
+    ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, NULL, NULL);
+    ok(ret == ERROR_BADKEY, "Got unexpected ret %ld.\n", ret);
+
+    ret = RegCreateKeyExW(hkey_main, L"Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, NULL, NULL);
+    ok(ret == ERROR_BADKEY, "Got unexpected ret %ld.\n", ret);
+
     ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL);
     ok(!ret, "RegCreateKeyExA failed with error %ld\n", ret);
     /* should succeed: all versions of Windows ignore the access rights

From bed19d0c8d8623f5ac12a22d2a64a08495e89267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 28 Jan 2024 19:32:11 +0100
Subject: [PATCH 205/389] winex11: Process XInput2 events with QS_INPUT filter.

(cherry picked from commit b341688dbd9dfc05bd61d6b8f494867e6343b702)
CW-Bug-Id: #23502
---
 dlls/winex11.drv/event.c | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 89a7506b236..ab151e28350 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -233,28 +233,6 @@ static Bool filter_event( Display *display, XEvent *event, char *arg )
     case ButtonPress:
     case ButtonRelease:
         return (mask & QS_MOUSEBUTTON) != 0;
-#ifdef GenericEvent
-    case GenericEvent:
-#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
-        if (event->xcookie.extension == xinput2_opcode)
-        {
-            switch (event->xcookie.evtype)
-            {
-            case XI_RawButtonPress:
-            case XI_RawButtonRelease:
-                return (mask & QS_MOUSEBUTTON) != 0;
-            case XI_RawMotion:
-            case XI_RawTouchBegin:
-            case XI_RawTouchUpdate:
-            case XI_RawTouchEnd:
-                return (mask & QS_INPUT) != 0;
-            case XI_DeviceChanged:
-                return (mask & (QS_INPUT|QS_MOUSEBUTTON)) != 0;
-            }
-        }
-#endif
-        return (mask & QS_SENDMESSAGE) != 0;
-#endif
     case MotionNotify:
     case EnterNotify:
     case LeaveNotify:
@@ -269,6 +247,13 @@ static Bool filter_event( Display *display, XEvent *event, char *arg )
     case PropertyNotify:
     case ClientMessage:
         return (mask & QS_POSTMESSAGE) != 0;
+#ifdef GenericEvent
+    case GenericEvent:
+#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
+        if (event->xcookie.extension == xinput2_opcode) return (mask & QS_INPUT) != 0;
+#endif
+        /* fallthrough */
+#endif
     default:
         return (mask & QS_SENDMESSAGE) != 0;
     }

From 847dbe5ad93c04fdf698af5eab1147cfabf247c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 28 Jan 2024 18:22:51 +0100
Subject: [PATCH 206/389] winex11: Initialize XInput2 extension on every
 thread.

(cherry picked from commit b7867059ceea7e4448fd294e4b5ac9d1bf8e03e9)
CW-Bug-Id: #23502
---
 dlls/winex11.drv/mouse.c       | 21 ++++++++++-----------
 dlls/winex11.drv/x11drv.h      |  5 +++--
 dlls/winex11.drv/x11drv_main.c |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index befc691263f..b2e1bedc0b3 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -331,22 +331,21 @@ static void update_relative_valuators( XIAnyClassInfo **classes, int num_classes
 
 
 /***********************************************************************
- *              X11DRV_XInput2_Init
+ *              x11drv_xinput2_init
  */
-void X11DRV_XInput2_Init(void)
+void x11drv_xinput2_init( struct x11drv_thread_data *data )
 {
 #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
-    struct x11drv_thread_data *data = x11drv_thread_data();
     int major = 2, minor = 2;
 
-    if (xinput2_available && pXIQueryVersion( data->display, &major, &minor ) == Success &&
-        pXIGetClientPointer( data->display, None, &data->xi2_core_pointer ))
-        TRACE( "XInput2 %d.%d available\n", major, minor );
-    else
+    if (!xinput2_available || pXIQueryVersion( data->display, &major, &minor ))
     {
-        data->xi2_core_pointer = 0;
-        WARN( "XInput 2.2 not available\n" );
+        WARN( "XInput 2.0 not available\n" );
+        xinput2_available = FALSE;
+        return;
     }
+
+    TRACE( "XInput2 %d.%d available\n", major, minor );
 #endif
 }
 
@@ -1942,9 +1941,9 @@ static BOOL X11DRV_XIDeviceEvent( XIDeviceEvent *event )
 #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */
 
 /***********************************************************************
- *              X11DRV_XInput2_Load
+ *              x11drv_xinput2_load
  */
-void X11DRV_XInput2_Load(void)
+void x11drv_xinput2_load(void)
 {
 #if defined(SONAME_LIBXI)
     int event, error;
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 9d3f742cbad..605a59fe3d3 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -266,8 +266,6 @@ extern void X11DRV_ThreadDetach(void);
 /* X11 driver internal functions */
 
 extern void X11DRV_Xcursor_Init(void);
-extern void X11DRV_XInput2_Load(void);
-extern void X11DRV_XInput2_Init(void);
 extern void X11DRV_XInput2_Enable( Display *display, Window window, long event_mask );
 
 extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image,
@@ -597,6 +595,9 @@ extern BOOL X11DRV_MappingNotify( HWND hWnd, XEvent *event );
 extern BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *event );
 
 extern int xinput2_opcode;
+extern void x11drv_xinput2_load(void);
+extern void x11drv_xinput2_init( struct x11drv_thread_data *data );
+
 extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );
 extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );
 
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 19c41ea4945..a5eb1416c99 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -804,7 +804,7 @@ static NTSTATUS x11drv_init( void *arg )
 #ifdef SONAME_LIBXCOMPOSITE
     X11DRV_XComposite_Init();
 #endif
-    X11DRV_XInput2_Load();
+    x11drv_xinput2_load();
 
     XkbUseExtension( gdi_display, NULL, NULL );
     X11DRV_InitKeyboard( gdi_display );
@@ -930,8 +930,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
     NtUserGetThreadInfo()->driver_data = (UINT_PTR)data;
 
     if (use_xim) xim_thread_attach( data );
+    x11drv_xinput2_init( data );
 
-    X11DRV_XInput2_Init();
     return data;
 }
 

From ea3f64a81f282c7f7a1f3b6ccff31a0c2ac84240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 12 Feb 2024 10:00:55 +0100
Subject: [PATCH 207/389] winex11: Always listen to XInput2 device changes
 events.

(cherry picked from commit 51e99345de4d2e2a7c5db939e9add141bd8c30f6)
CW-Bug-Id: #23502
---
 dlls/winex11.drv/mouse.c  | 59 ++++++++++++++++++++-------------------
 dlls/winex11.drv/x11drv.h |  2 +-
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index b2e1bedc0b3..71711f609ae 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -336,7 +336,10 @@ static void update_relative_valuators( XIAnyClassInfo **classes, int num_classes
 void x11drv_xinput2_init( struct x11drv_thread_data *data )
 {
 #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
+    unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)];
     int major = 2, minor = 2;
+    XIEventMask mask;
+    int count;
 
     if (!xinput2_available || pXIQueryVersion( data->display, &major, &minor ))
     {
@@ -346,6 +349,22 @@ void x11drv_xinput2_init( struct x11drv_thread_data *data )
     }
 
     TRACE( "XInput2 %d.%d available\n", major, minor );
+
+    mask.mask     = mask_bits;
+    mask.mask_len = sizeof(mask_bits);
+    mask.deviceid = XIAllMasterDevices;
+    memset( mask_bits, 0, sizeof(mask_bits) );
+    XISetMask( mask_bits, XI_DeviceChanged );
+    pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 );
+
+    if (!pXIGetClientPointer( data->display, None, &data->xinput2_pointer ))
+        WARN( "Failed to get xinput2 master pointer device\n" );
+    else
+    {
+        XIDeviceInfo *pointer_info = pXIQueryDevice( data->display, data->xinput2_pointer, &count );
+        update_relative_valuators( pointer_info->classes, pointer_info->num_classes );
+        pXIFreeDeviceInfo( pointer_info );
+    }
 #endif
 }
 
@@ -355,12 +374,9 @@ void x11drv_xinput2_init( struct x11drv_thread_data *data )
  */
 void X11DRV_XInput2_Enable( Display *display, Window window, long event_mask )
 {
-    struct x11drv_thread_data *data = x11drv_thread_data();
     unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)];
     BOOL raw = (window == None);
-    XIDeviceInfo *pointer_info;
     XIEventMask mask;
-    int count;
 
     mask.mask     = mask_bits;
     mask.mask_len = sizeof(mask_bits);
@@ -369,34 +385,19 @@ void X11DRV_XInput2_Enable( Display *display, Window window, long event_mask )
 
     /* FIXME: steam overlay doesn't like if we use XI2 for non-raw events */
 
-    if (event_mask & PointerMotionMask)
-    {
-        XISetMask( mask_bits, XI_DeviceChanged );
-        if (raw)
-        {
-            XISetMask( mask_bits, XI_RawMotion );
-            XISetMask( mask_bits, XI_RawTouchBegin );
-            XISetMask( mask_bits, XI_RawTouchUpdate );
-            XISetMask( mask_bits, XI_RawTouchEnd );
-        }
-    }
-    if (event_mask & ButtonPressMask)
+    if (raw && event_mask)
     {
-        XISetMask( mask_bits, XI_DeviceChanged );
-        if (raw) XISetMask( mask_bits, XI_RawButtonPress );
-    }
-    if (event_mask & ButtonReleaseMask)
-    {
-        XISetMask( mask_bits, XI_DeviceChanged );
-        if (raw) XISetMask( mask_bits, XI_RawButtonRelease );
+        XISetMask( mask_bits, XI_RawMotion );
+        XISetMask( mask_bits, XI_RawTouchBegin );
+        XISetMask( mask_bits, XI_RawTouchUpdate );
+        XISetMask( mask_bits, XI_RawTouchEnd );
+        XISetMask( mask_bits, XI_RawButtonPress );
+        XISetMask( mask_bits, XI_RawButtonRelease );
     }
 
+    XISetMask( mask_bits, XI_DeviceChanged );
     pXISelectEvents( display, raw ? DefaultRootWindow( display ) : window, &mask, 1 );
     if (!raw) XSelectInput( display, window, event_mask );
-
-    pointer_info = pXIQueryDevice( data->display, data->xi2_core_pointer, &count );
-    update_relative_valuators( pointer_info->classes, pointer_info->num_classes );
-    pXIFreeDeviceInfo( pointer_info );
 }
 
 #endif
@@ -1694,7 +1695,7 @@ static BOOL X11DRV_XIDeviceChangedEvent( XIDeviceChangedEvent *event )
 {
     struct x11drv_thread_data *data = x11drv_thread_data();
 
-    if (event->deviceid != data->xi2_core_pointer) return FALSE;
+    if (event->deviceid != data->xinput2_pointer) return FALSE;
     if (event->reason != XISlaveSwitch) return FALSE;
 
     update_relative_valuators( event->classes, event->num_classes );
@@ -1714,7 +1715,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input, RAWINPUT *raw
 
     if (x->number < 0 || y->number < 0) return FALSE;
     if (!event->valuators.mask_len) return FALSE;
-    if (event->deviceid != thread_data->xi2_core_pointer) return FALSE;
+    if (event->deviceid != thread_data->xinput2_pointer) return FALSE;
 
     if (x->mode == XIModeRelative && y->mode == XIModeRelative)
         input->mi.dwFlags &= ~(MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_VIRTUALDESK);
@@ -1859,7 +1860,7 @@ static BOOL X11DRV_RawButtonEvent( XGenericEventCookie *cookie )
         button = pointer_mapping->buttons[button] - 1;
 
     if (button < 0 || button >= NB_BUTTONS) return FALSE;
-    if (event->deviceid != thread_data->xi2_core_pointer) return FALSE;
+    if (event->deviceid != thread_data->xinput2_pointer) return FALSE;
 
     TRACE( "raw button %u (raw: %u) %s\n", button, event->detail, event->evtype == XI_RawButtonRelease ? "up" : "down" );
 
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 605a59fe3d3..4032ab85e9a 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -398,7 +398,7 @@ struct x11drv_thread_data
 #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
     XIValuatorClassInfo x_valuator;
     XIValuatorClassInfo y_valuator;
-    int      xi2_core_pointer;     /* XInput2 core pointer id */
+    int      xinput2_pointer;     /* XInput2 core pointer id */
     int      xi2_rawinput_only;
     int      xi2_active_touches;
     int      xi2_primary_touchid;

From 33e756b0c735e732fea161e6edee08b2ca557c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 4 Mar 2024 15:00:48 +0100
Subject: [PATCH 208/389] fixup! winex11.drv: Keep track of pointer and device
 button mappings.

CW-Bug-Id: #23502
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index e8338e9eb50..708c8269fc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1238,6 +1238,7 @@ then
 
     dnl *** All of the following tests require X11/Xlib.h
     AC_CHECK_HEADERS([X11/extensions/shape.h \
+                      X11/extensions/XInput.h \
                       X11/extensions/XInput2.h \
                       X11/extensions/XShm.h \
                       X11/extensions/Xfixes.h \

From 35e491c3b36cebb1abadffc7fc127355f77d8d73 Mon Sep 17 00:00:00 2001
From: Eric Pouech <epouech@codeweavers.com>
Date: Mon, 4 Mar 2024 18:51:54 +0100
Subject: [PATCH 209/389] dbghelp: Stop embedding unwind info in minidumps
 (X86_64).

CW-Bug-Id: https://www.codeweavers.com/support/bugs/browse/?cmd=bug_edit;bug_id=23456
---
 dlls/dbghelp/cpu_x86_64.c | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index eeae1f042b2..23ed5271128 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -951,44 +951,7 @@ static BOOL x86_64_fetch_minidump_thread(struct dump_context* dc, unsigned index
 
 static BOOL x86_64_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags)
 {
-    /* FIXME: not sure about the flags... */
-    if (1)
-    {
-        /* FIXME: crop values across module boundaries, */
-#ifdef __x86_64__
-        struct process*         pcs;
-        struct module*          module;
-        const RUNTIME_FUNCTION* rtf;
-        ULONG                   size;
-
-        if (!(pcs = process_find_by_handle(dc->process->handle)) ||
-            !(module = module_find_by_addr(pcs, dc->modules[index].base)))
-            return FALSE;
-        rtf = (const RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size);
-        if (rtf)
-        {
-            const RUNTIME_FUNCTION* end = (const RUNTIME_FUNCTION*)((const char*)rtf + size);
-            UNWIND_INFO ui;
-
-            while (rtf + 1 < end)
-            {
-                while (rtf->UnwindData & 1)  /* follow chained entry */
-                {
-                    FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n");
-                    return FALSE;
-                    /* we need to read into the other process */
-                    /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */
-                }
-                if (read_process_memory(dc->process, dc->modules[index].base + rtf->UnwindData, &ui, sizeof(ui)))
-                    minidump_add_memory_block(dc, dc->modules[index].base + rtf->UnwindData,
-                                              FIELD_OFFSET(UNWIND_INFO, UnwindCode) + ui.CountOfCodes * sizeof(UNWIND_CODE), 0);
-                rtf++;
-            }
-        }
-#endif
-    }
-
-    return TRUE;
+    return FALSE;
 }
 
 struct cpu cpu_x86_64 = {

From 3eeca96f1e1ab1427165a04001b93d0ac01fe575 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 4 Mar 2024 12:28:48 -0600
Subject: [PATCH 210/389] amd_ags_x64: Add WINE_HIDE_APU option.

CW-Bug-Id: #23489
---
 dlls/amd_ags_x64/amd_ags_x64_main.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index c605520632e..0ec45bc293d 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -706,6 +706,20 @@ static void init_device_displays_511(const char *adapter_name, AGSDisplayInfo_51
     heap_free(displays);
 }
 
+static int hide_apu(void)
+{
+    static int cached = -1;
+
+    if (cached == -1)
+    {
+        const char *s;
+
+        cached = ((s = getenv("WINE_HIDE_APU"))) && *s != '0';
+        if (cached)
+            FIXME("hack: hiding APU.\n");
+    }
+    return cached;
+}
 
 static AGSReturnCode init_ags_context(AGSContext *context, int ags_version)
 {
@@ -780,7 +794,7 @@ static AGSReturnCode init_ags_context(AGSContext *context, int ags_version)
             {
                 SET_DEVICE_FIELD(device, asicFamily, AsicFamily, context->version, AsicFamily_GCN4);
             }
-            if (vk_properties->deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU)
+            if (vk_properties->deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU && !hide_apu())
             {
                 if (context->version >= AMD_AGS_VERSION_6_0_0)
                     device_600->isAPU = 1;

From c45f4b8d94460e6fe83d561e19ece4cbc0124aa2 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 4 Mar 2024 14:37:03 -0600
Subject: [PATCH 211/389] winegstreamer: HACK: Do not enable low latency for
 Gungrave G.O.R.E.

CW-Bug-Id: #23455
---
 dlls/winegstreamer/video_decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 18ac6c0858f..3e42d04d75a 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -116,7 +116,7 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder)
 
     {
         const char *sgi;
-        if ((sgi = getenv("SteamGameId")) && ((!strcmp(sgi, "2009100")) || (!strcmp(sgi, "2555360"))))
+        if ((sgi = getenv("SteamGameId")) && (!strcmp(sgi, "2009100") || !strcmp(sgi, "2555360") || !strcmp(sgi, "1630110")))
             attrs.low_latency = FALSE;
     }
 

From ce93000cfa80f7dafd1ccb83cd051f64348c3365 Mon Sep 17 00:00:00 2001
From: Brendan McGrath <bmcgrath@codeweavers.com>
Date: Thu, 29 Feb 2024 11:46:06 +1100
Subject: [PATCH 212/389] mshtml: Pass DOMEvent instead of nsIDOMEvent during
 handle_event.

CW-Bug-Id: #23425

(cherry picked from commit 277acf61d0fb8e5d36fbadda8ecb349dd3dcc435)
---
 dlls/mshtml/htmlanchor.c | 8 ++++----
 dlls/mshtml/htmlarea.c   | 8 ++++----
 dlls/mshtml/htmlelem.c   | 6 +++---
 dlls/mshtml/htmlevent.c  | 2 +-
 dlls/mshtml/htmlevent.h  | 4 ++--
 dlls/mshtml/htmlform.c   | 6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c
index 7d2ad328890..147a5b9cbe6 100644
--- a/dlls/mshtml/htmlanchor.c
+++ b/dlls/mshtml/htmlanchor.c
@@ -829,13 +829,13 @@ static void HTMLAnchorElement_unlink(DispatchEx *dispex)
     unlink_ref(&This->nsanchor);
 }
 
-static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
+static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default)
 {
     HTMLAnchorElement *This = impl_from_DispatchEx(dispex);
     nsAString href_str, target_str;
     nsresult nsres;
 
-    if(eid == EVENTID_CLICK) {
+    if(event->event_id == EVENTID_CLICK) {
         nsAString_Init(&href_str, NULL);
         nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str);
         if (NS_FAILED(nsres)) {
@@ -850,14 +850,14 @@ static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, eventid_t eid,
             goto fallback;
         }
 
-        return handle_link_click_event(&This->element, &href_str, &target_str, event, prevent_default);
+        return handle_link_click_event(&This->element, &href_str, &target_str, event->nsevent, prevent_default);
 
 fallback:
         nsAString_Finish(&href_str);
         nsAString_Finish(&target_str);
     }
 
-    return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default);
+    return HTMLElement_handle_event(&This->element.node.event_target.dispex, event, prevent_default);
 }
 
 static const NodeImplVtbl HTMLAnchorElementImplVtbl = {
diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c
index c4cb109039a..1b9be40baab 100644
--- a/dlls/mshtml/htmlarea.c
+++ b/dlls/mshtml/htmlarea.c
@@ -439,13 +439,13 @@ static void HTMLAreaElement_unlink(DispatchEx *dispex)
     unlink_ref(&This->nsarea);
 }
 
-static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
+static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default)
 {
     HTMLAreaElement *This = impl_from_DispatchEx(dispex);
     nsAString href_str, target_str;
     nsresult nsres;
 
-    if(eid == EVENTID_CLICK) {
+    if(event->event_id == EVENTID_CLICK) {
         nsAString_Init(&href_str, NULL);
         nsres = nsIDOMHTMLAreaElement_GetHref(This->nsarea, &href_str);
         if (NS_FAILED(nsres)) {
@@ -460,14 +460,14 @@ static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, eventid_t eid, n
             goto fallback;
         }
 
-        return handle_link_click_event(&This->element, &href_str, &target_str, event, prevent_default);
+        return handle_link_click_event(&This->element, &href_str, &target_str, event->nsevent, prevent_default);
 
 fallback:
         nsAString_Finish(&href_str);
         nsAString_Finish(&target_str);
     }
 
-    return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default);
+    return HTMLElement_handle_event(&This->element.node.event_target.dispex, event, prevent_default);
 }
 
 static const NodeImplVtbl HTMLAreaElementImplVtbl = {
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 6fcab0cf89f..cbec1368eaa 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -7083,16 +7083,16 @@ void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid)
     ensure_doc_nsevent_handler(This->node.doc, This->node.nsnode, eid);
 }
 
-HRESULT HTMLElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
+HRESULT HTMLElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default)
 {
     HTMLElement *This = impl_from_DispatchEx(dispex);
 
-    switch(eid) {
+    switch(event->event_id) {
     case EVENTID_KEYDOWN: {
         nsIDOMKeyEvent *key_event;
         nsresult nsres;
 
-        nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event);
+        nsres = nsIDOMEvent_QueryInterface(event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event);
         if(NS_SUCCEEDED(nsres)) {
             UINT32 code = 0;
 
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index bba0970d7ce..485fb8c3f39 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -5165,7 +5165,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event,
             vtbl = dispex_get_vtbl(&target_chain[i]->dispex);
             if(!vtbl->handle_event)
                 continue;
-            hres = vtbl->handle_event(&target_chain[i]->dispex, event->event_id, event->nsevent, &prevent_default);
+            hres = vtbl->handle_event(&target_chain[i]->dispex, event, &prevent_default);
             if(FAILED(hres) || event->stop_propagation)
                 break;
             if(prevent_default)
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 2933314292e..545560a4030 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -133,7 +133,7 @@ typedef struct {
     nsISupports *(*get_gecko_target)(DispatchEx*);
     void (*bind_event)(DispatchEx*,eventid_t);
     EventTarget *(*get_parent_event_target)(DispatchEx*);
-    HRESULT (*handle_event)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*);
+    HRESULT (*handle_event)(DispatchEx*,DOMEvent*,BOOL*);
     ConnectionPointContainer *(*get_cp_container)(DispatchEx*);
     IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*);
 } event_target_vtbl_t;
@@ -143,7 +143,7 @@ IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*);
 nsISupports *HTMLElement_get_gecko_target(DispatchEx*);
 void HTMLElement_bind_event(DispatchEx*,eventid_t);
 EventTarget *HTMLElement_get_parent_event_target(DispatchEx*);
-HRESULT HTMLElement_handle_event(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*);
+HRESULT HTMLElement_handle_event(DispatchEx*,DOMEvent*,BOOL*);
 ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*);
 IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*);
 
diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index 3b8f0cb4e43..019f5cb1a5f 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -1061,16 +1061,16 @@ static HRESULT HTMLFormElement_invoke(DispatchEx *dispex, IDispatch *this_obj, D
     return S_OK;
 }
 
-static HRESULT HTMLFormElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
+static HRESULT HTMLFormElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default)
 {
     HTMLFormElement *This = impl_from_DispatchEx(dispex);
 
-    if(eid == EVENTID_SUBMIT) {
+    if(event->event_id == EVENTID_SUBMIT) {
         *prevent_default = TRUE;
         return IHTMLFormElement_submit(&This->IHTMLFormElement_iface);
     }
 
-    return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default);
+    return HTMLElement_handle_event(&This->element.node.event_target.dispex, event, prevent_default);
 }
 
 static const NodeImplVtbl HTMLFormElementImplVtbl = {

From 5d34273369e44e2b2683289fa7582711682bbf92 Mon Sep 17 00:00:00 2001
From: Brendan McGrath <bmcgrath@codeweavers.com>
Date: Wed, 21 Feb 2024 11:05:05 +1100
Subject: [PATCH 213/389] mshtml: Use generic event dispatcher for
 DOMContentLoaded.

Use generic event dispatcher instead of nsevent for the
DOMContentLoaded event.

Also allow processing before dispatching event.

Only update dom_content_loaded_event start/end time when the event is
trusted.

CW-Bug-Id: #23083

(cherry picked from commit 54980a786814ce3bed1f17be6e77658f9b9430ec)
---
 dlls/mshtml/htmldoc.c   | 36 +++++++++++++++++++++++++++++++++++-
 dlls/mshtml/htmlevent.c | 14 +++++++++++++-
 dlls/mshtml/htmlevent.h |  1 +
 dlls/mshtml/nsevents.c  | 22 ----------------------
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 6b5d73c0604..69c739001a6 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -6333,6 +6333,38 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI
                          DISPID_IHTMLWINDOW2_LOCATION, 0, flags, dp, res, ei, caller);
 }
 
+static HRESULT HTMLDocumentNode_pre_handle_event(DispatchEx* dispex, DOMEvent *event)
+{
+    HTMLDocumentNode *doc = impl_from_DispatchEx(dispex);
+    switch(event->event_id) {
+    case EVENTID_DOMCONTENTLOADED: {
+        if(event->trusted && doc->window)
+            doc->window->dom_content_loaded_event_start_time = get_time_stamp();
+        break;
+    }
+    default:
+        break;
+    }
+
+    return S_OK;
+}
+
+static HRESULT HTMLDocumentNode_handle_event(DispatchEx* dispex, DOMEvent *event, BOOL *prevent_default)
+{
+    HTMLDocumentNode *doc = impl_from_DispatchEx(dispex);
+    switch(event->event_id) {
+    case EVENTID_DOMCONTENTLOADED: {
+        if(event->trusted && doc->window)
+            doc->window->dom_content_loaded_event_end_time = get_time_stamp();
+        break;
+    }
+    default:
+        break;
+    }
+
+    return S_OK;
+}
+
 static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = {
     {
         .query_interface     = HTMLDocumentNode_query_interface,
@@ -6348,8 +6380,10 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = {
     .get_gecko_target        = HTMLDocumentNode_get_gecko_target,
     .bind_event              = HTMLDocumentNode_bind_event,
     .get_parent_event_target = HTMLDocumentNode_get_parent_event_target,
+    .pre_handle_event        = HTMLDocumentNode_pre_handle_event,
+    .handle_event            = HTMLDocumentNode_handle_event,
     .get_cp_container        = HTMLDocumentNode_get_cp_container,
-    .set_current_event       = HTMLDocumentNode_set_current_event
+    .set_current_event       = HTMLDocumentNode_set_current_event,
 };
 
 static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = {
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 485fb8c3f39..f6f21d7a9eb 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -117,7 +117,7 @@ typedef struct {
 /* Keep these sorted case sensitively */
 static const event_info_t event_info[] = {
     {L"DOMContentLoaded",  EVENT_TYPE_EVENT,     0,
-        EVENT_BUBBLES | EVENT_CANCELABLE},
+        EVENT_DEFAULTLISTENER | EVENT_HASDEFAULTHANDLERS | EVENT_BUBBLES | EVENT_CANCELABLE },
     {L"abort",             EVENT_TYPE_EVENT,     DISPID_EVMETH_ONABORT,
         EVENT_BIND_TO_TARGET},
     {L"afterprint",        EVENT_TYPE_EVENT,     DISPID_EVMETH_ONAFTERPRINT,
@@ -5132,6 +5132,18 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event,
     IEventTarget_AddRef(&event_target->IEventTarget_iface);
 
     event->phase = DEP_CAPTURING_PHASE;
+
+    if(event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS) {
+        for(i = 0; i < chain_cnt; i++) {
+            vtbl = dispex_get_vtbl(&target_chain[i]->dispex);
+            if(!vtbl->pre_handle_event)
+                continue;
+            hres = vtbl->pre_handle_event(&target_chain[i]->dispex, event);
+            if(FAILED(hres) || event->stop_propagation)
+                break;
+        }
+    }
+
     i = chain_cnt-1;
     while(!event->stop_propagation && i)
         call_event_handlers(target_chain[i--], event, dispatch_mode);
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 545560a4030..f2cbfe18bf2 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -133,6 +133,7 @@ typedef struct {
     nsISupports *(*get_gecko_target)(DispatchEx*);
     void (*bind_event)(DispatchEx*,eventid_t);
     EventTarget *(*get_parent_event_target)(DispatchEx*);
+    HRESULT (*pre_handle_event)(DispatchEx*,DOMEvent*);
     HRESULT (*handle_event)(DispatchEx*,DOMEvent*,BOOL*);
     ConnectionPointContainer *(*get_cp_container)(DispatchEx*);
     IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*);
diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index c229a2c634f..c6c6438a740 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -48,7 +48,6 @@ typedef struct {
 static nsresult handle_blur(HTMLDocumentNode*,nsIDOMEvent*);
 static nsresult handle_focus(HTMLDocumentNode*,nsIDOMEvent*);
 static nsresult handle_keypress(HTMLDocumentNode*,nsIDOMEvent*);
-static nsresult handle_dom_content_loaded(HTMLDocumentNode*,nsIDOMEvent*);
 static nsresult handle_pageshow(HTMLDocumentNode*,nsIDOMEvent*);
 static nsresult handle_pagehide(HTMLDocumentNode*,nsIDOMEvent*);
 static nsresult handle_load(HTMLDocumentNode*,nsIDOMEvent*);
@@ -68,7 +67,6 @@ static const struct {
     { EVENTID_BLUR,             0,                  handle_blur },
     { EVENTID_FOCUS,            0,                  handle_focus },
     { EVENTID_KEYPRESS,         BUBBLES,            handle_keypress },
-    { EVENTID_DOMCONTENTLOADED, OVERRIDE,           handle_dom_content_loaded },
     { EVENTID_PAGESHOW,         OVERRIDE,           handle_pageshow },
     { EVENTID_PAGEHIDE,         OVERRIDE,           handle_pagehide },
     { EVENTID_LOAD,             OVERRIDE,           handle_load },
@@ -234,26 +232,6 @@ static nsresult handle_keypress(HTMLDocumentNode *doc, nsIDOMEvent *event)
     return NS_OK;
 }
 
-static nsresult handle_dom_content_loaded(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
-{
-    DOMEvent *event;
-    HRESULT hres;
-
-    if(doc->window)
-        doc->window->dom_content_loaded_event_start_time = get_time_stamp();
-
-    hres = create_event_from_nsevent(nsevent, get_inner_window(doc), dispex_compat_mode(&doc->node.event_target.dispex), &event);
-    if(SUCCEEDED(hres)) {
-        dispatch_event(&doc->node.event_target, event);
-        IDOMEvent_Release(&event->IDOMEvent_iface);
-    }
-
-    if(doc->window)
-        doc->window->dom_content_loaded_event_end_time = get_time_stamp();
-
-    return NS_OK;
-}
-
 static nsresult handle_pageshow(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
 {
     HTMLInnerWindow *window;

From 2740d340a8bd181e94def94cc4776aaa97ad79ea Mon Sep 17 00:00:00 2001
From: Brendan McGrath <bmcgrath@codeweavers.com>
Date: Mon, 26 Feb 2024 14:36:50 +1100
Subject: [PATCH 214/389] mshtml/tests: Add test for document mode after
 InitNew and Load.

CW-Bug-Id: #23083

(cherry picked from commit 34a8478da895538c4e3f2a9432e150d4a33ebe06)
---
 dlls/mshtml/tests/dom.c | 76 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 36863d2ac62..b56e13aebfc 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -12253,6 +12253,81 @@ static void test_document_mode_lock(void)
     IHTMLDocument2_Release(doc);
 }
 
+static void test_document_mode_after_initnew(void)
+{
+    IHTMLDocument2 *doc;
+    IHTMLDocument6 *doc6;
+    IEventTarget *event_target;
+    IPersistStreamInit *init;
+    IStream *stream;
+    HRESULT hres;
+    HGLOBAL mem;
+    VARIANT var;
+    SIZE_T len;
+    MSG msg;
+
+    notif_doc = doc = create_document();
+    if(!doc)
+        return;
+    doc_complete = FALSE;
+
+    hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target);
+    ok(hres == E_NOINTERFACE, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres);
+    ok(event_target == NULL, "event_target != NULL\n");
+
+    len = strlen(doc_blank_ie9);
+    mem = GlobalAlloc(0, len);
+    memcpy(mem, doc_blank_ie9, len);
+    hres = CreateStreamOnHGlobal(mem, TRUE, &stream);
+    ok(hres == S_OK, "Failed to create stream: %08lx.\n", hres);
+
+    hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init);
+    ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08lx.\n", hres);
+
+    IPersistStreamInit_InitNew(init);
+    IPersistStreamInit_Load(init, stream);
+    IPersistStreamInit_Release(init);
+    IStream_Release(stream);
+
+    set_client_site(doc, TRUE);
+    do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
+
+    hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument6, (void**)&doc6);
+    ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument6) failed: %08lx\n", hres);
+
+    V_VT(&var) = VT_EMPTY;
+    hres = IHTMLDocument6_get_documentMode(doc6, &var);
+    ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres);
+    ok(V_VT(&var) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&var));
+    ok(V_R4(&var) == 5, "documentMode = %f, expected 5\n", V_R4(&var));
+    VariantClear(&var);
+
+    while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
+        TranslateMessage(&msg);
+        DispatchMessageW(&msg);
+    }
+
+    hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target);
+    todo_wine
+    ok(hres == S_OK, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres);
+    todo_wine
+    ok(event_target != NULL, "event_target == NULL\n");
+    if (event_target != NULL)
+        IEventTarget_Release(event_target);
+
+    V_VT(&var) = VT_EMPTY;
+    hres = IHTMLDocument6_get_documentMode(doc6, &var);
+    ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres);
+    ok(V_VT(&var) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&var));
+    todo_wine
+    ok(V_R4(&var) == 9, "documentMode = %f, expected 9\n", V_R4(&var));
+    IHTMLDocument6_Release(doc6);
+    VariantClear(&var);
+
+    set_client_site(doc, FALSE);
+    IHTMLDocument2_Release(doc);
+}
+
 static DWORD WINAPI create_document_proc(void *param)
 {
     IHTMLDocument2 *doc = NULL;
@@ -12378,6 +12453,7 @@ START_TEST(dom)
 
     test_quirks_mode();
     test_document_mode_lock();
+    test_document_mode_after_initnew();
     test_threads();
 
     /* Run this last since it messes with the process-wide user agent */

From 5cddb1309a46fc1ab88ff467f34c12fe1a07e39b Mon Sep 17 00:00:00 2001
From: Brendan McGrath <bmcgrath@codeweavers.com>
Date: Mon, 26 Feb 2024 14:39:01 +1100
Subject: [PATCH 215/389] mshtml: Always use the event target dispex.

The event target may be from a different document to the document associated with the
event handler.

CW-Bug-Id: #23083

(cherry picked from commit 74ff9f23717d2a8a8255d213099d2709e55e9c63)
---
 dlls/mshtml/nsevents.c  | 2 +-
 dlls/mshtml/tests/dom.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index c6c6438a740..38b3cccd951 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -444,7 +444,7 @@ static nsresult handle_htmlevent(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
         target = &node->event_target;
     }
 
-    hres = create_event_from_nsevent(nsevent, get_inner_window(doc), dispex_compat_mode(&doc->node.event_target.dispex), &event);
+    hres = create_event_from_nsevent(nsevent, get_inner_window(doc), dispex_compat_mode(&target->dispex), &event);
     if(FAILED(hres)) {
         IEventTarget_Release(&target->IEventTarget_iface);
         return NS_OK;
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index b56e13aebfc..ceb59ee8a78 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -12308,18 +12308,14 @@ static void test_document_mode_after_initnew(void)
     }
 
     hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target);
-    todo_wine
     ok(hres == S_OK, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres);
-    todo_wine
     ok(event_target != NULL, "event_target == NULL\n");
-    if (event_target != NULL)
-        IEventTarget_Release(event_target);
+    IEventTarget_Release(event_target);
 
     V_VT(&var) = VT_EMPTY;
     hres = IHTMLDocument6_get_documentMode(doc6, &var);
     ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres);
     ok(V_VT(&var) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&var));
-    todo_wine
     ok(V_R4(&var) == 9, "documentMode = %f, expected 9\n", V_R4(&var));
     IHTMLDocument6_Release(doc6);
     VariantClear(&var);

From 8963a000fec6ee40e8a8f80a5837f6b825ecb50a Mon Sep 17 00:00:00 2001
From: Brendan McGrath <bmcgrath@codeweavers.com>
Date: Mon, 26 Feb 2024 16:15:43 +1100
Subject: [PATCH 216/389] mshtml: Don't handle special case when doc !=
 node->doc.

CW-Bug-Id: #23083

(cherry picked from commit 57c2c41d751d179dd1b5a2bb02431a072908ad6b)
---
 dlls/mshtml/nsevents.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index 38b3cccd951..9a23d031d72 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -416,6 +416,7 @@ static nsresult handle_htmlevent(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
     nsIDOMEventTarget *event_target;
     EventTarget *target;
     nsIDOMNode *nsnode;
+    HTMLDOMNode *node = NULL;
     DOMEvent *event;
     nsresult nsres;
     HRESULT hres;
@@ -436,7 +437,6 @@ static nsresult handle_htmlevent(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
         target = &doc->window->event_target;
         IHTMLWindow2_AddRef(&doc->window->base.IHTMLWindow2_iface);
     }else {
-        HTMLDOMNode *node;
         hres = get_node(nsnode, TRUE, &node);
         nsIDOMNode_Release(nsnode);
         if(FAILED(hres))
@@ -451,7 +451,7 @@ static nsresult handle_htmlevent(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
     }
 
     /* If we fine need for more special cases here, we may consider handling it in a more generic way. */
-    if(event->event_id == EVENTID_FOCUS || event->event_id == EVENTID_BLUR) {
+    if((!node || doc == node->doc) && (event->event_id == EVENTID_FOCUS || event->event_id == EVENTID_BLUR)) {
         DOMEvent *focus_event;
 
         hres = create_document_event(doc, event->event_id == EVENTID_FOCUS ? EVENTID_FOCUSIN : EVENTID_FOCUSOUT, &focus_event);

From b028d34fd3a33dbba841fbe20403f5a258c6468f Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Fri, 1 Mar 2024 20:20:13 -0500
Subject: [PATCH 217/389] sapi: Implement ISpeechVoice::{get/put}_Volume.

(cherry picked from commit 7c384f361aaa38b31fa7b9ff72085eee728c52ea)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c |  9 ++++++++-
 dlls/sapi/tts.c       | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index 4d565b35294..a5c950aa80b 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -434,7 +434,7 @@ static void test_spvoice(void)
     DWORD start, duration;
     ISpeechVoice *speech_voice;
     ISpeechObjectTokens *speech_tokens;
-    LONG count;
+    LONG count, volume_long;
     BSTR req = NULL, opt = NULL;
     UINT info_count;
     ITypeInfo *typeinfo;
@@ -717,6 +717,13 @@ static void test_spvoice(void)
     ok(count == 1, "got %ld.\n", count);
     ISpeechObjectTokens_Release(speech_tokens);
 
+    volume_long = 0xdeadbeef;
+    hr = ISpeechVoice_put_Volume(speech_voice, 80);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ISpeechVoice_get_Volume(speech_voice, &volume_long);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(volume_long == 80, "got %ld.\n", volume_long);
+
     hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
     ok(hr == S_OK, "got %#lx.\n", hr);
 
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index d22ffd7a0da..325edaf04fb 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -291,16 +291,25 @@ static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate)
 
 static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume)
 {
-    FIXME("(%p, %p): stub.\n", iface, volume);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
+    USHORT res = 0;
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, volume);
+
+    if (!volume) return E_POINTER;
+    hr = ISpVoice_GetVolume(&This->ISpVoice_iface, &res);
+    *volume = res;
+    return hr;
 }
 
 static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume)
 {
-    FIXME("(%p, %ld): stub.\n", iface, volume);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
 
-    return E_NOTIMPL;
+    TRACE("(%p, %ld).\n", iface, volume);
+
+    return ISpVoice_SetVolume(&This->ISpVoice_iface, (USHORT)volume);
 }
 
 static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface,

From 7ae726d11b0d8e80a88069ee232b22d11952f648 Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Fri, 1 Mar 2024 20:44:43 -0500
Subject: [PATCH 218/389] sapi: Implement ISpeechVoice::{get/putref}_Voice.

(cherry picked from commit 43220a6063328bc445a346e5f6849731aafcaf88)

CW-Bug-Id: #22520
---
 dlls/sapi/tests/tts.c | 22 +++++++++++++++++++++-
 dlls/sapi/tts.c       | 26 ++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c
index a5c950aa80b..38c69e6144a 100644
--- a/dlls/sapi/tests/tts.c
+++ b/dlls/sapi/tests/tts.c
@@ -424,7 +424,7 @@ static void test_spvoice(void)
     IUnknown *dummy;
     ISpMMSysAudio *audio_out;
     ISpObjectTokenCategory *token_cat;
-    ISpObjectToken *token;
+    ISpObjectToken *token, *token2;
     WCHAR *token_id = NULL, *default_token_id = NULL;
     ISpDataKey *attrs_key;
     LONG rate;
@@ -435,6 +435,7 @@ static void test_spvoice(void)
     ISpeechVoice *speech_voice;
     ISpeechObjectTokens *speech_tokens;
     LONG count, volume_long;
+    ISpeechObjectToken *speech_token;
     BSTR req = NULL, opt = NULL;
     UINT info_count;
     ITypeInfo *typeinfo;
@@ -724,6 +725,25 @@ static void test_spvoice(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     ok(volume_long == 80, "got %ld.\n", volume_long);
 
+    hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)&speech_token);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    hr = ISpeechVoice_putref_Voice(speech_voice, speech_token);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ISpeechObjectToken_Release(speech_token);
+
+    speech_token = (ISpeechObjectToken *)0xdeadbeef;
+    hr = ISpeechVoice_get_Voice(speech_voice, &speech_token);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(speech_token && speech_token != (ISpeechObjectToken *)0xdeadbeef, "got %p.\n", speech_token);
+    hr = ISpeechObjectToken_QueryInterface(speech_token, &IID_ISpObjectToken, (void **)&token2);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    token_id = NULL;
+    hr = ISpObjectToken_GetId(token2, &token_id);
+    ok(hr == S_OK, "got %#lx.\n", hr);
+    ok(!wcscmp(token_id, test_token_id), "got %s.\n", wine_dbgstr_w(token_id));
+    CoTaskMemFree(token_id);
+    ISpObjectToken_Release(token2);
+
     hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL);
     ok(hr == S_OK, "got %#lx.\n", hr);
 
diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c
index 325edaf04fb..c474a118981 100644
--- a/dlls/sapi/tts.c
+++ b/dlls/sapi/tts.c
@@ -235,16 +235,34 @@ static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceS
 
 static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice)
 {
-    FIXME("(%p, %p): stub.\n", iface, voice);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
+    ISpObjectToken *token;
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, voice);
+
+    if (!voice) return E_POINTER;
+    if (FAILED(hr = ISpVoice_GetVoice(&This->ISpVoice_iface, &token)))
+        return hr;
+    hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)voice);
+    ISpObjectToken_Release(token);
+    return hr;
 }
 
 static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice)
 {
-    FIXME("(%p, %p): stub.\n", iface, voice);
+    struct speech_voice *This = impl_from_ISpeechVoice(iface);
+    ISpObjectToken *token;
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("(%p, %p).\n", iface, voice);
+
+    if (!voice) return E_INVALIDARG;
+    if (FAILED(hr = ISpeechObjectToken_QueryInterface(voice, &IID_ISpObjectToken, (void **)&token)))
+        return hr;
+    hr = ISpVoice_SetVoice(&This->ISpVoice_iface, token);
+    ISpObjectToken_Release(token);
+    return hr;
 }
 
 static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output)

From aff91e329206a3c260b1758331e86c3fee0f2fd5 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 4 Mar 2024 16:23:06 -0600
Subject: [PATCH 219/389] amd_ags_x64: Add stub implementation for DX12 marker
 functions.

CW-Bug-Id: #23474
---
 dlls/amd_ags_x64/amd_ags_x64.spec   |  6 +++---
 dlls/amd_ags_x64/amd_ags_x64_main.c | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/dlls/amd_ags_x64/amd_ags_x64.spec b/dlls/amd_ags_x64/amd_ags_x64.spec
index 7c5e3fb8f69..744035a9a69 100644
--- a/dlls/amd_ags_x64/amd_ags_x64.spec
+++ b/dlls/amd_ags_x64/amd_ags_x64.spec
@@ -45,9 +45,9 @@
 @ stub agsDriverExtensionsDX12_Destroy
 @ stdcall agsDriverExtensionsDX12_DestroyDevice(ptr ptr ptr)
 @ stdcall agsDriverExtensionsDX12_Init(ptr ptr ptr)
-@ stub agsDriverExtensionsDX12_PopMarker
-@ stub agsDriverExtensionsDX12_PushMarker
-@ stub agsDriverExtensionsDX12_SetMarker
+@ stdcall agsDriverExtensionsDX12_PopMarker(ptr ptr)
+@ stdcall agsDriverExtensionsDX12_PushMarker(ptr ptr ptr)
+@ stdcall agsDriverExtensionsDX12_SetMarker(ptr ptr ptr)
 @ stdcall agsGetCrossfireGPUCount(ptr ptr)
 @ stdcall agsGetVersionNumber()
 @ stdcall agsInit(ptr ptr ptr)
diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index 0ec45bc293d..e1cb3609b99 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -1466,6 +1466,27 @@ AGSReturnCode WINAPI agsDriverExtensionsDX12_DeInit( AGSContext* context )
     return AGS_SUCCESS;
 }
 
+AGSReturnCode WINAPI  agsDriverExtensionsDX12_SetMarker( AGSContext *context, ID3D12GraphicsCommandList *command_list, const char *data)
+{
+    WARN("context %p, command_list %p, data %p stub.\n", context, command_list, data);
+
+    return AGS_SUCCESS;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX12_PushMarker( AGSContext *context, ID3D12GraphicsCommandList *command_list, const char* data)
+{
+    WARN("context %p, command_list %p, data %p stub.\n", context, command_list, data);
+
+    return AGS_SUCCESS;
+}
+
+AGSReturnCode WINAPI agsDriverExtensionsDX12_PopMarker(AGSContext *context, ID3D12GraphicsCommandList *command_list)
+{
+    WARN("context %p, command_list %p stub.\n", context, command_list);
+
+    return AGS_SUCCESS;
+}
+
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
 {
     TRACE("%p, %u, %p.\n", instance, reason, reserved);

From 6ad59c41a5aa4981804f4a7bf1c58a53533754d3 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 5 Mar 2024 09:47:35 -0600
Subject: [PATCH 220/389] Revert "winegstreamer: Implement
 MFT_MESSAGE_COMMAND_DRAIN for video processor."

This reverts commit c6fe011aa26d50c761c932265af9d4d506ce72b4.

CW-Bug-Id: #22299
---
 dlls/winegstreamer/video_processor.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c
index 698ae498ec7..1cbb37dafc7 100644
--- a/dlls/winegstreamer/video_processor.c
+++ b/dlls/winegstreamer/video_processor.c
@@ -513,18 +513,7 @@ static HRESULT WINAPI video_processor_ProcessEvent(IMFTransform *iface, DWORD id
 
 static HRESULT WINAPI video_processor_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    struct video_processor *impl = impl_from_IMFTransform(iface);
-
-    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
-
-    if (!impl->wg_transform)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (message == MFT_MESSAGE_COMMAND_DRAIN)
-        return wg_transform_drain(impl->wg_transform);
-
-    FIXME("Ignoring message %#x.\n", message);
-
+    FIXME("iface %p, message %#x, param %#Ix stub!\n", iface, message, param);
     return S_OK;
 }
 

From 11704698efabdc8e03df8443c011aa3ad6691bd9 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 5 Mar 2024 09:47:36 -0600
Subject: [PATCH 221/389] Revert "winegstreamer: Implement
 MFT_MESSAGE_COMMAND_DRAIN for resampler."

This reverts commit 73410b62a84a58ecee639600a6b3fe689b2aa513.

CW-Bug-Id: #22299
---
 dlls/winegstreamer/resampler.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c
index 22fb273e84c..b5b62d58800 100644
--- a/dlls/winegstreamer/resampler.c
+++ b/dlls/winegstreamer/resampler.c
@@ -509,18 +509,7 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    struct resampler *impl = impl_from_IMFTransform(iface);
-
-    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
-
-    if (!impl->wg_transform)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (message == MFT_MESSAGE_COMMAND_DRAIN)
-        return wg_transform_drain(impl->wg_transform);
-
-    FIXME("Ignoring message %#x.\n", message);
-
+    FIXME("iface %p, message %#x, param %p stub!\n", iface, message, (void *)param);
     return S_OK;
 }
 

From 9cf34c9332835f18c2ccf021079f82d00977de6b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 5 Mar 2024 09:47:37 -0600
Subject: [PATCH 222/389] Revert "winegstreamer: Implement
 MFT_MESSAGE_COMMAND_DRAIN for aac decoder."

This reverts commit 3a3400aa407c2362a08095cb57ccb6e5aa68077d.

CW-Bug-Id: #22299
---
 dlls/winegstreamer/audio_decoder.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/audio_decoder.c b/dlls/winegstreamer/audio_decoder.c
index cd63f116cbf..771eae465fe 100644
--- a/dlls/winegstreamer/audio_decoder.c
+++ b/dlls/winegstreamer/audio_decoder.c
@@ -489,18 +489,7 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    struct audio_decoder *decoder = impl_from_IMFTransform(iface);
-
-    TRACE("iface %p, message %#x, param %p.\n", iface, message, (void *)param);
-
-    if (!decoder->wg_transform)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (message == MFT_MESSAGE_COMMAND_DRAIN)
-        return wg_transform_drain(decoder->wg_transform);
-
-    FIXME("Ignoring message %#x.\n", message);
-
+    FIXME("iface %p, message %#x, param %p stub!\n", iface, message, (void *)param);
     return S_OK;
 }
 

From 34bbb1a44849b57834f6632dd6186b2dd0a36e57 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 5 Mar 2024 10:49:09 -0600
Subject: [PATCH 223/389] fixup! ntdll: Simulate async file read and IO
 cancellation to workaround AC:Odyssey out of order dialogues bug.

CW-Bug-Id: #21711
---
 dlls/ntdll/unix/file.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index d84f44d4560..e5ea71fae80 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -5648,6 +5648,7 @@ struct async_file_read_job
     LONG  cancelled;
     struct list queue_entry;
     struct async_file_read_job *next;
+    ULONG64 queue_time_mcs;
 };
 
 
@@ -5668,7 +5669,9 @@ static void *async_file_read_thread(void *dummy)
     ULONG buffer_length = 0;
     void *buffer = NULL;
     struct list *entry;
+    struct timespec ts;
     NTSTATUS status;
+    ULONG64 delay;
     ULONG total;
     int result;
 
@@ -5719,6 +5722,13 @@ static void *async_file_read_thread(void *dummy)
                 break;
         }
 
+        clock_gettime( CLOCK_MONOTONIC, &ts );
+        delay = ts.tv_sec * (ULONG64)1000000 + ts.tv_nsec / 1000 - job->queue_time_mcs;
+        if (delay < 1000)
+            usleep( 1000 - delay );
+        else
+            usleep( 50 );
+
         total = result;
         status = (total || !job->length) ? STATUS_SUCCESS : STATUS_END_OF_FILE;
 done:
@@ -5779,6 +5789,7 @@ static NTSTATUS queue_async_file_read( HANDLE handle, int unix_handle, int needs
                             IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset )
 {
     struct async_file_read_job *job;
+    struct timespec ts;
 
     pthread_once( &async_file_read_once, async_file_read_init );
 
@@ -5810,6 +5821,8 @@ static NTSTATUS queue_async_file_read( HANDLE handle, int unix_handle, int needs
     job->offset = *offset;
     job->thread_id = GetCurrentThreadId();
     job->cancelled = 0;
+    clock_gettime( CLOCK_MONOTONIC, &ts );
+    job->queue_time_mcs = ts.tv_sec * (ULONG64)1000000 + ts.tv_nsec / 1000;
 
     list_add_tail( &async_file_read_queue, &job->queue_entry );
 

From 96040d13a70b704ba92e4d9345d9560e6726bdef Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Sat, 3 Feb 2024 17:23:52 +0100
Subject: [PATCH 224/389] winevulkan: Prepare for VK_KHR_calibrated_timestamps.

(cherry picked from commit db03d2be88d80195635188cb51507f4c2d9c2b13)
---
 dlls/winevulkan/vulkan.c | 65 +++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 27cf80ee907..1f15aadc294 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1673,17 +1673,19 @@ static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDoma
     return value;
 }
 
-VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_count,
-                                           const VkCalibratedTimestampInfoEXT *timestamp_infos,
-                                           uint64_t *timestamps, uint64_t *max_deviation)
+static VkResult wine_vk_get_timestamps(struct wine_device *device, uint32_t timestamp_count,
+                                       const VkCalibratedTimestampInfoEXT *timestamp_infos,
+                                       uint64_t *timestamps, uint64_t *max_deviation,
+                                       VkResult (*get_timestamps)(VkDevice, uint32_t, const VkCalibratedTimestampInfoEXT *, uint64_t *, uint64_t *))
 {
-    struct wine_device *device = wine_device_from_handle(handle);
     VkCalibratedTimestampInfoEXT* host_timestamp_infos;
     unsigned int i;
     VkResult res;
-    TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation);
 
-    if (!(host_timestamp_infos = malloc(sizeof(VkCalibratedTimestampInfoEXT) * timestamp_count)))
+    if (timestamp_count == 0)
+        return VK_SUCCESS;
+
+    if (!(host_timestamp_infos = calloc(sizeof(VkCalibratedTimestampInfoEXT), timestamp_count)))
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
     for (i = 0; i < timestamp_count; i++)
@@ -1693,24 +1695,23 @@ VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_c
         host_timestamp_infos[i].timeDomain = map_to_host_time_domain(timestamp_infos[i].timeDomain);
     }
 
-    res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->host_device, timestamp_count, host_timestamp_infos,
-                                                       timestamps, max_deviation);
-    if (res != VK_SUCCESS)
-        return res;
-
-    for (i = 0; i < timestamp_count; i++)
-        timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]);
+    res = get_timestamps(device->host_device, timestamp_count, host_timestamp_infos, timestamps, max_deviation);
+    if (res == VK_SUCCESS)
+    {
+        for (i = 0; i < timestamp_count; i++)
+            timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]);
+    }
 
     free(host_timestamp_infos);
 
     return res;
 }
 
-VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle,
-                                                             uint32_t *time_domain_count,
-                                                             VkTimeDomainEXT *time_domains)
+static VkResult wine_vk_get_time_domains(struct wine_phys_dev *phys_dev,
+                                         uint32_t *time_domain_count,
+                                         VkTimeDomainEXT *time_domains,
+                                         VkResult (*get_domains)(VkPhysicalDevice, uint32_t *, VkTimeDomainEXT *))
 {
-    struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle);
     BOOL supports_device = FALSE, supports_monotonic = FALSE, supports_monotonic_raw = FALSE;
     const VkTimeDomainEXT performance_counter_domain = get_performance_counter_time_domain();
     VkTimeDomainEXT *host_time_domains;
@@ -1721,16 +1722,14 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha
     VkResult res;
 
     /* Find out the time domains supported on the host */
-    res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->host_physical_device,
-                                                                                     &host_time_domain_count, NULL);
+    res = get_domains(phys_dev->host_physical_device, &host_time_domain_count, NULL);
     if (res != VK_SUCCESS)
         return res;
 
     if (!(host_time_domains = malloc(sizeof(VkTimeDomainEXT) * host_time_domain_count)))
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-    res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->host_physical_device,
-                                                                                     &host_time_domain_count, host_time_domains);
+    res = get_domains(phys_dev->host_physical_device, &host_time_domain_count, host_time_domains);
     if (res != VK_SUCCESS)
     {
         free(host_time_domains);
@@ -1780,6 +1779,30 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha
     return res;
 }
 
+VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_count,
+                                           const VkCalibratedTimestampInfoEXT *timestamp_infos,
+                                           uint64_t *timestamps, uint64_t *max_deviation)
+{
+    struct wine_device *device = wine_device_from_handle(handle);
+
+    TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation);
+
+    return wine_vk_get_timestamps(device, timestamp_count, timestamp_infos, timestamps, max_deviation,
+                                  device->funcs.p_vkGetCalibratedTimestampsEXT);
+}
+
+VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle,
+                                                             uint32_t *time_domain_count,
+                                                             VkTimeDomainEXT *time_domains)
+{
+    struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle);
+
+    TRACE("%p, %p, %p\n", phys_dev, time_domain_count, time_domains);
+
+    return wine_vk_get_time_domains(phys_dev, time_domain_count, time_domains,
+                                    phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT);
+}
+
 static inline void wine_vk_normalize_semaphore_handle_types_win(VkExternalSemaphoreHandleTypeFlags *types)
 {
     *types &=

From 040deb073bcdfb8420a5e28f03735f0868dd331d Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Sat, 3 Feb 2024 17:34:27 +0100
Subject: [PATCH 225/389] winevulkan: Update to VK spec version 1.3.277.

(cherry picked from commit ea890c4733db5119fdb63b900bb7e5c8d04b5245)
---
 dlls/winevulkan/make_vulkan |  5 ++++-
 dlls/winevulkan/vulkan.c    | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index f8ac5976efe..4f5df2fc697 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -64,7 +64,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())
 
-VK_XML_VERSION = "1.3.272"
+VK_XML_VERSION = "1.3.277"
 WINE_VK_VERSION = (1, 3)
 
 # Filenames to create.
@@ -101,6 +101,7 @@ UNSUPPORTED_EXTENSIONS = [
     "VK_KHR_external_fence_win32",
     # Relates to external_semaphore and needs type conversions in bitflags.
     "VK_KHR_shared_presentable_image", # Needs WSI work.
+    "VK_KHR_video_encode_queue",
     "VK_KHR_video_queue", # TODO Video extensions use separate headers + xml
     "VK_NV_external_memory_rdma", # Needs shared resources work.
 
@@ -278,6 +279,7 @@ MANUAL_UNIX_THUNKS = {
     "vkFreeCommandBuffers",
     "vkFreeMemory",
     "vkGetCalibratedTimestampsEXT",
+    "vkGetCalibratedTimestampsKHR",
     "vkGetDeviceProcAddr",
     "vkGetMemoryWin32HandleKHR",
     "vkGetMemoryWin32HandlePropertiesKHR",
@@ -285,6 +287,7 @@ MANUAL_UNIX_THUNKS = {
     "vkGetDeviceQueue2",
     "vkGetInstanceProcAddr",
     "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT",
+    "vkGetPhysicalDeviceCalibrateableTimeDomainsKHR",
     "vkGetPhysicalDeviceExternalBufferProperties",
     "vkGetPhysicalDeviceExternalBufferPropertiesKHR",
     "vkGetPhysicalDeviceExternalFenceProperties",
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 1f15aadc294..885af7ae970 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1791,6 +1791,18 @@ VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_c
                                   device->funcs.p_vkGetCalibratedTimestampsEXT);
 }
 
+VkResult wine_vkGetCalibratedTimestampsKHR(VkDevice handle, uint32_t timestamp_count,
+                                           const VkCalibratedTimestampInfoKHR *timestamp_infos,
+                                           uint64_t *timestamps, uint64_t *max_deviation)
+{
+    struct wine_device *device = wine_device_from_handle(handle);
+
+    TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation);
+
+    return wine_vk_get_timestamps(device, timestamp_count, timestamp_infos, timestamps, max_deviation,
+                                  device->funcs.p_vkGetCalibratedTimestampsKHR);
+}
+
 VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle,
                                                              uint32_t *time_domain_count,
                                                              VkTimeDomainEXT *time_domains)
@@ -1803,6 +1815,18 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha
                                     phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT);
 }
 
+VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(VkPhysicalDevice handle,
+                                                             uint32_t *time_domain_count,
+                                                             VkTimeDomainKHR *time_domains)
+{
+    struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle);
+
+    TRACE("%p, %p, %p\n", phys_dev, time_domain_count, time_domains);
+
+    return wine_vk_get_time_domains(phys_dev, time_domain_count, time_domains,
+                                    phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR);
+}
+
 static inline void wine_vk_normalize_semaphore_handle_types_win(VkExternalSemaphoreHandleTypeFlags *types)
 {
     *types &=

From 9e49e41380cece8c4136404aefeff56d383e13b0 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Tue, 5 Mar 2024 15:59:34 +0200
Subject: [PATCH 226/389] Update vk.xml to 1.3.277.

---
 dlls/winevulkan/vk.xml | 1757 ++++++++++++++++++++++++++++------------
 1 file changed, 1235 insertions(+), 522 deletions(-)

diff --git a/dlls/winevulkan/vk.xml b/dlls/winevulkan/vk.xml
index a696de6f012..fb92b7c2373 100644
--- a/dlls/winevulkan/vk.xml
+++ b/dlls/winevulkan/vk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <registry>
     <comment>
-Copyright 2015-2023 The Khronos Group Inc.
+Copyright 2015-2024 The Khronos Group Inc.
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
     </comment>
@@ -175,11 +175,11 @@ branch of the member gitlab server.
 #define <name>VKSC_API_VERSION_1_0</name> <type>VK_MAKE_API_VERSION</type>(VKSC_API_VARIANT, 1, 0, 0)// Patch version should always be set to 0</type>
 
         <type api="vulkan" category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 267</type>
+#define <name>VK_HEADER_VERSION</name> 277</type>
         <type api="vulkan" category="define" requires="VK_HEADER_VERSION">// Complete version of this file
 #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 3, VK_HEADER_VERSION)</type>
         <type api="vulkansc" category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 13</type>
+#define <name>VK_HEADER_VERSION</name> 14</type>
         <type api="vulkansc" category="define" requires="VKSC_API_VARIANT">// Complete version of this file
 #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(VKSC_API_VARIANT, 1, 0, VK_HEADER_VERSION)</type>
 
@@ -482,6 +482,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type requires="VkPresentScalingFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkPresentScalingFlagsEXT</name>;</type>
         <type requires="VkPresentGravityFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkPresentGravityFlagsEXT</name>;</type>
         <type requires="VkShaderCreateFlagBitsEXT"        category="bitmask">typedef <type>VkFlags</type> <name>VkShaderCreateFlagsEXT</name>;</type>
+        <type bitvalues="VkPhysicalDeviceSchedulingControlsFlagBitsARM" category="bitmask">typedef <type>VkFlags64</type> <name>VkPhysicalDeviceSchedulingControlsFlagsARM</name>;</type>
 
             <comment>Video Core extension</comment>
         <type requires="VkVideoCodecOperationFlagBitsKHR"           category="bitmask">typedef <type>VkFlags</type> <name>VkVideoCodecOperationFlagsKHR</name>;</type>
@@ -512,16 +513,16 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type requires="VkVideoComponentBitDepthFlagBitsKHR"        category="bitmask">typedef <type>VkFlags</type> <name>VkVideoComponentBitDepthFlagsKHR</name>;</type>
 
             <comment>Video Encode H.264 extension</comment>
-        <type requires="VkVideoEncodeH264CapabilityFlagBitsEXT"             category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264CapabilityFlagsEXT</name>;</type>
-        <type requires="VkVideoEncodeH264StdFlagBitsEXT"                    category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264StdFlagsEXT</name>;</type>
-        <type requires="VkVideoEncodeH264RateControlFlagBitsEXT"            category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264RateControlFlagsEXT</name>;</type>
+        <type requires="VkVideoEncodeH264CapabilityFlagBitsKHR"             category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264CapabilityFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeH264StdFlagBitsKHR"                    category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264StdFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeH264RateControlFlagBitsKHR"            category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264RateControlFlagsKHR</name>;</type>
 
             <comment>Video Encode H.265 extension</comment>
-        <type requires="VkVideoEncodeH265CapabilityFlagBitsEXT"             category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CapabilityFlagsEXT</name>;</type>
-        <type requires="VkVideoEncodeH265StdFlagBitsEXT"                    category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265StdFlagsEXT</name>;</type>
-        <type requires="VkVideoEncodeH265RateControlFlagBitsEXT"            category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265RateControlFlagsEXT</name>;</type>
-        <type requires="VkVideoEncodeH265CtbSizeFlagBitsEXT"                category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CtbSizeFlagsEXT</name>;</type>
-        <type requires="VkVideoEncodeH265TransformBlockSizeFlagBitsEXT"     category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265TransformBlockSizeFlagsEXT</name>;</type>
+        <type requires="VkVideoEncodeH265CapabilityFlagBitsKHR"             category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CapabilityFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeH265StdFlagBitsKHR"                    category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265StdFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeH265RateControlFlagBitsKHR"            category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265RateControlFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeH265CtbSizeFlagBitsKHR"                category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CtbSizeFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeH265TransformBlockSizeFlagBitsKHR"     category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265TransformBlockSizeFlagsKHR</name>;</type>
 
             <comment>Types which can be void pointers or class pointers, selected at compile time</comment>
         <type category="handle"                           objtypeenum="VK_OBJECT_TYPE_INSTANCE"><type>VK_DEFINE_HANDLE</type>(<name>VkInstance</name>)</type>
@@ -685,7 +686,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type name="VkShaderInfoTypeAMD" category="enum"/>
         <type name="VkQueueGlobalPriorityKHR" category="enum"/>
         <type name="VkQueueGlobalPriorityEXT" category="enum"                      alias="VkQueueGlobalPriorityKHR"/>
-        <type name="VkTimeDomainEXT" category="enum"/>
+        <type name="VkTimeDomainKHR" category="enum"/>
+        <type name="VkTimeDomainEXT" category="enum" alias="VkTimeDomainKHR"/>
         <type name="VkConservativeRasterizationModeEXT" category="enum"/>
         <type name="VkResolveModeFlagBits" category="enum"/>
         <type category="enum" name="VkResolveModeFlagBitsKHR"                      alias="VkResolveModeFlagBits"/>
@@ -730,7 +732,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type name="VkPerformanceOverrideTypeINTEL" category="enum"/>
         <type name="VkPerformanceParameterTypeINTEL" category="enum"/>
         <type name="VkPerformanceValueTypeINTEL" category="enum"/>
-        <type name="VkLineRasterizationModeEXT" category="enum"/>
+        <type name="VkLineRasterizationModeKHR" category="enum"/>
+        <type name="VkLineRasterizationModeEXT" category="enum" alias="VkLineRasterizationModeKHR"/>
         <type name="VkShaderModuleCreateFlagBits" category="enum"/>
         <type name="VkPipelineCompilerControlFlagBitsAMD" category="enum"/>
         <type name="VkShaderCorePropertiesFlagBitsAMD" category="enum"/>
@@ -865,8 +868,10 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type name="VkDeviceFaultAddressTypeEXT" category="enum"/>
         <type name="VkPresentScalingFlagBitsEXT" category="enum"/>
         <type name="VkPresentGravityFlagBitsEXT" category="enum"/>
+        <type name="VkLayerSettingTypeEXT" category="enum"/>
         <type name="VkLatencyMarkerNV" category="enum"/>
         <type name="VkOutOfBandQueueTypeNV" category="enum"/>
+        <type name="VkPhysicalDeviceSchedulingControlsFlagBitsARM" category="enum"/>
 
             <comment>Enumerated types in the header, but not used by the API</comment>
         <type name="VkVendorId" category="enum"/>
@@ -903,16 +908,16 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type name="VkVideoEncodeRateControlModeFlagBitsKHR" category="enum"/>
 
            <comment>Video H.264 Encode extensions</comment>
-        <type name="VkVideoEncodeH264CapabilityFlagBitsEXT"             category="enum"/>
-        <type name="VkVideoEncodeH264StdFlagBitsEXT"                    category="enum"/>
-        <type name="VkVideoEncodeH264RateControlFlagBitsEXT"            category="enum"/>
+        <type name="VkVideoEncodeH264CapabilityFlagBitsKHR"             category="enum"/>
+        <type name="VkVideoEncodeH264StdFlagBitsKHR"                    category="enum"/>
+        <type name="VkVideoEncodeH264RateControlFlagBitsKHR"            category="enum"/>
 
            <comment>Video H.265 Encode extensions</comment>
-        <type name="VkVideoEncodeH265CapabilityFlagBitsEXT"             category="enum"/>
-        <type name="VkVideoEncodeH265StdFlagBitsEXT"                    category="enum"/>
-        <type name="VkVideoEncodeH265RateControlFlagBitsEXT"            category="enum"/>
-        <type name="VkVideoEncodeH265CtbSizeFlagBitsEXT"                category="enum"/>
-        <type name="VkVideoEncodeH265TransformBlockSizeFlagBitsEXT"     category="enum"/>
+        <type name="VkVideoEncodeH265CapabilityFlagBitsKHR"             category="enum"/>
+        <type name="VkVideoEncodeH265StdFlagBitsKHR"                    category="enum"/>
+        <type name="VkVideoEncodeH265RateControlFlagBitsKHR"            category="enum"/>
+        <type name="VkVideoEncodeH265CtbSizeFlagBitsKHR"                category="enum"/>
+        <type name="VkVideoEncodeH265TransformBlockSizeFlagBitsKHR"     category="enum"/>
 
         <comment>The PFN_vk*Function types are used by VkAllocationCallbacks below</comment>
         <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkInternalAllocationNotification</name>)(
@@ -1453,7 +1458,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkComputePipelineCreateInfo">
             <member values="VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
-            <member optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
+            <member noautovalidity="true" optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
             <member><type>VkPipelineShaderStageCreateInfo</type> <name>stage</name></member>
             <member><type>VkPipelineLayout</type>       <name>layout</name><comment>Interface layout of the pipeline</comment></member>
             <member noautovalidity="true" optional="true"><type>VkPipeline</type>      <name>basePipelineHandle</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is nonzero, it specifies the handle of the base pipeline this is a derivative of</comment></member>
@@ -1592,7 +1597,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkGraphicsPipelineCreateInfo">
             <member values="VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
-            <member optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
+            <member noautovalidity="true" optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
             <member noautovalidity="true" optional="true"><type>uint32_t</type> <name>stageCount</name></member>
             <member api="vulkan" noautovalidity="true" len="stageCount" optional="true">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name><comment>One entry for each active shader stage</comment></member>
             <member api="vulkansc" noautovalidity="true" len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name><comment>One entry for each active shader stage</comment></member>
@@ -1656,7 +1661,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>uint32_t</type>               <name>offset</name><comment>Start of the range, in bytes</comment></member>
             <member><type>uint32_t</type>               <name>size</name><comment>Size of the range, in bytes</comment></member>
         </type>
-        <type category="struct" name="VkPipelineLayoutCreateInfo">
+        <type category="struct" name="VkPipelineLayoutCreateInfo" structextends="VkBindDescriptorSetsInfoKHR,VkPushConstantsInfoKHR,VkPushDescriptorSetInfoKHR,VkPushDescriptorSetWithTemplateInfoKHR,VkSetDescriptorBufferOffsetsInfoEXT,VkBindDescriptorBufferEmbeddedSamplersInfoEXT">
             <member values="VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
             <member optional="true"><type>VkPipelineLayoutCreateFlags</type>    <name>flags</name></member>
@@ -1859,7 +1864,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member limittype="bitmask"><type>VkBool32</type>           <name>residencyStandard2DBlockShape</name><comment>Sparse resources support: GPU will access all 2D (single sample) sparse resources using the standard sparse image block shapes (based on pixel format)</comment></member>
             <member limittype="bitmask"><type>VkBool32</type>           <name>residencyStandard2DMultisampleBlockShape</name><comment>Sparse resources support: GPU will access all 2D (multisample) sparse resources using the standard sparse image block shapes (based on pixel format)</comment></member>
             <member limittype="bitmask"><type>VkBool32</type>           <name>residencyStandard3DBlockShape</name><comment>Sparse resources support: GPU will access all 3D sparse resources using the standard sparse image block shapes (based on pixel format)</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>           <name>residencyAlignedMipSize</name><comment>Sparse resources support: Images with mip level dimensions that are NOT a multiple of the sparse image block dimensions will be placed in the mip tail</comment></member>
+            <member limittype="not"><type>VkBool32</type>           <name>residencyAlignedMipSize</name><comment>Sparse resources support: Images with mip level dimensions that are NOT a multiple of the sparse image block dimensions will be placed in the mip tail</comment></member>
             <member limittype="bitmask"><type>VkBool32</type>           <name>residencyNonResidentStrict</name><comment>Sparse resources support: GPU can consistently access non-resident regions of a resource, all reads return as if data is 0, writes are discarded</comment></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceLimits" returnedonly="true">
@@ -2233,6 +2238,19 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>uint32_t</type>                         <name>disabledValidationFeatureCount</name><comment>Number of validation features to disable</comment></member>
             <member len="disabledValidationFeatureCount">const <type>VkValidationFeatureDisableEXT</type>* <name>pDisabledValidationFeatures</name><comment>Validation features to disable</comment></member>
         </type>
+        <type category="struct" name="VkLayerSettingsCreateInfoEXT" allowduplicate="true" structextends="VkInstanceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT"><type>VkStructureType</type>  <name>sType</name><comment>Must be VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT</comment></member>
+            <member optional="true">const <type>void</type>*                      <name>pNext</name></member>
+            <member optional="true"><type>uint32_t</type>                         <name>settingCount</name><comment>Number of settings to configure</comment></member>
+            <member len="settingCount">const <type>VkLayerSettingEXT</type>* <name>pSettings</name><comment>Validation features to enable</comment></member>
+        </type>
+        <type category="struct" name="VkLayerSettingEXT">
+            <member len="null-terminated">const <type>char</type>* <name>pLayerName</name></member>
+            <member len="null-terminated">const <type>char</type>* <name>pSettingName</name></member>
+            <member><type>VkLayerSettingTypeEXT</type>       <name>type</name><comment>The type of the object</comment></member>
+            <member optional="true"><type>uint32_t</type>                         <name>valueCount</name><comment>Number of values of the setting</comment></member>
+            <member len="valueCount">const <type>void</type>* <name>pValues</name><comment>Values to pass for a setting</comment></member>
+        </type>
         <type category="struct" name="VkApplicationParametersEXT" allowduplicate="true" structextends="VkApplicationInfo,VkDeviceCreateInfo">
             <member values="VK_STRUCTURE_TYPE_APPLICATION_PARAMETERS_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*        <name>pNext</name></member>
@@ -2626,7 +2644,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                      <name>pNext</name></member>
             <member optional="true"><type>VkBufferCreateFlags</type> <name>flags</name></member>
-            <member><type>VkBufferUsageFlags</type>               <name>usage</name></member>
+            <member optional="true" noautovalidity="true"><type>VkBufferUsageFlags</type> <name>usage</name></member>
             <member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceExternalBufferInfoKHR"                   alias="VkPhysicalDeviceExternalBufferInfo"/>
@@ -3701,6 +3719,18 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member limittype="bitmask"><type>VkBool32</type>                     <name>nonStrictSinglePixelWideLinesUseParallelogram</name></member>
             <member limittype="bitmask"><type>VkBool32</type>                     <name>nonStrictWideLinesUseParallelogram</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceMaintenance6FeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                            <name>pNext</name></member>
+            <member><type>VkBool32</type>                                         <name>maintenance6</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceMaintenance6PropertiesKHR" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                            <name>pNext</name></member>
+            <member><type>VkBool32</type>                                         <name>blockTexelViewCompatibleMultipleLayers</name></member>
+            <member><type>uint32_t</type>                                         <name>maxCombinedImageSamplerDescriptorCount</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                     <name>fragmentShadingRateClampCombinerInputs</name></member>
+        </type>
         <type category="struct" name="VkRenderingAreaInfoKHR">
             <member values="VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                                <name>pNext</name></member>
@@ -3853,7 +3883,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>VkDebugUtilsMessengerCallbackDataFlagsEXT</type>                          <name>flags</name></member>
             <member optional="true" len="null-terminated">const <type>char</type>*                                  <name>pMessageIdName</name></member>
             <member><type>int32_t</type>                                                            <name>messageIdNumber</name></member>
-            <member len="null-terminated">const <type>char</type>*                                                  <name>pMessage</name></member>
+            <member optional="true" len="null-terminated">const <type>char</type>*                                  <name>pMessage</name></member>
             <member optional="true"><type>uint32_t</type>                                                           <name>queueLabelCount</name></member>
             <member len="queueLabelCount">const <type>VkDebugUtilsLabelEXT</type>*                  <name>pQueueLabels</name></member>
             <member optional="true"><type>uint32_t</type>                                                           <name>cmdBufLabelCount</name></member>
@@ -3913,11 +3943,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member limittype="bitmask"><type>VkBool32</type>               <name>fullyCoveredFragmentShaderInputVariable</name><comment>true if the implementation supports the FullyCoveredEXT SPIR-V builtin fragment shader input variable</comment></member>
             <member limittype="bitmask"><type>VkBool32</type>               <name>conservativeRasterizationPostDepthCoverage</name><comment>true if the implementation supports both conservative rasterization and post depth coverage sample coverage mask</comment></member>
         </type>
-        <type category="struct" name="VkCalibratedTimestampInfoEXT">
-            <member values="VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkCalibratedTimestampInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
-            <member><type>VkTimeDomainEXT</type>        <name>timeDomain</name></member>
+            <member><type>VkTimeDomainKHR</type>                        <name>timeDomain</name></member>
         </type>
+        <type category="struct" name="VkCalibratedTimestampInfoEXT" alias="VkCalibratedTimestampInfoKHR"/>
         <type category="struct" name="VkPhysicalDeviceShaderCorePropertiesAMD" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*    <name>pNext</name></member>
@@ -4142,21 +4173,29 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>uint64_t</type>               <name>value</name></member>
         </type>
         <type category="struct" name="VkSemaphoreSignalInfoKHR"                                alias="VkSemaphoreSignalInfo"/>
-        <type category="struct" name="VkVertexInputBindingDivisorDescriptionEXT">
+        <type category="struct" name="VkVertexInputBindingDivisorDescriptionKHR">
             <member><type>uint32_t</type>          <name>binding</name></member>
             <member><type>uint32_t</type>          <name>divisor</name></member>
         </type>
-        <type category="struct" name="VkPipelineVertexInputDivisorStateCreateInfoEXT" structextends="VkPipelineVertexInputStateCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVertexInputBindingDivisorDescriptionEXT" alias="VkVertexInputBindingDivisorDescriptionKHR"/>
+        <type category="struct" name="VkPipelineVertexInputDivisorStateCreateInfoKHR" structextends="VkPipelineVertexInputStateCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                         <name>pNext</name></member>
             <member><type>uint32_t</type>                            <name>vertexBindingDivisorCount</name></member>
-            <member len="vertexBindingDivisorCount">const <type>VkVertexInputBindingDivisorDescriptionEXT</type>*      <name>pVertexBindingDivisors</name></member>
+            <member len="vertexBindingDivisorCount">const <type>VkVertexInputBindingDivisorDescriptionKHR</type>*      <name>pVertexBindingDivisors</name></member>
         </type>
+        <type category="struct" name="VkPipelineVertexInputDivisorStateCreateInfoEXT" alias="VkPipelineVertexInputDivisorStateCreateInfoKHR"/>
         <type category="struct" name="VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
             <member limittype="max"><type>uint32_t</type>               <name>maxVertexAttribDivisor</name><comment>max value of vertex attribute divisor</comment></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                  <name>pNext</name></member>
+            <member limittype="max"><type>uint32_t</type>               <name>maxVertexAttribDivisor</name><comment>max value of vertex attribute divisor</comment></member>
+            <member limittype="max"><type>VkBool32</type>               <name>supportsNonZeroFirstInstance</name></member>
+        </type>
         <type category="struct" name="VkPhysicalDevicePCIBusInfoPropertiesEXT" structextends="VkPhysicalDeviceProperties2" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
@@ -4269,12 +4308,13 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkBool32</type>                            <name>shaderImageFloat32AtomicMinMax</name></member>
             <member><type>VkBool32</type>                            <name>sparseImageFloat32AtomicMinMax</name></member>
         </type>
-        <type category="struct" name="VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*        <name>pNext</name></member>
             <member><type>VkBool32</type>                           <name>vertexAttributeInstanceRateDivisor</name></member>
             <member><type>VkBool32</type>                           <name>vertexAttributeInstanceRateZeroDivisor</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT" alias="VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR"/>
         <type category="struct" name="VkQueueFamilyCheckpointPropertiesNV" structextends="VkQueueFamilyProperties2" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*           <name>pNext</name></member>
@@ -4545,7 +4585,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkRayTracingPipelineCreateInfoNV">
             <member values="VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
-            <member optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
+            <member noautovalidity="true" optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
             <member><type>uint32_t</type>               <name>stageCount</name></member>
             <member len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name><comment>One entry for each active shader stage</comment></member>
             <member><type>uint32_t</type>               <name>groupCount</name></member>
@@ -4558,7 +4598,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkRayTracingPipelineCreateInfoKHR">
             <member values="VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
-            <member optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
+            <member noautovalidity="true" optional="true"><type>VkPipelineCreateFlags</type>  <name>flags</name><comment>Pipeline creation flags</comment></member>
             <member optional="true"><type>uint32_t</type> <name>stageCount</name></member>
             <member len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name><comment>One entry for each active shader stage</comment></member>
             <member optional="true"><type>uint32_t</type> <name>groupCount</name></member>
@@ -4977,7 +5017,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>void</type>*                               <name>pNext</name></member>
             <member limittype="bitmask"><type>VkShaderStageFlags</type>                  <name>cooperativeMatrixSupportedStages</name></member>
         </type>
-        <type category="struct" name="VkCooperativeMatrixPropertiesNV">
+        <type category="struct" name="VkCooperativeMatrixPropertiesNV" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                               <name>pNext</name></member>
             <member><type>uint32_t</type>                            <name>MSize</name></member>
@@ -5192,11 +5232,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkBool32</type>                            <name>shaderSubgroupClock</name></member>
             <member><type>VkBool32</type>                            <name>shaderDeviceClock</name></member>
         </type>
-        <type category="struct" name="VkPhysicalDeviceIndexTypeUint8FeaturesEXT" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkPhysicalDeviceIndexTypeUint8FeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*        <name>pNext</name></member>
             <member><type>VkBool32</type>                           <name>indexTypeUint8</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceIndexTypeUint8FeaturesEXT"  alias="VkPhysicalDeviceIndexTypeUint8FeaturesKHR"/>
         <type category="struct" name="VkPhysicalDeviceShaderSMBuiltinsPropertiesNV" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_PROPERTIES_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                          <name>pNext</name></member>
@@ -5362,8 +5403,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkDeviceMemory</type>                   <name>memory</name></member>
         </type>
         <type category="struct" name="VkDeviceMemoryOpaqueCaptureAddressInfoKHR"               alias="VkDeviceMemoryOpaqueCaptureAddressInfo"/>
-        <type category="struct" name="VkPhysicalDeviceLineRasterizationFeaturesEXT" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkPhysicalDeviceLineRasterizationFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*        <name>pNext</name></member>
             <member><type>VkBool32</type>                           <name>rectangularLines</name></member>
             <member><type>VkBool32</type>                           <name>bresenhamLines</name></member>
@@ -5372,19 +5413,22 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkBool32</type>                           <name>stippledBresenhamLines</name></member>
             <member><type>VkBool32</type>                           <name>stippledSmoothLines</name></member>
         </type>
-        <type category="struct" name="VkPhysicalDeviceLineRasterizationPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
-            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkPhysicalDeviceLineRasterizationFeaturesEXT" alias="VkPhysicalDeviceLineRasterizationFeaturesKHR"/>
+        <type category="struct" name="VkPhysicalDeviceLineRasterizationPropertiesKHR" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                               <name>pNext</name></member>
             <member limittype="bits"><type>uint32_t</type>                            <name>lineSubPixelPrecisionBits</name></member>
         </type>
-        <type category="struct" name="VkPipelineRasterizationLineStateCreateInfoEXT" structextends="VkPipelineRasterizationStateCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true">const <type>void</type>*                                                      <name>pNext</name></member>
-            <member><type>VkLineRasterizationModeEXT</type>                                       <name>lineRasterizationMode</name></member>
+        <type category="struct" name="VkPhysicalDeviceLineRasterizationPropertiesEXT" alias="VkPhysicalDeviceLineRasterizationPropertiesKHR"/>
+        <type category="struct" name="VkPipelineRasterizationLineStateCreateInfoKHR" structextends="VkPipelineRasterizationStateCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*                                      <name>pNext</name></member>
+            <member><type>VkLineRasterizationModeKHR</type>                                       <name>lineRasterizationMode</name></member>
             <member><type>VkBool32</type>                                                         <name>stippledLineEnable</name></member>
             <member><type>uint32_t</type>                                                         <name>lineStippleFactor</name></member>
             <member><type>uint16_t</type>                                                         <name>lineStipplePattern</name></member>
         </type>
+        <type category="struct" name="VkPipelineRasterizationLineStateCreateInfoEXT" alias="VkPipelineRasterizationLineStateCreateInfoKHR"/>
         <type category="struct" name="VkPhysicalDevicePipelineCreationCacheControlFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>* <name>pNext</name></member>
@@ -5994,7 +6038,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>void</type>*<name>pNext</name></member>
             <member><type>VkBool32</type> <name>clustercullingShader</name></member>
             <member><type>VkBool32</type> <name>multiviewClusterCullingShader</name></member>
-       </type>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI" structextends="VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI"><type>VkStructureType</type>  <name>sType</name></member>
+            <member optional="true"><type>void</type>*<name>pNext</name></member>
+            <member><type>VkBool32</type> <name>clusterShadingRate</name></member>
+        </type>
         <type category="struct" name="VkBufferCopy2">
             <member values="VK_STRUCTURE_TYPE_BUFFER_COPY_2"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*        <name>pNext</name></member>
@@ -6183,7 +6232,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member noautovalidity="true"><type>VkFragmentShadingRateNV</type>            <name>shadingRate</name></member>
             <member noautovalidity="true"><type>VkFragmentShadingRateCombinerOpKHR</type> <name>combinerOps</name>[2]</member>
         </type>
-        <type category="struct" name="VkAccelerationStructureBuildSizesInfoKHR">
+        <type category="struct" name="VkAccelerationStructureBuildSizesInfoKHR" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*        <name>pNext</name></member>
             <member><type>VkDeviceSize</type>                       <name>accelerationStructureSize</name></member>
@@ -6674,6 +6723,18 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true">const <type>VkVideoReferenceSlotInfoKHR</type>* <name>pSetupReferenceSlot</name></member>
             <member optional="true"><type>uint32_t</type>               <name>referenceSlotCount</name></member>
             <member len="referenceSlotCount">const <type>VkVideoReferenceSlotInfoKHR</type>* <name>pReferenceSlots</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceVideoMaintenance1FeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*            <name>pNext</name></member>
+            <member><type>VkBool32</type>                         <name>videoMaintenance1</name></member>
+        </type>
+        <type category="struct" name="VkVideoInlineQueryInfoKHR" structextends="VkVideoDecodeInfoKHR,VkVideoEncodeInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member optional="true"><type>VkQueryPool</type>            <name>queryPool</name></member>
+            <member><type>uint32_t</type>                               <name>firstQuery</name></member>
+            <member><type>uint32_t</type>                               <name>queryCount</name></member>
         </type>
             <comment>Video Decode Codec Standard specific structures</comment>
         <type category="include" name="vk_video/vulkan_video_codec_h264std.h">#include "vk_video/vulkan_video_codec_h264std.h"</type>
@@ -6805,6 +6866,44 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true">const <type>void</type>*             <name>pNext</name></member>
             <member>const <type>StdVideoDecodeH265ReferenceInfo</type>*  <name>pStdReferenceInfo</name></member>
         </type>
+        <type category="include" name="vk_video/vulkan_video_codec_av1std.h">#include "vk_video/vulkan_video_codec_av1std.h"</type>
+        <type requires="vk_video/vulkan_video_codec_av1std.h" name="StdVideoAV1Profile"/>
+        <type requires="vk_video/vulkan_video_codec_av1std.h" name="StdVideoAV1Level"/>
+        <type requires="vk_video/vulkan_video_codec_av1std.h" name="StdVideoAV1SequenceHeader"/>
+        <type category="include" name="vk_video/vulkan_video_codec_av1std_decode.h">#include "vk_video/vulkan_video_codec_av1std_decode.h"</type>
+        <type requires="vk_video/vulkan_video_codec_av1std_decode.h" name="StdVideoDecodeAV1PictureInfo"/>
+        <type requires="vk_video/vulkan_video_codec_av1std_decode.h" name="StdVideoDecodeAV1ReferenceInfo"/>
+        <type category="struct" name="VkVideoDecodeAV1ProfileInfoKHR" structextends="VkVideoProfileInfoKHR,VkQueryPoolCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member><type>StdVideoAV1Profile</type>                     <name>stdProfile</name></member>
+            <member><type>VkBool32</type>                               <name>filmGrainSupport</name></member>
+        </type>
+        <type category="struct" name="VkVideoDecodeAV1CapabilitiesKHR" returnedonly="true" structextends="VkVideoCapabilitiesKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                  <name>pNext</name></member>
+            <member><type>StdVideoAV1Level</type>                       <name>maxLevel</name></member>
+        </type>
+        <type category="struct" name="VkVideoDecodeAV1SessionParametersCreateInfoKHR" structextends="VkVideoSessionParametersCreateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member>const <type>StdVideoAV1SequenceHeader</type>*       <name>pStdSequenceHeader</name></member>
+        </type>
+        <type category="struct" name="VkVideoDecodeAV1PictureInfoKHR" structextends="VkVideoDecodeInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member>const <type>StdVideoDecodeAV1PictureInfo</type>*    <name>pStdPictureInfo</name></member>
+            <member><type>int32_t</type>                                <name>referenceNameSlotIndices</name>[<enum>VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR</enum>]</member>
+            <member><type>uint32_t</type>                               <name>frameHeaderOffset</name></member>
+            <member><type>uint32_t</type>                               <name>tileCount</name></member>
+            <member len="tileCount">const <type>uint32_t</type>*        <name>pTileOffsets</name></member>
+            <member len="tileCount">const <type>uint32_t</type>*        <name>pTileSizes</name></member>
+        </type>
+        <type category="struct" name="VkVideoDecodeAV1DpbSlotInfoKHR" structextends="VkVideoReferenceSlotInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member>const <type>StdVideoDecodeAV1ReferenceInfo</type>*  <name>pStdReferenceInfo</name></member>
+        </type>
         <type category="struct" name="VkVideoSessionCreateInfoKHR">
             <member values="VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                   <name>pNext</name></member>
@@ -6857,7 +6956,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkVideoCodingControlInfoKHR">
             <member values="VK_STRUCTURE_TYPE_VIDEO_CODING_CONTROL_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                    <name>pNext</name></member>
-            <member><type>VkVideoCodingControlFlagsKHR</type>  <name>flags</name></member>
+            <member><type>VkVideoCodingControlFlagsKHR</type>                   <name>flags</name></member>
         </type>
         <type category="struct" name="VkVideoEncodeUsageInfoKHR" structextends="VkVideoProfileInfoKHR,VkQueryPoolCreateInfo">
             <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
@@ -6930,10 +7029,10 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkExtent2D</type>                            <name>encodeInputPictureGranularity</name></member>
             <member><type>VkVideoEncodeFeedbackFlagsKHR</type>         <name>supportedEncodeFeedbackFlags</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264CapabilitiesEXT" returnedonly="true" structextends="VkVideoCapabilitiesKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264CapabilitiesKHR" returnedonly="true" structextends="VkVideoCapabilitiesKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                 <name>pNext</name></member>
-            <member noautovalidity="true"><type>VkVideoEncodeH264CapabilityFlagsEXT</type> <name>flags</name></member>
+            <member noautovalidity="true"><type>VkVideoEncodeH264CapabilityFlagsKHR</type> <name>flags</name></member>
             <member><type>StdVideoH264LevelIdc</type>                  <name>maxLevelIdc</name></member>
             <member><type>uint32_t</type>                              <name>maxSliceCount</name></member>
             <member><type>uint32_t</type>                              <name>maxPPictureL0ReferenceCount</name></member>
@@ -6945,17 +7044,17 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>int32_t</type>                               <name>maxQp</name></member>
             <member><type>VkBool32</type>                              <name>prefersGopRemainingFrames</name></member>
             <member><type>VkBool32</type>                              <name>requiresGopRemainingFrames</name></member>
-            <member noautovalidity="true"><type>VkVideoEncodeH264StdFlagsEXT</type> <name>stdSyntaxFlags</name></member>
+            <member noautovalidity="true"><type>VkVideoEncodeH264StdFlagsKHR</type> <name>stdSyntaxFlags</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264QualityLevelPropertiesEXT" returnedonly="true" structextends="VkVideoEncodeQualityLevelPropertiesKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264QualityLevelPropertiesKHR" returnedonly="true" structextends="VkVideoEncodeQualityLevelPropertiesKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
-            <member><type>VkVideoEncodeH264RateControlFlagsEXT</type>   <name>preferredRateControlFlags</name></member>
+            <member><type>VkVideoEncodeH264RateControlFlagsKHR</type>   <name>preferredRateControlFlags</name></member>
             <member><type>uint32_t</type>                               <name>preferredGopFrameCount</name></member>
             <member><type>uint32_t</type>                               <name>preferredIdrPeriod</name></member>
             <member><type>uint32_t</type>                               <name>preferredConsecutiveBFrameCount</name></member>
             <member><type>uint32_t</type>                               <name>preferredTemporalLayerCount</name></member>
-            <member><type>VkVideoEncodeH264QpEXT</type>                 <name>preferredConstantQp</name></member>
+            <member><type>VkVideoEncodeH264QpKHR</type>                 <name>preferredConstantQp</name></member>
             <member><type>uint32_t</type>                               <name>preferredMaxL0ReferenceCount</name></member>
             <member><type>uint32_t</type>                               <name>preferredMaxL1ReferenceCount</name></member>
             <member><type>VkBool32</type>                               <name>preferredStdEntropyCodingModeFlag</name></member>
@@ -6971,111 +7070,111 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type requires="vk_video/vulkan_video_codec_h264std_encode.h" name="StdVideoEncodeH264RefMgmtFlags"/>
         <type requires="vk_video/vulkan_video_codec_h264std_encode.h" name="StdVideoEncodeH264RefListModEntry"/>
         <type requires="vk_video/vulkan_video_codec_h264std_encode.h" name="StdVideoEncodeH264RefPicMarkingEntry"/>
-        <type category="struct" name="VkVideoEncodeH264SessionCreateInfoEXT" structextends="VkVideoSessionCreateInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264SessionCreateInfoKHR" structextends="VkVideoSessionCreateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
             <member><type>VkBool32</type>                               <name>useMaxLevelIdc</name></member>
             <member><type>StdVideoH264LevelIdc</type>                   <name>maxLevelIdc</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264SessionParametersAddInfoEXT" structextends="VkVideoSessionParametersUpdateInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264SessionParametersAddInfoKHR" structextends="VkVideoSessionParametersUpdateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                               <name>pNext</name></member>
             <member optional="true"><type>uint32_t</type>                                                  <name>stdSPSCount</name></member>
             <member len="stdSPSCount" optional="true">const <type>StdVideoH264SequenceParameterSet</type>* <name>pStdSPSs</name></member>
             <member optional="true"><type>uint32_t</type>                                                  <name>stdPPSCount</name></member>
             <member len="stdPPSCount" optional="true">const <type>StdVideoH264PictureParameterSet</type>*  <name>pStdPPSs</name><comment>List of Picture Parameters associated with the spsStd, above</comment></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264SessionParametersCreateInfoEXT" structextends="VkVideoSessionParametersCreateInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264SessionParametersCreateInfoKHR" structextends="VkVideoSessionParametersCreateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                         <name>pNext</name></member>
             <member><type>uint32_t</type>                                                            <name>maxStdSPSCount</name></member>
             <member><type>uint32_t</type>                                                            <name>maxStdPPSCount</name></member>
-            <member optional="true">const <type>VkVideoEncodeH264SessionParametersAddInfoEXT</type>* <name>pParametersAddInfo</name></member>
+            <member optional="true">const <type>VkVideoEncodeH264SessionParametersAddInfoKHR</type>* <name>pParametersAddInfo</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264SessionParametersGetInfoEXT" structextends="VkVideoEncodeSessionParametersGetInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264SessionParametersGetInfoKHR" structextends="VkVideoEncodeSessionParametersGetInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
             <member><type>VkBool32</type>                               <name>writeStdSPS</name></member>
             <member><type>VkBool32</type>                               <name>writeStdPPS</name></member>
             <member><type>uint32_t</type>                               <name>stdSPSId</name></member>
             <member><type>uint32_t</type>                               <name>stdPPSId</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264SessionParametersFeedbackInfoEXT" structextends="VkVideoEncodeSessionParametersFeedbackInfoKHR" returnedonly="true">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264SessionParametersFeedbackInfoKHR" structextends="VkVideoEncodeSessionParametersFeedbackInfoKHR" returnedonly="true">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
             <member><type>VkBool32</type>                               <name>hasStdSPSOverrides</name></member>
             <member><type>VkBool32</type>                               <name>hasStdPPSOverrides</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264DpbSlotInfoEXT" structextends="VkVideoReferenceSlotInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264DpbSlotInfoKHR" structextends="VkVideoReferenceSlotInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                          <name>pNext</name></member>
             <member>const <type>StdVideoEncodeH264ReferenceInfo</type>*                               <name>pStdReferenceInfo</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264PictureInfoEXT" structextends="VkVideoEncodeInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264PictureInfoKHR" structextends="VkVideoEncodeInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                        <name>pNext</name></member>
             <member><type>uint32_t</type>                                                           <name>naluSliceEntryCount</name></member>
-            <member len="naluSliceEntryCount">const <type>VkVideoEncodeH264NaluSliceInfoEXT</type>* <name>pNaluSliceEntries</name></member>
+            <member len="naluSliceEntryCount">const <type>VkVideoEncodeH264NaluSliceInfoKHR</type>* <name>pNaluSliceEntries</name></member>
             <member>const <type>StdVideoEncodeH264PictureInfo</type>*                               <name>pStdPictureInfo</name></member>
             <member><type>VkBool32</type>                                                           <name>generatePrefixNalu</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264ProfileInfoEXT" structextends="VkVideoProfileInfoKHR,VkQueryPoolCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264ProfileInfoKHR" structextends="VkVideoProfileInfoKHR,VkQueryPoolCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*             <name>pNext</name></member>
             <member><type>StdVideoH264ProfileIdc</type>                  <name>stdProfileIdc</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264NaluSliceInfoEXT">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264NaluSliceInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                     <name>pNext</name></member>
             <member><type>int32_t</type>                                         <name>constantQp</name></member>
             <member>const <type>StdVideoEncodeH264SliceHeader</type>*            <name>pStdSliceHeader</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264RateControlInfoEXT" structextends="VkVideoCodingControlInfoKHR,VkVideoBeginCodingInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264RateControlInfoKHR" structextends="VkVideoCodingControlInfoKHR,VkVideoBeginCodingInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                     <name>pNext</name></member>
-            <member optional="true"><type>VkVideoEncodeH264RateControlFlagsEXT</type> <name>flags</name></member>
+            <member optional="true"><type>VkVideoEncodeH264RateControlFlagsKHR</type> <name>flags</name></member>
             <member><type>uint32_t</type>                                        <name>gopFrameCount</name></member>
             <member><type>uint32_t</type>                                        <name>idrPeriod</name></member>
             <member><type>uint32_t</type>                                        <name>consecutiveBFrameCount</name></member>
             <member><type>uint32_t</type>                                        <name>temporalLayerCount</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264QpEXT">
+        <type category="struct" name="VkVideoEncodeH264QpKHR">
             <member noautovalidity="true"><type>int32_t</type> <name>qpI</name></member>
             <member noautovalidity="true"><type>int32_t</type> <name>qpP</name></member>
             <member noautovalidity="true"><type>int32_t</type> <name>qpB</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264FrameSizeEXT">
+        <type category="struct" name="VkVideoEncodeH264FrameSizeKHR">
             <member noautovalidity="true"><type>uint32_t</type> <name>frameISize</name></member>
             <member noautovalidity="true"><type>uint32_t</type> <name>framePSize</name></member>
             <member noautovalidity="true"><type>uint32_t</type> <name>frameBSize</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264GopRemainingFrameInfoEXT" structextends="VkVideoBeginCodingInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264GopRemainingFrameInfoKHR" structextends="VkVideoBeginCodingInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*    <name>pNext</name></member>
             <member><type>VkBool32</type>                       <name>useGopRemainingFrames</name></member>
             <member><type>uint32_t</type>                       <name>gopRemainingI</name></member>
             <member><type>uint32_t</type>                       <name>gopRemainingP</name></member>
             <member><type>uint32_t</type>                       <name>gopRemainingB</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH264RateControlLayerInfoEXT" structextends="VkVideoEncodeRateControlLayerInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH264RateControlLayerInfoKHR" structextends="VkVideoEncodeRateControlLayerInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                     <name>pNext</name></member>
             <member><type>VkBool32</type>                                        <name>useMinQp</name></member>
-            <member><type>VkVideoEncodeH264QpEXT</type>                          <name>minQp</name></member>
+            <member><type>VkVideoEncodeH264QpKHR</type>                          <name>minQp</name></member>
             <member><type>VkBool32</type>                                        <name>useMaxQp</name></member>
-            <member><type>VkVideoEncodeH264QpEXT</type>                          <name>maxQp</name></member>
+            <member><type>VkVideoEncodeH264QpKHR</type>                          <name>maxQp</name></member>
             <member><type>VkBool32</type>                                        <name>useMaxFrameSize</name></member>
-            <member><type>VkVideoEncodeH264FrameSizeEXT</type>                   <name>maxFrameSize</name></member>
+            <member><type>VkVideoEncodeH264FrameSizeKHR</type>                   <name>maxFrameSize</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265CapabilitiesEXT" returnedonly="true" structextends="VkVideoCapabilitiesKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265CapabilitiesKHR" returnedonly="true" structextends="VkVideoCapabilitiesKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                 <name>pNext</name></member>
-            <member noautovalidity="true"><type>VkVideoEncodeH265CapabilityFlagsEXT</type> <name>flags</name></member>
+            <member noautovalidity="true"><type>VkVideoEncodeH265CapabilityFlagsKHR</type> <name>flags</name></member>
             <member><type>StdVideoH265LevelIdc</type>                  <name>maxLevelIdc</name></member>
             <member><type>uint32_t</type>                              <name>maxSliceSegmentCount</name></member>
             <member><type>VkExtent2D</type>                            <name>maxTiles</name></member>
-            <member><type>VkVideoEncodeH265CtbSizeFlagsEXT</type>      <name>ctbSizes</name></member>
-            <member><type>VkVideoEncodeH265TransformBlockSizeFlagsEXT</type>      <name>transformBlockSizes</name></member>
+            <member><type>VkVideoEncodeH265CtbSizeFlagsKHR</type>      <name>ctbSizes</name></member>
+            <member><type>VkVideoEncodeH265TransformBlockSizeFlagsKHR</type>      <name>transformBlockSizes</name></member>
             <member><type>uint32_t</type>                              <name>maxPPictureL0ReferenceCount</name></member>
             <member><type>uint32_t</type>                              <name>maxBPictureL0ReferenceCount</name></member>
             <member><type>uint32_t</type>                              <name>maxL1ReferenceCount</name></member>
@@ -7085,17 +7184,17 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>int32_t</type>                               <name>maxQp</name></member>
             <member><type>VkBool32</type>                              <name>prefersGopRemainingFrames</name></member>
             <member><type>VkBool32</type>                              <name>requiresGopRemainingFrames</name></member>
-            <member noautovalidity="true"><type>VkVideoEncodeH265StdFlagsEXT</type> <name>stdSyntaxFlags</name></member>
+            <member noautovalidity="true"><type>VkVideoEncodeH265StdFlagsKHR</type> <name>stdSyntaxFlags</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265QualityLevelPropertiesEXT" returnedonly="true" structextends="VkVideoEncodeQualityLevelPropertiesKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265QualityLevelPropertiesKHR" returnedonly="true" structextends="VkVideoEncodeQualityLevelPropertiesKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
-            <member><type>VkVideoEncodeH265RateControlFlagsEXT</type>   <name>preferredRateControlFlags</name></member>
+            <member><type>VkVideoEncodeH265RateControlFlagsKHR</type>   <name>preferredRateControlFlags</name></member>
             <member><type>uint32_t</type>                               <name>preferredGopFrameCount</name></member>
             <member><type>uint32_t</type>                               <name>preferredIdrPeriod</name></member>
             <member><type>uint32_t</type>                               <name>preferredConsecutiveBFrameCount</name></member>
             <member><type>uint32_t</type>                               <name>preferredSubLayerCount</name></member>
-            <member><type>VkVideoEncodeH265QpEXT</type>                 <name>preferredConstantQp</name></member>
+            <member><type>VkVideoEncodeH265QpKHR</type>                 <name>preferredConstantQp</name></member>
             <member><type>uint32_t</type>                               <name>preferredMaxL0ReferenceCount</name></member>
             <member><type>uint32_t</type>                               <name>preferredMaxL1ReferenceCount</name></member>
         </type>
@@ -7108,14 +7207,14 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type requires="vk_video/vulkan_video_codec_h265std_encode.h" name="StdVideoEncodeH265SliceSegmentHeaderFlags"/>
         <type requires="vk_video/vulkan_video_codec_h265std_encode.h" name="StdVideoEncodeH265ReferenceInfoFlags"/>
         <type requires="vk_video/vulkan_video_codec_h265std_encode.h" name="StdVideoEncodeH265ReferenceModificationFlags"/>
-        <type category="struct" name="VkVideoEncodeH265SessionCreateInfoEXT" structextends="VkVideoSessionCreateInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265SessionCreateInfoKHR" structextends="VkVideoSessionCreateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
             <member><type>VkBool32</type>                               <name>useMaxLevelIdc</name></member>
             <member><type>StdVideoH265LevelIdc</type>                   <name>maxLevelIdc</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265SessionParametersAddInfoEXT" structextends="VkVideoSessionParametersUpdateInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265SessionParametersAddInfoKHR" structextends="VkVideoSessionParametersUpdateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                               <name>pNext</name></member>
             <member optional="true"><type>uint32_t</type>                                                  <name>stdVPSCount</name></member>
             <member len="stdVPSCount" optional="true">const <type>StdVideoH265VideoParameterSet</type>*    <name>pStdVPSs</name></member>
@@ -7124,16 +7223,16 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>uint32_t</type>                                                  <name>stdPPSCount</name></member>
             <member len="stdPPSCount" optional="true">const <type>StdVideoH265PictureParameterSet</type>*  <name>pStdPPSs</name><comment>List of Picture Parameters associated with the spsStd, above</comment></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265SessionParametersCreateInfoEXT" structextends="VkVideoSessionParametersCreateInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265SessionParametersCreateInfoKHR" structextends="VkVideoSessionParametersCreateInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                         <name>pNext</name></member>
             <member><type>uint32_t</type>                                                            <name>maxStdVPSCount</name></member>
             <member><type>uint32_t</type>                                                            <name>maxStdSPSCount</name></member>
             <member><type>uint32_t</type>                                                            <name>maxStdPPSCount</name></member>
-            <member optional="true">const <type>VkVideoEncodeH265SessionParametersAddInfoEXT</type>* <name>pParametersAddInfo</name></member>
+            <member optional="true">const <type>VkVideoEncodeH265SessionParametersAddInfoKHR</type>* <name>pParametersAddInfo</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265SessionParametersGetInfoEXT" structextends="VkVideoEncodeSessionParametersGetInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265SessionParametersGetInfoKHR" structextends="VkVideoEncodeSessionParametersGetInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
             <member><type>VkBool32</type>                               <name>writeStdVPS</name></member>
             <member><type>VkBool32</type>                               <name>writeStdSPS</name></member>
@@ -7142,70 +7241,70 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>uint32_t</type>                               <name>stdSPSId</name></member>
             <member><type>uint32_t</type>                               <name>stdPPSId</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265SessionParametersFeedbackInfoEXT" structextends="VkVideoEncodeSessionParametersFeedbackInfoKHR" returnedonly="true">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265SessionParametersFeedbackInfoKHR" structextends="VkVideoEncodeSessionParametersFeedbackInfoKHR" returnedonly="true">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
             <member><type>VkBool32</type>                               <name>hasStdVPSOverrides</name></member>
             <member><type>VkBool32</type>                               <name>hasStdSPSOverrides</name></member>
             <member><type>VkBool32</type>                               <name>hasStdPPSOverrides</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265PictureInfoEXT" structextends="VkVideoEncodeInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265PictureInfoKHR" structextends="VkVideoEncodeInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                       <name>pNext</name></member>
             <member><type>uint32_t</type>                                                          <name>naluSliceSegmentEntryCount</name></member>
-            <member len="naluSliceSegmentEntryCount">const <type>VkVideoEncodeH265NaluSliceSegmentInfoEXT</type>* <name>pNaluSliceSegmentEntries</name></member>
+            <member len="naluSliceSegmentEntryCount">const <type>VkVideoEncodeH265NaluSliceSegmentInfoKHR</type>* <name>pNaluSliceSegmentEntries</name></member>
             <member>const <type>StdVideoEncodeH265PictureInfo</type>*                              <name>pStdPictureInfo</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265NaluSliceSegmentInfoEXT">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265NaluSliceSegmentInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                <name>pNext</name></member>
             <member><type>int32_t</type>                                                    <name>constantQp</name></member>
             <member>const <type>StdVideoEncodeH265SliceSegmentHeader</type>*                <name>pStdSliceSegmentHeader</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265RateControlInfoEXT" structextends="VkVideoCodingControlInfoKHR,VkVideoBeginCodingInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265RateControlInfoKHR" structextends="VkVideoCodingControlInfoKHR,VkVideoBeginCodingInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                     <name>pNext</name></member>
-            <member optional="true"><type>VkVideoEncodeH265RateControlFlagsEXT</type> <name>flags</name></member>
+            <member optional="true"><type>VkVideoEncodeH265RateControlFlagsKHR</type> <name>flags</name></member>
             <member><type>uint32_t</type>                                        <name>gopFrameCount</name></member>
             <member><type>uint32_t</type>                                        <name>idrPeriod</name></member>
             <member><type>uint32_t</type>                                        <name>consecutiveBFrameCount</name></member>
             <member><type>uint32_t</type>                                        <name>subLayerCount</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265QpEXT">
+        <type category="struct" name="VkVideoEncodeH265QpKHR">
             <member noautovalidity="true"><type>int32_t</type> <name>qpI</name></member>
             <member noautovalidity="true"><type>int32_t</type> <name>qpP</name></member>
             <member noautovalidity="true"><type>int32_t</type> <name>qpB</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265FrameSizeEXT">
+        <type category="struct" name="VkVideoEncodeH265FrameSizeKHR">
             <member noautovalidity="true"><type>uint32_t</type> <name>frameISize</name></member>
             <member noautovalidity="true"><type>uint32_t</type> <name>framePSize</name></member>
             <member noautovalidity="true"><type>uint32_t</type> <name>frameBSize</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265GopRemainingFrameInfoEXT" structextends="VkVideoBeginCodingInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265GopRemainingFrameInfoKHR" structextends="VkVideoBeginCodingInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*    <name>pNext</name></member>
             <member><type>VkBool32</type>                       <name>useGopRemainingFrames</name></member>
             <member><type>uint32_t</type>                       <name>gopRemainingI</name></member>
             <member><type>uint32_t</type>                       <name>gopRemainingP</name></member>
             <member><type>uint32_t</type>                       <name>gopRemainingB</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265RateControlLayerInfoEXT" structextends="VkVideoEncodeRateControlLayerInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265RateControlLayerInfoKHR" structextends="VkVideoEncodeRateControlLayerInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                     <name>pNext</name></member>
             <member><type>VkBool32</type>                                        <name>useMinQp</name></member>
-            <member><type>VkVideoEncodeH265QpEXT</type>                          <name>minQp</name></member>
+            <member><type>VkVideoEncodeH265QpKHR</type>                          <name>minQp</name></member>
             <member><type>VkBool32</type>                                        <name>useMaxQp</name></member>
-            <member><type>VkVideoEncodeH265QpEXT</type>                          <name>maxQp</name></member>
+            <member><type>VkVideoEncodeH265QpKHR</type>                          <name>maxQp</name></member>
             <member><type>VkBool32</type>                                        <name>useMaxFrameSize</name></member>
-            <member><type>VkVideoEncodeH265FrameSizeEXT</type>                   <name>maxFrameSize</name></member>
+            <member><type>VkVideoEncodeH265FrameSizeKHR</type>                   <name>maxFrameSize</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265ProfileInfoEXT" structextends="VkVideoProfileInfoKHR,VkQueryPoolCreateInfo">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265ProfileInfoKHR" structextends="VkVideoProfileInfoKHR,VkQueryPoolCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*    <name>pNext</name></member>
             <member><type>StdVideoH265ProfileIdc</type>         <name>stdProfileIdc</name></member>
         </type>
-        <type category="struct" name="VkVideoEncodeH265DpbSlotInfoEXT" structextends="VkVideoReferenceSlotInfoKHR">
-            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+        <type category="struct" name="VkVideoEncodeH265DpbSlotInfoKHR" structextends="VkVideoReferenceSlotInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*              <name>pNext</name></member>
             <member>const <type>StdVideoEncodeH265ReferenceInfo</type>*   <name>pStdReferenceInfo</name></member>
         </type>
@@ -7246,8 +7345,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkCuModuleCreateInfoNVX">
             <member values="VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*            <name>pNext</name></member>
-            <member><type>size_t</type>                 <name>dataSize</name></member>
-            <member len="dataSize">const <type>void</type>*            <name>pData</name></member>
+            <member optional="true"><type>size_t</type>                 <name>dataSize</name></member>
+            <member len="dataSize">const <type>void</type>*             <name>pData</name></member>
         </type>
         <type category="struct" name="VkCuFunctionCreateInfoNVX">
             <member values="VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member>
@@ -7332,7 +7431,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                   <name>pNext</name></member>
             <member><type>VkDeviceAddress</type>                         <name>address</name></member>
-            <member><type>VkBufferUsageFlags</type>                      <name>usage</name></member>
+            <member optional="true" noautovalidity="true"><type>VkBufferUsageFlags</type> <name>usage</name></member>
         </type>
         <type category="struct" name="VkDescriptorBufferBindingPushDescriptorBufferHandleEXT" structextends="VkDescriptorBufferBindingInfoEXT">
             <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_PUSH_DESCRIPTOR_BUFFER_HANDLE_EXT"><type>VkStructureType</type> <name>sType</name></member>
@@ -7545,7 +7644,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true">const <type>void</type>*      <name>pNext</name></member>
             <member><type>zx_handle_t</type>                      <name>collectionToken</name></member>
         </type>
-        <type category="struct" name="VkBufferCollectionPropertiesFUCHSIA">
+        <type category="struct" name="VkBufferCollectionPropertiesFUCHSIA" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*            <name>pNext</name></member>
             <member><type>uint32_t</type>                         <name>memoryTypeBits</name></member>
@@ -7599,6 +7698,36 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>uint32_t</type>                        <name>minBufferCountForDedicatedSlack</name></member>
             <member><type>uint32_t</type>                        <name>minBufferCountForSharedSlack</name></member>
         </type>
+        <type category="handle" parent="VkDevice" objtypeenum="VK_OBJECT_TYPE_CUDA_MODULE_NV"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkCudaModuleNV</name>)</type>
+        <type category="handle" parent="VkDevice" objtypeenum="VK_OBJECT_TYPE_CUDA_FUNCTION_NV"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkCudaFunctionNV</name>)</type>
+        <type category="struct" name="VkCudaModuleCreateInfoNV">
+            <member values="VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member><type>size_t</type>                 <name>dataSize</name></member>
+            <member len="dataSize">const <type>void</type>*            <name>pData</name></member>
+        </type>
+        <type category="struct" name="VkCudaFunctionCreateInfoNV">
+            <member values="VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>* <name>pNext</name></member>
+            <member><type>VkCudaModuleNV</type>         <name>module</name></member>
+            <member len="null-terminated">const <type>char</type>*            <name>pName</name></member>
+        </type>
+        <type category="struct" name="VkCudaLaunchInfoNV">
+            <member values="VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*            <name>pNext</name></member>
+            <member><type>VkCudaFunctionNV</type>       <name>function</name></member>
+            <member><type>uint32_t</type>               <name>gridDimX</name></member>
+            <member><type>uint32_t</type>               <name>gridDimY</name></member>
+            <member><type>uint32_t</type>               <name>gridDimZ</name></member>
+            <member><type>uint32_t</type>               <name>blockDimX</name></member>
+            <member><type>uint32_t</type>               <name>blockDimY</name></member>
+            <member><type>uint32_t</type>               <name>blockDimZ</name></member>
+            <member><type>uint32_t</type>               <name>sharedMemBytes</name></member>
+            <member optional="true"><type>size_t</type>                                     <name>paramCount</name></member>
+            <member noautovalidity="true" len="paramCount">const <type>void</type>* const * <name>pParams</name></member>
+            <member optional="true"><type>size_t</type>                                     <name>extraCount</name></member>
+            <member noautovalidity="true" len="extraCount">const <type>void</type>* const * <name>pExtras</name></member>
+        </type>
         <type category="struct" name="VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true" noautovalidity="true"><type>void</type>*        <name>pNext</name></member>
@@ -7998,7 +8127,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
 
             <member optional="true"><type>VkMicromapEXT</type>                          <name>micromap</name></member>
         </type>
-        <type category="struct" name="VkPipelinePropertiesIdentifierEXT">
+        <type category="struct" name="VkPipelinePropertiesIdentifierEXT" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_PIPELINE_PROPERTIES_IDENTIFIER_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*              <name>pNext</name></member>
             <member><type>uint8_t</type>                            <name>pipelineIdentifier</name>[<enum>VK_UUID_SIZE</enum>]</member>
@@ -8261,7 +8390,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>uint32_t</type>                            <name>vendorInfoCount</name></member>
             <member optional="true"><type>VkDeviceSize</type>                        <name>vendorBinarySize</name><comment>Specified in bytes</comment></member>
         </type>
-        <type category="struct" name="VkDeviceFaultInfoEXT">
+        <type category="struct" name="VkDeviceFaultInfoEXT" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*               <name>pNext</name></member>
             <member noautovalidity="true"><type>char</type>          <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the fault</comment></member>
@@ -8438,7 +8567,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </type>
         <type category="struct" name="VkDirectDriverLoadingListLUNARG" structextends="VkInstanceCreateInfo">
             <member values="VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true" noautovalidity="true"><type>void</type>*                 <name>pNext</name></member>
+            <member optional="true" noautovalidity="true">const <type>void</type>*           <name>pNext</name></member>
             <member><type>VkDirectDriverLoadingModeLUNARG</type>                             <name>mode</name></member>
             <member><type>uint32_t</type>                                                    <name>driverCount</name></member>
             <member len="driverCount">const <type>VkDirectDriverLoadingInfoLUNARG</type>*    <name>pDrivers</name></member>
@@ -8577,7 +8706,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkBool32</type>                            <name>cooperativeMatrix</name></member>
             <member><type>VkBool32</type>                            <name>cooperativeMatrixRobustBufferAccess</name></member>
         </type>
-        <type category="struct" name="VkCooperativeMatrixPropertiesKHR">
+        <type category="struct" name="VkCooperativeMatrixPropertiesKHR" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                               <name>pNext</name></member>
             <member><type>uint32_t</type>                            <name>MSize</name></member>
@@ -8612,7 +8741,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkExecutionGraphPipelineCreateInfoAMDX">
             <member values="VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_CREATE_INFO_AMDX"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                                <name>pNext</name></member>
-            <member optional="true"><type>VkPipelineCreateFlags</type>                      <name>flags</name></member>
+            <member noautovalidity="true" optional="true"><type>VkPipelineCreateFlags</type>                      <name>flags</name></member>
             <member optional="true"><type>uint32_t</type>                                   <name>stageCount</name></member>
             <member optional="true" len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>*    <name>pStages</name></member>
             <member optional="true">const <type>VkPipelineLibraryCreateInfoKHR</type>*      <name>pLibraryInfo</name></member>
@@ -8642,6 +8771,65 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member noautovalidity="true"><type>VkDeviceOrHostAddressConstAMDX</type>                  <name>infos</name></member>
             <member><type>uint64_t</type>                                                   <name>stride</name></member>
         </type>
+        <type category="struct" name="VkBindMemoryStatusKHR" structextends="VkBindBufferMemoryInfo,VkBindImageMemoryInfo">
+            <member values="VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*                                <name>pNext</name></member>
+            <member><type>VkResult</type>*                                                  <name>pResult</name></member>
+        </type>
+        <type category="struct" name="VkBindDescriptorSetsInfoKHR">
+          <member values="VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true">const <type>void</type>*                                              <name>pNext</name></member>
+          <member><type>VkShaderStageFlags</type>                                                       <name>stageFlags</name></member>
+          <member optional="true"><type>VkPipelineLayout</type>                                         <name>layout</name></member>
+          <member optional="true"><type>uint32_t</type>                                                 <name>firstSet</name></member>
+          <member><type>uint32_t</type>                                                                 <name>descriptorSetCount</name></member>
+          <member len="descriptorSetCount">const <type>VkDescriptorSet</type>*                          <name>pDescriptorSets</name></member>
+          <member optional="true"><type>uint32_t</type>                                                 <name>dynamicOffsetCount</name></member>
+          <member optional="true,true" len="dynamicOffsetCount">const <type>uint32_t</type>*            <name>pDynamicOffsets</name></member>
+        </type>
+        <type category="struct" name="VkPushConstantsInfoKHR">
+          <member values="VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR"><type>VkStructureType</type>          <name>sType</name></member>
+          <member optional="true">const <type>void</type>*                                                 <name>pNext</name></member>
+          <member optional="true"><type>VkPipelineLayout</type>                                            <name>layout</name></member>
+          <member><type>VkShaderStageFlags</type>                                                          <name>stageFlags</name></member>
+          <member optional="true"><type>uint32_t</type>                                                    <name>offset</name></member>
+          <member><type>uint32_t</type>                                                                    <name>size</name></member>
+          <member len="size">const <type>void</type>*                                                      <name>pValues</name></member>
+        </type>
+        <type category="struct" name="VkPushDescriptorSetInfoKHR">
+          <member values="VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true">const <type>void</type>*                                             <name>pNext</name></member>
+          <member><type>VkShaderStageFlags</type>                                                      <name>stageFlags</name></member>
+          <member optional="true"><type>VkPipelineLayout</type>                                        <name>layout</name></member>
+          <member optional="true"><type>uint32_t</type>                                                <name>set</name></member>
+          <member><type>uint32_t</type>                                                                <name>descriptorWriteCount</name></member>
+          <member len="descriptorWriteCount">const <type>VkWriteDescriptorSet</type>*                  <name>pDescriptorWrites</name></member>
+        </type>
+        <type category="struct" name="VkPushDescriptorSetWithTemplateInfoKHR">
+          <member values="VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true">const <type>void</type>*                                                           <name>pNext</name></member>
+          <member><type>VkDescriptorUpdateTemplate</type>                                                            <name>descriptorUpdateTemplate</name></member>
+          <member optional="true"><type>VkPipelineLayout</type>                                                      <name>layout</name></member>
+          <member optional="true"><type>uint32_t</type>                                                              <name>set</name></member>
+          <member>const <type>void</type>*                                                                           <name>pData</name></member>
+        </type>
+        <type category="struct" name="VkSetDescriptorBufferOffsetsInfoEXT">
+          <member values="VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true">const <type>void</type>*                                                       <name>pNext</name></member>
+          <member><type>VkShaderStageFlags</type>                                                                <name>stageFlags</name></member>
+          <member optional="true"><type>VkPipelineLayout</type>                                                  <name>layout</name></member>
+          <member optional="true"><type>uint32_t</type>                                                          <name>firstSet</name></member>
+          <member><type>uint32_t</type>                                                                          <name>setCount</name></member>
+          <member len="setCount">const <type>uint32_t</type>*                                                    <name>pBufferIndices</name></member>
+          <member len="setCount">const <type>VkDeviceSize</type>*                                                <name>pOffsets</name></member>
+        </type>
+        <type category="struct" name="VkBindDescriptorBufferEmbeddedSamplersInfoEXT">
+          <member values="VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true">const <type>void</type>*                                                                  <name>pNext</name></member>
+          <member><type>VkShaderStageFlags</type>                                                                           <name>stageFlags</name></member>
+          <member optional="true"><type>VkPipelineLayout</type>                                                             <name>layout</name></member>
+          <member optional="true"><type>uint32_t</type>                                                                     <name>set</name></member>
+        </type>
         <type category="struct" name="VkPhysicalDeviceCubicClampFeaturesQCOM" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*            <name>pNext</name></member>
@@ -8699,6 +8887,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>void</type>*                       <name>pNext</name></member>
             <member><type>VkLayeredDriverUnderlyingApiMSFT</type>            <name>underlyingAPI</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDevicePerStageDescriptorSetFeaturesNV" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true" noautovalidity="true"><type>void</type>*     <name>pNext</name></member>
+            <member><type>VkBool32</type>                                        <name>perStageDescriptorSet</name></member>
+            <member><type>VkBool32</type>                                        <name>dynamicPipelineLayout</name></member>
+        </type>
         <type category="struct" name="VkPhysicalDeviceExternalFormatResolveFeaturesANDROID" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
           <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
           <member optional="true"><type>void</type>*        <name>pNext</name></member>
@@ -8707,7 +8901,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkPhysicalDeviceExternalFormatResolvePropertiesANDROID" structextends="VkPhysicalDeviceProperties2" returnedonly="true">
           <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID"><type>VkStructureType</type> <name>sType</name></member>
           <member optional="true"><type>void</type>*        <name>pNext</name></member>
-          <member limittype="noauto"><type>VkBool32</type>  <name>nullColorAttachmentWithExternalFormatResolve</name></member>
+          <member limittype="not"><type>VkBool32</type>  <name>nullColorAttachmentWithExternalFormatResolve</name></member>
           <member limittype="noauto"><type>VkChromaLocation</type>  <name>externalFormatResolveChromaOffsetX</name></member>
           <member limittype="noauto"><type>VkChromaLocation</type>  <name>externalFormatResolveChromaOffsetY</name></member>
         </type>
@@ -8738,7 +8932,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkGetLatencyMarkerInfoNV">
             <member values="VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true" noautovalidity="true">const <type>void</type>* <name>pNext</name></member>
-            <member><type>VkLatencyTimingsFrameReportNV</type>* <name>pTimings</name></member>
+            <member optional="true"><type>uint32_t</type> <name>timingCount</name></member>
+            <member optional="true" len="timingCount"><type>VkLatencyTimingsFrameReportNV</type>* <name>pTimings</name></member>
         </type>
         <type category="struct" name="VkLatencyTimingsFrameReportNV">
             <member values="VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV"><type>VkStructureType</type> <name>sType</name></member>
@@ -8776,9 +8971,113 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkLatencySurfaceCapabilitiesNV" structextends="VkSurfaceCapabilities2KHR">
             <member values="VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                              <name>pNext</name></member>
-            <member optional="false,true"><type>uint32_t</type>                           <name>presentModeCount</name></member>
+            <member optional="true"><type>uint32_t</type>                                 <name>presentModeCount</name></member>
             <member optional="true" len="presentModeCount"><type>VkPresentModeKHR</type>* <name>pPresentModes</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceCudaKernelLaunchFeaturesNV" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*    <name>pNext</name></member>
+            <member><type>VkBool32</type>                       <name>cudaKernelLaunchFeatures</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceCudaKernelLaunchPropertiesNV" structextends="VkPhysicalDeviceProperties2" returnedonly="true">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*    <name>pNext</name></member>
+            <member limittype="max"><type>uint32_t</type>         <name>computeCapabilityMinor</name></member>
+            <member limittype="min"><type>uint32_t</type>         <name>computeCapabilityMajor</name></member>
+        </type>
+        <type category="struct" name="VkDeviceQueueShaderCoreControlCreateInfoARM" structextends="VkDeviceQueueCreateInfo,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*            <name>pNext</name></member>
+            <member><type>uint32_t</type>                         <name>shaderCoreCount</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceSchedulingControlsFeaturesARM" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*            <name>pNext</name></member>
+            <member><type>VkBool32</type>                         <name>schedulingControls</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceSchedulingControlsPropertiesARM" structextends="VkPhysicalDeviceProperties2">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                       <name>pNext</name></member>
+            <member><type>VkPhysicalDeviceSchedulingControlsFlagsARM</type>  <name>schedulingControlsFlags</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+          <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RELAXED_LINE_RASTERIZATION_FEATURES_IMG"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true"><type>void</type>*        <name>pNext</name></member>
+          <member><type>VkBool32</type>  <name>relaxedLineRasterization</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceRenderPassStripedFeaturesARM" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true" noautovalidity="true"><type>void</type>*     <name>pNext</name></member>
+            <member><type>VkBool32</type>                                        <name>renderPassStriped</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceRenderPassStripedPropertiesARM" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                           <name>pNext</name></member>
+            <member><type>VkExtent2D</type>                                      <name>renderPassStripeGranularity</name></member>
+            <member><type>uint32_t</type>                                        <name>maxRenderPassStripes</name></member>
+        </type>
+        <type category="struct" name="VkRenderPassStripeInfoARM">
+            <member values="VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>* <name>pNext</name></member>
+            <member><type>VkRect2D</type>                                        <name>stripeArea</name></member>
+        </type>
+        <type category="struct" name="VkRenderPassStripeBeginInfoARM" structextends="VkRenderingInfo,VkRenderPassBeginInfo">
+            <member values="VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>* <name>pNext</name></member>
+            <member><type>uint32_t</type>                                          <name>stripeInfoCount</name></member>
+            <member len="stripeInfoCount">const <type>VkRenderPassStripeInfoARM</type>*  <name>pStripeInfos</name></member>
+        </type>
+        <type category="struct" name="VkRenderPassStripeSubmitInfoARM" structextends="VkCommandBufferSubmitInfo">
+            <member values="VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>* <name>pNext</name></member>
+            <member><type>uint32_t</type>                                                    <name>stripeSemaphoreInfoCount</name></member>
+            <member len="stripeSemaphoreInfoCount">const <type>VkSemaphoreSubmitInfo</type>* <name>pStripeSemaphoreInfos</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*    <name>pNext</name></member>
+            <member><type>VkBool32</type> <name>shaderMaximalReconvergence</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*    <name>pNext</name></member>
+            <member><type>VkBool32</type> <name>shaderSubgroupRotate</name></member>
+            <member><type>VkBool32</type> <name>shaderSubgroupRotateClustered</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceShaderExpectAssumeFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true" noautovalidity="true"><type>void</type>*     <name>pNext</name></member>
+            <member><type>VkBool32</type>                                        <name>shaderExpectAssume</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceShaderFloatControls2FeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+          <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+          <member optional="true"><type>void</type>*        <name>pNext</name></member>
+          <member><type>VkBool32</type>                     <name>shaderFloatControls2</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true" noautovalidity="true"><type>void</type>*                                <name>pNext</name></member>
+            <member><type>VkBool32</type>                                                                   <name>dynamicRenderingLocalRead</name></member>
+        </type>
+        <type category="struct" name="VkRenderingAttachmentLocationInfoKHR" structextends="VkGraphicsPipelineCreateInfo,VkCommandBufferInheritanceInfo">
+            <member values="VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*                                                <name>pNext</name></member>
+            <member optional="true"><type>uint32_t</type>                                                   <name>colorAttachmentCount</name></member>
+            <member noautovalidity="true" len="colorAttachmentCount">const <type>uint32_t</type>*           <name>pColorAttachmentLocations</name></member>
+        </type>
+        <type category="struct" name="VkRenderingInputAttachmentIndexInfoKHR" structextends="VkGraphicsPipelineCreateInfo,VkCommandBufferInheritanceInfo">
+            <member values="VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*                                                <name>pNext</name></member>
+            <member optional="true"><type>uint32_t</type>                                                   <name>colorAttachmentCount</name></member>
+            <member len="colorAttachmentCount" optional="true">const <type>uint32_t</type>*                 <name>pColorAttachmentInputIndices</name></member>
+            <member optional="true">const <type>uint32_t</type>*                                            <name>pDepthInputAttachmentIndex</name></member>
+            <member optional="true">const <type>uint32_t</type>*                                            <name>pStencilInputAttachmentIndex</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceShaderQuadControlFeaturesKHR" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true" noautovalidity="true"><type>void</type>*        <name>pNext</name></member>
+            <member><type>VkBool32</type>                           <name>shaderQuadControl</name></member>
+        </type>
     </types>
 
 
@@ -8817,6 +9116,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum type="uint32_t" value="16"        name="VK_MAX_GLOBAL_PRIORITY_SIZE_KHR"/>
         <enum                                   name="VK_MAX_GLOBAL_PRIORITY_SIZE_EXT" alias="VK_MAX_GLOBAL_PRIORITY_SIZE_KHR"/>
         <enum type="uint32_t" value="32"        name="VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT"/>
+        <enum type="uint32_t" value="7"         name="VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR"/>
         <enum type="uint32_t" value="(~0U)"     name="VK_SHADER_INDEX_UNUSED_AMDX"/>
     </enums>
 
@@ -9649,11 +9949,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
     <enums name="VkSwapchainImageUsageFlagBitsANDROID" type="bitmask">
       <enum bitpos="0"      name="VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_ANDROID"/>
     </enums>
-    <enums name="VkTimeDomainEXT" type="enum">
-        <enum value="0"     name="VK_TIME_DOMAIN_DEVICE_EXT"/>
-        <enum value="1"     name="VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT"/>
-        <enum value="2"     name="VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT"/>
-        <enum value="3"     name="VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT"/>
+    <enums name="VkTimeDomainKHR" type="enum">
+        <enum value="0"     name="VK_TIME_DOMAIN_DEVICE_KHR"/>
+        <enum value="1"     name="VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR"/>
+        <enum value="2"     name="VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR"/>
+        <enum value="3"     name="VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR"/>
     </enums>
     <enums name="VkDebugReportFlagBitsEXT" type="bitmask">
         <enum bitpos="0"    name="VK_DEBUG_REPORT_INFORMATION_BIT_EXT"/>
@@ -9745,6 +10045,16 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum value="6"     name="VK_VALIDATION_FEATURE_DISABLE_UNIQUE_HANDLES_EXT"/>
         <enum value="7"     name="VK_VALIDATION_FEATURE_DISABLE_SHADER_VALIDATION_CACHE_EXT"/>
     </enums>
+    <enums name="VkLayerSettingTypeEXT" type="enum">
+        <enum value="0"     name="VK_LAYER_SETTING_TYPE_BOOL32_EXT"/>
+        <enum value="1"     name="VK_LAYER_SETTING_TYPE_INT32_EXT"/>
+        <enum value="2"     name="VK_LAYER_SETTING_TYPE_INT64_EXT"/>
+        <enum value="3"     name="VK_LAYER_SETTING_TYPE_UINT32_EXT"/>
+        <enum value="4"     name="VK_LAYER_SETTING_TYPE_UINT64_EXT"/>
+        <enum value="5"     name="VK_LAYER_SETTING_TYPE_FLOAT32_EXT"/>
+        <enum value="6"     name="VK_LAYER_SETTING_TYPE_FLOAT64_EXT"/>
+        <enum value="7"     name="VK_LAYER_SETTING_TYPE_STRING_EXT"/>
+    </enums>
     <enums name="VkSubgroupFeatureFlagBits" type="bitmask">
         <enum bitpos="0"    name="VK_SUBGROUP_FEATURE_BASIC_BIT"              comment="Basic subgroup operations"/>
         <enum bitpos="1"    name="VK_SUBGROUP_FEATURE_VOTE_BIT"               comment="Vote subgroup operations"/>
@@ -10193,11 +10503,15 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum value="2" name="VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR"/>
         <enum value="3" name="VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_FLOAT64_KHR"/>
     </enums>
-    <enums name="VkLineRasterizationModeEXT" type="enum">
-        <enum value="0"     name="VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT"/>
-        <enum value="1"     name="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT"/>
-        <enum value="2"     name="VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT"/>
-        <enum value="3"     name="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT"/>
+    <enums name="VkLineRasterizationModeKHR" type="enum">
+        <enum value="0"     name="VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR"/>
+        <enum               name="VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT"             alias="VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR"/>
+        <enum value="1"     name="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR"/>
+        <enum               name="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT"         alias="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR"/>
+        <enum value="2"     name="VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR"/>
+        <enum               name="VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT"           alias="VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR"/>
+        <enum value="3"     name="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR"/>
+        <enum               name="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT"  alias="VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR"/>
     </enums>
     <enums name="VkShaderModuleCreateFlagBits" type="bitmask">
     </enums>
@@ -10436,6 +10750,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum bitpos="1"    name="VK_PRESENT_GRAVITY_MAX_BIT_EXT"/>
         <enum bitpos="2"    name="VK_PRESENT_GRAVITY_CENTERED_BIT_EXT"/>
     </enums>
+    <enums name="VkPhysicalDeviceSchedulingControlsFlagBitsARM" type="bitmask" bitwidth="64">
+        <enum bitpos="0"    name="VK_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_SHADER_CORE_COUNT_ARM"/>
+    </enums>
 
     <enums name="VkVideoCodecOperationFlagBitsKHR" type="bitmask">
         <enum value="0"     name="VK_VIDEO_CODEC_OPERATION_NONE_KHR"/>
@@ -10518,45 +10835,45 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum bitpos="1"    name="VK_VIDEO_ENCODE_RATE_CONTROL_MODE_CBR_BIT_KHR"/>
         <enum bitpos="2"    name="VK_VIDEO_ENCODE_RATE_CONTROL_MODE_VBR_BIT_KHR"/>
     </enums>
-    <enums name="VkVideoEncodeH264CapabilityFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_HRD_COMPLIANCE_BIT_EXT"/>
-        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_EXT"/>
-        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_ROW_UNALIGNED_SLICE_BIT_EXT"/>
-        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_DIFFERENT_SLICE_TYPE_BIT_EXT"/>
-        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_EXT"/>
-        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_EXT"/>
-        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_EXT"/>
-        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_EXT"/>
-        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_EXT"/>
-    </enums>
-    <enums name="VkVideoEncodeH264StdFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H264_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H264_STD_QPPRIME_Y_ZERO_TRANSFORM_BYPASS_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H264_STD_SCALING_MATRIX_PRESENT_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H264_STD_CHROMA_QP_INDEX_OFFSET_BIT_EXT"/>
-        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H264_STD_SECOND_CHROMA_QP_INDEX_OFFSET_BIT_EXT"/>
-        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H264_STD_PIC_INIT_QP_MINUS26_BIT_EXT"/>
-        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H264_STD_WEIGHTED_PRED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_EXPLICIT_BIT_EXT"/>
-        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_IMPLICIT_BIT_EXT"/>
-        <enum bitpos="9"    name="VK_VIDEO_ENCODE_H264_STD_TRANSFORM_8X8_MODE_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="10"   name="VK_VIDEO_ENCODE_H264_STD_DIRECT_SPATIAL_MV_PRED_FLAG_UNSET_BIT_EXT"/>
-        <enum bitpos="11"   name="VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_UNSET_BIT_EXT"/>
-        <enum bitpos="12"   name="VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="13"   name="VK_VIDEO_ENCODE_H264_STD_DIRECT_8X8_INFERENCE_FLAG_UNSET_BIT_EXT"/>
-        <enum bitpos="14"   name="VK_VIDEO_ENCODE_H264_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="15"   name="VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_DISABLED_BIT_EXT"/>
-        <enum bitpos="16"   name="VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_ENABLED_BIT_EXT"/>
-        <enum bitpos="17"   name="VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_PARTIAL_BIT_EXT"/>
-        <enum bitpos="19"   name="VK_VIDEO_ENCODE_H264_STD_SLICE_QP_DELTA_BIT_EXT"/>
-        <enum bitpos="20"   name="VK_VIDEO_ENCODE_H264_STD_DIFFERENT_SLICE_QP_DELTA_BIT_EXT"/>
-    </enums>
-    <enums name="VkVideoEncodeH264RateControlFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_EXT"/>
-        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_REGULAR_GOP_BIT_EXT"/>
-        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_EXT"/>
-        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_EXT"/>
-        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_EXT"/>
+    <enums name="VkVideoEncodeH264CapabilityFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_HRD_COMPLIANCE_BIT_KHR"/>
+        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_KHR"/>
+        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_ROW_UNALIGNED_SLICE_BIT_KHR"/>
+        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_DIFFERENT_SLICE_TYPE_BIT_KHR"/>
+        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_KHR"/>
+        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_KHR"/>
+        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR"/>
+        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_KHR"/>
+        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR"/>
+    </enums>
+    <enums name="VkVideoEncodeH264StdFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H264_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H264_STD_QPPRIME_Y_ZERO_TRANSFORM_BYPASS_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H264_STD_SCALING_MATRIX_PRESENT_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H264_STD_CHROMA_QP_INDEX_OFFSET_BIT_KHR"/>
+        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H264_STD_SECOND_CHROMA_QP_INDEX_OFFSET_BIT_KHR"/>
+        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H264_STD_PIC_INIT_QP_MINUS26_BIT_KHR"/>
+        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H264_STD_WEIGHTED_PRED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_EXPLICIT_BIT_KHR"/>
+        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_IMPLICIT_BIT_KHR"/>
+        <enum bitpos="9"    name="VK_VIDEO_ENCODE_H264_STD_TRANSFORM_8X8_MODE_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="10"   name="VK_VIDEO_ENCODE_H264_STD_DIRECT_SPATIAL_MV_PRED_FLAG_UNSET_BIT_KHR"/>
+        <enum bitpos="11"   name="VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_UNSET_BIT_KHR"/>
+        <enum bitpos="12"   name="VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="13"   name="VK_VIDEO_ENCODE_H264_STD_DIRECT_8X8_INFERENCE_FLAG_UNSET_BIT_KHR"/>
+        <enum bitpos="14"   name="VK_VIDEO_ENCODE_H264_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="15"   name="VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_DISABLED_BIT_KHR"/>
+        <enum bitpos="16"   name="VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_ENABLED_BIT_KHR"/>
+        <enum bitpos="17"   name="VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_PARTIAL_BIT_KHR"/>
+        <enum bitpos="19"   name="VK_VIDEO_ENCODE_H264_STD_SLICE_QP_DELTA_BIT_KHR"/>
+        <enum bitpos="20"   name="VK_VIDEO_ENCODE_H264_STD_DIFFERENT_SLICE_QP_DELTA_BIT_KHR"/>
+    </enums>
+    <enums name="VkVideoEncodeH264RateControlFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_KHR"/>
+        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_REGULAR_GOP_BIT_KHR"/>
+        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR"/>
+        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR"/>
+        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR"/>
     </enums>
     <enums name="VkHostImageCopyFlagBitsEXT" type="bitmask">
         <enum bitpos="0"    name="VK_HOST_IMAGE_COPY_MEMCPY_EXT"/>
@@ -10634,58 +10951,58 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum bitpos="2"    name="VK_RENDERING_RESUMING_BIT"/>
         <enum               name="VK_RENDERING_RESUMING_BIT_KHR" alias="VK_RENDERING_RESUMING_BIT"/>
     </enums>
-    <enums name="VkVideoEncodeH265CapabilityFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_HRD_COMPLIANCE_BIT_EXT"/>
-        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_EXT"/>
-        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_ROW_UNALIGNED_SLICE_SEGMENT_BIT_EXT"/>
-        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_DIFFERENT_SLICE_SEGMENT_TYPE_BIT_EXT"/>
-        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_EXT"/>
-        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_EXT"/>
-        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_EXT"/>
-        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_EXT"/>
-        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_EXT"/>
-        <enum bitpos="9"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_EXT"/>
-    </enums>
-    <enums name="VkVideoEncodeH265StdFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H265_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H265_STD_SAMPLE_ADAPTIVE_OFFSET_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H265_STD_SCALING_LIST_DATA_PRESENT_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H265_STD_PCM_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H265_STD_SPS_TEMPORAL_MVP_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H265_STD_INIT_QP_MINUS26_BIT_EXT"/>
-        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H265_STD_WEIGHTED_PRED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H265_STD_WEIGHTED_BIPRED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H265_STD_LOG2_PARALLEL_MERGE_LEVEL_MINUS2_BIT_EXT"/>
-        <enum bitpos="9"    name="VK_VIDEO_ENCODE_H265_STD_SIGN_DATA_HIDING_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="10"   name="VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="11"   name="VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_UNSET_BIT_EXT"/>
-        <enum bitpos="12"   name="VK_VIDEO_ENCODE_H265_STD_PPS_SLICE_CHROMA_QP_OFFSETS_PRESENT_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="13"   name="VK_VIDEO_ENCODE_H265_STD_TRANSQUANT_BYPASS_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="14"   name="VK_VIDEO_ENCODE_H265_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="15"   name="VK_VIDEO_ENCODE_H265_STD_ENTROPY_CODING_SYNC_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="16"   name="VK_VIDEO_ENCODE_H265_STD_DEBLOCKING_FILTER_OVERRIDE_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="17"   name="VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="18"   name="VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENT_FLAG_SET_BIT_EXT"/>
-        <enum bitpos="19"   name="VK_VIDEO_ENCODE_H265_STD_SLICE_QP_DELTA_BIT_EXT"/>
-        <enum bitpos="20"   name="VK_VIDEO_ENCODE_H265_STD_DIFFERENT_SLICE_QP_DELTA_BIT_EXT"/>
-    </enums>
-    <enums name="VkVideoEncodeH265RateControlFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_EXT"/>
-        <enum bitpos="1"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_REGULAR_GOP_BIT_EXT"/>
-        <enum bitpos="2"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_EXT"/>
-        <enum bitpos="3"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_EXT"/>
-        <enum bitpos="4"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_TEMPORAL_SUB_LAYER_PATTERN_DYADIC_BIT_EXT"/>
-    </enums>
-    <enums name="VkVideoEncodeH265CtbSizeFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"      name="VK_VIDEO_ENCODE_H265_CTB_SIZE_16_BIT_EXT"/>
-        <enum bitpos="1"      name="VK_VIDEO_ENCODE_H265_CTB_SIZE_32_BIT_EXT"/>
-        <enum bitpos="2"      name="VK_VIDEO_ENCODE_H265_CTB_SIZE_64_BIT_EXT"/>
-    </enums>
-    <enums name="VkVideoEncodeH265TransformBlockSizeFlagBitsEXT" type="bitmask">
-        <enum bitpos="0"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_4_BIT_EXT"/>
-        <enum bitpos="1"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_8_BIT_EXT"/>
-        <enum bitpos="2"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_16_BIT_EXT"/>
-        <enum bitpos="3"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_32_BIT_EXT"/>
+    <enums name="VkVideoEncodeH265CapabilityFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_HRD_COMPLIANCE_BIT_KHR"/>
+        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_KHR"/>
+        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_ROW_UNALIGNED_SLICE_SEGMENT_BIT_KHR"/>
+        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_DIFFERENT_SLICE_SEGMENT_TYPE_BIT_KHR"/>
+        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_KHR"/>
+        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_KHR"/>
+        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR"/>
+        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_KHR"/>
+        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_KHR"/>
+        <enum bitpos="9"    name="VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR"/>
+    </enums>
+    <enums name="VkVideoEncodeH265StdFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"    name="VK_VIDEO_ENCODE_H265_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="1"    name="VK_VIDEO_ENCODE_H265_STD_SAMPLE_ADAPTIVE_OFFSET_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="2"    name="VK_VIDEO_ENCODE_H265_STD_SCALING_LIST_DATA_PRESENT_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="3"    name="VK_VIDEO_ENCODE_H265_STD_PCM_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="4"    name="VK_VIDEO_ENCODE_H265_STD_SPS_TEMPORAL_MVP_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="5"    name="VK_VIDEO_ENCODE_H265_STD_INIT_QP_MINUS26_BIT_KHR"/>
+        <enum bitpos="6"    name="VK_VIDEO_ENCODE_H265_STD_WEIGHTED_PRED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="7"    name="VK_VIDEO_ENCODE_H265_STD_WEIGHTED_BIPRED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="8"    name="VK_VIDEO_ENCODE_H265_STD_LOG2_PARALLEL_MERGE_LEVEL_MINUS2_BIT_KHR"/>
+        <enum bitpos="9"    name="VK_VIDEO_ENCODE_H265_STD_SIGN_DATA_HIDING_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="10"   name="VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="11"   name="VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_UNSET_BIT_KHR"/>
+        <enum bitpos="12"   name="VK_VIDEO_ENCODE_H265_STD_PPS_SLICE_CHROMA_QP_OFFSETS_PRESENT_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="13"   name="VK_VIDEO_ENCODE_H265_STD_TRANSQUANT_BYPASS_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="14"   name="VK_VIDEO_ENCODE_H265_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="15"   name="VK_VIDEO_ENCODE_H265_STD_ENTROPY_CODING_SYNC_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="16"   name="VK_VIDEO_ENCODE_H265_STD_DEBLOCKING_FILTER_OVERRIDE_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="17"   name="VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="18"   name="VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENT_FLAG_SET_BIT_KHR"/>
+        <enum bitpos="19"   name="VK_VIDEO_ENCODE_H265_STD_SLICE_QP_DELTA_BIT_KHR"/>
+        <enum bitpos="20"   name="VK_VIDEO_ENCODE_H265_STD_DIFFERENT_SLICE_QP_DELTA_BIT_KHR"/>
+    </enums>
+    <enums name="VkVideoEncodeH265RateControlFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_KHR"/>
+        <enum bitpos="1"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_REGULAR_GOP_BIT_KHR"/>
+        <enum bitpos="2"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR"/>
+        <enum bitpos="3"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR"/>
+        <enum bitpos="4"      name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_TEMPORAL_SUB_LAYER_PATTERN_DYADIC_BIT_KHR"/>
+    </enums>
+    <enums name="VkVideoEncodeH265CtbSizeFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"      name="VK_VIDEO_ENCODE_H265_CTB_SIZE_16_BIT_KHR"/>
+        <enum bitpos="1"      name="VK_VIDEO_ENCODE_H265_CTB_SIZE_32_BIT_KHR"/>
+        <enum bitpos="2"      name="VK_VIDEO_ENCODE_H265_CTB_SIZE_64_BIT_KHR"/>
+    </enums>
+    <enums name="VkVideoEncodeH265TransformBlockSizeFlagBitsKHR" type="bitmask">
+        <enum bitpos="0"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_4_BIT_KHR"/>
+        <enum bitpos="1"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_8_BIT_KHR"/>
+        <enum bitpos="2"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_16_BIT_KHR"/>
+        <enum bitpos="3"      name="VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_32_BIT_KHR"/>
     </enums>
     <enums name="VkExportMetalObjectTypeFlagBitsEXT" type="bitmask">
         <enum bitpos="0"      name="VK_EXPORT_METAL_OBJECT_TYPE_METAL_DEVICE_BIT_EXT"/>
@@ -11655,7 +11972,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
             <proto><type>void</type> <name>vkCmdBindIndexBuffer</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
-            <param><type>VkBuffer</type> <name>buffer</name></param>
+            <param optional="true"><type>VkBuffer</type> <name>buffer</name></param>
             <param><type>VkDeviceSize</type> <name>offset</name></param>
             <param><type>VkIndexType</type> <name>indexType</name></param>
         </command>
@@ -12980,8 +13297,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param><type>VkDevice</type> <name>device</name></param>
             <param><type>VkImage</type> <name>image</name></param>
             <param><type>int</type> <name>nativeFenceFd</name></param>
-            <param><type>VkSemaphore</type> <name>semaphore</name></param>
-            <param><type>VkFence</type> <name>fence</name></param>
+            <param optional="true"><type>VkSemaphore</type> <name>semaphore</name></param>
+            <param optional="true"><type>VkFence</type> <name>fence</name></param>
         </command>
         <command>
             <proto><type>VkResult</type> <name>vkQueueSignalReleaseImageANDROID</name></proto>
@@ -13007,19 +13324,21 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param><type>VkBool32</type> <name>localDimmingEnable</name></param>
         </command>
         <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
-            <proto><type>VkResult</type> <name>vkGetPhysicalDeviceCalibrateableTimeDomainsEXT</name></proto>
+            <proto><type>VkResult</type> <name>vkGetPhysicalDeviceCalibrateableTimeDomainsKHR</name></proto>
             <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param>
             <param optional="false,true"><type>uint32_t</type>* <name>pTimeDomainCount</name></param>
-            <param optional="true" len="pTimeDomainCount"><type>VkTimeDomainEXT</type>* <name>pTimeDomains</name></param>
+            <param optional="true" len="pTimeDomainCount"><type>VkTimeDomainKHR</type>* <name>pTimeDomains</name></param>
         </command>
+        <command name="vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" alias="vkGetPhysicalDeviceCalibrateableTimeDomainsKHR"/>
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
-            <proto><type>VkResult</type> <name>vkGetCalibratedTimestampsEXT</name></proto>
+            <proto><type>VkResult</type> <name>vkGetCalibratedTimestampsKHR</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param><type>uint32_t</type> <name>timestampCount</name></param>
-            <param len="timestampCount">const <type>VkCalibratedTimestampInfoEXT</type>* <name>pTimestampInfos</name></param>
+            <param len="timestampCount">const <type>VkCalibratedTimestampInfoKHR</type>* <name>pTimestampInfos</name></param>
             <param len="timestampCount"><type>uint64_t</type>* <name>pTimestamps</name></param>
             <param><type>uint64_t</type>* <name>pMaxDeviation</name></param>
         </command>
+        <command name="vkGetCalibratedTimestampsEXT" alias="vkGetCalibratedTimestampsKHR"/>
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
             <proto><type>VkResult</type> <name>vkSetDebugUtilsObjectNameEXT</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
@@ -13738,17 +14057,18 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param optional="true" len="pInternalRepresentationCount"><type>VkPipelineExecutableInternalRepresentationKHR</type>* <name>pInternalRepresentations</name></param>
         </command>
         <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
-            <proto><type>void</type> <name>vkCmdSetLineStippleEXT</name></proto>
+            <proto><type>void</type> <name>vkCmdSetLineStippleKHR</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
             <param><type>uint32_t</type> <name>lineStippleFactor</name></param>
             <param><type>uint16_t</type> <name>lineStipplePattern</name></param>
         </command>
+        <command name="vkCmdSetLineStippleEXT" alias="vkCmdSetLineStippleKHR"/>
         <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
             <proto><type>VkResult</type> <name>vkGetFaultData</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param><type>VkFaultQueryBehavior</type> <name>faultQueryBehavior</name></param>
             <param><type>VkBool32</type>* <name>pUnrecordedFaults</name></param>
-            <param><type>uint32_t</type>* <name>pFaultCount</name></param>
+            <param optional="false,true"><type>uint32_t</type>* <name>pFaultCount</name></param>
             <param optional="true" len="pFaultCount"><type>VkFaultData</type>* <name>pFaults</name></param>
         </command>
         <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY">
@@ -13867,7 +14187,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
             <proto><type>void</type> <name>vkCmdBindIndexBuffer2KHR</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
-            <param><type>VkBuffer</type> <name>buffer</name></param>
+            <param optional="true"><type>VkBuffer</type> <name>buffer</name></param>
             <param><type>VkDeviceSize</type> <name>offset</name></param>
             <param><type>VkDeviceSize</type> <name>size</name></param>
             <param><type>VkIndexType</type> <name>indexType</name></param>
@@ -14596,6 +14916,44 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param><type>VkBufferCollectionFUCHSIA</type> <name>collection</name></param>
             <param><type>VkBufferCollectionPropertiesFUCHSIA</type>* <name>pProperties</name></param>
         </command>
+        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_OUT_OF_HOST_MEMORY">
+            <proto><type>VkResult</type> <name>vkCreateCudaModuleNV</name></proto>
+            <param><type>VkDevice</type> <name>device</name></param>
+            <param>const <type>VkCudaModuleCreateInfoNV</type>* <name>pCreateInfo</name></param>
+            <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
+            <param><type>VkCudaModuleNV</type>* <name>pModule</name></param>
+        </command>
+        <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_INITIALIZATION_FAILED">
+            <proto><type>VkResult</type> <name>vkGetCudaModuleCacheNV</name></proto>
+            <param><type>VkDevice</type> <name>device</name></param>
+            <param><type>VkCudaModuleNV</type> <name>module</name></param>
+            <param optional="false,true"><type>size_t</type>* <name>pCacheSize</name></param>
+            <param optional="true" len="pCacheSize"><type>void</type>* <name>pCacheData</name></param>
+        </command>
+        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_OUT_OF_HOST_MEMORY">
+            <proto><type>VkResult</type> <name>vkCreateCudaFunctionNV</name></proto>
+            <param><type>VkDevice</type> <name>device</name></param>
+            <param>const <type>VkCudaFunctionCreateInfoNV</type>* <name>pCreateInfo</name></param>
+            <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
+            <param><type>VkCudaFunctionNV</type>* <name>pFunction</name></param>
+        </command>
+        <command>
+            <proto><type>void</type> <name>vkDestroyCudaModuleNV</name></proto>
+            <param><type>VkDevice</type> <name>device</name></param>
+            <param><type>VkCudaModuleNV</type> <name>module</name></param>
+            <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
+        </command>
+        <command>
+            <proto><type>void</type> <name>vkDestroyCudaFunctionNV</name></proto>
+            <param><type>VkDevice</type> <name>device</name></param>
+            <param><type>VkCudaFunctionNV</type> <name>function</name></param>
+            <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
+        </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="action">
+            <proto><type>void</type> <name>vkCmdCudaLaunchKernelNV</name></proto>
+            <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkCudaLaunchInfoNV</type>* <name>pLaunchInfo</name></param>
+        </command>
         <command queues="graphics" renderpass="outside" cmdbufferlevel="primary,secondary" tasks="action,state">
             <proto><type>void</type> <name>vkCmdBeginRendering</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type>                   <name>commandBuffer</name></param>
@@ -14833,7 +15191,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <command>
             <proto><type>void</type> <name>vkDestroyShaderEXT</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
-            <param externsync="true"><type>VkShaderEXT</type> <name>shader</name></param>
+            <param optional="true" externsync="true"><type>VkShaderEXT</type> <name>shader</name></param>
             <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
         </command>
         <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
@@ -14907,6 +15265,36 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param><type>VkDeviceAddress</type>                                 <name>scratch</name></param>
             <param><type>VkDeviceAddress</type>                                 <name>countInfo</name></param>
         </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdBindDescriptorSets2KHR</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkBindDescriptorSetsInfoKHR</type>* <name>pBindDescriptorSetsInfo</name></param>
+        </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdPushConstants2KHR</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkPushConstantsInfoKHR</type>* <name>pPushConstantsInfo</name></param>
+        </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdPushDescriptorSet2KHR</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkPushDescriptorSetInfoKHR</type>* <name>pPushDescriptorSetInfo</name></param>
+        </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdPushDescriptorSetWithTemplate2KHR</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkPushDescriptorSetWithTemplateInfoKHR</type>* <name>pPushDescriptorSetWithTemplateInfo</name></param>
+        </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdSetDescriptorBufferOffsets2EXT</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkSetDescriptorBufferOffsetsInfoEXT</type>* <name>pSetDescriptorBufferOffsetsInfo</name></param>
+        </command>
+        <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdBindDescriptorBufferEmbeddedSamplers2EXT</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkBindDescriptorBufferEmbeddedSamplersInfoEXT</type>* <name>pBindDescriptorBufferEmbeddedSamplersInfo</name></param>
+        </command>
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INITIALIZATION_FAILED">
             <proto><type>VkResult</type> <name>vkSetLatencySleepModeNV</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
@@ -14929,7 +15317,6 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <proto><type>void</type> <name>vkGetLatencyTimingsNV</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param><type>VkSwapchainKHR</type> <name>swapchain</name></param>
-            <param><type>uint32_t</type>* <name>pTimingCount</name></param>
             <param><type>VkGetLatencyMarkerInfoNV</type>* <name>pLatencyMarkerInfo</name></param>
         </command>
         <command>
@@ -14937,6 +15324,16 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param><type>VkQueue</type> <name>queue</name></param>
             <param>const <type>VkOutOfBandQueueTypeInfoNV</type>* <name>pQueueTypeInfo</name></param>
         </command>
+        <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdSetRenderingAttachmentLocationsKHR</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkRenderingAttachmentLocationInfoKHR</type>* <name>pLocationInfo</name></param>
+        </command>
+        <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" tasks="state">
+            <proto><type>void</type> <name>vkCmdSetRenderingInputAttachmentIndicesKHR</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param>const <type>VkRenderingInputAttachmentIndexInfoKHR</type>* <name>pLocationInfo</name></param>
+        </command>
     </commands>
 
     <feature api="vulkan,vulkansc" name="VK_VERSION_1_0" number="1.0" comment="Vulkan core API interface definitions">
@@ -16773,7 +17170,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </extension>
         <extension name="VK_KHR_video_decode_queue" number="25" type="device" depends="VK_KHR_video_queue+VK_KHR_synchronization2" author="KHR" contact="jake.beju@amd.com" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="7"                                         name="VK_KHR_VIDEO_DECODE_QUEUE_SPEC_VERSION"/>
+                <enum value="8"                                         name="VK_KHR_VIDEO_DECODE_QUEUE_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_video_decode_queue&quot;"     name="VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR"/>
                 <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_DECODE_CAPABILITIES_KHR"/>
@@ -16950,101 +17347,101 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_AMD_shader_ballot&quot;"                  name="VK_AMD_SHADER_BALLOT_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_video_encode_h264" number="39" type="device" depends="VK_KHR_video_encode_queue" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" provisional="true" platform="provisional" supported="vulkan">
-            <require>
-                <enum value="12"                                                name="VK_EXT_VIDEO_ENCODE_H264_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_video_encode_h264&quot;"              name="VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="1" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="2" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="3" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="4" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="5" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="6" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="7" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="8" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="9" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="10" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="11" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="12" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="13" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="16" extends="VkVideoCodecOperationFlagBitsKHR"    name="VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
+        <extension name="VK_KHR_video_encode_h264" number="39" type="device" depends="VK_KHR_video_encode_queue" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" supported="vulkan" ratified="vulkan">
+            <require>
+                <enum value="14"                                                name="VK_KHR_VIDEO_ENCODE_H264_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_video_encode_h264&quot;"              name="VK_KHR_VIDEO_ENCODE_H264_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR"/>
+                <enum offset="1" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR"/>
+                <enum offset="2" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR"/>
+                <enum offset="3" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_KHR"/>
+                <enum offset="4" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_KHR"/>
+                <enum offset="5" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_KHR"/>
+                <enum offset="6" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_KHR"/>
+                <enum offset="7" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_KHR"/>
+                <enum offset="8" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_KHR"/>
+                <enum offset="9" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_KHR"/>
+                <enum offset="10" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_KHR"/>
+                <enum offset="11" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_KHR"/>
+                <enum offset="12" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_KHR"/>
+                <enum offset="13" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_KHR"/>
+                <enum bitpos="16" extends="VkVideoCodecOperationFlagBitsKHR"    name="VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_KHR"/>
 
-                <type name="VkVideoEncodeH264CapabilityFlagBitsEXT"/>
-                <type name="VkVideoEncodeH264CapabilityFlagsEXT"/>
-                <type name="VkVideoEncodeH264StdFlagBitsEXT"/>
-                <type name="VkVideoEncodeH264StdFlagsEXT"/>
-                <type name="VkVideoEncodeH264CapabilitiesEXT"/>
-                <type name="VkVideoEncodeH264QualityLevelPropertiesEXT"/>
-                <type name="VkVideoEncodeH264SessionCreateInfoEXT"/>
-                <type name="VkVideoEncodeH264SessionParametersCreateInfoEXT"/>
-                <type name="VkVideoEncodeH264SessionParametersAddInfoEXT"/>
-                <type name="VkVideoEncodeH264SessionParametersGetInfoEXT"/>
-                <type name="VkVideoEncodeH264SessionParametersFeedbackInfoEXT"/>
-                <type name="VkVideoEncodeH264PictureInfoEXT"/>
-                <type name="VkVideoEncodeH264DpbSlotInfoEXT"/>
-                <type name="VkVideoEncodeH264NaluSliceInfoEXT"/>
-                <type name="VkVideoEncodeH264ProfileInfoEXT"/>
-                <type name="VkVideoEncodeH264RateControlInfoEXT"/>
-                <type name="VkVideoEncodeH264RateControlFlagBitsEXT"/>
-                <type name="VkVideoEncodeH264RateControlFlagsEXT"/>
-                <type name="VkVideoEncodeH264RateControlLayerInfoEXT"/>
-                <type name="VkVideoEncodeH264QpEXT"/>
-                <type name="VkVideoEncodeH264FrameSizeEXT"/>
-                <type name="VkVideoEncodeH264GopRemainingFrameInfoEXT"/>
-            </require>
-        </extension>
-        <extension name="VK_EXT_video_encode_h265" number="40" type="device" depends="VK_KHR_video_encode_queue" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" provisional="true" platform="provisional" supported="vulkan">
-            <require>
-                <enum value="12"                                             name="VK_EXT_VIDEO_ENCODE_H265_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_video_encode_h265&quot;"           name="VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="1" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="2" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="3" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="4" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="5" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="6" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="7" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="9" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="10" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="11" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="12" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="13" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="14" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="17" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
+                <type name="VkVideoEncodeH264CapabilityFlagBitsKHR"/>
+                <type name="VkVideoEncodeH264CapabilityFlagsKHR"/>
+                <type name="VkVideoEncodeH264StdFlagBitsKHR"/>
+                <type name="VkVideoEncodeH264StdFlagsKHR"/>
+                <type name="VkVideoEncodeH264CapabilitiesKHR"/>
+                <type name="VkVideoEncodeH264QualityLevelPropertiesKHR"/>
+                <type name="VkVideoEncodeH264SessionCreateInfoKHR"/>
+                <type name="VkVideoEncodeH264SessionParametersCreateInfoKHR"/>
+                <type name="VkVideoEncodeH264SessionParametersAddInfoKHR"/>
+                <type name="VkVideoEncodeH264SessionParametersGetInfoKHR"/>
+                <type name="VkVideoEncodeH264SessionParametersFeedbackInfoKHR"/>
+                <type name="VkVideoEncodeH264PictureInfoKHR"/>
+                <type name="VkVideoEncodeH264DpbSlotInfoKHR"/>
+                <type name="VkVideoEncodeH264NaluSliceInfoKHR"/>
+                <type name="VkVideoEncodeH264ProfileInfoKHR"/>
+                <type name="VkVideoEncodeH264RateControlInfoKHR"/>
+                <type name="VkVideoEncodeH264RateControlFlagBitsKHR"/>
+                <type name="VkVideoEncodeH264RateControlFlagsKHR"/>
+                <type name="VkVideoEncodeH264RateControlLayerInfoKHR"/>
+                <type name="VkVideoEncodeH264QpKHR"/>
+                <type name="VkVideoEncodeH264FrameSizeKHR"/>
+                <type name="VkVideoEncodeH264GopRemainingFrameInfoKHR"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_video_encode_h265" number="40" type="device" depends="VK_KHR_video_encode_queue" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" supported="vulkan" ratified="vulkan">
+            <require>
+                <enum value="14"                                             name="VK_KHR_VIDEO_ENCODE_H265_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_video_encode_h265&quot;"           name="VK_KHR_VIDEO_ENCODE_H265_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_KHR"/>
+                <enum offset="1" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR"/>
+                <enum offset="2" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR"/>
+                <enum offset="3" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_KHR"/>
+                <enum offset="4" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_KHR"/>
+                <enum offset="5" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_KHR"/>
+                <enum offset="6" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_KHR"/>
+                <enum offset="7" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_KHR"/>
+                <enum offset="9" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_KHR"/>
+                <enum offset="10" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_KHR"/>
+                <enum offset="11" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_KHR"/>
+                <enum offset="12" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_KHR"/>
+                <enum offset="13" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_KHR"/>
+                <enum offset="14" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_KHR"/>
+                <enum bitpos="17" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_KHR"/>
 
-                <type name="VkVideoEncodeH265CapabilityFlagBitsEXT"/>
-                <type name="VkVideoEncodeH265CapabilityFlagsEXT"/>
-                <type name="VkVideoEncodeH265StdFlagBitsEXT"/>
-                <type name="VkVideoEncodeH265StdFlagsEXT"/>
-                <type name="VkVideoEncodeH265CtbSizeFlagBitsEXT"/>
-                <type name="VkVideoEncodeH265CtbSizeFlagsEXT"/>
-                <type name="VkVideoEncodeH265TransformBlockSizeFlagBitsEXT"/>
-                <type name="VkVideoEncodeH265TransformBlockSizeFlagsEXT"/>
-                <type name="VkVideoEncodeH265CapabilitiesEXT"/>
-                <type name="VkVideoEncodeH265SessionCreateInfoEXT"/>
-                <type name="VkVideoEncodeH265QualityLevelPropertiesEXT"/>
-                <type name="VkVideoEncodeH265SessionParametersCreateInfoEXT"/>
-                <type name="VkVideoEncodeH265SessionParametersAddInfoEXT"/>
-                <type name="VkVideoEncodeH265SessionParametersGetInfoEXT"/>
-                <type name="VkVideoEncodeH265SessionParametersFeedbackInfoEXT"/>
-                <type name="VkVideoEncodeH265PictureInfoEXT"/>
-                <type name="VkVideoEncodeH265DpbSlotInfoEXT"/>
-                <type name="VkVideoEncodeH265NaluSliceSegmentInfoEXT"/>
-                <type name="VkVideoEncodeH265ProfileInfoEXT"/>
-                <type name="VkVideoEncodeH265RateControlInfoEXT"/>
-                <type name="VkVideoEncodeH265RateControlFlagBitsEXT"/>
-                <type name="VkVideoEncodeH265RateControlFlagsEXT"/>
-                <type name="VkVideoEncodeH265RateControlLayerInfoEXT"/>
-                <type name="VkVideoEncodeH265QpEXT"/>
-                <type name="VkVideoEncodeH265FrameSizeEXT"/>
-                <type name="VkVideoEncodeH265GopRemainingFrameInfoEXT"/>
+                <type name="VkVideoEncodeH265CapabilityFlagBitsKHR"/>
+                <type name="VkVideoEncodeH265CapabilityFlagsKHR"/>
+                <type name="VkVideoEncodeH265StdFlagBitsKHR"/>
+                <type name="VkVideoEncodeH265StdFlagsKHR"/>
+                <type name="VkVideoEncodeH265CtbSizeFlagBitsKHR"/>
+                <type name="VkVideoEncodeH265CtbSizeFlagsKHR"/>
+                <type name="VkVideoEncodeH265TransformBlockSizeFlagBitsKHR"/>
+                <type name="VkVideoEncodeH265TransformBlockSizeFlagsKHR"/>
+                <type name="VkVideoEncodeH265CapabilitiesKHR"/>
+                <type name="VkVideoEncodeH265SessionCreateInfoKHR"/>
+                <type name="VkVideoEncodeH265QualityLevelPropertiesKHR"/>
+                <type name="VkVideoEncodeH265SessionParametersCreateInfoKHR"/>
+                <type name="VkVideoEncodeH265SessionParametersAddInfoKHR"/>
+                <type name="VkVideoEncodeH265SessionParametersGetInfoKHR"/>
+                <type name="VkVideoEncodeH265SessionParametersFeedbackInfoKHR"/>
+                <type name="VkVideoEncodeH265PictureInfoKHR"/>
+                <type name="VkVideoEncodeH265DpbSlotInfoKHR"/>
+                <type name="VkVideoEncodeH265NaluSliceSegmentInfoKHR"/>
+                <type name="VkVideoEncodeH265ProfileInfoKHR"/>
+                <type name="VkVideoEncodeH265RateControlInfoKHR"/>
+                <type name="VkVideoEncodeH265RateControlFlagBitsKHR"/>
+                <type name="VkVideoEncodeH265RateControlFlagsKHR"/>
+                <type name="VkVideoEncodeH265RateControlLayerInfoKHR"/>
+                <type name="VkVideoEncodeH265QpKHR"/>
+                <type name="VkVideoEncodeH265FrameSizeKHR"/>
+                <type name="VkVideoEncodeH265GopRemainingFrameInfoKHR"/>
             </require>
         </extension>
         <extension name="VK_KHR_video_decode_h264" number="41" type="device" depends="VK_KHR_video_decode_queue" author="KHR" contact="peter.fang@amd.com" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="8"                                              name="VK_KHR_VIDEO_DECODE_H264_SPEC_VERSION"/>
+                <enum value="9"                                              name="VK_KHR_VIDEO_DECODE_H264_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_video_decode_h264&quot;"           name="VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR"/>
                 <enum offset="1" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR"/>
@@ -17348,9 +17745,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkAcquireNextImage2KHR"/>
             </require>
         </extension>
-        <extension name="VK_EXT_validation_flags" number="62" type="instance" author="GOOGLE" contact="Tobin Ehlis @tobine" specialuse="debugging" supported="vulkan" deprecatedby="VK_EXT_validation_features">
+        <extension name="VK_EXT_validation_flags" number="62" type="instance" author="GOOGLE" contact="Tobin Ehlis @tobine" specialuse="debugging" supported="vulkan" deprecatedby="VK_EXT_layer_settings">
             <require>
-                <enum value="2"                                                 name="VK_EXT_VALIDATION_FLAGS_SPEC_VERSION"/>
+                <enum value="3"                                                 name="VK_EXT_VALIDATION_FLAGS_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_validation_flags&quot;"               name="VK_EXT_VALIDATION_FLAGS_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                      name="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"/>
                 <type name="VkValidationFlagsEXT"/>
@@ -17826,7 +18223,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPipelineViewportSwizzleStateCreateFlagsNV"/>
             </require>
         </extension>
-        <extension name="VK_EXT_discard_rectangles" number="100" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_discard_rectangles" number="100" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan,vulkansc" ratified="vulkan">
             <require>
                 <enum value="2"                                             name="VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_discard_rectangles&quot;"         name="VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME"/>
@@ -17962,10 +18359,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkSubpassEndInfoKHR"/>
             </require>
         </extension>
-        <extension name="VK_IMG_extension_111" number="111" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled">
+        <extension name="VK_IMG_relaxed_line_rasterization" number="111" type="device" depends="(VK_KHR_get_physical_device_properties2,VK_VERSION_1_1)" author="IMG" contact="James Fitzpatrick @jamesfitzpatrick" supported="vulkan" specialuse="glemulation">
             <require>
-                <enum value="0"                                             name="VK_IMG_EXTENSION_111_SPEC_VERSION"/>
-                <enum value="&quot;VK_IMG_extension_111&quot;"              name="VK_IMG_EXTENSION_111_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_IMG_RELAXED_LINE_RASTERIZATION_SPEC_VERSION"/>
+                <enum value="&quot;VK_IMG_relaxed_line_rasterization&quot;" name="VK_IMG_RELAXED_LINE_RASTERIZATION_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RELAXED_LINE_RASTERIZATION_FEATURES_IMG"/>
+                <type name="VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG"/>
             </require>
         </extension>
         <extension name="VK_KHR_shared_presentable_image" number="112" type="device" depends="VK_KHR_swapchain+VK_KHR_get_surface_capabilities2+(VK_KHR_get_physical_device_properties2,VK_VERSION_1_1)" author="KHR" contact="Alon Or-bach @alonorbach" supported="vulkan,vulkansc" ratified="vulkan,vulkansc">
@@ -18332,10 +18731,18 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum bitpos="25" extends="VkBufferUsageFlagBits2KHR"       name="VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX"/>
             </require>
         </extension>
-        <extension name="VK_AMD_extension_136" number="136" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled">
+        <extension name="VK_KHR_extension_136" number="136" type="device" author="KHR" contact="Tobias Hector @tobski" supported="disabled">
             <require>
-                <enum value="0"                                             name="VK_AMD_EXTENSION_136_SPEC_VERSION"/>
-                <enum value="&quot;VK_AMD_extension_136&quot;"              name="VK_AMD_EXTENSION_136_EXTENSION_NAME"/>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_136_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_136&quot;"              name="VK_KHR_EXTENSION_136_EXTENSION_NAME"/>
+                <enum bitpos="28" extends="VkBufferUsageFlagBits"           name="VK_BUFFER_USAGE_RESERVED_28_BIT_KHR"/>
+                <enum bitpos="29" extends="VkBufferUsageFlagBits"           name="VK_BUFFER_USAGE_RESERVED_29_BIT_KHR"/>
+                <enum bitpos="30" extends="VkBufferUsageFlagBits"           name="VK_BUFFER_USAGE_RESERVED_30_BIT_KHR"/>
+            </require>
+            <require depends="VK_KHR_maintenance5">
+                <enum bitpos="28" extends="VkBufferUsageFlagBits2KHR"       name="VK_BUFFER_USAGE_2_RESERVED_28_BIT_KHR"/>
+                <enum bitpos="29" extends="VkBufferUsageFlagBits2KHR"       name="VK_BUFFER_USAGE_2_RESERVED_29_BIT_KHR"/>
+                <enum bitpos="30" extends="VkBufferUsageFlagBits2KHR"       name="VK_BUFFER_USAGE_2_RESERVED_30_BIT_KHR"/>
             </require>
         </extension>
         <extension name="VK_AMD_mixed_attachment_samples" number="137" type="device" author="AMD" contact="Matthaeus G. Chajdas @anteru" supported="vulkan">
@@ -19058,7 +19465,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdDrawIndexedIndirectCountKHR"/>
             </require>
         </extension>
-        <extension name="VK_EXT_filter_cubic" number="171" type="device" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_filter_cubic" number="171" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan,vulkansc">
             <require>
                 <enum value="3"                                             name="VK_EXT_FILTER_CUBIC_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_filter_cubic&quot;"               name="VK_EXT_FILTER_CUBIC_EXTENSION_NAME"/>
@@ -19070,7 +19477,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkFilterCubicImageViewImageFormatPropertiesEXT"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_render_pass_shader_resolve" number="172" type="device" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="vulkan">
+        <extension name="VK_QCOM_render_pass_shader_resolve" number="172" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="4"                                                 name="VK_QCOM_RENDER_PASS_SHADER_RESOLVE_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_render_pass_shader_resolve&quot;"    name="VK_QCOM_RENDER_PASS_SHADER_RESOLVE_EXTENSION_NAME"/>
@@ -19078,13 +19485,13 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum bitpos="3" extends="VkSubpassDescriptionFlagBits"         name="VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_173" number="173" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
+        <extension name="VK_QCOM_extension_173" number="173" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_173_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_173&quot;"             name="VK_QCOM_EXTENSION_173_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_174" number="174" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled">
+        <extension name="VK_QCOM_extension_174" number="174" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_174_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_174&quot;"             name="VK_QCOM_EXTENSION_174_EXTENSION_NAME"/>
@@ -19176,11 +19583,15 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPipelineCompilerControlCreateInfoAMD"/>
             </require>
         </extension>
-        <extension name="VK_EXT_calibrated_timestamps" number="185" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="EXT" contact="Daniel Rakos @drakos-amd" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_calibrated_timestamps" number="185" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="EXT" contact="Daniel Rakos @drakos-amd" promotedto="VK_KHR_calibrated_timestamps" supported="vulkan,vulkansc">
             <require>
                 <enum value="2"                                             name="VK_EXT_CALIBRATED_TIMESTAMPS_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_calibrated_timestamps&quot;"      name="VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT"/>
+                <enum extends="VkStructureType"                             name="VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT" alias="VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR"/>
+                <enum extends="VkTimeDomainKHR"                             name="VK_TIME_DOMAIN_DEVICE_EXT"                       alias="VK_TIME_DOMAIN_DEVICE_KHR"/>
+                <enum extends="VkTimeDomainKHR"                             name="VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT"              alias="VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR"/>
+                <enum extends="VkTimeDomainKHR"                             name="VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT"          alias="VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR"/>
+                <enum extends="VkTimeDomainKHR"                             name="VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT"    alias="VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR"/>
                 <type name="VkTimeDomainEXT"/>
                 <type name="VkCalibratedTimestampInfoEXT"/>
                 <command name="vkGetPhysicalDeviceCalibrateableTimeDomainsEXT"/>
@@ -19203,7 +19614,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </extension>
         <extension name="VK_KHR_video_decode_h265" number="188" type="device" depends="VK_KHR_video_decode_queue" author="KHR" contact="peter.fang@amd.com" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="7"                                             name="VK_KHR_VIDEO_DECODE_H265_SPEC_VERSION"/>
+                <enum value="8"                                             name="VK_KHR_VIDEO_DECODE_H265_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_video_decode_h265&quot;"          name="VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR"/>
                 <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR"/>
@@ -19246,13 +19657,13 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkDeviceMemoryOverallocationCreateInfoAMD"/>
             </require>
         </extension>
-        <extension name="VK_EXT_vertex_attribute_divisor" number="191" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="NV" contact="Vikram Kushwaha @vkushwaha" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_vertex_attribute_divisor" number="191" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="NV" contact="Vikram Kushwaha @vkushwaha" supported="vulkan,vulkansc" promotedto="VK_KHR_vertex_attribute_divisor">
             <require>
-                <enum value="3"                                         name="VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_vertex_attribute_divisor&quot;"   name="VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT"/>
-                <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT"/>
-                <enum offset="2" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT"/>
+                <enum value="3"                                           name="VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_vertex_attribute_divisor&quot;" name="VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT"/>
+                <enum            extends="VkStructureType"                name="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT" alias="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR"/>
+                <enum            extends="VkStructureType"                name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR"/>
                 <type name="VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT"/>
                 <type name="VkVertexInputBindingDivisorDescriptionEXT"/>
                 <type name="VkPipelineVertexInputDivisorStateCreateInfoEXT"/>
@@ -19719,10 +20130,19 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_AMD_extension_232&quot;"              name="VK_AMD_EXTENSION_232_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_AMD_extension_233" number="233" author="AMD" contact="Martin Dinkov @mdinkov" supported="disabled">
+        <extension name="VK_KHR_dynamic_rendering_local_read" number="233" type="device" depends="VK_KHR_dynamic_rendering" author="AMD" contact="Tobias Hector @tobski" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                             name="VK_AMD_EXTENSION_233_SPEC_VERSION"/>
-                <enum value="&quot;VK_AMD_extension_233&quot;"              name="VK_AMD_EXTENSION_233_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_dynamic_rendering_local_read&quot;" name="VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkImageLayout"                    name="VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR"/>
+                <command name="vkCmdSetRenderingAttachmentLocationsKHR"/>
+                <command name="vkCmdSetRenderingInputAttachmentIndicesKHR"/>
+                <type name="VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR"/>
+                <type name="VkRenderingAttachmentLocationInfoKHR"/>
+                <type name="VkRenderingInputAttachmentIndexInfoKHR"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR"/>
+                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR"/>
+                <enum offset="2" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR"/>
             </require>
         </extension>
         <extension name="VK_AMD_extension_234" number="234" author="AMD" contact="Martin Dinkov @mdinkov" supported="disabled">
@@ -19739,10 +20159,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT"/>
             </require>
         </extension>
-        <extension name="VK_AMD_extension_236" number="236" author="AMD" contact="Martin Dinkov @mdinkov" supported="disabled">
+        <extension name="VK_KHR_shader_quad_control" number="236" type="device" depends="VK_VERSION_1_1+VK_KHR_vulkan_memory_model+VK_KHR_shader_maximal_reconvergence" author="KHR" contact="Tobias Hector @tobski" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                             name="VK_AMD_EXTENSION_236_SPEC_VERSION"/>
-                <enum value="&quot;VK_AMD_extension_236&quot;"              name="VK_AMD_EXTENSION_236_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_KHR_SHADER_QUAD_CONTROL_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_shader_quad_control&quot;"          name="VK_KHR_SHADER_QUAD_CONTROL_EXTENSION_NAME"/>
+                <type                                                       name="VkPhysicalDeviceShaderQuadControlFeaturesKHR"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR"/>
             </require>
         </extension>
         <extension name="VK_KHR_spirv_1_4" number="237" type="device" depends="VK_VERSION_1_1+VK_KHR_shader_float_controls" author="KHR" contact="Jesse Hall @critsec" supported="vulkan" promotedto="VK_VERSION_1_2" ratified="vulkan">
@@ -19861,9 +20283,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkImageStencilUsageCreateInfoEXT"/>
             </require>
         </extension>
-        <extension name="VK_EXT_validation_features" number="248" type="instance" author="LUNARG" contact="Karl Schultz @karl-lunarg" specialuse="debugging" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_validation_features" number="248" type="instance" author="LUNARG" contact="Karl Schultz @karl-lunarg" specialuse="debugging" supported="vulkan,vulkansc" deprecatedby="VK_EXT_layer_settings">
             <require>
-                <enum value="5"                                             name="VK_EXT_VALIDATION_FEATURES_SPEC_VERSION"/>
+                <enum value="6"                                             name="VK_EXT_VALIDATION_FEATURES_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_validation_features&quot;"        name="VK_EXT_VALIDATION_FEATURES_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT"/>
                 <type name="VkValidationFeaturesEXT"/>
@@ -20031,14 +20453,14 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum bitpos="19" extends="VkImageCreateFlagBits"           name="VK_IMAGE_CREATE_RESERVED_19_BIT_EXT"/>
             </require>
         </extension>
-        <extension name="VK_EXT_line_rasterization" number="260" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="EXT" contact="Jeff Bolz @jeffbolznv" specialuse="cadsupport" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_line_rasterization" number="260" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="EXT" contact="Jeff Bolz @jeffbolznv" specialuse="cadsupport" supported="vulkan,vulkansc" promotedto="VK_KHR_line_rasterization">
             <require>
                 <enum value="1"                                             name="VK_EXT_LINE_RASTERIZATION_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_line_rasterization&quot;"         name="VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT"/>
-                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT"/>
-                <enum offset="2" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT"/>
-                <enum offset="0" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_LINE_STIPPLE_EXT"/>
+                <enum extends="VkStructureType"                             name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR"/>
+                <enum extends="VkStructureType"                             name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT" alias="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR"/>
+                <enum extends="VkStructureType"                             name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR"/>
+                <enum extends="VkDynamicState"                              name="VK_DYNAMIC_STATE_LINE_STIPPLE_EXT" alias="VK_DYNAMIC_STATE_LINE_STIPPLE_KHR"/>
                 <type name="VkPhysicalDeviceLineRasterizationFeaturesEXT"/>
                 <type name="VkPhysicalDeviceLineRasterizationPropertiesEXT"/>
                 <type name="VkPipelineRasterizationLineStateCreateInfoEXT"/>
@@ -20081,12 +20503,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_BRCM_extension_265&quot;"             name="VK_BRCM_EXTENSION_265_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_index_type_uint8" number="266" type="device" author="EXT" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" contact="Piers Daniell @pdaniell-nv" supported="vulkan,vulkansc">
+        <extension name="VK_EXT_index_type_uint8" number="266" type="device" author="EXT" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" contact="Piers Daniell @pdaniell-nv" supported="vulkan,vulkansc" promotedto="VK_KHR_index_type_uint8">
             <require>
                 <enum value="1"                                             name="VK_EXT_INDEX_TYPE_UINT8_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_index_type_uint8&quot;"           name="VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT"/>
-                <enum offset="0" extends="VkIndexType"                      name="VK_INDEX_TYPE_UINT8_EXT"/>
+                <enum extends="VkStructureType"                             name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR"/>
+                <enum extends="VkIndexType"                                 name="VK_INDEX_TYPE_UINT8_EXT" alias="VK_INDEX_TYPE_UINT8_KHR"/>
                 <type name="VkPhysicalDeviceIndexTypeUint8FeaturesEXT"/>
             </require>
         </extension>
@@ -20363,9 +20785,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_render_pass_transform" number="283" type="device" depends="VK_KHR_swapchain+VK_KHR_surface" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_render_pass_transform" number="283" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
-                <enum value="3"                                             name="VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION"/>
+                <enum value="4"                                             name="VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_render_pass_transform&quot;"     name="VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM"/>
                 <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM"/>
@@ -20571,43 +20993,43 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_KHR_extension_299&quot;"          name="VK_KHR_EXTENSION_299_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_video_encode_queue" number="300"  type="device" depends="VK_KHR_video_queue+VK_KHR_synchronization2" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" provisional="true" platform="provisional" supported="vulkan" ratified="vulkan">
+        <extension name="VK_KHR_video_encode_queue" number="300"  type="device" depends="VK_KHR_video_queue+VK_KHR_synchronization2" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="10"                                        name="VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION"/>
+                <enum value="12"                                        name="VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_video_encode_queue&quot;"     name="VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME"/>
                 <!-- VkPipelineStageFlagBits bitpos="27" is reserved by this extension, but not used -->
-                <enum bitpos="27" extends="VkPipelineStageFlagBits2"    name="VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS" />
-                <enum bitpos="37" extends="VkAccessFlagBits2"           name="VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS" />
-                <enum bitpos="38" extends="VkAccessFlagBits2"           name="VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="2" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="3" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_CAPABILITIES_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="4" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="5" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="6" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="7" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="8" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="9" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="10" extends="VkStructureType"             name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="6" extends="VkQueueFlagBits"              name="VK_QUEUE_VIDEO_ENCODE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="1" extends="VkVideoCodingControlFlagBitsKHR" name="VK_VIDEO_CODING_CONTROL_ENCODE_RATE_CONTROL_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="2" extends="VkVideoCodingControlFlagBitsKHR" name="VK_VIDEO_CODING_CONTROL_ENCODE_QUALITY_LEVEL_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="15" extends="VkBufferUsageFlagBits"       name="VK_BUFFER_USAGE_VIDEO_ENCODE_DST_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="16" extends="VkBufferUsageFlagBits"       name="VK_BUFFER_USAGE_VIDEO_ENCODE_SRC_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="13" extends="VkImageUsageFlagBits"        name="VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="14" extends="VkImageUsageFlagBits"        name="VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="15" extends="VkImageUsageFlagBits"        name="VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="27" extends="VkFormatFeatureFlagBits"     name="VK_FORMAT_FEATURE_VIDEO_ENCODE_INPUT_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="28" extends="VkFormatFeatureFlagBits"     name="VK_FORMAT_FEATURE_VIDEO_ENCODE_DPB_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="1" extends="VkVideoSessionCreateFlagBitsKHR" name="VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_PARAMETER_OPTIMIZATIONS_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="0" extends="VkImageLayout"                name="VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="1" extends="VkImageLayout"                name="VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="2" extends="VkImageLayout"                name="VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum offset="0" extends="VkQueryType"                  name="VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
+                <enum bitpos="27" extends="VkPipelineStageFlagBits2"    name="VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR"/>
+                <enum bitpos="37" extends="VkAccessFlagBits2"           name="VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR"/>
+                <enum bitpos="38" extends="VkAccessFlagBits2"           name="VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR"/>
+                <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR"/>
+                <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR"/>
+                <enum offset="2" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR"/>
+                <enum offset="3" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_CAPABILITIES_KHR"/>
+                <enum offset="4" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR"/>
+                <enum offset="5" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR"/>
+                <enum offset="6" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR"/>
+                <enum offset="7" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR"/>
+                <enum offset="8" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR"/>
+                <enum offset="9" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR"/>
+                <enum offset="10" extends="VkStructureType"             name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR"/>
+                <enum bitpos="6" extends="VkQueueFlagBits"              name="VK_QUEUE_VIDEO_ENCODE_BIT_KHR"/>
+                <enum bitpos="1" extends="VkVideoCodingControlFlagBitsKHR" name="VK_VIDEO_CODING_CONTROL_ENCODE_RATE_CONTROL_BIT_KHR"/>
+                <enum bitpos="2" extends="VkVideoCodingControlFlagBitsKHR" name="VK_VIDEO_CODING_CONTROL_ENCODE_QUALITY_LEVEL_BIT_KHR"/>
+                <enum bitpos="15" extends="VkBufferUsageFlagBits"       name="VK_BUFFER_USAGE_VIDEO_ENCODE_DST_BIT_KHR"/>
+                <enum bitpos="16" extends="VkBufferUsageFlagBits"       name="VK_BUFFER_USAGE_VIDEO_ENCODE_SRC_BIT_KHR"/>
+                <enum bitpos="13" extends="VkImageUsageFlagBits"        name="VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR"/>
+                <enum bitpos="14" extends="VkImageUsageFlagBits"        name="VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR"/>
+                <enum bitpos="15" extends="VkImageUsageFlagBits"        name="VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR"/>
+                <enum bitpos="27" extends="VkFormatFeatureFlagBits"     name="VK_FORMAT_FEATURE_VIDEO_ENCODE_INPUT_BIT_KHR"/>
+                <enum bitpos="28" extends="VkFormatFeatureFlagBits"     name="VK_FORMAT_FEATURE_VIDEO_ENCODE_DPB_BIT_KHR"/>
+                <enum bitpos="1" extends="VkVideoSessionCreateFlagBitsKHR" name="VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_PARAMETER_OPTIMIZATIONS_BIT_KHR"/>
+                <enum offset="0" extends="VkImageLayout"                name="VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR"/>
+                <enum offset="1" extends="VkImageLayout"                name="VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR"/>
+                <enum offset="2" extends="VkImageLayout"                name="VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR"/>
+                <enum offset="0" extends="VkQueryType"                  name="VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR"/>
                 <enum offset="0" extends="VkQueryResultStatusKHR" dir="-" name="VK_QUERY_RESULT_STATUS_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_KHR"/>
 
-                <enum offset="0" extends="VkResult" dir="-"             name="VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
+                <enum offset="0" extends="VkResult" dir="-"             name="VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR"/>
 
                 <type name="VkVideoEncodeFlagsKHR"/>
                 <type name="VkVideoEncodeInfoKHR"/>
@@ -20645,8 +21067,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdEncodeVideoKHR"/>
             </require>
             <require depends="VK_KHR_format_feature_flags2">
-                <enum bitpos="27" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="28" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
+                <enum bitpos="27" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR"/>
+                <enum bitpos="28" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR"/>
             </require>
         </extension>
         <extension name="VK_NV_device_diagnostics_config" number="301" type="device" depends="VK_KHR_get_physical_device_properties2" author="NV" contact="Kedarnath Thangudu @kthangudu" supported="vulkan">
@@ -20661,47 +21083,71 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkDeviceDiagnosticsConfigFlagBitsNV"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_render_pass_store_ops" number="302" type="device" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="vulkan">
+        <extension name="VK_QCOM_render_pass_store_ops" number="302" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="2"                                             name="VK_QCOM_RENDER_PASS_STORE_OPS_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_render_pass_store_ops&quot;"     name="VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME"/>
                 <enum extends="VkAttachmentStoreOp"                         name="VK_ATTACHMENT_STORE_OP_NONE_QCOM" alias="VK_ATTACHMENT_STORE_OP_NONE"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_303" number="303" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
+        <extension name="VK_QCOM_extension_303" number="303" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_303_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_303&quot;"             name="VK_QCOM_EXTENSION_303_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_304" number="304" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
+        <extension name="VK_QCOM_extension_304" number="304" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_304_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_304&quot;"             name="VK_QCOM_EXTENSION_304_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_305" number="305" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled">
+        <extension name="VK_QCOM_extension_305" number="305" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_305_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_305&quot;"             name="VK_QCOM_EXTENSION_305_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_306" number="306" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled">
+        <extension name="VK_QCOM_extension_306" number="306" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_306_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_306&quot;"             name="VK_QCOM_EXTENSION_306_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_307" number="307" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled">
+        <extension name="VK_QCOM_extension_307" number="307" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_307_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_307&quot;"             name="VK_QCOM_EXTENSION_307_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_NV_extension_308" number="308" type="device" author="NV" contact="Tristan Lorach @tlorach" supported="disabled">
-            <require>
-                <enum value="0"                                             name="VK_NV_EXTENSION_308_SPEC_VERSION"/>
-                <enum value="&quot;VK_NV_extension_308&quot;"               name="VK_NV_EXTENSION_308_EXTENSION_NAME"/>
+        <extension name="VK_NV_cuda_kernel_launch" number="308" type="device" author="NV" contact="Tristan Lorach @tlorach" supported="vulkan" provisional="true">
+            <require>
+                <enum value="2"                                             name="VK_NV_CUDA_KERNEL_LAUNCH_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_cuda_kernel_launch&quot;"          name="VK_NV_CUDA_KERNEL_LAUNCH_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV"/>
+                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV"/>
+                <enum offset="2" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV"/>
+                <enum offset="3" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV"/>
+                <enum offset="4" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV"/>
+                <enum offset="0" extends="VkObjectType"                     name="VK_OBJECT_TYPE_CUDA_MODULE_NV"/>
+                <enum offset="1" extends="VkObjectType"                     name="VK_OBJECT_TYPE_CUDA_FUNCTION_NV"/>
+                <type name="VkCudaModuleNV"/>
+                <type name="VkCudaFunctionNV"/>
+                <type name="VkCudaModuleCreateInfoNV"/>
+                <type name="VkCudaFunctionCreateInfoNV"/>
+                <type name="VkCudaLaunchInfoNV"/>
+                <type name="VkPhysicalDeviceCudaKernelLaunchFeaturesNV"/>
+                <type name="VkPhysicalDeviceCudaKernelLaunchPropertiesNV"/>
+                <command name="vkCreateCudaModuleNV"/>
+                <command name="vkGetCudaModuleCacheNV"/>
+                <command name="vkCreateCudaFunctionNV"/>
+                <command name="vkDestroyCudaModuleNV"/>
+                <command name="vkDestroyCudaFunctionNV"/>
+                <command name="vkCmdCudaLaunchKernelNV"/>
+            </require>
+            <require depends="VK_EXT_debug_report">
+                <enum offset="0" extends="VkDebugReportObjectTypeEXT"       name="VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT"/>
+                <enum offset="1" extends="VkDebugReportObjectTypeEXT"       name="VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT"/>
             </require>
         </extension>
         <extension name="VK_KHR_object_refresh" number="309" type="device" author="KHR" contact="Aidan Fabius @afabius" supported="vulkansc" ratified="vulkansc">
@@ -20717,7 +21163,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkGetPhysicalDeviceRefreshableObjectTypesKHR"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_310" number="310" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
+        <extension name="VK_QCOM_extension_310" number="310" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                             name="VK_QCOM_EXTENSION_310_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_310&quot;"             name="VK_QCOM_EXTENSION_310_EXTENSION_NAME"/>
@@ -21134,9 +21580,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPhysicalDeviceFragmentDensityMap2PropertiesEXT"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_rotated_copy_commands" number="334" type="device" depends="VK_KHR_swapchain+VK_KHR_copy_commands2" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_rotated_copy_commands" number="334" type="device" depends="VK_KHR_copy_commands2" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
-                <enum value="1"                                             name="VK_QCOM_ROTATED_COPY_COMMANDS_SPEC_VERSION"/>
+                <enum value="2"                                             name="VK_QCOM_ROTATED_COPY_COMMANDS_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_rotated_copy_commands&quot;"     name="VK_QCOM_ROTATED_COPY_COMMANDS_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM"/>
                 <type name="VkCopyCommandTransformInfoQCOM"/>
@@ -21220,7 +21666,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkGetImageSubresourceLayout2EXT"/>
             </require>
         </extension>
-        <extension name="VK_EXT_attachment_feedback_loop_layout" number="340" type="device" depends="VK_KHR_get_physical_device_properties2" author="EXT" contact="Joshua Ashton @Joshua-Ashton" supported="vulkan">
+        <extension name="VK_EXT_attachment_feedback_loop_layout" number="340" type="device" depends="VK_KHR_get_physical_device_properties2" author="EXT" contact="Joshua Ashton @Joshua-Ashton" supported="vulkan" ratified="vulkan">
             <require>
                 <enum value="2"                                                    name="VK_EXT_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_attachment_feedback_loop_layout&quot;"   name="VK_EXT_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_EXTENSION_NAME"/>
@@ -21839,7 +22285,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPhysicalDeviceShaderTileImagePropertiesEXT"/>
             </require>
         </extension>
-        <extension name="VK_EXT_opacity_micromap" number="397" type="device"  depends="VK_KHR_acceleration_structure+VK_KHR_synchronization2" author="EXT" contact="Christoph Kubisch @pixeljetstream, Eric Werness" supported="vulkan">
+        <extension name="VK_EXT_opacity_micromap" number="397" type="device"  depends="VK_KHR_acceleration_structure+VK_KHR_synchronization2" author="EXT" contact="Christoph Kubisch @pixeljetstream, Eric Werness" supported="vulkan" ratified="vulkan">
             <require>
                 <enum value="2"                                             name="VK_EXT_OPACITY_MICROMAP_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_opacity_micromap&quot;"           name="VK_EXT_OPACITY_MICROMAP_EXTENSION_NAME"/>
@@ -21933,11 +22379,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_JUICE_extension_400&quot;"        name="VK_JUICE_EXTENSION_400_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_load_store_op_none" number="401" author="EXT" type="device" contact="Shahbaz Youssefi @syoussefi" supported="vulkan">
+        <extension name="VK_EXT_load_store_op_none" number="401" author="EXT" type="device" contact="Shahbaz Youssefi @syoussefi" supported="vulkan" promotedto="VK_KHR_load_store_op_none" ratified="vulkan">
             <require>
                 <enum value="1"                                         name="VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_load_store_op_none&quot;"          name="VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME"/>
-                <enum offset="0" extends="VkAttachmentLoadOp" name="VK_ATTACHMENT_LOAD_OP_NONE_EXT"/>
+                <enum value="&quot;VK_EXT_load_store_op_none&quot;"     name="VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME"/>
+                <enum extends="VkAttachmentLoadOp" name="VK_ATTACHMENT_LOAD_OP_NONE_EXT" alias="VK_ATTACHMENT_LOAD_OP_NONE_KHR"/>
                 <enum extends="VkAttachmentStoreOp" name="VK_ATTACHMENT_STORE_OP_NONE_EXT" alias="VK_ATTACHMENT_STORE_OP_NONE"/>
             </require>
         </extension>
@@ -21961,10 +22407,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </extension>
         <extension name="VK_HUAWEI_cluster_culling_shader" number="405" type="device" depends="VK_KHR_get_physical_device_properties2" author="HUAWEI" contact="Yuchang Wang @richard_Wang2" supported="vulkan">
             <require>
-                <enum value="2"                                              name="VK_HUAWEI_CLUSTER_CULLING_SHADER_SPEC_VERSION"/>
+                <enum value="3"                                              name="VK_HUAWEI_CLUSTER_CULLING_SHADER_SPEC_VERSION"/>
                 <enum value="&quot;VK_HUAWEI_cluster_culling_shader&quot;"   name="VK_HUAWEI_CLUSTER_CULLING_SHADER_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI"/>
                 <enum offset="1" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI"/>
+                <enum offset="2" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI"/>
                 <enum bitpos="41" extends="VkPipelineStageFlagBits2"         name="VK_PIPELINE_STAGE_2_CLUSTER_CULLING_SHADER_BIT_HUAWEI"/>
                 <enum bitpos="19" extends="VkShaderStageFlagBits"            name="VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI"/>
                 <enum bitpos="13" extends="VkQueryPipelineStatisticFlagBits" name="VK_QUERY_PIPELINE_STATISTIC_CLUSTER_CULLING_SHADER_INVOCATIONS_BIT_HUAWEI"/>
@@ -21972,6 +22419,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdDrawClusterIndirectHUAWEI"/>
                 <type name="VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI"/>
                 <type name="VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI"/>
+                <type name="VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI"/>
             </require>
         </extension>
         <extension name="VK_HUAWEI_extension_406" number="406" author="HUAWEI" contact="Hueilong Wang @wyvernathuawei" supported="disabled">
@@ -22061,16 +22509,28 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkPhysicalDeviceShaderCorePropertiesARM"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_417" number="417" author="KHR" contact="Kevin Petit @kpet" supported="disabled">
+        <extension name="VK_KHR_shader_subgroup_rotate" number="417" author="KHR" contact="Kevin Petit @kpet" type="device" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_417_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_417&quot;"          name="VK_KHR_EXTENSION_417_EXTENSION_NAME"/>
+                <enum value="2"                                         name="VK_KHR_SHADER_SUBGROUP_ROTATE_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_shader_subgroup_rotate&quot;" name="VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR"/>
+                <enum bitpos="9" extends="VkSubgroupFeatureFlagBits"    name="VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR"/>
+                <enum bitpos="10" extends="VkSubgroupFeatureFlagBits"   name="VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR"/>
+                <type name="VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR"/>
             </require>
         </extension>
-        <extension name="VK_ARM_extension_418" number="418" author="ARM" contact="Kevin Petit @kpet" supported="disabled">
+        <extension name="VK_ARM_scheduling_controls" number="418" author="ARM" contact="Kevin Petit @kpet" type="device" depends="VK_ARM_shader_core_builtins" supported="vulkan">
             <require>
-                <enum value="0"                                         name="VK_ARM_EXTENSION_418_SPEC_VERSION"/>
-                <enum value="&quot;VK_ARM_extension_418&quot;"          name="VK_ARM_EXTENSION_418_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_ARM_SCHEDULING_CONTROLS_SPEC_VERSION"/>
+                <enum value="&quot;VK_ARM_scheduling_controls&quot;"    name="VK_ARM_SCHEDULING_CONTROLS_EXTENSION_NAME"/>
+                <enum extends="VkStructureType" offset="0"              name="VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM"/>
+                <enum extends="VkStructureType" offset="1"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM"/>
+                <enum extends="VkStructureType" offset="2"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM"/>
+                <type name="VkDeviceQueueShaderCoreControlCreateInfoARM"/>
+                <type name="VkPhysicalDeviceSchedulingControlsFeaturesARM"/>
+                <type name="VkPhysicalDeviceSchedulingControlsPropertiesARM"/>
+                <type name="VkPhysicalDeviceSchedulingControlsFlagsARM"/>
+                <type name="VkPhysicalDeviceSchedulingControlsFlagBitsARM"/>
             </require>
         </extension>
         <extension name="VK_EXT_image_sliced_view_of_3d" number="419" depends="VK_KHR_maintenance1+VK_KHR_get_physical_device_properties2" author="EXT" contact="Mike Blumenkrantz @zmike" specialuse="d3demulation" type="device" supported="vulkan">
@@ -22128,10 +22588,20 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_ARM_extension_424&quot;"          name="VK_ARM_EXTENSION_424_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_ARM_extension_425" number="425" author="ARM" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="disabled">
+        <extension name="VK_ARM_render_pass_striped" number="425" type="device" depends="VK_KHR_get_physical_device_properties2,VK_KHR_synchronization2" author="ARM" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="vulkan">
             <require>
-                <enum value="0"                                         name="VK_ARM_EXTENSION_425_SPEC_VERSION"/>
-                <enum value="&quot;VK_ARM_extension_425&quot;"          name="VK_ARM_EXTENSION_425_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_ARM_RENDER_PASS_STRIPED_SPEC_VERSION"/>
+                <enum value="&quot;VK_ARM_render_pass_striped&quot;"    name="VK_ARM_RENDER_PASS_STRIPED_EXTENSION_NAME"/>
+                <enum offset="0"  extends="VkStructureType"                 name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM"/>
+                <enum offset="1"  extends="VkStructureType"                 name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM"/>
+                <enum offset="2"  extends="VkStructureType"                 name="VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM"/>
+                <enum offset="3"  extends="VkStructureType"                 name="VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM"/>
+                <enum offset="4"  extends="VkStructureType"                 name="VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM"/>
+                <type name="VkPhysicalDeviceRenderPassStripedFeaturesARM"/>
+                <type name="VkPhysicalDeviceRenderPassStripedPropertiesARM"/>
+                <type name="VkRenderPassStripeBeginInfoARM"/>
+                <type name="VkRenderPassStripeInfoARM"/>
+                <type name="VkRenderPassStripeSubmitInfoARM"/>
             </require>
         </extension>
         <extension name="VK_QCOM_fragment_density_map_offset" number="426" type="device" depends="VK_KHR_get_physical_device_properties2+VK_EXT_fragment_density_map" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
@@ -22230,10 +22700,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_GOOGLE_surfaceless_query&quot;"   name="VK_GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_435" number="435" author="KHR" contact="Alan Baker @alan-baker" supported="disabled">
+        <extension name="VK_KHR_shader_maximal_reconvergence" number="435" type="device" author="KHR" depends="VK_VERSION_1_1" contact="Alan Baker @alan-baker" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_435_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_435&quot;"          name="VK_KHR_EXTENSION_435_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_KHR_SHADER_MAXIMAL_RECONVERGENCE_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_shader_maximal_reconvergence&quot;"          name="VK_KHR_SHADER_MAXIMAL_RECONVERGENCE_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR"/>
+                <type name="VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR"/>
             </require>
         </extension>
         <extension name="VK_EXT_application_parameters" number="436" type="instance" author="EXT" contact="Daniel Koch @dgkoch" supported="vulkansc">
@@ -22264,7 +22736,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_SEC_extension_439&quot;"          name="VK_SEC_EXTENSION_439_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_440" number="440" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
+        <extension name="VK_QCOM_extension_440" number="440" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                         name="VK_QCOM_EXTENSION_440_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_440&quot;"         name="VK_QCOM_EXTENSION_440_EXTENSION_NAME"/>
@@ -22272,7 +22744,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum bitpos="1" extends="VkDeviceQueueCreateFlagBits"  name="VK_DEVICE_QUEUE_CREATE_RESERVED_1_BIT_QCOM"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_image_processing" number="441" type="device" depends="VK_KHR_format_feature_flags2" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_image_processing" number="441" type="device" depends="VK_KHR_format_feature_flags2" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="1"                                         name="VK_QCOM_IMAGE_PROCESSING_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_image_processing&quot;"      name="VK_QCOM_IMAGE_PROCESSING_EXTENSION_NAME"/>
@@ -22357,7 +22829,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_SEC_extension_451&quot;"          name="VK_SEC_EXTENSION_451_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_nested_command_buffer" number="452" type="device" depends="VK_KHR_get_physical_device_properties2" author="EXT" contact="Piers Daniell @pdaniell-nv" supported="vulkan">
+        <extension name="VK_EXT_nested_command_buffer" number="452" type="device" depends="VK_KHR_get_physical_device_properties2" author="EXT" contact="Piers Daniell @pdaniell-nv" supported="vulkan" ratified="vulkan">
             <require>
                 <enum value="1"                                         name="VK_EXT_NESTED_COMMAND_BUFFER_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_nested_command_buffer&quot;"  name="VK_EXT_NESTED_COMMAND_BUFFER_EXTENSION_NAME"/>
@@ -22394,13 +22866,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_GOOGLE_extension_455&quot;"       name="VK_GOOGLE_EXTENSION_455_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_extended_dynamic_state3" number="456" type="device" depends="VK_KHR_get_physical_device_properties2" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan">
+        <extension name="VK_EXT_extended_dynamic_state3" number="456" type="device" depends="VK_KHR_get_physical_device_properties2" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan" ratified="vulkan">
             <require>
                 <enum value="2"                                              name="VK_EXT_EXTENDED_DYNAMIC_STATE_3_SPEC_VERSION"/>
                 <enum value="&quot;VK_EXT_extended_dynamic_state3&quot;"     name="VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT"/>
                 <enum offset="1" extends="VkStructureType"                   name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_PROPERTIES_EXT"/>
-                <enum offset="2" extends="VkDynamicState"                    name="VK_DYNAMIC_STATE_TESSELLATION_DOMAIN_ORIGIN_EXT"/>
                 <enum offset="3" extends="VkDynamicState"                    name="VK_DYNAMIC_STATE_DEPTH_CLAMP_ENABLE_EXT"/>
                 <enum offset="4" extends="VkDynamicState"                    name="VK_DYNAMIC_STATE_POLYGON_MODE_EXT"/>
                 <enum offset="5" extends="VkDynamicState"                    name="VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT"/>
@@ -22411,21 +22882,10 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum offset="10" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_COLOR_BLEND_ENABLE_EXT"/>
                 <enum offset="11" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_COLOR_BLEND_EQUATION_EXT"/>
                 <enum offset="12" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_COLOR_WRITE_MASK_EXT"/>
-                <enum offset="13" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_RASTERIZATION_STREAM_EXT"/>
-                <enum offset="14" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_CONSERVATIVE_RASTERIZATION_MODE_EXT"/>
-                <enum offset="15" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_EXTRA_PRIMITIVE_OVERESTIMATION_SIZE_EXT"/>
-                <enum offset="16" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_DEPTH_CLIP_ENABLE_EXT"/>
-                <enum offset="17" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_ENABLE_EXT"/>
-                <enum offset="18" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_COLOR_BLEND_ADVANCED_EXT"/>
-                <enum offset="19" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_PROVOKING_VERTEX_MODE_EXT"/>
-                <enum offset="20" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_LINE_RASTERIZATION_MODE_EXT"/>
-                <enum offset="21" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT"/>
-                <enum offset="22" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT"/>
                 <type name="VkPhysicalDeviceExtendedDynamicState3FeaturesEXT"/>
                 <type name="VkPhysicalDeviceExtendedDynamicState3PropertiesEXT"/>
                 <type name="VkColorBlendEquationEXT"/>
                 <type name="VkColorBlendAdvancedEXT"/>
-                <command name="vkCmdSetTessellationDomainOriginEXT"/>
                 <command name="vkCmdSetDepthClampEnableEXT"/>
                 <command name="vkCmdSetPolygonModeEXT"/>
                 <command name="vkCmdSetRasterizationSamplesEXT"/>
@@ -22436,15 +22896,45 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdSetColorBlendEnableEXT"/>
                 <command name="vkCmdSetColorBlendEquationEXT"/>
                 <command name="vkCmdSetColorWriteMaskEXT"/>
+            </require>
+            <require depends="VK_KHR_maintenance2,VK_VERSION_1_1">
+                <enum offset="2" extends="VkDynamicState"                    name="VK_DYNAMIC_STATE_TESSELLATION_DOMAIN_ORIGIN_EXT"/>
+                <command name="vkCmdSetTessellationDomainOriginEXT"/>
+            </require>
+            <require depends="VK_EXT_transform_feedback">
+                <enum offset="13" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_RASTERIZATION_STREAM_EXT"/>
                 <command name="vkCmdSetRasterizationStreamEXT"/>
+            </require>
+            <require depends="VK_EXT_conservative_rasterization">
+                <enum offset="14" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_CONSERVATIVE_RASTERIZATION_MODE_EXT"/>
+                <enum offset="15" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_EXTRA_PRIMITIVE_OVERESTIMATION_SIZE_EXT"/>
                 <command name="vkCmdSetConservativeRasterizationModeEXT"/>
                 <command name="vkCmdSetExtraPrimitiveOverestimationSizeEXT"/>
+            </require>
+            <require depends="VK_EXT_depth_clip_enable">
+                <enum offset="16" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_DEPTH_CLIP_ENABLE_EXT"/>
                 <command name="vkCmdSetDepthClipEnableEXT"/>
+            </require>
+            <require depends="VK_EXT_sample_locations">
+                <enum offset="17" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_ENABLE_EXT"/>
                 <command name="vkCmdSetSampleLocationsEnableEXT"/>
+            </require>
+            <require depends="VK_EXT_blend_operation_advanced">
+                <enum offset="18" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_COLOR_BLEND_ADVANCED_EXT"/>
                 <command name="vkCmdSetColorBlendAdvancedEXT"/>
+            </require>
+            <require depends="VK_EXT_provoking_vertex">
+                <enum offset="19" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_PROVOKING_VERTEX_MODE_EXT"/>
                 <command name="vkCmdSetProvokingVertexModeEXT"/>
+            </require>
+            <require depends="VK_EXT_line_rasterization">
+                <enum offset="20" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_LINE_RASTERIZATION_MODE_EXT"/>
+                <enum offset="21" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT"/>
                 <command name="vkCmdSetLineRasterizationModeEXT"/>
                 <command name="vkCmdSetLineStippleEnableEXT"/>
+            </require>
+            <require depends="VK_EXT_depth_clip_control">
+                <enum offset="22" extends="VkDynamicState"                   name="VK_DYNAMIC_STATE_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE_EXT"/>
                 <command name="vkCmdSetDepthClipNegativeOneToOneEXT"/>
             </require>
             <require depends="VK_NV_clip_space_w_scaling">
@@ -22683,8 +23173,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdBindIndexBuffer2KHR"/>
                 <command name="vkGetRenderingAreaGranularityKHR"/>
                 <type name="VkRenderingAreaInfoKHR"/>
-                <command name ="vkGetDeviceImageSubresourceLayoutKHR"/>
-                <command name ="vkGetImageSubresourceLayout2KHR"/>
+                <command name="vkGetDeviceImageSubresourceLayoutKHR"/>
+                <command name="vkGetImageSubresourceLayout2KHR"/>
                 <type name="VkDeviceImageSubresourceInfoKHR"/>
                 <type name="VkImageSubresource2KHR"/>
                 <type name="VkSubresourceLayout2KHR"/>
@@ -22845,6 +23335,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <require>
                 <enum value="0"                                         name="VK_AMD_EXTENSION_479_SPEC_VERSION"/>
                 <enum value="&quot;VK_AMD_extension_479&quot;"          name="VK_AMD_EXTENSION_479_EXTENSION_NAME"/>
+                <enum bitpos="32" extends="VkPipelineCreateFlagBits2KHR" name="VK_PIPELINE_CREATE_2_RESERVED_32_BIT_KHR"/>
             </require>
         </extension>
         <extension name="VK_EXT_extension_480" number="480" author="EXT" contact="Daniel Stone" supported="disabled">
@@ -22925,15 +23416,31 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdSetColorBlendEnableEXT"/>
                 <command name="vkCmdSetColorBlendEquationEXT"/>
                 <command name="vkCmdSetColorWriteMaskEXT"/>
+            </require>
+            <require depends="VK_EXT_transform_feedback">
                 <command name="vkCmdSetRasterizationStreamEXT"/>
+            </require>
+            <require depends="VK_EXT_conservative_rasterization">
                 <command name="vkCmdSetConservativeRasterizationModeEXT"/>
                 <command name="vkCmdSetExtraPrimitiveOverestimationSizeEXT"/>
+            </require>
+            <require depends="VK_EXT_depth_clip_enable">
                 <command name="vkCmdSetDepthClipEnableEXT"/>
+            </require>
+            <require depends="VK_EXT_sample_locations">
                 <command name="vkCmdSetSampleLocationsEnableEXT"/>
+            </require>
+            <require depends="VK_EXT_blend_operation_advanced">
                 <command name="vkCmdSetColorBlendAdvancedEXT"/>
+            </require>
+            <require depends="VK_EXT_provoking_vertex">
                 <command name="vkCmdSetProvokingVertexModeEXT"/>
+            </require>
+            <require depends="VK_EXT_line_rasterization">
                 <command name="vkCmdSetLineRasterizationModeEXT"/>
                 <command name="vkCmdSetLineStippleEnableEXT"/>
+            </require>
+            <require depends="VK_EXT_depth_clip_control">
                 <command name="vkCmdSetDepthClipNegativeOneToOneEXT"/>
             </require>
             <require depends="VK_EXT_subgroup_size_control,VK_VERSION_1_3">
@@ -22984,7 +23491,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum bitpos="31" extends="VkPipelineCreateFlagBits2KHR" name="VK_PIPELINE_CREATE_2_RESERVED_31_BIT_KHR"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_tile_properties" number="485" type="device" depends="VK_KHR_get_physical_device_properties2" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_tile_properties" number="485" type="device" depends="VK_KHR_get_physical_device_properties2" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="1"                                               name="VK_QCOM_TILE_PROPERTIES_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_tile_properties&quot;"             name="VK_QCOM_TILE_PROPERTIES_EXTENSION_NAME"/>
@@ -23021,7 +23528,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_488&quot;"          name="VK_EXT_EXTENSION_488_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_multiview_per_view_viewports" number="489" type="device" author="QCOM" contact="Jeff Leger @jackohound" depends="VK_KHR_get_physical_device_properties2" supported="vulkan">
+        <extension name="VK_QCOM_multiview_per_view_viewports" number="489" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" depends="VK_KHR_get_physical_device_properties2" supported="vulkan">
             <require>
                 <enum value="1"                                                name="VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_multiview_per_view_viewports&quot;" name="VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME"/>
@@ -23121,10 +23628,14 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_496&quot;"              name="VK_EXT_EXTENSION_496_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_EXT_extension_497" number="497" author="EXT" contact="Christophe Riccio @christophe" type="device" supported="disabled">
+        <extension name="VK_EXT_layer_settings" number="497" author="EXT" contact="Christophe Riccio @christophe" type="instance" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                             name="VK_EXT_EXTENSION_497_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_extension_497&quot;"              name="VK_EXT_EXTENSION_497_EXTENSION_NAME"/>
+                <enum value="2"                                             name="VK_EXT_LAYER_SETTINGS_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_layer_settings&quot;"              name="VK_EXT_LAYER_SETTINGS_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT"/>
+                <type name="VkLayerSettingsCreateInfoEXT"/>
+                <type name="VkLayerSettingEXT"/>
+                <type name="VkLayerSettingTypeEXT"/>
             </require>
         </extension>
         <extension name="VK_ARM_shader_core_builtins" number="498" author="ARM" contact="Kevin Petit @kpet" type="device" depends="VK_KHR_get_physical_device_properties2" supported="vulkan">
@@ -23183,9 +23694,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_505&quot;"              name="VK_EXT_EXTENSION_505_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_NV_low_latency2" number="506" author="NV" contact="Charles Hansen @cshansen" type="device" supported="vulkan">
+        <extension name="VK_NV_low_latency2" number="506" author="NV" depends="VK_VERSION_1_2,VK_KHR_timeline_semaphore" contact="Charles Hansen @cshansen" type="device" supported="vulkan">
             <require>
-                <enum value="1"                                             name="VK_NV_LOW_LATENCY_2_SPEC_VERSION"/>
+                <enum value="2"                                             name="VK_NV_LOW_LATENCY_2_SPEC_VERSION"/>
                 <enum value="&quot;VK_NV_low_latency2&quot;"                name="VK_NV_LOW_LATENCY_2_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV"/>
                 <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV"/>
@@ -23252,7 +23763,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_MESA_extension_510&quot;"             name="VK_MESA_EXTENSION_510_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_multiview_per_view_render_areas" number="511" type="device" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_multiview_per_view_render_areas" number="511" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="1"                                                   name="VK_QCOM_MULTIVIEW_PER_VIEW_RENDER_AREAS_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_multiview_per_view_render_areas&quot;" name="VK_QCOM_MULTIVIEW_PER_VIEW_RENDER_AREAS_EXTENSION_NAME"/>
@@ -23268,10 +23779,22 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_512&quot;"              name="VK_EXT_EXTENSION_512_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_513" number="513" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" type="device" supported="disabled">
+        <extension name="VK_KHR_video_decode_av1" number="513" author="KHR" depends="VK_KHR_video_decode_queue" contact="Daniel Rakos @aqnuep" type="device" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                             name="VK_KHR_EXTENSION_513_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_513&quot;"              name="VK_KHR_EXTENSION_513_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_KHR_VIDEO_DECODE_AV1_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_video_decode_av1&quot;"           name="VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR"/>
+                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR"/>
+                <enum offset="3" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR"/>
+                <enum offset="4" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR"/>
+                <enum offset="5" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR"/>
+                <enum bitpos="2" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR"/>
+                <enum name="VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR"/>
+                <type name="VkVideoDecodeAV1ProfileInfoKHR"/>
+                <type name="VkVideoDecodeAV1CapabilitiesKHR"/>
+                <type name="VkVideoDecodeAV1SessionParametersCreateInfoKHR"/>
+                <type name="VkVideoDecodeAV1PictureInfoKHR"/>
+                <type name="VkVideoDecodeAV1DpbSlotInfoKHR"/>
             </require>
         </extension>
         <extension name="VK_KHR_extension_514" number="514" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" type="device" supported="disabled">
@@ -23286,19 +23809,26 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_KHR_extension_515&quot;"              name="VK_KHR_EXTENSION_515_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_516" number="516" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" type="device" supported="disabled">
+        <extension name="VK_KHR_video_maintenance1" number="516" author="KHR" contact="Daniel Rakos @aqnuep" type="device" depends="VK_KHR_video_queue" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                             name="VK_KHR_EXTENSION_516_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_516&quot;"              name="VK_KHR_EXTENSION_516_EXTENSION_NAME"/>
-                <enum bitpos="20" extends="VkImageCreateFlagBits"           name="VK_IMAGE_CREATE_RESERVED_20_BIT_KHR"/>
-                <enum bitpos="6" extends="VkBufferCreateFlagBits"           name="VK_BUFFER_CREATE_RESERVED_6_BIT_KHR"/>
+                <enum value="1"                                             name="VK_KHR_VIDEO_MAINTENANCE_1_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_video_maintenance1&quot;"         name="VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR"/>
+                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR"/>
+                <enum bitpos="20" extends="VkImageCreateFlagBits"           name="VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR"/>
+                <enum bitpos="6" extends="VkBufferCreateFlagBits"           name="VK_BUFFER_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR"/>
+                <enum bitpos="2" extends="VkVideoSessionCreateFlagBitsKHR"  name="VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR"/>
+                <type name="VkPhysicalDeviceVideoMaintenance1FeaturesKHR"/>
+                <type name="VkVideoInlineQueryInfoKHR"/>
             </require>
         </extension>
-        <extension name="VK_EXT_extension_517" number="517" author="EXT" contact="Daniel Story" supported="disabled">
+        <extension name="VK_NV_per_stage_descriptor_set" number="517" depends="VK_KHR_maintenance6" type="device" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan">
             <require>
-                <enum value="0"                                                name="VK_EXT_EXTENSION_517_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_extension_517&quot;"                 name="VK_EXT_EXTENSION_517_EXTENSION_NAME"/>
-                <enum bitpos="6" extends="VkDescriptorSetLayoutCreateFlagBits" name="VK_DESCRIPTOR_SET_LAYOUT_CREATE_RESERVED_6_BIT_EXT"/>
+                <enum value="1"                                                name="VK_NV_PER_STAGE_DESCRIPTOR_SET_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_per_stage_descriptor_set&quot;"       name="VK_NV_PER_STAGE_DESCRIPTOR_SET_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                     name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV"/>
+                <enum bitpos="6" extends="VkDescriptorSetLayoutCreateFlagBits" name="VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV"/>
+                <type name="VkPhysicalDevicePerStageDescriptorSetFeaturesNV"/>
             </require>
         </extension>
         <extension name="VK_MESA_extension_518" number="518" author="MESA" contact="Dave Airlie @airlied" type="device" supported="disabled">
@@ -23307,7 +23837,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_MESA_extension_518&quot;"             name="VK_MESA_EXTENSION_518_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_image_processing2" number="519" type="device" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan" depends="VK_QCOM_image_processing">
+        <extension name="VK_QCOM_image_processing2" number="519" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan" depends="VK_QCOM_image_processing">
             <require>
                 <enum value="1"                                                   name="VK_QCOM_IMAGE_PROCESSING_2_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_image_processing2&quot;"               name="VK_QCOM_IMAGE_PROCESSING_2_EXTENSION_NAME"/>
@@ -23320,7 +23850,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkBlockMatchWindowCompareModeQCOM"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_filter_cubic_weights" number="520" type="device" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan" depends="VK_EXT_filter_cubic">
+        <extension name="VK_QCOM_filter_cubic_weights" number="520" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan" depends="VK_EXT_filter_cubic">
             <require>
                 <enum value="1"                                             name="VK_QCOM_FILTER_CUBIC_WEIGHTS_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_filter_cubic_weights&quot;"      name="VK_QCOM_FILTER_CUBIC_WEIGHTS_EXTENSION_NAME"/>
@@ -23333,7 +23863,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkCubicFilterWeightsQCOM"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_ycbcr_degamma" number="521" type="device" author="QCOM" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_ycbcr_degamma" number="521" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="1"                                                   name="VK_QCOM_YCBCR_DEGAMMA_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_ycbcr_degamma&quot;"                   name="VK_QCOM_YCBCR_DEGAMMA_EXTENSION_NAME"/>
@@ -23343,7 +23873,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <type name="VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_filter_cubic_clamp" number="522" type="device" author="QCOM" depends="(VK_EXT_filter_cubic)+(VK_VERSION_1_2,VK_EXT_sampler_filter_minmax)" contact="Jeff Leger @jackohound" supported="vulkan">
+        <extension name="VK_QCOM_filter_cubic_clamp" number="522" type="device" author="QCOM" depends="(VK_EXT_filter_cubic)+(VK_VERSION_1_2,VK_EXT_sampler_filter_minmax)" contact="Matthew Netsch @mnetsch" supported="vulkan">
             <require>
                 <enum value="1"                                                   name="VK_QCOM_FILTER_CUBIC_CLAMP_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_filter_cubic_clamp&quot;"              name="VK_QCOM_FILTER_CUBIC_CLAMP_EXTENSION_NAME"/>
@@ -23374,16 +23904,25 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <command name="vkCmdSetAttachmentFeedbackLoopEnableEXT"/>
             </require>
         </extension>
-        <extension name="VK_EXT_extension_526" number="526" author="EXT" contact="Shahbaz Youssefi @syoussefi" supported="disabled">
+        <extension name="VK_KHR_vertex_attribute_divisor" number="526" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="KHR" contact="Shahbaz Youssefi @syoussefi" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_EXT_EXTENSION_526_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_extension_526&quot;"          name="VK_EXT_EXTENSION_526_EXTENSION_NAME"/>
+                <enum value="1"                                            name="VK_KHR_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_vertex_attribute_divisor&quot;"  name="VK_KHR_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                 name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR"/>
+                <enum offset="1" extends="VkStructureType" extnumber="191" name="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR"/>
+                <enum offset="2" extends="VkStructureType" extnumber="191" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR"/>
+                <type name="VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR"/>
+                <type name="VkVertexInputBindingDivisorDescriptionKHR"/>
+                <type name="VkPipelineVertexInputDivisorStateCreateInfoKHR"/>
+                <type name="VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR"/>
             </require>
         </extension>
-        <extension name="VK_EXT_extension_527" number="527" author="EXT" contact="Shahbaz Youssefi @syoussefi" supported="disabled">
+        <extension name="VK_KHR_load_store_op_none" number="527" author="KHR" type="device" contact="Shahbaz Youssefi @syoussefi" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_EXT_EXTENSION_527_SPEC_VERSION"/>
-                <enum value="&quot;VK_EXT_extension_527&quot;"          name="VK_EXT_EXTENSION_527_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_KHR_LOAD_STORE_OP_NONE_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_load_store_op_none&quot;"     name="VK_KHR_LOAD_STORE_OP_NONE_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkAttachmentLoadOp" extnumber="401" name="VK_ATTACHMENT_LOAD_OP_NONE_KHR"/>
+                <enum extends="VkAttachmentStoreOp" name="VK_ATTACHMENT_STORE_OP_NONE_KHR" alias="VK_ATTACHMENT_STORE_OP_NONE"/>
             </require>
         </extension>
         <extension name="VK_EXT_extension_528" number="528" author="EXT" contact="Shahbaz Youssefi @syoussefi" supported="disabled">
@@ -23392,10 +23931,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_528&quot;"          name="VK_EXT_EXTENSION_528_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_529" number="529" author="KHR" contact="Graeme Leese @gnl21" supported="disabled">
+        <extension name="VK_KHR_shader_float_controls2" number="529" type="device" depends="VK_VERSION_1_1+VK_KHR_shader_float_controls" author="KHR" contact="Graeme Leese @gnl21" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_529_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_529&quot;"          name="VK_KHR_EXTENSION_529_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_KHR_SHADER_FLOAT_CONTROLS_2_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_shader_float_controls2&quot;" name="VK_KHR_SHADER_FLOAT_CONTROLS_2_EXTENSION_NAME"/>
+                <type name="VkPhysicalDeviceShaderFloatControls2FeaturesKHR"/>
+                <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR"/>
             </require>
         </extension>
         <extension name="VK_QNX_external_memory_screen_buffer" number="530" type="device" author="QNX" depends="((VK_KHR_sampler_ycbcr_conversion+VK_KHR_external_memory+VK_KHR_dedicated_allocation),VK_VERSION_1_1)+VK_EXT_queue_family_foreign" platform="screen" contact="Mike Gorchak @mgorchak-blackberry, Aaron Ruby @aruby-blackberry" supported="vulkan,vulkansc">
@@ -23437,19 +23978,31 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_533&quot;"          name="VK_EXT_EXTENSION_533_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_534" number="534" author="KHR" contact="Piers Daniell @pdaniell-nv" supported="disabled">
+        <extension name="VK_KHR_index_type_uint8" number="534" type="device" author="KHR" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" contact="Piers Daniell @pdaniell-nv" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_534_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_534&quot;"          name="VK_KHR_EXTENSION_534_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_KHR_INDEX_TYPE_UINT8_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_index_type_uint8&quot;"           name="VK_KHR_INDEX_TYPE_UINT8_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType" extnumber="266"  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR"/>
+                <enum offset="0" extends="VkIndexType" extnumber="266"      name="VK_INDEX_TYPE_UINT8_KHR"/>
+                <type name="VkPhysicalDeviceIndexTypeUint8FeaturesKHR"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_535" number="535" author="KHR" contact="Piers Daniell @pdaniell-nv" supported="disabled">
+        <extension name="VK_KHR_line_rasterization" number="535" type="device" author="KHR" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" contact="Piers Daniell @pdaniell-nv" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_535_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_535&quot;"          name="VK_KHR_EXTENSION_535_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_KHR_LINE_RASTERIZATION_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_line_rasterization&quot;"         name="VK_KHR_LINE_RASTERIZATION_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType" extnumber="260"  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR"/>
+                <enum offset="1" extends="VkStructureType" extnumber="260"  name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR"/>
+                <enum offset="2" extends="VkStructureType" extnumber="260"  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR"/>
+                <enum offset="0" extends="VkDynamicState"  extnumber="260"  name="VK_DYNAMIC_STATE_LINE_STIPPLE_KHR"/>
+                <type name="VkPhysicalDeviceLineRasterizationFeaturesKHR"/>
+                <type name="VkPhysicalDeviceLineRasterizationPropertiesKHR"/>
+                <type name="VkPipelineRasterizationLineStateCreateInfoKHR"/>
+                <type name="VkLineRasterizationModeKHR"/>
+                <command name="vkCmdSetLineStippleKHR"/>
             </require>
         </extension>
-        <extension name="VK_QCOM_extension_536" number="536" type="device" author="QCOM" contact="Jeff Leger @jackohound" supported="disabled">
+        <extension name="VK_QCOM_extension_536" number="536" type="device" author="QCOM" contact="Matthew Netsch @mnetsch" supported="disabled">
             <require>
                 <enum value="0"                                                   name="VK_QCOM_EXTENSION_536_SPEC_VERSION"/>
                 <enum value="&quot;VK_QCOM_extension_536&quot;"                   name="VK_QCOM_EXTENSION_536_EXTENSION_NAME"/>
@@ -23497,22 +24050,59 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_EXT_extension_543&quot;"          name="VK_EXT_EXTENSION_543_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_544" number="544" author="KHR" contact="Daniel Rakos @aqnuep" supported="disabled">
+        <extension name="VK_KHR_calibrated_timestamps" number="544" type="device" depends="VK_KHR_get_physical_device_properties2,VK_VERSION_1_1" author="KHR" contact="Daniel Rakos @aqnuep" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_544_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_544&quot;"          name="VK_KHR_EXTENSION_544_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_KHR_CALIBRATED_TIMESTAMPS_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_calibrated_timestamps&quot;"  name="VK_KHR_CALIBRATED_TIMESTAMPS_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType" extnumber="185" name="VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR"/>
+                <type name="VkTimeDomainKHR"/>
+                <type name="VkCalibratedTimestampInfoKHR"/>
+                <command name="vkGetPhysicalDeviceCalibrateableTimeDomainsKHR"/>
+                <command name="vkGetCalibratedTimestampsKHR"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_545" number="545" author="KHR" contact="Kevin Petit @kpet" supported="disabled">
+        <extension name="VK_KHR_shader_expect_assume" number="545" type="device" author="KHR" depends="VK_KHR_get_physical_device_properties2" contact="Kevin Petit @kpet" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_545_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_545&quot;"          name="VK_KHR_EXTENSION_545_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_KHR_SHADER_EXPECT_ASSUME_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_shader_expect_assume&quot;"       name="VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR"/>
+                <type name="VkPhysicalDeviceShaderExpectAssumeFeaturesKHR"/>
             </require>
         </extension>
-        <extension name="VK_KHR_extension_546" number="546" author="KHR" contact="Jon Leech @oddhack" supported="disabled">
+        <extension name="VK_KHR_maintenance6" number="546" type="device" depends="VK_VERSION_1_1" author="KHR" contact="Jon Leech @oddhack" supported="vulkan" ratified="vulkan">
             <require>
-                <enum value="0"                                         name="VK_KHR_EXTENSION_546_SPEC_VERSION"/>
-                <enum value="&quot;VK_KHR_extension_546&quot;"          name="VK_KHR_EXTENSION_546_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_KHR_MAINTENANCE_6_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_maintenance6&quot;"           name="VK_KHR_MAINTENANCE_6_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR"/>
+                <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR"/>
+                <enum offset="2" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR"/>
+                <enum offset="3" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR"/>
+                <enum offset="4" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR"/>
+                <type name="VkPhysicalDeviceMaintenance6FeaturesKHR"/>
+                <type name="VkPhysicalDeviceMaintenance6PropertiesKHR"/>
+                <type name="VkBindMemoryStatusKHR"/>
+                <type name="VkBindDescriptorSetsInfoKHR"/>
+                <type name="VkPushConstantsInfoKHR"/>
+                <command name="vkCmdBindDescriptorSets2KHR"/>
+                <command name="vkCmdPushConstants2KHR"/>
+            </require>
+            <require depends="VK_KHR_push_descriptor">
+                <enum offset="5" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR"/>
+                <enum offset="6" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR"/>
+                <type name="VkPushDescriptorSetInfoKHR"/>
+                <type name="VkPushDescriptorSetWithTemplateInfoKHR"/>
+                <command name="vkCmdPushDescriptorSet2KHR"/>
+                <command name="vkCmdPushDescriptorSetWithTemplate2KHR"/>
+            </require>
+            <require depends="VK_EXT_descriptor_buffer">
+                <enum offset="7" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT"/>
+                <enum offset="8" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT"/>
+                <type name="VkSetDescriptorBufferOffsetsInfoEXT"/>
+                <type name="VkBindDescriptorBufferEmbeddedSamplersInfoEXT"/>
+                <command name="vkCmdSetDescriptorBufferOffsets2EXT"/>
+                <command name="vkCmdBindDescriptorBufferEmbeddedSamplers2EXT"/>
+            </require>
+            <require comment="Individual APIs with dependencies on specific versions/extensions should get their own require blocks with depends= attribute set appropriately">
             </require>
         </extension>
         <extension name="VK_NV_descriptor_pool_overallocation" number="547" type="device" author="NV" depends="VK_VERSION_1_1" contact="Piers Daniell @pdaniell-nv" supported="vulkan">
@@ -23534,7 +24124,91 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <extension name="VK_NV_extension_549" number="549" author="NV" contact="Piers Daniell @pdaniell-nv" supported="disabled">
             <require>
                 <enum value="0"                                         name="VK_NV_EXTENSION_549_SPEC_VERSION"/>
-                <enum value="&quot;VK_NV_extension_549&quot;"          name="VK_NV_EXTENSION_549_EXTENSION_NAME"/>
+                <enum value="&quot;VK_NV_extension_549&quot;"           name="VK_NV_EXTENSION_549_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_550" number="550" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                         name="VK_NV_EXTENSION_550_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_550&quot;"           name="VK_NV_EXTENSION_550_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_551" number="551" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                         name="VK_NV_EXTENSION_551_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_551&quot;"           name="VK_NV_EXTENSION_551_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_552" number="552" author="NV" contact="Russell Chou @russellcnv" supported="disabled">
+            <require>
+                <enum value="0"                                         name="VK_NV_EXTENSION_552_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_552&quot;"           name="VK_NV_EXTENSION_552_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_553" number="553" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" type="device" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_553_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_553&quot;"              name="VK_KHR_EXTENSION_553_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_554" number="554" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" type="device" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_554_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_554&quot;"              name="VK_KHR_EXTENSION_554_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_IMG_extension_555" number="555" author="IMG" contact="Jarred Davies" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_IMG_EXTENSION_555_SPEC_VERSION"/>
+                <enum value="&quot;VK_IMG_extension_555&quot;"              name="VK_IMG_EXTENSION_555_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_556" number="556" type="device" author="NV" contact="Rodrigo Locatti @rlocatti" supported="disabled">
+            <require>
+                <enum value="1"                                             name="VK_NV_EXTENSION_556_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_556&quot;"               name="VK_NV_EXTENSION_556_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_557" number="557" type="device" author="NV" contact="Chris Lentini @clentini" supported="disabled">
+            <require>
+                <enum value="1"                                             name="VK_NV_EXTENSION_557_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_557&quot;"               name="VK_NV_EXTENSION_557_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_558" number="558" type="device" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_558_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_558&quot;"              name="VK_KHR_EXTENSION_558_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_559" number="559" type="device" author="KHR" contact="Nathan Gauër @Keenuts1" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_559_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_559&quot;"              name="VK_KHR_EXTENSION_559_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_560" number="560" author="NV" contact="Lujin Wang @lwnv" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_NV_EXTENSION_560_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_560&quot;"               name="VK_NV_EXTENSION_560_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_EXT_extension_561" number="561" author="EXT" contact="Piers Daniell @pdaniell-nv" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_EXT_EXTENSION_561_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_extension_561&quot;"              name="VK_EXT_EXTENSION_561_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_562" number="562" author="KHR" contact="Piers Daniell @pdaniell-nv" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_562_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_562&quot;"              name="VK_KHR_EXTENSION_562_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_563" number="563" author="KHR" contact="Jon Leech @oddhack" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_563_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_563&quot;"              name="VK_KHR_EXTENSION_563_EXTENSION_NAME"/>
             </require>
         </extension>
     </extensions>
@@ -25156,6 +25830,30 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <spirvextension name="SPV_AMDX_shader_enqueue">
             <enable extension="VK_AMDX_shader_enqueue"/>
         </spirvextension>
+        <spirvextension name="SPV_HUAWEI_cluster_culling_shader">
+            <enable extension="VK_HUAWEI_cluster_culling_shader"/>
+        </spirvextension>
+        <spirvextension name="SPV_HUAWEI_subpass_shading">
+            <enable extension="VK_HUAWEI_subpass_shading"/>
+        </spirvextension>
+        <spirvextension name="SPV_NV_ray_tracing_motion_blur">
+            <enable extension="VK_NV_ray_tracing_motion_blur"/>
+        </spirvextension>
+        <spirvextension name="SPV_KHR_maximal_reconvergence">
+            <enable extension="VK_KHR_shader_maximal_reconvergence"/>
+        </spirvextension>
+        <spirvextension name="SPV_KHR_subgroup_rotate">
+            <enable extension="VK_KHR_shader_subgroup_rotate"/>
+        </spirvextension>
+        <spirvextension name="SPV_KHR_expect_assume">
+            <enable extension="VK_KHR_shader_expect_assume"/>
+        </spirvextension>
+        <spirvextension name="SPV_KHR_float_controls2">
+            <enable extension="VK_KHR_shader_float_controls2"/>
+        </spirvextension>
+        <spirvextension name="SPV_KHR_quad_control">
+            <enable extension="VK_KHR_shader_quad_control"/>
+        </spirvextension>
     </spirvextensions>
     <spirvcapabilities comment="SPIR-V Capabilities allowed in Vulkan and what is required to use it">
         <spirvcapability name="Matrix">
@@ -25651,6 +26349,21 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <spirvcapability name="ShaderEnqueueAMDX">
             <enable struct="VkPhysicalDeviceShaderEnqueueFeaturesAMDX" feature="shaderEnqueue" requires="VK_AMDX_shader_enqueue"/>
         </spirvcapability>
+        <spirvcapability name="GroupNonUniformRotateKHR">
+            <enable struct="VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR" feature="shaderSubgroupRotate" requires="VK_KHR_shader_subgroup_rotate"/>
+        </spirvcapability>
+        <spirvcapability name="ExpectAssumeKHR">
+            <enable struct="VkPhysicalDeviceShaderExpectAssumeFeaturesKHR" feature="shaderExpectAssume" requires="VK_KHR_shader_expect_assume"/>
+        </spirvcapability>
+        <spirvcapability name="FloatControls2">
+            <enable struct="VkPhysicalDeviceShaderFloatControls2FeaturesKHR" feature="shaderFloatControls2" requires="VK_KHR_shader_float_controls2"/>
+        </spirvcapability>
+        <spirvcapability name="QuadControlKHR">
+            <enable struct="VkPhysicalDeviceShaderQuadControlFeaturesKHR" feature="shaderQuadControl" requires="VK_KHR_shader_quad_control"/>
+        </spirvcapability>
+        <spirvcapability name="MaximallyReconvergesKHR">
+            <enable struct="VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR" feature="shaderMaximalReconvergence" requires="VK_KHR_shader_maximal_reconvergence"/>
+        </spirvcapability>
     </spirvcapabilities>
     <sync comment="Machine readable representation of the synchronization objects and their mappings">
         <syncstage name="VK_PIPELINE_STAGE_2_NONE" alias="VK_PIPELINE_STAGE_NONE">

From 35882c905176dfd46d446af09c085e7655562771 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 20 Feb 2024 21:07:13 +0100
Subject: [PATCH 227/389] winevulkan: Update to VK spec version 1.3.278.

The new spec uses length attribute for some static arrays. Change is_dynamic_array
to account account for that. Eventually we could use the new information to improve
conversion thunks.

(cherry picked from commit f380e34a5e94371f691179711e6ce4697be0da61)
---
 dlls/winevulkan/make_vulkan | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 4f5df2fc697..e7b91b845e7 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -64,7 +64,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())
 
-VK_XML_VERSION = "1.3.277"
+VK_XML_VERSION = "1.3.278"
 WINE_VK_VERSION = (1, 3)
 
 # Filenames to create.
@@ -126,6 +126,7 @@ UNSUPPORTED_EXTENSIONS = [
 # winevulkan may nonetheless use, or extensions we want to generate headers for
 # but not expose to applications (useful for test commits)
 UNEXPOSED_EXTENSIONS = {
+    "VK_EXT_map_memory_placed",
 }
 
 # The Vulkan loader provides entry-points for core functionality and important
@@ -1399,7 +1400,7 @@ class VkVariable(object):
         Vulkan uses this for dynamically sized arrays for which
         there is a 'count' parameter.
         """
-        return self.dyn_array_len is not None
+        return self.dyn_array_len is not None and self.array_len is None
 
     def is_static_array(self):
         """ Returns if the member is an array.

From d012b4b1340888d40a59b7fc60d476961f03316a Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Wed, 6 Mar 2024 16:22:39 +0200
Subject: [PATCH 228/389] Update vk.xml to 1.3.278.

---
 dlls/winevulkan/vk.xml | 315 ++++++++++++++++++++++++++---------------
 1 file changed, 203 insertions(+), 112 deletions(-)

diff --git a/dlls/winevulkan/vk.xml b/dlls/winevulkan/vk.xml
index fb92b7c2373..c8464a2eae5 100644
--- a/dlls/winevulkan/vk.xml
+++ b/dlls/winevulkan/vk.xml
@@ -175,7 +175,7 @@ branch of the member gitlab server.
 #define <name>VKSC_API_VERSION_1_0</name> <type>VK_MAKE_API_VERSION</type>(VKSC_API_VARIANT, 1, 0, 0)// Patch version should always be set to 0</type>
 
         <type api="vulkan" category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 277</type>
+#define <name>VK_HEADER_VERSION</name> 278</type>
         <type api="vulkan" category="define" requires="VK_HEADER_VERSION">// Complete version of this file
 #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 3, VK_HEADER_VERSION)</type>
         <type api="vulkansc" category="define">// Version of this file
@@ -338,8 +338,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type requires="VkCommandBufferResetFlagBits"     category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferResetFlags</name>;</type>
         <type requires="VkCommandBufferUsageFlagBits"     category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferUsageFlags</name>;</type>
         <type requires="VkQueryPipelineStatisticFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPipelineStatisticFlags</name>;</type>
-        <type                                             category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryMapFlags</name>;</type>
-        <type                                             category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryUnmapFlagsKHR</name>;</type>
+        <type requires="VkMemoryMapFlagBits"              category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryMapFlags</name>;</type>
+        <type requires="VkMemoryUnmapFlagBitsKHR"         category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryUnmapFlagsKHR</name>;</type>
         <type requires="VkImageAspectFlagBits"            category="bitmask">typedef <type>VkFlags</type> <name>VkImageAspectFlags</name>;</type>
         <type requires="VkSparseMemoryBindFlagBits"       category="bitmask">typedef <type>VkFlags</type> <name>VkSparseMemoryBindFlags</name>;</type>
         <type requires="VkSparseImageFormatFlagBits"      category="bitmask">typedef <type>VkFlags</type> <name>VkSparseImageFormatFlags</name>;</type>
@@ -502,7 +502,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type requires="VkVideoDecodeH264PictureLayoutFlagBitsKHR"  category="bitmask">typedef <type>VkFlags</type> <name>VkVideoDecodeH264PictureLayoutFlagsKHR</name>;</type>
 
             <comment>Video Encode Core extension</comment>
-        <type                                                       category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeFlagsKHR</name>;</type>
+        <type requires="VkVideoEncodeFlagBitsKHR"                   category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeFlagsKHR</name>;</type>
         <type requires="VkVideoEncodeUsageFlagBitsKHR"              category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeUsageFlagsKHR</name>;</type>
         <type requires="VkVideoEncodeContentFlagBitsKHR"            category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeContentFlagsKHR</name>;</type>
         <type requires="VkVideoEncodeCapabilityFlagBitsKHR"         category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeCapabilityFlagsKHR</name>;</type>
@@ -619,6 +619,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type name="VkFormat" category="enum"/>
         <type name="VkFormatFeatureFlagBits" category="enum"/>
         <type name="VkFrontFace" category="enum"/>
+        <type name="VkMemoryMapFlagBits" category="enum"/>
         <type name="VkImageAspectFlagBits" category="enum"/>
         <type name="VkImageCreateFlagBits" category="enum"/>
         <type name="VkImageLayout" category="enum"/>
@@ -872,6 +873,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type name="VkLatencyMarkerNV" category="enum"/>
         <type name="VkOutOfBandQueueTypeNV" category="enum"/>
         <type name="VkPhysicalDeviceSchedulingControlsFlagBitsARM" category="enum"/>
+        <type name="VkMemoryUnmapFlagBitsKHR" category="enum"/>
 
             <comment>Enumerated types in the header, but not used by the API</comment>
         <type name="VkVendorId" category="enum"/>
@@ -900,6 +902,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <comment>Video H.265 Decode extensions</comment>
 
             <comment>Video Encode extensions</comment>
+        <type name="VkVideoEncodeFlagBitsKHR" category="enum"/>
         <type name="VkVideoEncodeUsageFlagBitsKHR" category="enum"/>
         <type name="VkVideoEncodeContentFlagBitsKHR" category="enum"/>
         <type name="VkVideoEncodeTuningModeKHR" category="enum"/>
@@ -1042,20 +1045,20 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member limittype="noauto"><type>uint32_t</type>       <name>vendorID</name></member>
             <member limittype="noauto"><type>uint32_t</type>       <name>deviceID</name></member>
             <member limittype="noauto"><type>VkPhysicalDeviceType</type> <name>deviceType</name></member>
-            <member limittype="noauto"><type>char</type>           <name>deviceName</name>[<enum>VK_MAX_PHYSICAL_DEVICE_NAME_SIZE</enum>]</member>
+            <member limittype="noauto" len="null-terminated"><type>char</type>           <name>deviceName</name>[<enum>VK_MAX_PHYSICAL_DEVICE_NAME_SIZE</enum>]</member>
             <member limittype="noauto"><type>uint8_t</type>        <name>pipelineCacheUUID</name>[<enum>VK_UUID_SIZE</enum>]</member>
             <member limittype="struct"><type>VkPhysicalDeviceLimits</type> <name>limits</name></member>
             <member limittype="struct"><type>VkPhysicalDeviceSparseProperties</type> <name>sparseProperties</name></member>
         </type>
         <type category="struct" name="VkExtensionProperties" returnedonly="true">
-            <member><type>char</type>            <name>extensionName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]<comment>extension name</comment></member>
-            <member><type>uint32_t</type>        <name>specVersion</name><comment>version of the extension specification implemented</comment></member>
+            <member len="null-terminated"><type>char</type> <name>extensionName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]<comment>extension name</comment></member>
+            <member><type>uint32_t</type>                   <name>specVersion</name><comment>version of the extension specification implemented</comment></member>
         </type>
         <type category="struct" name="VkLayerProperties" returnedonly="true">
-            <member><type>char</type>            <name>layerName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]<comment>layer name</comment></member>
-            <member><type>uint32_t</type>        <name>specVersion</name><comment>version of the layer specification implemented</comment></member>
-            <member><type>uint32_t</type>        <name>implementationVersion</name><comment>build or release version of the layer's library</comment></member>
-            <member><type>char</type>            <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the layer</comment></member>
+            <member len="null-terminated"><type>char</type> <name>layerName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]<comment>layer name</comment></member>
+            <member><type>uint32_t</type>                   <name>specVersion</name><comment>version of the layer specification implemented</comment></member>
+            <member><type>uint32_t</type>                   <name>implementationVersion</name><comment>build or release version of the layer's library</comment></member>
+            <member len="null-terminated"><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the layer</comment></member>
         </type>
         <type category="struct" name="VkApplicationInfo">
             <member values="VK_STRUCTURE_TYPE_APPLICATION_INFO"><type>VkStructureType</type> <name>sType</name></member>
@@ -1111,10 +1114,10 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member limittype="min,mul"><type>VkExtent3D</type>             <name>minImageTransferGranularity</name><comment>Minimum alignment requirement for image transfers</comment></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceMemoryProperties" returnedonly="true">
-            <member><type>uint32_t</type>               <name>memoryTypeCount</name></member>
-            <member><type>VkMemoryType</type>           <name>memoryTypes</name>[<enum>VK_MAX_MEMORY_TYPES</enum>]</member>
-            <member><type>uint32_t</type>               <name>memoryHeapCount</name></member>
-            <member><type>VkMemoryHeap</type>           <name>memoryHeaps</name>[<enum>VK_MAX_MEMORY_HEAPS</enum>]</member>
+            <member><type>uint32_t</type>                                     <name>memoryTypeCount</name></member>
+            <member len="memoryTypeCount"><type>VkMemoryType</type>           <name>memoryTypes</name>[<enum>VK_MAX_MEMORY_TYPES</enum>]</member>
+            <member><type>uint32_t</type>                                     <name>memoryHeapCount</name></member>
+            <member len="memoryHeapCount"><type>VkMemoryHeap</type>           <name>memoryHeaps</name>[<enum>VK_MAX_MEMORY_HEAPS</enum>]</member>
         </type>
         <type category="struct" name="VkMemoryAllocateInfo">
             <member values="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member>
@@ -2593,8 +2596,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                            <name>pNext</name></member>
             <member limittype="exact"><type>VkDriverId</type>                  <name>driverID</name></member>
-            <member limittype="exact"><type>char</type>                        <name>driverName</name>[<enum>VK_MAX_DRIVER_NAME_SIZE</enum>]</member>
-            <member limittype="exact"><type>char</type>                        <name>driverInfo</name>[<enum>VK_MAX_DRIVER_INFO_SIZE</enum>]</member>
+            <member limittype="exact" len="null-terminated"><type>char</type>  <name>driverName</name>[<enum>VK_MAX_DRIVER_NAME_SIZE</enum>]</member>
+            <member limittype="exact" len="null-terminated"><type>char</type>  <name>driverInfo</name>[<enum>VK_MAX_DRIVER_INFO_SIZE</enum>]</member>
             <member limittype="exact"><type>VkConformanceVersion</type>        <name>conformanceVersion</name></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceDriverPropertiesKHR"                     alias="VkPhysicalDeviceDriverProperties"/>
@@ -3025,7 +3028,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                            <name>pNext</name></member>
             <member><type>uint32_t</type>                         <name>physicalDeviceCount</name></member>
-            <member><type>VkPhysicalDevice</type>                 <name>physicalDevices</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE</enum>]</member>
+            <member len="physicalDeviceCount"><type>VkPhysicalDevice</type>       <name>physicalDevices</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE</enum>]</member>
             <member><type>VkBool32</type>                         <name>subsetAllocation</name></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceGroupPropertiesKHR"                      alias="VkPhysicalDeviceGroupProperties"/>
@@ -3308,7 +3311,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkPhysicalDeviceSurfaceInfo2KHR">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>* <name>pNext</name></member>
-            <member optional="true"><type>VkSurfaceKHR</type> <name>surface</name></member>
+            <member noautovalidity="true" optional="true"><type>VkSurfaceKHR</type> <name>surface</name></member>
         </type>
         <type category="struct" name="VkSurfaceCapabilities2KHR" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member>
@@ -3839,11 +3842,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkBool32</type>                    <name>globalPriorityQuery</name></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT" alias="VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR"/>
-        <type category="struct" name="VkQueueFamilyGlobalPriorityPropertiesKHR" structextends="VkQueueFamilyProperties2">
+        <type category="struct" name="VkQueueFamilyGlobalPriorityPropertiesKHR" structextends="VkQueueFamilyProperties2" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true"><type>void</type>*    <name>pNext</name></member>
-            <member limittype="max"><type>uint32_t</type>                     <name>priorityCount</name></member>
-            <member limittype="bitmask"><type>VkQueueGlobalPriorityKHR</type> <name>priorities</name>[<enum>VK_MAX_GLOBAL_PRIORITY_SIZE_KHR</enum>]</member>
+            <member optional="true"><type>void</type>*                                            <name>pNext</name></member>
+            <member limittype="max"><type>uint32_t</type>                                         <name>priorityCount</name></member>
+            <member limittype="bitmask" len="priorityCount"><type>VkQueueGlobalPriorityKHR</type> <name>priorities</name>[<enum>VK_MAX_GLOBAL_PRIORITY_SIZE_KHR</enum>]</member>
         </type>
         <type category="struct" name="VkQueueFamilyGlobalPriorityPropertiesEXT" alias="VkQueueFamilyGlobalPriorityPropertiesKHR"/>
         <type category="struct" name="VkDebugUtilsObjectNameInfoEXT" structextends="VkPipelineShaderStageCreateInfo">
@@ -5118,9 +5121,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                   <name>pNext</name></member>
             <member optional="true"><type>VkPerformanceCounterDescriptionFlagsKHR</type> <name>flags</name></member>
-            <member><type>char</type>                                    <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>char</type>                                    <name>category</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>char</type>                                    <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>              <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>              <name>category</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>              <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
         </type>
         <type category="struct" name="VkQueryPoolPerformanceCreateInfoKHR" structextends="VkQueryPoolCreateInfo">
             <member values="VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
@@ -5189,7 +5192,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member selection="VK_PERFORMANCE_VALUE_TYPE_BOOL_INTEL"><type>VkBool32</type>                             <name>valueBool</name></member>
             <member selection="VK_PERFORMANCE_VALUE_TYPE_STRING_INTEL" len="null-terminated">const <type>char</type>*  <name>valueString</name></member>
         </type>
-        <type category="struct" name="VkPerformanceValueINTEL">
+        <type category="struct" name="VkPerformanceValueINTEL" returnedonly="true">
             <member><type>VkPerformanceValueTypeINTEL</type>        <name>type</name></member>
             <member selector="type" noautovalidity="true"><type>VkPerformanceValueDataINTEL</type>        <name>data</name></member>
         </type>
@@ -5295,10 +5298,10 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <type category="struct" name="VkPipelineExecutablePropertiesKHR" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*              <name>pNext</name></member>
-            <member><type>VkShaderStageFlags</type> <name>stages</name></member>
-            <member><type>char</type>               <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>char</type>               <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>uint32_t</type>           <name>subgroupSize</name></member>
+            <member><type>VkShaderStageFlags</type>                 <name>stages</name></member>
+            <member len="null-terminated"><type>char</type>         <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>         <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member><type>uint32_t</type>                           <name>subgroupSize</name></member>
         </type>
         <type category="struct" name="VkPipelineExecutableInfoKHR">
             <member values="VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
@@ -5314,19 +5317,19 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </type>
         <type category="struct" name="VkPipelineExecutableStatisticKHR" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true"><type>void</type>*              <name>pNext</name></member>
-            <member><type>char</type>               <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>char</type>               <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member optional="true"><type>void</type>*                  <name>pNext</name></member>
+            <member len="null-terminated"><type>char</type>             <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>             <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
             <member><type>VkPipelineExecutableStatisticFormatKHR</type> <name>format</name></member>
             <member selector="format" noautovalidity="true"><type>VkPipelineExecutableStatisticValueKHR</type>  <name>value</name></member>
         </type>
         <type category="struct" name="VkPipelineExecutableInternalRepresentationKHR" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true"><type>void</type>*              <name>pNext</name></member>
-            <member><type>char</type>               <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>char</type>               <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>VkBool32</type>           <name>isText</name></member>
-            <member><type>size_t</type>             <name>dataSize</name></member>
+            <member optional="true"><type>void</type>*                <name>pNext</name></member>
+            <member len="null-terminated"><type>char</type>           <name>name</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>           <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member><type>VkBool32</type>                             <name>isText</name></member>
+            <member><type>size_t</type>                               <name>dataSize</name></member>
             <member optional="true" len="dataSize"><type>void</type>* <name>pData</name></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
@@ -5372,7 +5375,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </type>
         <type category="struct" name="VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT" alias="VkPipelineShaderStageRequiredSubgroupSizeCreateInfo"/>
         <type category="struct" name="VkShaderRequiredSubgroupSizeCreateInfoEXT" alias="VkPipelineShaderStageRequiredSubgroupSizeCreateInfo"/>
-        <type category="struct" name="VkSubpassShadingPipelineCreateInfoHUAWEI" returnedonly="true" structextends="VkComputePipelineCreateInfo">
+        <type category="struct" name="VkSubpassShadingPipelineCreateInfoHUAWEI" structextends="VkComputePipelineCreateInfo">
             <member values="VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*                  <name>pNext</name></member>
             <member><type>VkRenderPass</type>           <name>renderPass</name></member>
@@ -5525,56 +5528,56 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*    <name>pNext</name></member>
             <member limittype="noauto"><type>VkDriverId</type>                       <name>driverID</name></member>
-            <member limittype="noauto"><type>char</type>                             <name>driverName</name>[<enum>VK_MAX_DRIVER_NAME_SIZE</enum>]</member>
-            <member limittype="noauto"><type>char</type>                             <name>driverInfo</name>[<enum>VK_MAX_DRIVER_INFO_SIZE</enum>]</member>
+            <member limittype="noauto" len="null-terminated"><type>char</type>       <name>driverName</name>[<enum>VK_MAX_DRIVER_NAME_SIZE</enum>]</member>
+            <member limittype="noauto" len="null-terminated"><type>char</type>       <name>driverInfo</name>[<enum>VK_MAX_DRIVER_INFO_SIZE</enum>]</member>
             <member limittype="noauto"><type>VkConformanceVersion</type>             <name>conformanceVersion</name></member>
             <member limittype="exact"><type>VkShaderFloatControlsIndependence</type> <name>denormBehaviorIndependence</name></member>
             <member limittype="exact"><type>VkShaderFloatControlsIndependence</type> <name>roundingModeIndependence</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderSignedZeroInfNanPreserveFloat16</name><comment>An implementation can preserve signed zero, nan, inf</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderSignedZeroInfNanPreserveFloat32</name><comment>An implementation can preserve signed zero, nan, inf</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderSignedZeroInfNanPreserveFloat64</name><comment>An implementation can preserve signed zero, nan, inf</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderDenormPreserveFloat16</name><comment>An implementation can preserve  denormals</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderDenormPreserveFloat32</name><comment>An implementation can preserve  denormals</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderDenormPreserveFloat64</name><comment>An implementation can preserve  denormals</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderDenormFlushToZeroFloat16</name><comment>An implementation can flush to zero  denormals</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderDenormFlushToZeroFloat32</name><comment>An implementation can flush to zero  denormals</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderDenormFlushToZeroFloat64</name><comment>An implementation can flush to zero  denormals</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderRoundingModeRTEFloat16</name><comment>An implementation can support RTE</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderRoundingModeRTEFloat32</name><comment>An implementation can support RTE</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderRoundingModeRTEFloat64</name><comment>An implementation can support RTE</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderRoundingModeRTZFloat16</name><comment>An implementation can support RTZ</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderRoundingModeRTZFloat32</name><comment>An implementation can support RTZ</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderRoundingModeRTZFloat64</name><comment>An implementation can support RTZ</comment></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxUpdateAfterBindDescriptorsInAllPools</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderUniformBufferArrayNonUniformIndexingNative</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderSampledImageArrayNonUniformIndexingNative</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderStorageBufferArrayNonUniformIndexingNative</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderStorageImageArrayNonUniformIndexingNative</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>shaderInputAttachmentArrayNonUniformIndexingNative</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>robustBufferAccessUpdateAfterBind</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>quadDivergentImplicitLod</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageDescriptorUpdateAfterBindSamplers</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageDescriptorUpdateAfterBindUniformBuffers</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageDescriptorUpdateAfterBindStorageBuffers</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageDescriptorUpdateAfterBindSampledImages</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageDescriptorUpdateAfterBindStorageImages</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageDescriptorUpdateAfterBindInputAttachments</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxPerStageUpdateAfterBindResources</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindSamplers</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindUniformBuffers</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindUniformBuffersDynamic</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindStorageBuffers</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindStorageBuffersDynamic</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindSampledImages</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindStorageImages</name></member>
-            <member limittype="max"><type>uint32_t</type>                         <name>maxDescriptorSetUpdateAfterBindInputAttachments</name></member>
-            <member limittype="bitmask"><type>VkResolveModeFlags</type>               <name>supportedDepthResolveModes</name><comment>supported depth resolve modes</comment></member>
-            <member limittype="bitmask"><type>VkResolveModeFlags</type>               <name>supportedStencilResolveModes</name><comment>supported stencil resolve modes</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>independentResolveNone</name><comment>depth and stencil resolve modes can be set independently if one of them is none</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>independentResolve</name><comment>depth and stencil resolve modes can be set independently</comment></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>filterMinmaxSingleComponentFormats</name></member>
-            <member limittype="bitmask"><type>VkBool32</type>                         <name>filterMinmaxImageComponentMapping</name></member>
-            <member limittype="max"><type>uint64_t</type>                         <name>maxTimelineSemaphoreValueDifference</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderSignedZeroInfNanPreserveFloat16</name><comment>An implementation can preserve signed zero, nan, inf</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderSignedZeroInfNanPreserveFloat32</name><comment>An implementation can preserve signed zero, nan, inf</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderSignedZeroInfNanPreserveFloat64</name><comment>An implementation can preserve signed zero, nan, inf</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderDenormPreserveFloat16</name><comment>An implementation can preserve  denormals</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderDenormPreserveFloat32</name><comment>An implementation can preserve  denormals</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderDenormPreserveFloat64</name><comment>An implementation can preserve  denormals</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderDenormFlushToZeroFloat16</name><comment>An implementation can flush to zero  denormals</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderDenormFlushToZeroFloat32</name><comment>An implementation can flush to zero  denormals</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderDenormFlushToZeroFloat64</name><comment>An implementation can flush to zero  denormals</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderRoundingModeRTEFloat16</name><comment>An implementation can support RTE</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderRoundingModeRTEFloat32</name><comment>An implementation can support RTE</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderRoundingModeRTEFloat64</name><comment>An implementation can support RTE</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderRoundingModeRTZFloat16</name><comment>An implementation can support RTZ</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderRoundingModeRTZFloat32</name><comment>An implementation can support RTZ</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderRoundingModeRTZFloat64</name><comment>An implementation can support RTZ</comment></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxUpdateAfterBindDescriptorsInAllPools</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderUniformBufferArrayNonUniformIndexingNative</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderSampledImageArrayNonUniformIndexingNative</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderStorageBufferArrayNonUniformIndexingNative</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderStorageImageArrayNonUniformIndexingNative</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>shaderInputAttachmentArrayNonUniformIndexingNative</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>robustBufferAccessUpdateAfterBind</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>quadDivergentImplicitLod</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageDescriptorUpdateAfterBindSamplers</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageDescriptorUpdateAfterBindUniformBuffers</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageDescriptorUpdateAfterBindStorageBuffers</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageDescriptorUpdateAfterBindSampledImages</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageDescriptorUpdateAfterBindStorageImages</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageDescriptorUpdateAfterBindInputAttachments</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxPerStageUpdateAfterBindResources</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindSamplers</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindUniformBuffers</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindUniformBuffersDynamic</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindStorageBuffers</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindStorageBuffersDynamic</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindSampledImages</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindStorageImages</name></member>
+            <member limittype="max"><type>uint32_t</type>                            <name>maxDescriptorSetUpdateAfterBindInputAttachments</name></member>
+            <member limittype="bitmask"><type>VkResolveModeFlags</type>              <name>supportedDepthResolveModes</name><comment>supported depth resolve modes</comment></member>
+            <member limittype="bitmask"><type>VkResolveModeFlags</type>              <name>supportedStencilResolveModes</name><comment>supported stencil resolve modes</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>independentResolveNone</name><comment>depth and stencil resolve modes can be set independently if one of them is none</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>independentResolve</name><comment>depth and stencil resolve modes can be set independently</comment></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>filterMinmaxSingleComponentFormats</name></member>
+            <member limittype="bitmask"><type>VkBool32</type>                        <name>filterMinmaxImageComponentMapping</name></member>
+            <member limittype="max"><type>uint64_t</type>                            <name>maxTimelineSemaphoreValueDifference</name></member>
             <member limittype="bitmask" optional="true"><type>VkSampleCountFlags</type> <name>framebufferIntegerColorSampleCounts</name></member>
         </type>
         <type category="struct" name="VkPhysicalDeviceVulkan13Features" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
@@ -5670,12 +5673,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </type>
         <type category="struct" name="VkPhysicalDeviceToolProperties" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true"><type>void</type>* <name>pNext</name></member>
-            <member><type>char</type>                  <name>name</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>
-            <member><type>char</type>                  <name>version</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>
-            <member><type>VkToolPurposeFlags</type>    <name>purposes</name></member>
-            <member><type>char</type>                  <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
-            <member><type>char</type>                  <name>layer</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>
+            <member optional="true"><type>void</type>*      <name>pNext</name></member>
+            <member len="null-terminated"><type>char</type> <name>name</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type> <name>version</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>
+            <member><type>VkToolPurposeFlags</type>         <name>purposes</name></member>
+            <member len="null-terminated"><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type> <name>layer</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>
         </type>
         <type category="struct" name="VkPhysicalDeviceToolPropertiesEXT" alias="VkPhysicalDeviceToolProperties"/>
         <type category="struct" name="VkSamplerCustomBorderColorCreateInfoEXT" structextends="VkSamplerCreateInfo">
@@ -7934,7 +7937,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_SHADER_MODULE_IDENTIFIER_EXT"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true"><type>void</type>*          <name>pNext</name></member>
             <member noautovalidity="true"><type>uint32_t</type> <name>identifierSize</name></member>
-            <member><type>uint8_t</type>                        <name>identifier</name>[<enum>VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT</enum>]</member>
+            <member len="identifierSize"><type>uint8_t</type>   <name>identifier</name>[<enum>VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT</enum>]</member>
         </type>
         <type category="struct" name="VkImageCompressionControlEXT" structextends="VkImageCreateInfo,VkSwapchainCreateInfoKHR,VkPhysicalDeviceImageFormatInfo2">
             <member values="VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_CONTROL_EXT"><type>VkStructureType</type> <name>sType</name></member>
@@ -7986,7 +7989,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </type>
         <type category="struct" name="VkRenderPassSubpassFeedbackInfoEXT" returnedonly="true">
             <member><type>VkSubpassMergeStatusEXT</type>                                                          <name>subpassMergeStatus</name></member>
-            <member><type>char</type>                                                                             <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
+            <member len="null-terminated"><type>char</type>                                                       <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>
             <member><type>uint32_t</type>                                                                         <name>postMergeIndex</name></member>
         </type>
         <type category="struct" name="VkRenderPassSubpassFeedbackCreateInfoEXT" structextends="VkSubpassDescription2">
@@ -8379,9 +8382,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member><type>VkDeviceSize</type>                        <name>addressPrecision</name></member>
         </type>
         <type category="struct" name="VkDeviceFaultVendorInfoEXT">
-            <member noautovalidity="true"><type>char</type>          <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the fault</comment></member>
-            <member><type>uint64_t</type>                            <name>vendorFaultCode</name></member>
-            <member><type>uint64_t</type>                            <name>vendorFaultData</name></member>
+            <member noautovalidity="true" len="null-terminated"><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the fault</comment></member>
+            <member><type>uint64_t</type>                                         <name>vendorFaultCode</name></member>
+            <member><type>uint64_t</type>                                         <name>vendorFaultData</name></member>
         </type>
         <type category="struct" name="VkDeviceFaultCountsEXT">
             <member values="VK_STRUCTURE_TYPE_DEVICE_FAULT_COUNTS_EXT"><type>VkStructureType</type> <name>sType</name></member>
@@ -8392,11 +8395,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </type>
         <type category="struct" name="VkDeviceFaultInfoEXT" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
-            <member optional="true"><type>void</type>*               <name>pNext</name></member>
-            <member noautovalidity="true"><type>char</type>          <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the fault</comment></member>
-            <member optional="true"><type>VkDeviceFaultAddressInfoEXT</type>* <name>pAddressInfos</name></member>
-            <member optional="true"><type>VkDeviceFaultVendorInfoEXT</type>*  <name>pVendorInfos</name></member>
-            <member optional="true"><type>void</type>*                        <name>pVendorBinaryData</name></member>
+            <member optional="true"><type>void</type>*                            <name>pNext</name></member>
+            <member noautovalidity="true" len="null-terminated"><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the fault</comment></member>
+            <member optional="true"><type>VkDeviceFaultAddressInfoEXT</type>*     <name>pAddressInfos</name></member>
+            <member optional="true"><type>VkDeviceFaultVendorInfoEXT</type>*      <name>pVendorInfos</name></member>
+            <member optional="true"><type>void</type>*                            <name>pVendorBinaryData</name></member>
         </type>
         <type category="struct" name="VkDeviceFaultVendorBinaryHeaderVersionOneEXT">
             <comment>The fields in this structure are non-normative since structure packing is implementation-defined in C. The specification defines the normative layout.</comment>
@@ -8935,7 +8938,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true"><type>uint32_t</type> <name>timingCount</name></member>
             <member optional="true" len="timingCount"><type>VkLatencyTimingsFrameReportNV</type>* <name>pTimings</name></member>
         </type>
-        <type category="struct" name="VkLatencyTimingsFrameReportNV">
+        <type category="struct" name="VkLatencyTimingsFrameReportNV" returnedonly="true">
             <member values="VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true" noautovalidity="true">const <type>void</type>* <name>pNext</name></member>
             <member><type>uint64_t</type>               <name>presentID</name></member>
@@ -9078,6 +9081,28 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true" noautovalidity="true"><type>void</type>*        <name>pNext</name></member>
             <member><type>VkBool32</type>                           <name>shaderQuadControl</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*               <name>pNext</name></member>
+            <member><type>VkBool32</type>                            <name>shaderFloat16VectorAtomics</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceMapMemoryPlacedFeaturesEXT" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*            <name>pNext</name></member>
+            <member><type>VkBool32</type>                         <name>memoryMapPlaced</name></member>
+            <member><type>VkBool32</type>                         <name>memoryMapRangePlaced</name></member>
+            <member><type>VkBool32</type>                         <name>memoryUnmapReserve</name></member>
+        </type>
+        <type category="struct" name="VkPhysicalDeviceMapMemoryPlacedPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*            <name>pNext</name></member>
+            <member limittype="min,pot"><type>VkDeviceSize</type> <name>minPlacedMemoryMapAlignment</name></member>
+        </type>
+        <type category="struct" name="VkMemoryMapPlacedInfoEXT" structextends="VkMemoryMapInfoKHR">
+            <member values="VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true">const <type>void</type>*  <name>pNext</name></member>
+            <member noautovalidity="true"><type>void</type>*  <name>pPlacedAddress</name></member>
+        </type>
     </types>
 
 
@@ -9837,6 +9862,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum bitpos="9"    name="VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT" comment="Optional"/>
         <enum bitpos="10"   name="VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT"                 comment="Optional"/>
     </enums>
+    <enums name="VkMemoryMapFlagBits" type="bitmask">
+    </enums>
     <enums name="VkImageAspectFlagBits" type="bitmask">
         <enum bitpos="0"    name="VK_IMAGE_ASPECT_COLOR_BIT"/>
         <enum bitpos="1"    name="VK_IMAGE_ASPECT_DEPTH_BIT"/>
@@ -10800,6 +10827,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum bitpos="0"    name="VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR"/>
         <enum bitpos="1"    name="VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR"/>
     </enums>
+    <enums name="VkVideoEncodeFlagBitsKHR" type="bitmask">
+    </enums>
     <enums name="VkVideoEncodeUsageFlagBitsKHR" type="bitmask">
         <enum value="0"     name="VK_VIDEO_ENCODE_USAGE_DEFAULT_KHR"/>
         <enum bitpos="0"    name="VK_VIDEO_ENCODE_USAGE_TRANSCODING_BIT_KHR"/>
@@ -11211,6 +11240,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <enum value="0"    name="VK_OUT_OF_BAND_QUEUE_TYPE_RENDER_NV"/>
         <enum value="1"    name="VK_OUT_OF_BAND_QUEUE_TYPE_PRESENT_NV"/>
     </enums>
+    <enums name="VkMemoryUnmapFlagBitsKHR" type="bitmask">
+    </enums>
 
     <commands comment="Vulkan command definitions">
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_LAYER_NOT_PRESENT,VK_ERROR_EXTENSION_NOT_PRESENT,VK_ERROR_INCOMPATIBLE_DRIVER">
@@ -11705,11 +11736,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
             <param len="createInfoCount"><type>VkPipeline</type>* <name>pPipelines</name></param>
         </command>
-        <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR">
+        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR">
             <proto><type>VkResult</type> <name>vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param><type>VkRenderPass</type> <name>renderpass</name></param>
-            <param><type>VkExtent2D</type>* <name>pMaxWorkgroupSize</name></param>
+            <param len="1"><type>VkExtent2D</type>* <name>pMaxWorkgroupSize</name></param>
         </command>
         <command>
             <proto><type>void</type> <name>vkDestroyPipeline</name></proto>
@@ -15175,12 +15206,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <param>const <type>VkMemoryMapInfoKHR</type>* <name>pMemoryMapInfo</name></param>
             <param optional="false,true"><type>void</type>** <name>ppData</name></param>
         </command>
-        <command successcodes="VK_SUCCESS">
+        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_MEMORY_MAP_FAILED">
             <proto><type>VkResult</type> <name>vkUnmapMemory2KHR</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param>const <type>VkMemoryUnmapInfoKHR</type>* <name>pMemoryUnmapInfo</name></param>
         </command>
-        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT">
+        <command successcodes="VK_SUCCESS,VK_INCOMPATIBLE_SHADER_BINARY_EXT" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED">
             <proto><type>VkResult</type> <name>vkCreateShadersEXT</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
             <param><type>uint32_t</type> <name>createInfoCount</name></param>
@@ -15491,6 +15522,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <require comment="Memory commands">
             <type name="VkMappedMemoryRange"/>
             <type name="VkMemoryAllocateInfo"/>
+            <type name="VkMemoryMapFlagBits"/>
             <type name="VkMemoryMapFlags"/>
             <command name="vkAllocateMemory"/>
             <command name="vkFreeMemory"/>
@@ -20638,15 +20670,24 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum offset="1" extends="VkStructureType"    name="VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR"/>
                 <type name="VkMemoryMapInfoKHR"/>
                 <type name="VkMemoryUnmapInfoKHR"/>
+                <type name="VkMemoryUnmapFlagBitsKHR"/>
                 <type name="VkMemoryUnmapFlagsKHR"/>
                 <command name="vkMapMemory2KHR"/>
                 <command name="vkUnmapMemory2KHR"/>
             </require>
         </extension>
-        <extension name="VK_INTEL_extension_273" number="273" type="device" author="INTEL" contact="Faith Ekstrand @gfxstrand" supported="disabled">
+        <extension name="VK_EXT_map_memory_placed" number="273" type="device" depends="VK_KHR_map_memory2" author="EXT" contact="Faith Ekstrand @gfxstrand" supported="vulkan">
             <require>
-                <enum value="0"                                             name="VK_INTEL_EXTENSION_273_SPEC_VERSION"/>
-                <enum value="&quot;VK_INTEL_extension_273&quot;"            name="VK_INTEL_EXTENSION_273_EXTENSION_NAME"/>
+                <enum value="1"                                         name="VK_EXT_MAP_MEMORY_PLACED_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_map_memory_placed&quot;"      name="VK_EXT_MAP_MEMORY_PLACED_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT"/>
+                <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT"/>
+                <enum offset="2" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT"/>
+                <enum bitpos="0" extends="VkMemoryMapFlagBits"          name="VK_MEMORY_MAP_PLACED_BIT_EXT"/>
+                <enum bitpos="0" extends="VkMemoryUnmapFlagBitsKHR"     name="VK_MEMORY_UNMAP_RESERVE_BIT_EXT"/>
+                <type name="VkPhysicalDeviceMapMemoryPlacedFeaturesEXT"/>
+                <type name="VkPhysicalDeviceMapMemoryPlacedPropertiesEXT"/>
+                <type name="VkMemoryMapPlacedInfoEXT"/>
             </require>
         </extension>
         <extension name="VK_EXT_shader_atomic_float2" number="274" type="device" depends="VK_EXT_shader_atomic_float" author="EXT" contact="Faith Ekstrand @gfxstrand" supported="vulkan">
@@ -23370,7 +23411,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum extnumber="353" offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT"/>
                 <enum extends="VkStructureType"                            name="VK_STRUCTURE_TYPE_SHADER_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT" alias="VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO"/>
                 <enum offset="0" extends="VkObjectType"                    name="VK_OBJECT_TYPE_SHADER_EXT"/>
-                <enum offset="0" extends="VkResult"                        name="VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT"/>
+                <enum offset="0" extends="VkResult"                        name="VK_INCOMPATIBLE_SHADER_BINARY_EXT"/>
+                <enum            extends="VkResult"                        name="VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT" alias="VK_INCOMPATIBLE_SHADER_BINARY_EXT" deprecated="aliased"/>
                 <type name="VkShaderEXT"/>
                 <type name="VkShaderCreateFlagBitsEXT"/>
                 <type name="VkShaderCreateFlagsEXT"/>
@@ -23590,6 +23632,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <require>
                 <enum value="0"                                         name="VK_NV_EXTENSION_492_SPEC_VERSION"/>
                 <enum value="&quot;VK_NV_extension_492&quot;"           name="VK_NV_EXTENSION_492_EXTENSION_NAME"/>
+                <enum bitpos="44" extends="VkPipelineStageFlagBits2"    name="VK_PIPELINE_STAGE_2_RESERVED_44_BIT_NV"/>
             </require>
         </extension>
         <extension name="VK_NV_extended_sparse_address_space" number="493" type="device" author="NV" contact="Russell Chou @russellcnv" supported="vulkan">
@@ -24155,6 +24198,16 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <require>
                 <enum value="0"                                             name="VK_KHR_EXTENSION_554_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_extension_554&quot;"              name="VK_KHR_EXTENSION_554_EXTENSION_NAME"/>
+                <enum bitpos="2"  extends="VkVideoEncodeCapabilityFlagBitsKHR" name="VK_VIDEO_ENCODE_CAPABILITY_RESERVED_2_BIT_KHR"/>
+                <enum bitpos="3"  extends="VkVideoEncodeCapabilityFlagBitsKHR" name="VK_VIDEO_ENCODE_CAPABILITY_RESERVED_3_BIT_KHR"/>
+                <enum bitpos="3"  extends="VkVideoSessionCreateFlagBitsKHR" name="VK_VIDEO_SESSION_CREATE_RESERVED_3_BIT_KHR"/>
+                <enum bitpos="4"  extends="VkVideoSessionCreateFlagBitsKHR" name="VK_VIDEO_SESSION_CREATE_RESERVED_4_BIT_KHR"/>
+                <enum bitpos="0"  extends="VkVideoEncodeFlagBitsKHR"        name="VK_VIDEO_ENCODE_RESERVED_0_BIT_KHR"/>
+                <enum bitpos="1"  extends="VkVideoEncodeFlagBitsKHR"        name="VK_VIDEO_ENCODE_RESERVED_1_BIT_KHR"/>
+                <enum bitpos="25" extends="VkImageUsageFlagBits"            name="VK_IMAGE_USAGE_RESERVED_25_BIT_KHR"/>
+                <enum bitpos="26" extends="VkImageUsageFlagBits"            name="VK_IMAGE_USAGE_RESERVED_26_BIT_KHR"/>
+                <enum bitpos="49" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_RESERVED_49_BIT_KHR"/>
+                <enum bitpos="50" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_RESERVED_50_BIT_KHR"/>
             </require>
         </extension>
         <extension name="VK_IMG_extension_555" number="555" author="IMG" contact="Jarred Davies" supported="disabled">
@@ -24211,6 +24264,38 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_KHR_extension_563&quot;"              name="VK_KHR_EXTENSION_563_EXTENSION_NAME"/>
             </require>
         </extension>
+        <extension name="VK_NV_shader_atomic_float16_vector" number="564" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan">
+            <require>
+                <enum value="1"                                             name="VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_shader_atomic_float16_vector&quot;" name="VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV"/>
+                <type name="VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV"/>
+            </require>
+        </extension>
+        <extension name="VK_EXT_extension_565" number="565" author="EXT" contact="Kevin Petit @kpet" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_EXT_EXTENSION_565_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_extension_565&quot;"              name="VK_EXT_EXTENSION_565_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_ARM_extension_566" number="566" author="ARM" contact="Kevin Petit @kpet" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_ARM_EXTENSION_566_SPEC_VERSION"/>
+                <enum value="&quot;VK_ARM_extension_566&quot;"              name="VK_ARM_EXTENSION_566_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_ARM_extension_567" number="567" author="ARM" contact="Kevin Petit @kpet" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_ARM_EXTENSION_567_SPEC_VERSION"/>
+                <enum value="&quot;VK_ARM_extension_567&quot;"              name="VK_ARM_EXTENSION_567_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_ARM_extension_568" number="568" author="ARM" contact="Kevin Petit @kpet" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_ARM_EXTENSION_568_SPEC_VERSION"/>
+                <enum value="&quot;VK_ARM_extension_568&quot;"              name="VK_ARM_EXTENSION_568_EXTENSION_NAME"/>
+            </require>
+        </extension>
     </extensions>
     <formats>
         <format name="VK_FORMAT_R4G4_UNORM_PACK8" class="8-bit" blockSize="1" texelsPerBlock="1" packed="8">
@@ -25789,6 +25874,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <spirvextension name="SPV_EXT_shader_atomic_float16_add">
             <enable extension="VK_EXT_shader_atomic_float2"/>
         </spirvextension>
+        <spirvextension name="SPV_NV_shader_atomic_fp16_vector">
+            <enable extension="VK_NV_shader_atomic_float16_vector"/>
+        </spirvextension>
         <spirvextension name="SPV_EXT_fragment_fully_covered">
             <enable extension="VK_EXT_conservative_rasterization"/>
         </spirvextension>
@@ -25926,6 +26014,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <enable struct="VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT" feature="shaderBufferFloat64AtomicMinMax" requires="VK_EXT_shader_atomic_float2"/>
             <enable struct="VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT" feature="shaderSharedFloat64AtomicMinMax" requires="VK_EXT_shader_atomic_float2"/>
         </spirvcapability>
+        <spirvcapability name="AtomicFloat16VectorNV">
+            <enable struct="VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV" feature="shaderFloat16VectorAtomics" requires="VK_NV_shader_atomic_float16_vector"/>
+        </spirvcapability>
         <spirvcapability name="Int64ImageEXT">
             <enable struct="VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT" feature="shaderImageInt64Atomics" requires="VK_EXT_shader_image_atomic_int64"/>
         </spirvcapability>

From b4cedf18dc829bc5064c75eab381bc6fc22647e1 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 20 Feb 2024 21:26:32 +0100
Subject: [PATCH 229/389] winevulkan: Remove no longer needed spec workarounds.

(cherry picked from commit 7995f3813c9df22a752d59500b3a9f3e625b1fa0)
---
 dlls/winevulkan/make_vulkan | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index e7b91b845e7..05ffd93d65e 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2125,14 +2125,11 @@ class VkStruct(Sequence):
 
         # Those structs seem to be broken in spec, they are specified as
         # returned only, but documented as input structs.
-        if name in ["VkSubpassShadingPipelineCreateInfoHUAWEI",
-                    "VkPipelineShaderStageRequiredSubgroupSizeCreateInfo"]:
+        if name in ["VkPipelineShaderStageRequiredSubgroupSizeCreateInfo"]:
             returnedonly = False
 
         # Those structs don't have returnedonly in spec, but they could (should?).
-        if name in ["VkSurfaceCapabilitiesPresentBarrierNV",
-                    "VkCooperativeMatrixPropertiesNV",
-                    "VkPerformanceValueINTEL"]:
+        if name in ["VkSurfaceCapabilitiesPresentBarrierNV"]:
             returnedonly = True
 
         structextends = struct.attrib.get("structextends")

From b9aad66250a0343c152d0c89c5561d2a2322a243 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 2 Mar 2024 17:12:15 +0100
Subject: [PATCH 230/389] winevulkan: Update to VK spec version 1.3.279.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
(cherry picked from commit ec6879b78ec58bfad9f3039fdab9498173a44f56)
---
 dlls/winevulkan/make_vulkan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 05ffd93d65e..467eee61c2a 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -64,7 +64,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())
 
-VK_XML_VERSION = "1.3.278"
+VK_XML_VERSION = "1.3.279"
 WINE_VK_VERSION = (1, 3)
 
 # Filenames to create.

From d78dcf8935897e8d67d4a997f1adcc7ef1ad0960 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Wed, 6 Mar 2024 16:34:43 +0200
Subject: [PATCH 231/389] Update vk.xml to 1.3.279.

---
 dlls/winevulkan/vk.xml | 73 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/dlls/winevulkan/vk.xml b/dlls/winevulkan/vk.xml
index c8464a2eae5..ee9221e9eb3 100644
--- a/dlls/winevulkan/vk.xml
+++ b/dlls/winevulkan/vk.xml
@@ -175,7 +175,7 @@ branch of the member gitlab server.
 #define <name>VKSC_API_VERSION_1_0</name> <type>VK_MAKE_API_VERSION</type>(VKSC_API_VARIANT, 1, 0, 0)// Patch version should always be set to 0</type>
 
         <type api="vulkan" category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 278</type>
+#define <name>VK_HEADER_VERSION</name> 279</type>
         <type api="vulkan" category="define" requires="VK_HEADER_VERSION">// Complete version of this file
 #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 3, VK_HEADER_VERSION)</type>
         <type api="vulkansc" category="define">// Version of this file
@@ -1467,7 +1467,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member noautovalidity="true" optional="true"><type>VkPipeline</type>      <name>basePipelineHandle</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is nonzero, it specifies the handle of the base pipeline this is a derivative of</comment></member>
             <member><type>int32_t</type>                <name>basePipelineIndex</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is not -1, it specifies an index into pCreateInfos of the base pipeline this is a derivative of</comment></member>
         </type>
-        <type category="struct" name="VkComputePipelineIndirectBufferInfoNV">
+        <type category="struct" name="VkComputePipelineIndirectBufferInfoNV" structextends="VkComputePipelineCreateInfo">
             <member values="VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*   <name>pNext</name></member>
             <member><type>VkDeviceAddress</type>               <name>deviceAddress</name></member>
@@ -2488,7 +2488,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member values="VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true">const <type>void</type>*                        <name>pNext</name></member>
             <member><type>VkPipelineBindPoint</type>                <name>pipelineBindPoint</name></member>
-            <member><type>VkPipeline</type>                         <name>pipeline</name></member>
+            <member optional="true"><type>VkPipeline</type>         <name>pipeline</name></member>
             <member><type>VkIndirectCommandsLayoutNV</type>         <name>indirectCommandsLayout</name></member>
             <member><type>uint32_t</type>                           <name>streamCount</name></member>
             <member len="streamCount">const <type>VkIndirectCommandsStreamNV</type>*  <name>pStreams</name></member>
@@ -9103,6 +9103,11 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <member optional="true">const <type>void</type>*  <name>pNext</name></member>
             <member noautovalidity="true"><type>void</type>*  <name>pPlacedAddress</name></member>
         </type>
+        <type category="struct" name="VkPhysicalDeviceRawAccessChainsFeaturesNV" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
+            <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV"><type>VkStructureType</type> <name>sType</name></member>
+            <member optional="true"><type>void</type>*                           <name>pNext</name></member>
+            <member><type>VkBool32</type>                                        <name>shaderRawAccessChains</name></member>
+        </type>
     </types>
 
 
@@ -22708,8 +22713,10 @@ typedef void* <name>MTLSharedEvent_id</name>;
         </extension>
         <extension name="VK_NV_extension_430" number="430" author="NV" contact="Vikram Kushwaha @vkushwaha-nv" supported="disabled">
             <require>
-                <enum value="0"                                         name="VK_NV_EXTENSION_430_SPEC_VERSION"/>
-                <enum value="&quot;VK_NV_extension_430&quot;"           name="VK_NV_EXTENSION_430_EXTENSION_NAME"/>
+                <enum value="0"                                          name="VK_NV_EXTENSION_430_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_430&quot;"            name="VK_NV_EXTENSION_430_EXTENSION_NAME"/>
+                <enum bitpos="33" extends="VkPipelineCreateFlagBits2KHR" name="VK_PIPELINE_CREATE_2_RESERVED_33_BIT_KHR"/>
+                <enum bitpos="51" extends="VkFormatFeatureFlagBits2"     name="VK_FORMAT_FEATURE_2_RESERVED_51_BIT_EXT"/>
             </require>
         </extension>
         <extension name="VK_NV_linear_color_attachment" number="431" type="device" author="NVIDIA" contact="sourav parmar @souravpNV" depends="VK_KHR_get_physical_device_properties2" supported="vulkan">
@@ -23310,8 +23317,8 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum bitpos="14" extends="VkBufferUsageFlagBits2KHR"    name="VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR"/>
             </require>
             <require depends="VK_KHR_video_encode_queue">
-                <enum bitpos="15" extends="VkBufferUsageFlagBits2KHR"    name="VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
-                <enum bitpos="16" extends="VkBufferUsageFlagBits2KHR"    name="VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
+                <enum bitpos="15" extends="VkBufferUsageFlagBits2KHR"    name="VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR"/>
+                <enum bitpos="16" extends="VkBufferUsageFlagBits2KHR"    name="VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR"/>
             </require>
             <require depends="VK_VERSION_1_2,VK_KHR_buffer_device_address,VK_EXT_buffer_device_address">
                 <enum bitpos="17" extends="VkBufferUsageFlagBits2KHR"    name="VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT_KHR"/>
@@ -24216,10 +24223,12 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_IMG_extension_555&quot;"              name="VK_IMG_EXTENSION_555_EXTENSION_NAME"/>
             </require>
         </extension>
-        <extension name="VK_NV_extension_556" number="556" type="device" author="NV" contact="Rodrigo Locatti @rlocatti" supported="disabled">
+        <extension name="VK_NV_raw_access_chains" number="556" type="device" author="NV" contact="Rodrigo Locatti @rlocatti" supported="vulkan">
             <require>
-                <enum value="1"                                             name="VK_NV_EXTENSION_556_SPEC_VERSION"/>
-                <enum value="&quot;VK_NV_extension_556&quot;"               name="VK_NV_EXTENSION_556_EXTENSION_NAME"/>
+                <enum value="1"                                             name="VK_NV_RAW_ACCESS_CHAINS_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_raw_access_chains&quot;"           name="VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME"/>
+                <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV"/>
+                <type name="VkPhysicalDeviceRawAccessChainsFeaturesNV"/>
             </require>
         </extension>
         <extension name="VK_NV_extension_557" number="557" type="device" author="NV" contact="Chris Lentini @clentini" supported="disabled">
@@ -24262,6 +24271,7 @@ typedef void* <name>MTLSharedEvent_id</name>;
             <require>
                 <enum value="0"                                             name="VK_KHR_EXTENSION_563_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_extension_563&quot;"              name="VK_KHR_EXTENSION_563_EXTENSION_NAME"/>
+                <enum bitpos="43" extends="VkFormatFeatureFlagBits2"        name="VK_FORMAT_FEATURE_2_RESERVED_43_BIT_KHR"/>
             </require>
         </extension>
         <extension name="VK_NV_shader_atomic_float16_vector" number="564" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan">
@@ -24296,6 +24306,43 @@ typedef void* <name>MTLSharedEvent_id</name>;
                 <enum value="&quot;VK_ARM_extension_568&quot;"              name="VK_ARM_EXTENSION_568_EXTENSION_NAME"/>
             </require>
         </extension>
+        <extension name="VK_NV_extension_569" number="569" author="NV" contact="Vikram Kushwaha @vkushwaha-nv" supported="disabled">
+            <require>
+                <enum value="0"                                         name="VK_NV_EXTENSION_569_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_569&quot;"           name="VK_NV_EXTENSION_569_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_570" number="570" author="NV" contact="Vikram Kushwaha @vkushwaha-nv" supported="disabled">
+            <require>
+                <enum value="0"                                         name="VK_NV_EXTENSION_570_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_570&quot;"           name="VK_NV_EXTENSION_570_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_571" number="571" author="NV" contact="Vikram Kushwaha @vkushwaha-nv" supported="disabled">
+            <require>
+                <enum value="0"                                         name="VK_NV_EXTENSION_571_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_571&quot;"           name="VK_NV_EXTENSION_571_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_572" number="572" author="NV" contact="Jeff Juliano @jjuliano" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_NV_EXTENSION_572_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_572&quot;"               name="VK_NV_EXTENSION_572_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_EXT_extension_573" number="573" author="EXT" contact="Mike Blumenkrantz @zmike" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_EXT_EXTENSION_573_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_extension_573&quot;"               name="VK_EXT_EXTENSION_573_EXTENSION_NAME"/>
+                <enum bitpos="7" extends="VkShaderCreateFlagBitsEXT" name="VK_SHADER_CREATE_EXTENSION_573_BIT_EXT"/>
+            </require>
+        </extension>
+        <extension name="VK_KHR_extension_574" number="574" author="KHR" contact="Ralph Potter gitlab:@r_potter" supported="disabled">
+            <require>
+                <enum value="0"                                             name="VK_KHR_EXTENSION_574_SPEC_VERSION"/>
+                <enum value="&quot;VK_KHR_extension_574&quot;"              name="VK_KHR_EXTENSION_574_EXTENSION_NAME"/>
+            </require>
+        </extension>
     </extensions>
     <formats>
         <format name="VK_FORMAT_R4G4_UNORM_PACK8" class="8-bit" blockSize="1" texelsPerBlock="1" packed="8">
@@ -25942,6 +25989,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <spirvextension name="SPV_KHR_quad_control">
             <enable extension="VK_KHR_shader_quad_control"/>
         </spirvextension>
+        <spirvextension name="SPV_NV_raw_access_chains">
+            <enable extension="VK_NV_raw_access_chains"/>
+        </spirvextension>
     </spirvextensions>
     <spirvcapabilities comment="SPIR-V Capabilities allowed in Vulkan and what is required to use it">
         <spirvcapability name="Matrix">
@@ -26455,6 +26505,9 @@ typedef void* <name>MTLSharedEvent_id</name>;
         <spirvcapability name="MaximallyReconvergesKHR">
             <enable struct="VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR" feature="shaderMaximalReconvergence" requires="VK_KHR_shader_maximal_reconvergence"/>
         </spirvcapability>
+        <spirvcapability name="RawAccessChainsNV">
+            <enable struct="VkPhysicalDeviceRawAccessChainsFeaturesNV" feature="shaderRawAccessChains" requires="VK_NV_raw_access_chains"/>
+        </spirvcapability>
     </spirvcapabilities>
     <sync comment="Machine readable representation of the synchronization objects and their mappings">
         <syncstage name="VK_PIPELINE_STAGE_2_NONE" alias="VK_PIPELINE_STAGE_NONE">

From 2ba356c339ad577078967c4eed015ededc1ebe0f Mon Sep 17 00:00:00 2001
From: Helix Graziani <helix.graziani@hotmail.com>
Date: Mon, 29 Jan 2024 19:24:07 -0500
Subject: [PATCH 232/389] cfgmgr32: Add CM_Get_Device_Interface_PropertyW stub.

(cherry picked from commit 91d60983acad0e8791b94f60dad5d318b67c0166)

CW-Bug-Id: #23528
---
 dlls/cfgmgr32/cfgmgr32.spec |  2 +-
 dlls/cfgmgr32/main.c        | 13 +++++++++++++
 include/cfgmgr32.h          |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec
index e4cd845e2a4..29de7bbdc55 100644
--- a/dlls/cfgmgr32/cfgmgr32.spec
+++ b/dlls/cfgmgr32/cfgmgr32.spec
@@ -91,7 +91,7 @@
 @ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW
 @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA
 @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW
-@ stub CM_Get_Device_Interface_PropertyW
+@ stdcall CM_Get_Device_Interface_PropertyW(wstr ptr ptr ptr ptr long)
 @ stub CM_Get_First_Log_Conf
 @ stub CM_Get_First_Log_Conf_Ex
 @ stub CM_Get_Global_State
diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c
index f40068af0df..7d48a96be85 100644
--- a/dlls/cfgmgr32/main.c
+++ b/dlls/cfgmgr32/main.c
@@ -67,3 +67,16 @@ CONFIGRET WINAPI CM_Register_Notification( CM_NOTIFY_FILTER *filter, void *conte
 
     return CR_CALL_NOT_IMPLEMENTED;
 }
+
+/***********************************************************************
+ *           CM_Get_Device_Interface_PropertyW (cfgmgr32.@)
+ */
+CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW( LPCWSTR device_interface, const DEVPROPKEY *property_key,
+                                                    DEVPROPTYPE *property_type, BYTE *property_buffer,
+                                                    ULONG *property_buffer_size, ULONG flags )
+{
+    FIXME("%s %p %p %p %p %ld stub!\n", debugstr_w(device_interface), property_key, property_type,
+          property_buffer, property_buffer_size, flags);
+
+    return CR_CALL_NOT_IMPLEMENTED;
+}
diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h
index a0bb89a2a67..ee1846b0e97 100644
--- a/include/cfgmgr32.h
+++ b/include/cfgmgr32.h
@@ -26,6 +26,7 @@
 #endif
 
 #include <winreg.h>
+#include <devpropdef.h>
 
 /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */
 #ifdef WINE_NO_UNICODE_MACROS
@@ -312,6 +313,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH
 #define     CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex)
 CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG);
 CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE);
+CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW(LPCWSTR,const DEVPROPKEY*,DEVPROPTYPE*,PBYTE,PULONG,ULONG);
 CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG);
 CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE);
 CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG);

From c052bc05295222afa5d3bc238e8df5e782d2d180 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 6 Mar 2024 20:56:10 -0600
Subject: [PATCH 233/389] win32u: HACK: Clear queue QS_RAWINPUT if
 NtUserGetRawInputBuffer() got everything for Apex Legends.

CW-Bug-Id: #23533
---
 dlls/win32u/rawinput.c | 10 ++++++++++
 server/protocol.def    |  2 ++
 server/queue.c         |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c
index 3fa187f9673..1e071e30a94 100644
--- a/dlls/win32u/rawinput.c
+++ b/dlls/win32u/rawinput.c
@@ -676,6 +676,7 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data
  */
 UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT header_size )
 {
+    static int cached_clear_qs_rawinput = -1;
     unsigned int count = 0, remaining, rawinput_size, next_size, overhead;
     struct rawinput_thread_data *thread_data;
     struct hardware_msg_data *msg_data;
@@ -708,6 +709,7 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade
         {
             req->rawinput_size = rawinput_size;
             req->buffer_size = 0;
+            req->clear_qs_rawinput = 0;
             if (wine_server_call( req )) return ~0u;
             *data_size = reply->next_size;
         }
@@ -718,12 +720,20 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade
     if (!(thread_data = get_rawinput_thread_data())) return ~0u;
     rawinput = thread_data->buffer;
 
+    if (cached_clear_qs_rawinput == -1)
+    {
+        const char *sgi;
+
+        cached_clear_qs_rawinput = (sgi = getenv( "SteamGameId" )) && !strcmp( sgi, "1172470" );
+    }
+
     /* first RAWINPUT block in the buffer is used for WM_INPUT message data */
     msg_data = (struct hardware_msg_data *)NEXTRAWINPUTBLOCK(rawinput);
     SERVER_START_REQ( get_rawinput_buffer )
     {
         req->rawinput_size = rawinput_size;
         req->buffer_size = *data_size;
+        req->clear_qs_rawinput = cached_clear_qs_rawinput;
         wine_server_set_reply( req, msg_data, RAWINPUT_BUFFER_SIZE - rawinput->header.dwSize );
         if (wine_server_call( req )) return ~0u;
         next_size = reply->next_size;
diff --git a/server/protocol.def b/server/protocol.def
index cd78c8f2f26..848afbcc19c 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3872,6 +3872,8 @@ struct handle_info
 @REQ(get_rawinput_buffer)
     data_size_t rawinput_size; /* size of RAWINPUT structure */
     data_size_t buffer_size;   /* size of output buffer */
+    int         clear_qs_rawinput;
+    int         __pad;
 @REPLY
     data_size_t next_size; /* minimum size to get next message data */
     unsigned int count;
diff --git a/server/queue.c b/server/queue.c
index 12592241c92..a41ae7583af 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -3971,6 +3971,8 @@ DECL_HANDLER(get_rawinput_buffer)
         count++;
     }
 
+    if (req->clear_qs_rawinput && !ptr) clear_queue_bits( current->queue, QS_RAWINPUT );
+
     reply->next_size = next_size;
     reply->count = count;
     set_reply_data_ptr( buf, pos );

From bbb57dd771f2914ffb1e0de9ea6faf714e717bbb Mon Sep 17 00:00:00 2001
From: Brendan McGrath <bmcgrath@codeweavers.com>
Date: Fri, 8 Mar 2024 07:18:13 +1100
Subject: [PATCH 234/389] amend! mshtml: Pass DOMEvent instead of nsIDOMEvent
 during handle_event.

mshtml: Pass DOMEvent instead of nsIDOMEvent during handle_event.

CW-Bug-Id: #23083

(cherry picked from commit 277acf61d0fb8e5d36fbadda8ecb349dd3dcc435)

From 07f4d1ae893a3c12a65ac42e3fabcf5c8d4fa8d0 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 8 Mar 2024 15:21:54 +0800
Subject: [PATCH 235/389] user32/tests: Add some ReleaseCapture() tests.

CW-Bug-Id: #23531
---
 dlls/user32/tests/win.c | 77 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 69c8d945951..822c266eba6 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -13061,6 +13061,82 @@ static void test_shell_tray(void)
     DestroyWindow(hwnd);
 }
 
+static int wm_mousemove_count;
+static BOOL do_release_capture;
+
+static LRESULT WINAPI test_ReleaseCapture_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+    if (msg == WM_MOUSEMOVE)
+    {
+        wm_mousemove_count++;
+        if (wm_mousemove_count >= 100)
+            return 1;
+
+        if (do_release_capture)
+            ReleaseCapture();
+        return 0;
+    }
+    return DefWindowProcA(hwnd, msg, wp, lp);
+}
+
+static void test_ReleaseCapture(void)
+{
+    WNDCLASSA cls = {0};
+    ATOM atom;
+    HWND hwnd;
+    POINT pt;
+    BOOL ret;
+
+    cls.lpfnWndProc = test_ReleaseCapture_proc;
+    cls.hInstance = GetModuleHandleA(0);
+    cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
+    cls.hbrBackground = GetStockObject(BLACK_BRUSH);
+    cls.lpszClassName = "test_ReleaseCapture_class";
+    atom = RegisterClassA(&cls);
+    ok(!!atom, "RegisterClassA failed, error %#lx.\n", GetLastError());
+
+    hwnd = CreateWindowExA(WS_EX_TOPMOST, cls.lpszClassName, "", WS_POPUP | WS_VISIBLE, 100, 100,
+                           100, 100, NULL, NULL, 0, NULL);
+    ok(!!hwnd, "CreateWindowA failed, error %#lx.\n", GetLastError());
+    ret = SetForegroundWindow(hwnd);
+    ok(ret, "SetForegroundWindow failed, error %#lx.\n", GetLastError());
+    GetCursorPos(&pt);
+    ret = SetCursorPos(150, 150);
+    ok(ret, "SetCursorPos failed, error %#lx.\n", GetLastError());
+    flush_events(TRUE);
+
+    /* Test a Wine bug that WM_MOUSEMOVE is post too many times when calling ReleaseCapture() during
+     * handling WM_MOUSEMOVE and the cursor is on the window */
+    do_release_capture = TRUE;
+    ret = ReleaseCapture();
+    ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError());
+    flush_events(TRUE);
+    do_release_capture = FALSE;
+    todo_wine
+    ok(wm_mousemove_count < 10, "Got too many WM_MOUSEMOVE.\n");
+
+    /* Test that ReleaseCapture() should send a WM_MOUSEMOVE if a window is captured */
+    SetCapture(hwnd);
+    wm_mousemove_count = 0;
+    ret = ReleaseCapture();
+    ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError());
+    flush_events(TRUE);
+    ok(wm_mousemove_count == 1, "Got no WM_MOUSEMOVE.\n");
+
+    /* Test that ReleaseCapture() shouldn't send WM_MOUSEMOVE if no window is captured */
+    wm_mousemove_count = 0;
+    ret = ReleaseCapture();
+    ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError());
+    flush_events(TRUE);
+    todo_wine
+    ok(wm_mousemove_count == 0, "Got WM_MOUSEMOVE.\n");
+
+    ret = SetCursorPos(pt.x, pt.y);
+    ok(ret, "SetCursorPos failed, error %#lx.\n", GetLastError());
+    DestroyWindow(hwnd);
+    UnregisterClassA(cls.lpszClassName, GetModuleHandleA(0));
+}
+
 START_TEST(win)
 {
     char **argv;
@@ -13243,6 +13319,7 @@ START_TEST(win)
     test_cancel_mode();
     test_DragDetect();
     test_WM_NCCALCSIZE();
+    test_ReleaseCapture();
 
     /* add the tests above this line */
     if (hhook) UnhookWindowsHookEx(hhook);

From fafcc251402e5d5970c349f60234edfdbdee1d5c Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 8 Mar 2024 16:38:16 +0800
Subject: [PATCH 236/389] win32u: Only send mouse input in ReleaseCapture()
 when a window is captured.

Fix a regression from "bb496ea8 - server: Always queue mouse messages delivered to another window."

Fix ETHER VAPOR Remaster (214570) launches to black screen when the cursor is in the game window.

The game calls ReleaseCapture() when handling WM_MOUSEMOVE. After bb496ea8, WM_MOUSEMOVE is always
queued because the message window is NULL. So ReleaseCapture() ends up queuing another WM_MOUSEMOVE.
So the game ends up handling infinite WM_MOUSEMOVE messages at startup and is not able to do anything.

CW-Bug-Id: #23531
---
 dlls/user32/tests/win.c | 2 --
 dlls/win32u/input.c     | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 822c266eba6..8f5d1c0b973 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -13112,7 +13112,6 @@ static void test_ReleaseCapture(void)
     ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError());
     flush_events(TRUE);
     do_release_capture = FALSE;
-    todo_wine
     ok(wm_mousemove_count < 10, "Got too many WM_MOUSEMOVE.\n");
 
     /* Test that ReleaseCapture() should send a WM_MOUSEMOVE if a window is captured */
@@ -13128,7 +13127,6 @@ static void test_ReleaseCapture(void)
     ret = ReleaseCapture();
     ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError());
     flush_events(TRUE);
-    todo_wine
     ok(wm_mousemove_count == 0, "Got WM_MOUSEMOVE.\n");
 
     ret = SetCursorPos(pt.x, pt.y);
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index 69bc57f3ca4..9acdeb40388 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1803,10 +1803,13 @@ HWND WINAPI NtUserSetCapture( HWND hwnd )
  */
 BOOL release_capture(void)
 {
-    BOOL ret = set_capture_window( 0, 0, NULL );
+    HWND previous = NULL;
+    BOOL ret;
+
+    ret = set_capture_window( 0, 0, &previous );
 
     /* Somebody may have missed some mouse movements */
-    if (ret)
+    if (ret && previous)
     {
         INPUT input = { .type = INPUT_MOUSE };
         input.mi.dwFlags = MOUSEEVENTF_MOVE;

From 77ddaa6dcfdc02e028731a8d1492e46a6e175e16 Mon Sep 17 00:00:00 2001
From: Renato Pereyra <renatopereyra@google.com>
Date: Thu, 7 Mar 2024 11:32:29 -0600
Subject: [PATCH 237/389] winex11.drv: Apply the GL vendor override for Intel
 GPUs too

https://github.com/ValveSoftware/wine/pull/222

The vendor override forces wine to report an AMD GPU. Previously,
the vendor override only applied for NVIDIA GPUs.

Also, rename WINE_GL_HIDE_NVIDIA to WINE_GL_VENDOR_REPORT_AMD.

More info: https://github.com/ValveSoftware/Proton/issues/7529
---
 dlls/winex11.drv/opengl.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index fde7a9672af..cd8889f6091 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -3495,7 +3495,7 @@ static const GLubyte *wglGetString(GLenum name)
         int sz;
 
         override_vendor = 0;
-        if ((env = getenv("WINE_GL_HIDE_NVIDIA")))
+        if ((env = getenv("WINE_GL_VENDOR_REPORT_AMD")))
         {
             override_vendor = env[0] != '0';
         }
@@ -3523,13 +3523,19 @@ static const GLubyte *wglGetString(GLenum name)
         if (name == GL_RENDERER)
         {
             s = pglGetString(name);
-            if (s && strstr((const char *)s, "NVIDIA")) return (const GLubyte *)"AMD Radeon Graphics";
+            if (s && (strstr((const char *)s, "NVIDIA") || strstr((const char *)s, "Intel")))
+            {
+                return (const GLubyte *)"AMD Radeon Graphics";
+            }
             return s;
         }
         else if (name == GL_VENDOR)
         {
             s = pglGetString(name);
-            if (s && strstr((const char *)s, "NVIDIA")) return (const GLubyte *)"AMD";
+            if (s && (strstr((const char *)s, "NVIDIA") || strstr((const char *)s, "Intel")))
+            {
+                return (const GLubyte *)"AMD";
+            }
             return s;
         }
     }

From 9f1b447856caf856ab10d9936a37f71ad59fc6df Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Thu, 7 Mar 2024 20:18:03 +0000
Subject: [PATCH 238/389] mscoree: Implement CLRRuntimeHost_Start.

(cherry picked from commit 934cfb86b5e2b485b4b90e1eeac4021733559591)

CW-Bug-Id: #23538
---
 dlls/mscoree/corruntimehost.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c
index c8d384730c0..f931473de7a 100644
--- a/dlls/mscoree/corruntimehost.c
+++ b/dlls/mscoree/corruntimehost.c
@@ -814,8 +814,12 @@ static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface)
 
 static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface)
 {
-    FIXME("(%p)\n", iface);
-    return E_NOTIMPL;
+    RuntimeHost *This = impl_from_ICLRRuntimeHost( iface );
+    MonoDomain *dummy;
+
+    TRACE("%p\n", This);
+
+    return RuntimeHost_GetDefaultDomain(This, NULL, &dummy);
 }
 
 static HRESULT WINAPI CLRRuntimeHost_Stop(ICLRRuntimeHost* iface)

From fc83dbd83748ba2dcae8bdeafe22b81c2975376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 26 Nov 2023 18:59:54 +0100
Subject: [PATCH 239/389] loader: Expose the standard debugging symbols for
 GDB.

CW-Bug-Id: #22176
---
 loader/main.c      |  3 ++-
 loader/preloader.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/loader/main.c b/loader/main.c
index c258e025183..5a208cc048c 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -38,7 +38,8 @@
 
 extern char **environ;
 
-/* the preloader will set this variable */
+/* the preloader will set these variables */
+__attribute((visibility("default"))) struct r_debug *wine_r_debug = NULL;
 const __attribute((visibility("default"))) struct wine_preload_info *wine_main_preload_info = NULL;
 
 /* canonicalize path and return its directory name */
diff --git a/loader/preloader.c b/loader/preloader.c
index d0551bae63a..f27d6df8c17 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -79,12 +79,16 @@
 #ifdef HAVE_ELF_H
 # include <elf.h>
 #endif
+
+/* define _r_debug so we can re-define it as r_debug_extended */
+#define _r_debug no_r_debug;
 #ifdef HAVE_LINK_H
 # include <link.h>
 #endif
 #ifdef HAVE_SYS_LINK_H
 # include <sys/link.h>
 #endif
+#undef _r_debug
 
 #include "wine/asm.h"
 #include "main.h"
@@ -1387,6 +1391,39 @@ static void set_process_name( int argc, char *argv[] )
     for (i = 1; i < argc; i++) argv[i] -= off;
 }
 
+struct wld_r_debug_extended
+{
+    struct r_debug base;
+    struct wld_r_debug_extended *r_next;
+};
+
+/* GDB integration, _r_debug_state is *required* for GDB to hook the preloader */
+__attribute((visibility("default"))) void _r_debug_state(void) {}
+__attribute((visibility("default"))) struct wld_r_debug_extended _r_debug = {{0}};
+
+/* sets the preloader r_debug address into DT_DEBUG */
+static void init_r_debug( struct wld_auxv *av )
+{
+    ElfW(Phdr) *phdr, *ph;
+    ElfW(Dyn) *dyn = NULL;
+    char *l_addr;
+    int phnum;
+
+    _r_debug.base.r_version = 2;
+    _r_debug.base.r_brk = (ElfW(Addr))_r_debug_state;
+
+    if (!(phnum = get_auxiliary( av, AT_PHNUM, 0 ))) return;
+    if (!(phdr = (void *)get_auxiliary( av, AT_PHDR, 0 ))) return;
+    l_addr = (char *)phdr - sizeof(ElfW(Ehdr));
+    _r_debug.base.r_ldbase = (ElfW(Addr))l_addr;
+
+    for (ph = phdr; ph < &phdr[phnum]; ++ph) if (ph->p_type == PT_DYNAMIC) break;
+    if (ph >= &phdr[phnum]) return;
+
+    dyn = (void *)(ph->p_vaddr + l_addr);
+    while (dyn->d_tag != DT_DEBUG && dyn->d_tag != DT_NULL) dyn++;
+    if (dyn->d_tag == DT_DEBUG) dyn->d_un.d_ptr = (uintptr_t)&_r_debug;
+}
 
 /*
  *  wld_start
@@ -1403,6 +1440,7 @@ void* wld_start( void **stack )
     struct wld_auxv new_av[8], delete_av[3], *av;
     struct wld_link_map main_binary_map, ld_so_map;
     struct wine_preload_info **wine_main_preload_info;
+    struct r_debug *ld_so_r_debug, **wine_r_debug;
 
     pargc = *stack;
     argv = (char **)pargc + 1;
@@ -1432,6 +1470,8 @@ void* wld_start( void **stack )
     dump_auxiliary( av );
 #endif
 
+    init_r_debug( av );
+
     /* reserve memory that Wine needs */
     if (reserve) preload_reserve( reserve );
     for (i = 0; preload_info[i].size; i++)
@@ -1470,6 +1510,17 @@ void* wld_start( void **stack )
     interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp;
     map_so_lib( interp, &ld_so_map );
 
+    /* expose ld.so _r_debug as a separate namespace in r_next */
+    ld_so_r_debug = find_symbol( &ld_so_map, "_r_debug", STT_OBJECT );
+    if (ld_so_r_debug) _r_debug.r_next = (struct wld_r_debug_extended *)ld_so_r_debug;
+    else wld_printf( "_r_debug not found in ld.so\n" );
+
+    _r_debug_state(); /* notify GDB that _r_debug is ready */
+
+    wine_r_debug = find_symbol( &main_binary_map, "wine_r_debug", STT_OBJECT );
+    if (wine_r_debug) *wine_r_debug = &_r_debug.base;
+    else wld_printf( "wine_r_debug not found\n" );
+
     /* store pointer to the preload info into the appropriate main binary variable */
     wine_main_preload_info = find_symbol( &main_binary_map, "wine_main_preload_info", STT_OBJECT );
     if (wine_main_preload_info) *wine_main_preload_info = preload_info;

From 8e3f7bd95d66091f9dfa8af7238f2fa5d43f2a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 26 Nov 2023 18:59:54 +0100
Subject: [PATCH 240/389] ntdll: Maintain a PE module link map and expose it to
 GDB.

CW-Bug-Id: #22176
---
 dlls/ntdll/unix/virtual.c | 130 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 97b55022c7a..afdbae04c60 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -51,6 +51,12 @@
 #ifdef HAVE_SYS_USER_H
 # include <sys/user.h>
 #endif
+#ifdef HAVE_LINK_H
+# include <link.h>
+#endif
+#ifdef HAVE_SYS_LINK_H
+# include <sys/link.h>
+#endif
 #ifdef HAVE_LIBPROCSTAT_H
 # include <libprocstat.h>
 #endif
@@ -82,6 +88,120 @@ WINE_DECLARE_DEBUG_CHANNEL(module);
 WINE_DECLARE_DEBUG_CHANNEL(virtual_ranges);
 WINE_DECLARE_DEBUG_CHANNEL(virtstat);
 
+/* Gdb integration, in loader/main.c */
+static struct r_debug *wine_r_debug;
+
+#if defined(HAVE_LINK_H) || defined(HAVE_SYS_LINK_H)
+
+struct link_map_entry
+{
+    struct link_map map;
+    const void *module;
+};
+static struct link_map link_map = {.l_name = (char *)""};
+
+static void r_debug_set_state( int state )
+{
+    wine_r_debug->r_map = &link_map;
+    wine_r_debug->r_state = state;
+    ((void (*)(void))wine_r_debug->r_brk)();
+}
+
+static char *get_path_from_fd( int fd, int sz )
+{
+#ifdef linux
+    char *ret = malloc( 32 + sz );
+
+    if (ret) sprintf( ret, "/proc/self/fd/%u", fd );
+    return ret;
+#elif defined(F_GETPATH)
+    char *ret = malloc( PATH_MAX + sz );
+
+    if (!ret) return NULL;
+    if (!fcntl( fd, F_GETPATH, ret )) return ret;
+    free( ret );
+    return NULL;
+#else
+    return NULL;
+#endif
+}
+
+static char *r_debug_path_from_fd( int fd )
+{
+    char *real, *path;
+    if (!(path = get_path_from_fd( fd, 0 ))) return NULL;
+    if (!(real = realpath( path, NULL ))) return path;
+    free( path );
+    return real;
+}
+
+static void r_debug_add_module( void *module, int fd, INT_PTR offset )
+{
+    struct link_map *ptr = link_map.l_next, *next;
+    struct link_map_entry *entry;
+
+    if (!wine_r_debug) return;
+
+    while (ptr)
+    {
+        entry = LIST_ENTRY(ptr, struct link_map_entry, map);
+        if (entry->module == module) break;
+        ptr = ptr->l_next;
+    }
+
+    r_debug_set_state( RT_ADD );
+
+    if (ptr) entry->map.l_addr = offset;
+    else if ((entry = calloc( 1, sizeof(*entry) )))
+    {
+        entry->module = module;
+        entry->map.l_addr = offset;
+        entry->map.l_name = r_debug_path_from_fd( fd );
+
+        entry->map.l_next = link_map.l_next;
+        if ((next = entry->map.l_next)) next->l_prev = &entry->map;
+        entry->map.l_prev = &link_map;
+        link_map.l_next = &entry->map;
+    }
+
+    r_debug_set_state( RT_CONSISTENT );
+}
+
+static void r_debug_remove_module( void *module )
+{
+    struct link_map *ptr = link_map.l_next, *next;
+    struct link_map_entry *entry;
+
+    if (!wine_r_debug) return;
+
+    while (ptr)
+    {
+        entry = LIST_ENTRY(ptr, struct link_map_entry, map);
+        if (entry->module == module) break;
+        ptr = ptr->l_next;
+    }
+    if (!ptr) return;
+
+    r_debug_set_state( RT_DELETE );
+
+    entry->map.l_prev->l_next = entry->map.l_next;
+    if ((next = entry->map.l_next)) next->l_prev = entry->map.l_prev;
+
+    r_debug_set_state( RT_CONSISTENT );
+
+    free( entry->map.l_name );
+    free( entry );
+}
+
+#else /* defined(HAVE_LINK_H) || defined(HAVE_SYS_LINK_H) */
+
+#define RT_CONSISTENT 0
+static void r_debug_set_state( int state ) {}
+static void r_debug_add_module( void *module, int fd, INT_PTR offset ) {}
+static void r_debug_remove_module( void *module ) {}
+
+#endif /* defined(HAVE_LINK_H) || defined(HAVE_SYS_LINK_H) */
+
 struct preload_info
 {
     void  *addr;
@@ -3051,6 +3171,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
 #ifdef VALGRIND_LOAD_PDB_DEBUGINFO
     VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, ptr - (char *)wine_server_get_ptr( image_info->base ));
 #endif
+    r_debug_add_module( ptr, fd, ptr - (char *)wine_server_get_ptr( image_info->base ) );
     return STATUS_SUCCESS;
 }
 
@@ -3413,11 +3534,14 @@ static int disable_kernel_ww( int argc, char *argv[] )
 void virtual_init( int argc, char *argv[] )
 {
     const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" );
+    struct r_debug **r_debug = dlsym( RTLD_DEFAULT, "wine_r_debug" );
     const char *preload = getenv( "WINEPRELOADRESERVE" );
     size_t size;
     int i;
     pthread_mutexattr_t attr;
 
+    if (r_debug && (wine_r_debug = *r_debug)) r_debug_set_state( RT_CONSISTENT );
+
     pthread_mutexattr_init( &attr );
     pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );
     pthread_mutex_init( &virtual_mutex, &attr );
@@ -5972,7 +6096,11 @@ static NTSTATUS unmap_view_of_section( HANDLE process, PVOID addr, ULONG flags )
     SERVER_END_REQ;
     if (!status)
     {
-        if (view->protect & SEC_IMAGE) release_builtin_module( view->base );
+        if (view->protect & SEC_IMAGE)
+        {
+            r_debug_remove_module( view->base );
+            release_builtin_module( view->base );
+        }
         if (flags & MEM_PRESERVE_PLACEHOLDER) free_pages_preserve_placeholder( view, view->base, view->size );
         else delete_view( view );
     }

From 9c5f2804d5a986cd132d4583da3ae07287fd46d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sun, 26 Nov 2023 18:35:47 +0100
Subject: [PATCH 241/389] tools: Add gdbunwind.py script with a syscall
 unwinder.

CW-Bug-Id: #22176
---
 tools/gdbunwind.py | 177 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 tools/gdbunwind.py

diff --git a/tools/gdbunwind.py b/tools/gdbunwind.py
new file mode 100644
index 00000000000..8611d789f1f
--- /dev/null
+++ b/tools/gdbunwind.py
@@ -0,0 +1,177 @@
+#!/bin/env python3
+
+# Copyright 2021 Rémi Bernon for CodeWeavers
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+from gdb.unwinder import Unwinder
+import gdb
+import re
+
+ARCH_OFFSETS_X86_64 = {
+    "rax":           (0x0000, 'void *'),
+    "rbx":           (0x0008, 'void *'),
+    "rcx":           (0x0010, 'void *'),
+    "rdx":           (0x0018, 'void *'),
+    "rsi":           (0x0020, 'void *'),
+    "rdi":           (0x0028, 'void *'),
+    "r8":            (0x0030, 'void *'),
+    "r9":            (0x0038, 'void *'),
+    "r10":           (0x0040, 'void *'),
+    "r11":           (0x0048, 'void *'),
+    "r12":           (0x0050, 'void *'),
+    "r13":           (0x0058, 'void *'),
+    "r14":           (0x0060, 'void *'),
+    "r15":           (0x0068, 'void *'),
+    "rip":           (0x0070, 'void *'),
+    "cs":            (0x0078, 'void *'),
+    "eflags":        (0x0080, 'void *'),
+    "rsp":           (0x0088, 'void *'),
+    "ss":            (0x0090, 'void *'),
+    "rbp":           (0x0098, 'void *'),
+    "prev_frame":    (0x00a0, 'void *'),
+    "syscall_cfa":   (0x00a8, 'void *'),
+    # "syscall_flags": (0x00b0, 'unsigned int'),
+    # "restore_flags": (0x00b4, 'unsigned int'),
+    "teb_offset":    (0x0328, 'void *'),
+}
+
+ARCH_OFFSETS_I386 = {
+    # "syscall_flags": (0x000, 'unsigned short'),
+    # "restore_flags": (0x002, 'unsigned short'),
+    "eflags":        (0x004, 'unsigned int'),
+    "eip":           (0x008, 'void *'),
+    "esp":           (0x00c, 'void *'),
+    "cs":            (0x010, 'unsigned short'),
+    "ss":            (0x012, 'unsigned short'),
+    "ds":            (0x014, 'unsigned short'),
+    "es":            (0x016, 'unsigned short'),
+    "fs":            (0x018, 'unsigned short'),
+    "gs":            (0x01a, 'unsigned short'),
+    "eax":           (0x01c, 'void *'),
+    "ebx":           (0x020, 'void *'),
+    "ecx":           (0x024, 'void *'),
+    "edx":           (0x028, 'void *'),
+    "edi":           (0x02c, 'void *'),
+    "esi":           (0x030, 'void *'),
+    "ebp":           (0x034, 'void *'),
+    "syscall_cfa":   (0x038, 'void *'),
+    "prev_frame":    (0x03c, 'void *'),
+    "teb_offset":    (0x1f8, 'void *'),
+}
+
+
+def arch_offsets(arch):
+    if 'x86-64' in arch:
+        return ARCH_OFFSETS_X86_64
+    if 'i386' in arch:
+        return ARCH_OFFSETS_I386
+
+
+def find_syscall_frame(sp, arch, teb):
+    (off, type) = arch_offsets(arch)['teb_offset']
+    frame = int(gdb.parse_and_eval(f'*(void **){teb + off}'))
+
+    while frame:
+        (off, type) = arch_offsets(arch)['prev_frame']
+        next_frame = int(gdb.parse_and_eval(f'*(void **){(frame + off)}'))
+        if not next_frame: return frame
+
+        (off, type) = arch_offsets(arch)['ebp']
+        ebp = int(gdb.parse_and_eval(f'*(void **){(next_frame + off)}'))
+        if ebp >= sp: return frame
+
+
+def callback_registers(pc, sp, pending_frame):
+    arch = pending_frame.architecture().name()
+
+    if 'x86-64' in arch:
+        frame = int(pending_frame.read_register("rbp"))
+        frame = (frame - 0x448) & ~0x3f
+
+        (off, type) = arch_offsets(arch)['syscall_cfa']
+        val = gdb.parse_and_eval(f'*({type} *){int(frame + off)}')
+        yield 'rip', gdb.parse_and_eval(f'*(void **){int(val - 8)}')
+        yield 'rbp', val - 16
+
+    elif 'i386' in arch:
+        teb = int(pending_frame.read_register('edx'))
+        frame = find_syscall_frame(sp, arch, teb)
+
+        (off, type) = arch_offsets(arch)['syscall_cfa']
+        val = gdb.parse_and_eval(f'*({type} *){int(frame + off)}')
+        yield 'eip', gdb.parse_and_eval(f'*(void **){int(val - 4)}')
+        yield 'ebp', val - 8
+
+
+def registers(pc, sp, pending_frame):
+    arch = pending_frame.architecture().name()
+    frame = sp
+
+    if 'x86-64' in arch:
+        if 'syscall' in str(pc):
+            rbp = pending_frame.read_register("rbp")
+            frame = rbp - 0x98
+    elif 'i386' in arch:
+        if 'syscall' in str(pc):
+            ebp = pending_frame.read_register("ebp")
+            frame = ebp - 0x34
+        else:
+            frame += 16
+
+    for reg, (off, type) in arch_offsets(arch).items():
+        val = gdb.parse_and_eval(f'*({type} *){int(frame + off)}')
+
+        if reg in ('eflags', 'cs', 'ss', 'ds', 'es', 'fs', 'gs'):
+            int32 = gdb.lookup_type('int')
+            val = val.cast(int32)
+        if reg in ('syscall_cfa', 'prev_frame', 'teb_offset'):
+            continue
+
+        yield reg, val
+
+
+class WineSyscallFrameId(object):
+    def __init__(self, sp, pc):
+        self.sp = sp
+        self.pc = pc
+
+
+class WineSyscallUnwinder(Unwinder):
+    def __init__(self):
+        super().__init__("WineSyscallUnwinder", gdb.SIGTRAMP_FRAME)
+        self.pattern = re.compile('__wine_(syscall|unix_call)'
+                                  '|KiUserCallbackDispatcher')
+
+    def __call__(self, pending_frame):
+        pc = pending_frame.read_register("pc")
+        if self.pattern.search(str(pc)) is None:
+            return None
+
+        sp = pending_frame.read_register("sp")
+        frame = WineSyscallFrameId(sp, pc)
+        if 'KiUserCallbackDispatcher' in str(pc):
+            unwind_info = pending_frame.create_unwind_info(frame)
+            for reg, val in callback_registers(pc, sp, pending_frame):
+                unwind_info.add_saved_register(reg, val)
+            return unwind_info
+
+        unwind_info = pending_frame.create_unwind_info(frame)
+        for reg, val in registers(pc, sp, pending_frame):
+            unwind_info.add_saved_register(reg, val)
+        return unwind_info
+
+
+gdb.unwinder.register_unwinder(None, WineSyscallUnwinder(), replace=True)

From eb709ed1d706c7d779e662b72717b5db80aa2808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 22 Jan 2024 20:28:29 +0100
Subject: [PATCH 242/389] HACK: loader: Map /run/host to / in the link map.

CW-Bug-Id: #22176
---
 dlls/ntdll/unix/virtual.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index afdbae04c60..44ca5043dd0 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -131,6 +131,7 @@ static char *r_debug_path_from_fd( int fd )
     char *real, *path;
     if (!(path = get_path_from_fd( fd, 0 ))) return NULL;
     if (!(real = realpath( path, NULL ))) return path;
+    if (!strncmp( real, "/run/host", 9 )) memmove( real, real + 9, strlen( real ) - 8 );
     free( path );
     return real;
 }

From 5fe119b4878a0bb78d5cf44dd7031888052aa474 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 8 Mar 2024 19:45:07 -0600
Subject: [PATCH 243/389] imm32: Set lengths to 0 for NULL strings in
 ImmSetCompositionString().

CW-Bug-Id: #23541
---
 dlls/imm32/imm.c         |  6 ++++++
 dlls/imm32/tests/imm32.c | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index cc843ce4a8e..264276d53d6 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2539,6 +2539,9 @@ BOOL WINAPI ImmSetCompositionStringA(
         return FALSE;
 
     if (!(ime = imc_select_ime( data ))) return FALSE;
+    if (!lpComp) dwCompLen = 0;
+    if (!lpRead) dwReadLen = 0;
+
     if (!ime_is_unicode( ime )) return ime->pImeSetCompositionString( hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen );
 
     comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0);
@@ -2596,6 +2599,9 @@ BOOL WINAPI ImmSetCompositionStringW(
         return FALSE;
 
     if (!(ime = imc_select_ime( data ))) return FALSE;
+    if (!lpComp) dwCompLen = 0;
+    if (!lpRead) dwReadLen = 0;
+
     if (ime_is_unicode( ime )) return ime->pImeSetCompositionString( hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen );
 
     comp_len = WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, NULL, 0, NULL,
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 66ebbfd161d..c5d2b85558e 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -1077,12 +1077,24 @@ static void test_SCS_SETSTR(void)
     DWORD prop;
 
     imc = ImmGetContext(hwnd);
-    ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0);
+    ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL, 0);
     if (!ret) {
         win_skip("Composition isn't supported\n");
         ImmReleaseContext(hwnd, imc);
         return;
     }
+
+    ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 128, NULL, 128);
+    ok(ret, "got error %lu.\n", GetLastError());
+
+    alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20);
+    ok(!alen, "got %ld.\n", alen);
+    wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20);
+    ok(!wlen, "got %ld.\n", alen);
+
+    ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL, 2);
+    ok(ret, "got error %lu.\n", GetLastError());
+
     msg_spy_flush_msgs();
 
     alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20);

From 2c6954ef9e776fd83118a2b7ec0da12cb8473437 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshui@codeweavers.com>
Date: Mon, 11 Mar 2024 23:13:41 +0000
Subject: [PATCH 244/389] wm_reader: Don't reinit stream if read_compressed
 didn't change.

CW-Bug-Id: #23483
---
 dlls/winegstreamer/wm_reader.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 1421fb6a5ac..95213b1580b 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -2447,8 +2447,11 @@ static HRESULT WINAPI reader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD st
         return E_INVALIDARG;
     }
 
-    stream->read_compressed = compressed;
-    reinit_stream(reader, compressed);
+    if (stream->read_compressed != compressed)
+    {
+        stream->read_compressed = compressed;
+        reinit_stream(reader, compressed);
+    }
 
     LeaveCriticalSection(&reader->cs);
     return S_OK;

From b36dd1400ae8a2a453e4e5e061e5236023b19951 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 11 Mar 2024 13:15:26 -0600
Subject: [PATCH 245/389] Revert "ntdll: HACK: Disable kernel write watches for
 BDO."

This reverts commit 2f075843d6131f4def5fa350b3d7923a91edc913.

CW-Bug-Id: #23322
---
 dlls/ntdll/unix/loader.c       |  4 ++--
 dlls/ntdll/unix/unix_private.h |  2 +-
 dlls/ntdll/unix/virtual.c      | 15 ++++-----------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 8e70e882191..b7d1f677203 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -2278,7 +2278,7 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo
     main_envp = environ;
 
     init_paths( argv );
-    virtual_init( argc, argv );
+    virtual_init();
     init_environment();
 
 #ifdef __i386__
@@ -2525,7 +2525,7 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] )
     set_max_limit( RLIMIT_NICE );
 #endif
 
-    virtual_init( argc, argv );
+    virtual_init();
     init_environment();
 
 #ifdef __APPLE__
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 57bf0cdfd05..cf6b9ab0c53 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -245,7 +245,7 @@ extern NTSTATUS system_time_precise( void *args );
 extern void *steamclient_handle_fault( LPCVOID addr, DWORD err );
 extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags );
 extern void *anon_mmap_alloc( size_t size, int prot );
-extern void virtual_init( int argc, char *argv[] );
+extern void virtual_init(void);
 extern ULONG_PTR get_system_affinity_mask(void);
 extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 );
 extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size,
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 44ca5043dd0..32977a07008 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -3520,19 +3520,10 @@ static void *alloc_virtual_heap( SIZE_T size )
     return anon_mmap_alloc( size, PROT_READ | PROT_WRITE );
 }
 
-static int disable_kernel_ww( int argc, char *argv[] )
-{
-    const char *env_var;
-
-    if ((env_var = getenv("WINE_DISABLE_KERNEL_WRITEWATCH"))) return !!atoi(env_var);
-    if (argc > 1 && argv && argv[1] && strstr( argv[1], "blackdesert64.exe" )) return 1;
-    return 0;
-}
-
 /***********************************************************************
  *           virtual_init
  */
-void virtual_init( int argc, char *argv[] )
+void virtual_init(void)
 {
     const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" );
     struct r_debug **r_debug = dlsym( RTLD_DEFAULT, "wine_r_debug" );
@@ -3540,6 +3531,7 @@ void virtual_init( int argc, char *argv[] )
     size_t size;
     int i;
     pthread_mutexattr_t attr;
+    const char *env_var;
 
     if (r_debug && (wine_r_debug = *r_debug)) r_debug_set_state( RT_CONSISTENT );
 
@@ -3555,7 +3547,8 @@ void virtual_init( int argc, char *argv[] )
     host_addr_space_limit = address_space_limit;
 #endif
 
-    if (!disable_kernel_ww( argc, argv ) && (pagemap_reset_fd = open("/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC)) != -1)
+    if (!((env_var = getenv("WINE_DISABLE_KERNEL_WRITEWATCH")) && atoi(env_var))
+            && (pagemap_reset_fd = open("/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC)) != -1)
     {
         use_kernel_writewatch = TRUE;
         if ((pagemap_fd = open("/proc/self/pagemap", O_RDONLY | O_CLOEXEC)) == -1)

From 33c20873be9eb92b64be0916f2d6093d5955ac0f Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 11 Mar 2024 16:18:46 -0600
Subject: [PATCH 246/389] Revert "ntdll: Use kernel soft dirty flags for write
 watches support."

This reverts commit af8ab05b7931136a920a28cb73074c25bca1def9.

CW-Bug-Id: #23524
---
 dlls/kernel32/tests/virtual.c |  54 +-----------
 dlls/ntdll/unix/virtual.c     | 153 +++-------------------------------
 2 files changed, 16 insertions(+), 191 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index 445f519f409..c54fb16ba15 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -2127,61 +2127,15 @@ static void test_write_watch(void)
     ok( count == 1, "wrong count %Iu\n", count );
     ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] );
 
-    ret = pResetWriteWatch( base, size );
-    ok( !ret, "pResetWriteWatch failed %u\n", GetLastError() );
-
-    ret = VirtualProtect( base, 6*pagesize, PAGE_READWRITE, &old_prot );
-    ok( ret, "VirtualProtect failed error %u\n", GetLastError() );
-    ok( old_prot == PAGE_NOACCESS, "wrong old prot %x\n", old_prot );
-
-    base[3*pagesize + 200] = 3;
-    base[5*pagesize + 200] = 3;
-
     ret = VirtualFree( base, size, MEM_DECOMMIT );
     ok( ret, "VirtualFree failed %lu\n", GetLastError() );
 
     count = 64;
     ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
-    ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
-    ok( !count, "wrong count %lu\n", count );
-
-    base = VirtualAlloc( base, size, MEM_COMMIT, PAGE_READWRITE );
-    ok(!!base, "VirtualAlloc failed.\n");
-
-    count = 64;
-    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
-    ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
-    ok( !count, "wrong count %lu\n", count );
-
-    base[3*pagesize + 200] = 3;
-    ret = VirtualProtect( base, 6*pagesize, PAGE_READWRITE, &old_prot );
-    ok( ret, "VirtualProtect failed error %u\n", GetLastError() );
-    ok( old_prot == PAGE_READWRITE, "wrong old prot %x\n", old_prot );
-
-    base[5*pagesize + 200] = 3;
-    count = 64;
-    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
-    ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
-    ok( count == 2, "wrong count %lu\n", count );
-    ok( results[0] == base + 3*pagesize && results[1] == base + 5*pagesize, "wrong result %p\n", results[0] );
-
-    ret = VirtualFree( base, size, MEM_DECOMMIT );
-    ok( ret, "VirtualFree failed %u\n", GetLastError() );
-
-    count = 64;
-    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
-    ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
-    todo_wine ok( count == 1, "wrong count %lu\n", count );
-    ok( results[0] == base + 3*pagesize, "wrong result %p\n", results[0] );
-
-    base = VirtualAlloc( base, size, MEM_COMMIT, PAGE_READWRITE );
-    ok(!!base, "VirtualAlloc failed.\n");
-
-    count = 64;
-    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
-    ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
-    todo_wine ok( count == 1, "wrong count %lu\n", count );
-    ok( results[0] == base + 3*pagesize, "wrong result %p\n", results[0] );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 1 || broken(count == 0), /* win98 */
+        "wrong count %Iu\n", count );
+    if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] );
 
     VirtualFree( base, 0, MEM_RELEASE );
 }
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 32977a07008..66e9de9e6d3 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -332,13 +332,6 @@ static BYTE **pages_vprot;
 static BYTE *pages_vprot;
 #endif
 
-static BOOL use_kernel_writewatch;
-static int pagemap_fd, pagemap_reset_fd, clear_refs_fd;
-#define PAGE_FLAGS_BUFFER_LENGTH 1024
-#define PM_SOFT_DIRTY_PAGE (1ull << 57)
-
-static void reset_write_watches( void *base, SIZE_T size );
-
 static struct file_view *view_block_start, *view_block_end, *next_free_view;
 #ifdef _WIN64
 static const size_t view_block_size = 0x200000;
@@ -1280,7 +1273,7 @@ static int get_unix_prot( BYTE vprot )
         if (vprot & VPROT_WRITE) prot |= PROT_WRITE | PROT_READ;
         if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE | PROT_READ;
         if (vprot & VPROT_EXEC) prot |= PROT_EXEC | PROT_READ;
-        if (vprot & VPROT_WRITEWATCH && !use_kernel_writewatch) prot &= ~PROT_WRITE;
+        if (vprot & VPROT_WRITEWATCH) prot &= ~PROT_WRITE;
     }
     if (!prot) prot = PROT_NONE;
     return prot;
@@ -1703,13 +1696,6 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
         TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 );
         mprotect( base, size, unix_prot | PROT_EXEC );
     }
-
-    if (vprot & VPROT_WRITEWATCH && use_kernel_writewatch)
-    {
-        madvise( view->base, view->size, MADV_NOHUGEPAGE );
-        reset_write_watches( view->base, view->size );
-    }
-
     return STATUS_SUCCESS;
 }
 
@@ -1833,7 +1819,7 @@ static BOOL set_vprot( struct file_view *view, void *base, size_t size, BYTE vpr
 {
     int unix_prot = get_unix_prot(vprot);
 
-    if (!use_kernel_writewatch && view->protect & VPROT_WRITEWATCH)
+    if (view->protect & VPROT_WRITEWATCH)
     {
         /* each page may need different protections depending on write watch flag */
         set_page_vprot_bits( base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH );
@@ -1910,24 +1896,8 @@ static void update_write_watches( void *base, size_t size, size_t accessed_size
  */
 static void reset_write_watches( void *base, SIZE_T size )
 {
-    if (use_kernel_writewatch)
-    {
-        char buffer[17];
-        ssize_t ret;
-
-        memset(buffer, 0, sizeof(buffer));
-        buffer[0] = '6';
-        *(void **)&buffer[1] = base;
-        *(void **)&buffer[1 + 8] = (char *)base + size;
-
-        if ((ret = write(clear_refs_fd, buffer, sizeof(buffer))) != sizeof(buffer))
-            ERR("Could not clear soft dirty bits, ret %zd, error %s.\n", ret, strerror(errno));
-    }
-    else
-    {
-        set_page_vprot_bits( base, size, VPROT_WRITEWATCH, 0 );
-        mprotect_range( base, size, 0, 0 );
-    }
+    set_page_vprot_bits( base, size, VPROT_WRITEWATCH, 0 );
+    mprotect_range( base, size, 0, 0 );
 }
 
 
@@ -2261,11 +2231,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
 
         view->protect = vprot | VPROT_PLACEHOLDER;
         set_vprot( view, base, size, vprot );
-        if (vprot & VPROT_WRITEWATCH)
-        {
-            madvise( base, size, MADV_NOHUGEPAGE );
-            reset_write_watches( base, size );
-        }
+        if (vprot & VPROT_WRITEWATCH) reset_write_watches( base, size );
         *view_ret = view;
         return STATUS_SUCCESS;
     }
@@ -2434,9 +2400,6 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz
     if (!size) size = view->size;
     if (anon_mmap_fixed( (char *)view->base + start, size, PROT_NONE, 0 ) != MAP_FAILED)
     {
-        if (use_kernel_writewatch && view->protect & VPROT_WRITEWATCH)
-            madvise( view->base, view->size, MADV_NOHUGEPAGE );
-
         set_page_vprot_bits( (char *)view->base + start, size, 0, VPROT_COMMITTED );
         return STATUS_SUCCESS;
     }
@@ -3531,7 +3494,6 @@ void virtual_init(void)
     size_t size;
     int i;
     pthread_mutexattr_t attr;
-    const char *env_var;
 
     if (r_debug && (wine_r_debug = *r_debug)) r_debug_set_state( RT_CONSISTENT );
 
@@ -3547,24 +3509,6 @@ void virtual_init(void)
     host_addr_space_limit = address_space_limit;
 #endif
 
-    if (!((env_var = getenv("WINE_DISABLE_KERNEL_WRITEWATCH")) && atoi(env_var))
-            && (pagemap_reset_fd = open("/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC)) != -1)
-    {
-        use_kernel_writewatch = TRUE;
-        if ((pagemap_fd = open("/proc/self/pagemap", O_RDONLY | O_CLOEXEC)) == -1)
-        {
-            ERR("Could not open pagemap file, error %s.\n", strerror(errno));
-            exit(-1);
-        }
-        if ((clear_refs_fd = open("/proc/self/clear_refs", O_WRONLY | O_CLOEXEC)) == -1)
-        {
-            ERR("Could not open clear_refs file, error %s.\n", strerror(errno));
-            exit(-1);
-        }
-        if (ERR_ON(virtual))
-            MESSAGE("wine: using kernel write watches (experimental).\n");
-    }
-
     if (preload_info && *preload_info)
         for (i = 0; (*preload_info)[i].size; i++)
             mmap_add_reserved_area( (*preload_info)[i].addr, (*preload_info)[i].size );
@@ -4291,7 +4235,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
         }
         else ret = grow_thread_stack( page, &stack_info );
     }
-    else if (!use_kernel_writewatch && err & EXCEPTION_WRITE_FAULT)
+    else if (err & EXCEPTION_WRITE_FAULT)
     {
         if (vprot & VPROT_WRITEWATCH)
         {
@@ -4390,11 +4334,11 @@ static NTSTATUS check_write_access( void *base, size_t size, BOOL *has_write_wat
     for (i = 0; i < size; i += page_size)
     {
         BYTE vprot = get_page_vprot( addr + i );
-        if (!use_kernel_writewatch && vprot & VPROT_WRITEWATCH) *has_write_watch = TRUE;
+        if (vprot & VPROT_WRITEWATCH) *has_write_watch = TRUE;
         if (!(get_unix_prot( vprot & ~VPROT_WRITEWATCH ) & PROT_WRITE))
             return STATUS_INVALID_USER_BUFFER;
     }
-    if (!use_kernel_writewatch && *has_write_watch)
+    if (*has_write_watch)
         mprotect_range( addr, size, 0, VPROT_WRITEWATCH );  /* temporarily enable write access */
     return STATUS_SUCCESS;
 }
@@ -6297,90 +6241,17 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T
         char *addr = base;
         char *end = addr + size;
 
-        if (use_kernel_writewatch)
+        while (pos < *count && addr < end)
         {
-            static UINT64 buffer[PAGE_FLAGS_BUFFER_LENGTH];
-            unsigned int i, length;
-            ssize_t read_length;
-
-            if (flags & WRITE_WATCH_FLAG_RESET)
-            {
-                if (is_win64)
-                {
-                    addresses[0] = end;
-                    if ((read_length = pread(pagemap_reset_fd, addresses, *count * sizeof(*addresses),
-                            ((ULONG_PTR)addr >> page_shift) * sizeof(*addresses))) == -1)
-                    {
-                        ERR("Error reading page flags, read_length %zd, error %s.\n", read_length, strerror(errno));
-                        status = STATUS_INVALID_ADDRESS;
-                        goto done;
-                    }
-                    *count = read_length / sizeof(*addresses);
-                    *granularity = page_size;
-                    goto done;
-                }
-
-                while (pos < *count && addr < end)
-                {
-                    length = min(PAGE_FLAGS_BUFFER_LENGTH, *count - pos);
-
-                    buffer[0] = (ULONG_PTR)end;
-                    if ((read_length = pread(pagemap_reset_fd, buffer, length * sizeof(*buffer),
-                            ((ULONG_PTR)addr >> page_shift) * sizeof(*buffer))) == -1)
-                    {
-                        ERR("Error reading page flags, read_length %zd, error %s.\n", read_length, strerror(errno));
-                        status = STATUS_INVALID_ADDRESS;
-                        goto done;
-                    }
-                    read_length /= sizeof(*buffer);
-                    for (i = 0; i < read_length; ++i)
-                    {
-                        assert(pos < *count);
-                        addresses[pos++] = (void *)(ULONG_PTR)buffer[i];
-                    }
-                    if (read_length < length)
-                        break;
-                    addr = (char *)(ULONG_PTR)buffer[read_length - 1] + page_size;
-                }
-            }
-            else
-            {
-                while (pos < *count && addr < end)
-                {
-                    length = min(PAGE_FLAGS_BUFFER_LENGTH, (end - addr) >> page_shift);
-
-                    if ((read_length = pread(pagemap_fd, buffer, length * sizeof(*buffer),
-                            ((ULONG_PTR)addr >> page_shift) * sizeof(*buffer))) != length * sizeof(*buffer))
-                    {
-                        ERR("Error reading page flags, read_length %zd, error %s.\n", read_length, strerror(errno));
-                        status = STATUS_INVALID_ADDRESS;
-                        goto done;
-                    }
-                    for (i = 0; i < length && pos < *count; ++i)
-                    {
-                        if (buffer[i] & PM_SOFT_DIRTY_PAGE)
-                            addresses[pos++] = addr;
-
-                        addr += page_size;
-                    }
-                }
-            }
-        }
-        else
-        {
-            while (pos < *count && addr < end)
-            {
-                if (!(get_page_vprot( addr ) & VPROT_WRITEWATCH)) addresses[pos++] = addr;
-                addr += page_size;
-            }
-            if (flags & WRITE_WATCH_FLAG_RESET) reset_write_watches( base, addr - (char *)base );
+            if (!(get_page_vprot( addr ) & VPROT_WRITEWATCH)) addresses[pos++] = addr;
+            addr += page_size;
         }
+        if (flags & WRITE_WATCH_FLAG_RESET) reset_write_watches( base, addr - (char *)base );
         *count = pos;
         *granularity = page_size;
     }
     else status = STATUS_INVALID_PARAMETER;
 
-done:
     server_leave_uninterrupted_section( &virtual_mutex, &sigset );
     return status;
 }

From d7c6fec87095ed885278e432a958fa6726a22964 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 8 May 2020 14:32:09 +0300
Subject: [PATCH 247/389] ntdll: Use UFFD for write watches support if
 available.

Requires Linux kernel 6.7+ to have effect.

CW-Bug-Id: #23524
---
 dlls/kernel32/tests/virtual.c   | 162 ++++++++++++++++++++++++++++-
 dlls/ntdll/unix/uffd_tmp_defs.h |  75 ++++++++++++++
 dlls/ntdll/unix/virtual.c       | 176 ++++++++++++++++++++++++++++++--
 dlls/ws2_32/tests/sock.c        |  16 ++-
 4 files changed, 410 insertions(+), 19 deletions(-)
 create mode 100644 dlls/ntdll/unix/uffd_tmp_defs.h

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index c54fb16ba15..bc573644d97 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -1631,7 +1631,7 @@ static void test_write_watch(void)
     MEMORY_BASIC_INFORMATION info;
     HANDLE readpipe, writepipe, file;
     OVERLAPPED overlapped, *overlapped2;
-    void *results[64];
+    void *results[2048];
     ULONG_PTR count;
     ULONG i, pagesize;
     BOOL success;
@@ -1671,6 +1671,7 @@ static void test_write_watch(void)
 
     SetLastError( 0xdeadbeef );
     ret = pGetWriteWatch( 0, GetModuleHandleW(NULL), size, results, &count, &pagesize );
+    ok(ret, "failed.\n");
     if (ret)
     {
         ok( ret == ~0u, "GetWriteWatch succeeded %lu\n", ret );
@@ -1694,6 +1695,7 @@ static void test_write_watch(void)
     ok( results[0] == base + pagesize, "wrong result %p\n", results[0] );
 
     count = 64;
+    results[0] = (void *)0xdeadbeef;
     ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
     ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
     ok( count == 1, "wrong count %Iu\n", count );
@@ -2103,6 +2105,16 @@ static void test_write_watch(void)
 
     base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_WRITE_WATCH, PAGE_NOACCESS );
     ok( base != NULL, "VirtualAlloc failed %lu\n", GetLastError() );
+
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 0, "wrong count %Iu\n", count );
+
+    ret = pResetWriteWatch( base, size );
+    ok( !ret, "pResetWriteWatch failed %lu\n", GetLastError() );
+
+
     base = VirtualAlloc( base, size, MEM_COMMIT, PAGE_NOACCESS );
     ok( base != NULL, "VirtualAlloc failed %lu\n", GetLastError() );
 
@@ -2122,20 +2134,160 @@ static void test_write_watch(void)
     ok( old_prot == PAGE_READWRITE, "wrong old prot %lx\n", old_prot );
 
     count = 64;
-    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ret = pGetWriteWatch( /*0*/WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
     ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
     ok( count == 1, "wrong count %Iu\n", count );
     ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] );
 
+    ret = pResetWriteWatch( base, size );
+    ret = pResetWriteWatch( base + 6*pagesize, size - 6 * pagesize );
+    ok( !ret, "pResetWriteWatch failed %lu\n", GetLastError() );
+
+    count = 64;
+    results[0] = (void *)0xdeadbeef;
+    ret = pGetWriteWatch( /*0*/WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 0, "wrong count %Iu\n", count );
+    ok( results[0] == (void *)0xdeadbeef, "wrong result %p\n", results[0] );
+
+    ret = VirtualFree( base + pagesize, pagesize, MEM_DECOMMIT );
+    ok( ret, "VirtualFree failed %lu\n", GetLastError() );
+
+    ret = VirtualProtect( base + 2*pagesize, pagesize, PAGE_READWRITE, &old_prot );
+    ok( ret, "VirtualProtect failed error %lu\n", GetLastError() );
+    ok( old_prot == PAGE_NOACCESS, "wrong old prot %lx\n", old_prot );
+
+    count = 64;
+    results[0] = (void *)0xdeadbeef;
+    ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 0, "wrong count %Iu\n", count );
+    ok( results[0] == (void *)0xdeadbeef, "wrong result %p\n", results[0] );
+
+    base[2*pagesize + 200] = 3;
+    count = 64;
+    results[0] = (void *)0xdeadbeef;
+    ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 1, "wrong count %Iu\n", count );
+    ok( results[0] == base + 2*pagesize, "wrong result %p\n", results[0] );
+
+    base = VirtualAlloc( base, size, MEM_COMMIT, PAGE_NOACCESS );
+    ok( !!base, "VirtualFree failed %lu\n", GetLastError() );
+
+    ret = VirtualProtect( base, 6*pagesize, PAGE_READWRITE, &old_prot );
+    ok( ret, "VirtualProtect failed error %lu\n", GetLastError() );
+    ok( old_prot == PAGE_NOACCESS, "wrong old prot %lx\n", old_prot );
+
+    base[3*pagesize + 200] = 3;
+    base[5*pagesize + 200] = 3;
+
     ret = VirtualFree( base, size, MEM_DECOMMIT );
     ok( ret, "VirtualFree failed %lu\n", GetLastError() );
 
     count = 64;
     ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
     ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
-    ok( count == 1 || broken(count == 0), /* win98 */
-        "wrong count %Iu\n", count );
-    if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] );
+    ok( !count, "wrong count %Iu\n", count );
+
+    base = VirtualAlloc( base, size, MEM_COMMIT, PAGE_READWRITE );
+    ok(!!base, "VirtualAlloc failed.\n");
+
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( !count, "wrong count %Iu\n", count );
+
+    /* Looks like VirtualProtect latches write watch state somewhere, so if pages are decommitted after,
+     * (which normally clears write watch state), a page from range which previously had protection change
+     * is still reported as dirty. */
+    base[3*pagesize + 200] = 3;
+    ret = VirtualProtect( base, 6*pagesize, PAGE_READWRITE, &old_prot );
+    ok( ret, "VirtualProtect failed error %lu\n", GetLastError() );
+    ok( old_prot == PAGE_READWRITE, "wrong old prot %lx\n", old_prot );
+
+    base[5*pagesize + 200] = 3;
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 2, "wrong c    ount %Iu\n", count );
+    ok( results[0] == base + 3*pagesize && results[1] == base + 5*pagesize, "wrong result %p\n", results[0] );
+
+    ret = VirtualFree( base, size, MEM_DECOMMIT );
+    ok( ret, "VirtualFree failed %lu\n", GetLastError() );
+
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    todo_wine ok( count == 1, "wrong count %Iu\n", count );
+    ok( results[0] == base + 3*pagesize, "wrong result %p\n", results[0] );
+
+    base = VirtualAlloc( base, size, MEM_COMMIT, PAGE_READWRITE );
+    ok(!!base, "VirtualAlloc failed.\n");
+
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    todo_wine ok( count == 1, "wrong count %Iu\n", count );
+    ok( results[0] == base + 3*pagesize, "wrong result %p\n", results[0] );
+
+    base[4*pagesize + 200] = 4;
+    base[2*pagesize + 200] = 4;
+    base[6*pagesize + 200] = 4;
+
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    todo_wine ok( count == 4, "wrong count %Iu\n", count );
+    ok( results[0] == base + 2*pagesize, "wrong result %p\n", results[0] );
+    todo_wine ok( results[1] == base + 3*pagesize, "wrong result %p\n", results[0] );
+    todo_wine ok( results[2] == base + 4*pagesize, "wrong result %p\n", results[0] );
+    todo_wine ok( results[3] == base + 6*pagesize, "wrong result %p\n", results[0] );
+
+    VirtualFree( base, 0, MEM_RELEASE );
+
+    /* Test longer range */
+    size = 2048 * pagesize;
+    base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE );
+    ok( base != NULL, "VirtualAlloc failed %lu\n", GetLastError() );
+
+    count = 2048;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 0, "wrong count %Iu\n", count );
+
+    count = 2048;
+    for (i = 0; i < count; i += 2)
+        ++base[i * pagesize];
+
+    ret = VirtualProtect( base, size / 2, PAGE_READONLY, &old_prot );
+    ok( ret, "VirtualProtect failed error %lu\n", GetLastError() );
+
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 1024, "wrong count %Iu\n", count );
+
+    for (i = 0; i < count; ++i)
+    {
+        ok( results[i] == base + i * 2 * pagesize, "wrong result %p\n", results[i] );
+        if (results[i] != base + i * 2 * pagesize)
+            break;
+    }
+
+    ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 1024, "wrong count %Iu\n", count );
+
+    for (i = 0; i < count; ++i)
+    {
+        ok( results[i] == base + i * 2 * pagesize, "wrong result %p\n", results[i] );
+        if (results[i] != base + i * 2 * pagesize)
+            break;
+    }
+
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
+    ok( count == 0, "wrong count %Iu\n", count );
 
     VirtualFree( base, 0, MEM_RELEASE );
 }
diff --git a/dlls/ntdll/unix/uffd_tmp_defs.h b/dlls/ntdll/unix/uffd_tmp_defs.h
new file mode 100644
index 00000000000..f79c34c6145
--- /dev/null
+++ b/dlls/ntdll/unix/uffd_tmp_defs.h
@@ -0,0 +1,75 @@
+#ifndef __UFFD_TMP_DEFS__
+#define __UFFD_TMP_DEFS__
+
+#ifdef __x86_64__
+#define __NR_userfaultfd 323
+#else
+#define __NR_userfaultfd 374
+#endif
+
+#ifndef UFFD_FEATURE_WP_ASYNC
+#define UFFD_FEATURE_WP_UNPOPULATED		(1<<13)
+#define UFFD_FEATURE_WP_ASYNC			(1<<15)
+#endif
+
+#ifndef PAGEMAP_SCAN
+/* Pagemap ioctl */
+#define PAGEMAP_SCAN	_IOWR('f', 16, struct pm_scan_arg)
+
+/* Bits are set in flags of the page_region and masks in pm_scan_args */
+#define PAGE_IS_WPALLOWED	(1 << 0)
+#define PAGE_IS_WRITTEN		(1 << 1)
+#define PAGE_IS_FILE		(1 << 2)
+#define PAGE_IS_PRESENT		(1 << 3)
+#define PAGE_IS_SWAPPED		(1 << 4)
+#define PAGE_IS_PFNZERO		(1 << 5)
+#define PAGE_IS_HUGE		(1 << 6)
+/*
+ * struct page_region - Page region with flags
+ * @start:	Start of the region
+ * @end:	End of the region (exclusive)
+ * @categories:	PAGE_IS_* category bitmask for the region
+ */
+struct page_region {
+	__u64 start;
+	__u64 end;
+	__u64 categories;
+};
+
+/* Flags for PAGEMAP_SCAN ioctl */
+#define PM_SCAN_WP_MATCHING	(1 << 0)	/* Write protect the pages matched. */
+#define PM_SCAN_CHECK_WPASYNC	(1 << 1)	/* Abort the scan when a non-WP-enabled page is found. */
+
+/*
+ * struct pm_scan_arg - Pagemap ioctl argument
+ * @size:		Size of the structure
+ * @flags:		Flags for the IOCTL
+ * @start:		Starting address of the region
+ * @end:		Ending address of the region
+ * @walk_end		Address where the scan stopped (written by kernel).
+ *			walk_end == end informs that the scan completed on entire range.
+ * @vec:		Address of page_region struct array for output
+ * @vec_len:		Length of the page_region struct array
+ * @max_pages:		Optional limit for number of returned pages (0 = disabled)
+ * @category_inverted:	PAGE_IS_* categories which values match if 0 instead of 1
+ * @category_mask:	Skip pages for which any category doesn't match
+ * @category_anyof_mask: Skip pages for which no category matches
+ * @return_mask:	PAGE_IS_* categories that are to be reported in `page_region`s returned
+ */
+struct pm_scan_arg {
+	__u64 size;
+	__u64 flags;
+	__u64 start;
+	__u64 end;
+	__u64 walk_end;
+	__u64 vec;
+	__u64 vec_len;
+	__u64 max_pages;
+	__u64 category_inverted;
+	__u64 category_mask;
+	__u64 category_anyof_mask;
+	__u64 return_mask;
+};
+#endif
+
+#endif
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 66e9de9e6d3..8cec203820f 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -70,6 +70,10 @@
 # include <mach/mach_vm.h>
 #endif
 
+#include <linux/userfaultfd.h>
+#include <sys/ioctl.h>
+#include "uffd_tmp_defs.h"
+
 #include <sys/uio.h>
 
 #include "ntstatus.h"
@@ -332,6 +336,9 @@ static BYTE **pages_vprot;
 static BYTE *pages_vprot;
 #endif
 
+static int use_kernel_writewatch;
+static int uffd_fd, pagemap_fd;
+
 static struct file_view *view_block_start, *view_block_end, *next_free_view;
 #ifdef _WIN64
 static const size_t view_block_size = 0x200000;
@@ -369,6 +376,127 @@ void *anon_mmap_alloc( size_t size, int prot )
     return mmap( NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0 );
 }
 
+static void kernel_writewatch_init(void)
+{
+    struct uffdio_api uffdio_api;
+
+    uffd_fd = syscall( __NR_userfaultfd, O_CLOEXEC | O_NONBLOCK );
+    if (uffd_fd == -1) return;
+
+    uffdio_api.api = UFFD_API;
+    uffdio_api.features = UFFD_FEATURE_WP_ASYNC | UFFD_FEATURE_WP_UNPOPULATED;
+    if (ioctl( uffd_fd, UFFDIO_API, &uffdio_api ) || uffdio_api.api != UFFD_API)
+    {
+        close( uffd_fd );
+        return;
+    }
+    pagemap_fd = open( "/proc/self/pagemap", O_CLOEXEC | O_RDONLY );
+    if (pagemap_fd == -1)
+    {
+        ERR("Error opening /proc/self/pagemap.\n");
+        close( uffd_fd );
+        return;
+    }
+    use_kernel_writewatch = 1;
+}
+
+static void kernel_writewatch_reset( void *start, SIZE_T len )
+{
+    struct pm_scan_arg arg = { 0 };
+
+    arg.size = sizeof(arg);
+    arg.start = (UINT_PTR)start;
+    arg.end = arg.start + len;
+    arg.flags = PM_SCAN_WP_MATCHING;
+    arg.category_mask = PAGE_IS_WRITTEN;
+    arg.return_mask = PAGE_IS_WRITTEN;
+    if (ioctl( pagemap_fd, PAGEMAP_SCAN, &arg ) < 0)
+        ERR( "ioctl(PAGEMAP_SCAN) failed, err %s.\n", strerror(errno) );
+}
+
+static void kernel_writewatch_register_range( struct file_view *view, void *base, size_t size )
+{
+    struct uffdio_register uffdio_register;
+    struct uffdio_writeprotect wp;
+
+    if (!(view->protect & VPROT_WRITEWATCH) || !use_kernel_writewatch) return;
+
+    madvise( base, size, MADV_NOHUGEPAGE );
+    uffdio_register.range.start = (UINT_PTR)base;
+    uffdio_register.range.len = size;
+    uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
+    if (ioctl( uffd_fd, UFFDIO_REGISTER, &uffdio_register ) == -1)
+    {
+        ERR( "ioctl( UFFDIO_REGISTER ) failed, %s.\n", strerror(errno) );
+        return;
+    }
+
+    if (!(uffdio_register.ioctls & UFFDIO_WRITEPROTECT))
+    {
+        ERR( "uffdio_register.ioctls %s.\n", wine_dbgstr_longlong(uffdio_register.ioctls) );
+        return;
+    }
+    wp.range.start = (UINT_PTR)base;
+    wp.range.len = size;
+    wp.mode = UFFDIO_WRITEPROTECT_MODE_WP;
+
+    if (ioctl(uffd_fd, UFFDIO_WRITEPROTECT, &wp) == -1)
+    {
+        perror("ioctl(UFFDIO_WRITEPROTECT)");
+        exit(-1);
+    }
+}
+
+static NTSTATUS kernel_get_write_watches( void *base, SIZE_T size, void **buffer, ULONG_PTR *count, BOOL reset )
+{
+    SIZE_T buffer_len = count ? *count : 0;
+    struct pm_scan_arg arg = { 0 };
+    char *addr = base, *next_addr;
+    struct page_region rgns[256];
+    int rgn_count, i;
+    size_t c_addr;
+
+    assert( !(size & page_mask) );
+
+    arg.size = sizeof(arg);
+    arg.vec = (UINT_PTR)rgns;
+    arg.vec_len = ARRAY_SIZE(rgns);
+    if (reset)
+        arg.flags |= PM_SCAN_WP_MATCHING;
+    arg.category_mask = PAGE_IS_WRITTEN;
+    arg.return_mask = PAGE_IS_WRITTEN;
+
+    *count = 0;
+    while (1)
+    {
+        arg.start = (UINT_PTR)addr;
+        arg.end = arg.start + size;
+        arg.max_pages = buffer_len;
+
+        if ((rgn_count = ioctl( pagemap_fd, PAGEMAP_SCAN, &arg )) < 0)
+        {
+            ERR( "ioctl( PAGEMAP_SCAN ) failed, error %s.\n", strerror(errno) );
+            return STATUS_INTERNAL_ERROR;
+        }
+        if (!rgn_count) break;
+
+        assert( rgn_count <= ARRAY_SIZE(rgns) );
+        for (i = 0; i < rgn_count; ++i)
+        {
+            assert( rgns[i].categories == PAGE_IS_WRITTEN );
+            assert( !buffer || buffer_len >= ((rgns[i].end - rgns[i].start) >> page_shift) );
+            for (c_addr = rgns[i].start; buffer_len && c_addr != rgns[i].end; c_addr += page_size, --buffer_len)
+                buffer[(*count)++] = (void *)c_addr;
+        }
+        if (!buffer_len || rgn_count < arg.vec_len) break;
+        next_addr = (void *)(UINT_PTR)arg.walk_end;
+        assert( size >= next_addr - addr );
+        if (!(size -= next_addr - addr)) break;
+        addr = next_addr;
+    }
+    return STATUS_SUCCESS;
+}
+
 
 static void mmap_add_reserved_area( void *addr, SIZE_T size )
 {
@@ -1273,7 +1401,7 @@ static int get_unix_prot( BYTE vprot )
         if (vprot & VPROT_WRITE) prot |= PROT_WRITE | PROT_READ;
         if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE | PROT_READ;
         if (vprot & VPROT_EXEC) prot |= PROT_EXEC | PROT_READ;
-        if (vprot & VPROT_WRITEWATCH) prot &= ~PROT_WRITE;
+        if (vprot & VPROT_WRITEWATCH && !use_kernel_writewatch) prot &= ~PROT_WRITE;
     }
     if (!prot) prot = PROT_NONE;
     return prot;
@@ -1696,6 +1824,8 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
         TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 );
         mprotect( base, size, unix_prot | PROT_EXEC );
     }
+
+    kernel_writewatch_register_range( view, view->base, view->size );
     return STATUS_SUCCESS;
 }
 
@@ -1819,7 +1949,7 @@ static BOOL set_vprot( struct file_view *view, void *base, size_t size, BYTE vpr
 {
     int unix_prot = get_unix_prot(vprot);
 
-    if (view->protect & VPROT_WRITEWATCH)
+    if (!use_kernel_writewatch && view->protect & VPROT_WRITEWATCH)
     {
         /* each page may need different protections depending on write watch flag */
         set_page_vprot_bits( base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH );
@@ -1896,8 +2026,12 @@ static void update_write_watches( void *base, size_t size, size_t accessed_size
  */
 static void reset_write_watches( void *base, SIZE_T size )
 {
-    set_page_vprot_bits( base, size, VPROT_WRITEWATCH, 0 );
-    mprotect_range( base, size, 0, 0 );
+    if (use_kernel_writewatch) kernel_writewatch_reset( base, size );
+    else
+    {
+        set_page_vprot_bits( base, size, VPROT_WRITEWATCH, 0 );
+        mprotect_range( base, size, 0, 0 );
+    }
 }
 
 
@@ -2231,7 +2365,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
 
         view->protect = vprot | VPROT_PLACEHOLDER;
         set_vprot( view, base, size, vprot );
-        if (vprot & VPROT_WRITEWATCH) reset_write_watches( base, size );
+        if (vprot & VPROT_WRITEWATCH)
+        {
+            kernel_writewatch_register_range( view, base, size );
+            reset_write_watches( base, size );
+        }
         *view_ret = view;
         return STATUS_SUCCESS;
     }
@@ -2401,6 +2539,7 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz
     if (anon_mmap_fixed( (char *)view->base + start, size, PROT_NONE, 0 ) != MAP_FAILED)
     {
         set_page_vprot_bits( (char *)view->base + start, size, 0, VPROT_COMMITTED );
+        kernel_writewatch_register_range( view, (char *)view->base + start, size );
         return STATUS_SUCCESS;
     }
     return STATUS_NO_MEMORY;
@@ -3494,6 +3633,7 @@ void virtual_init(void)
     size_t size;
     int i;
     pthread_mutexattr_t attr;
+    const char *env_var;
 
     if (r_debug && (wine_r_debug = *r_debug)) r_debug_set_state( RT_CONSISTENT );
 
@@ -3509,6 +3649,12 @@ void virtual_init(void)
     host_addr_space_limit = address_space_limit;
 #endif
 
+    if (!((env_var = getenv( "WINE_DISABLE_KERNEL_WRITEWATCH" )) && atoi( env_var )))
+        kernel_writewatch_init();
+
+    if (use_kernel_writewatch)
+        MESSAGE( "wine: using kernel write watches, use_kernel_writewatch %d.\n", use_kernel_writewatch );
+
     if (preload_info && *preload_info)
         for (i = 0; (*preload_info)[i].size; i++)
             mmap_add_reserved_area( (*preload_info)[i].addr, (*preload_info)[i].size );
@@ -4235,7 +4381,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
         }
         else ret = grow_thread_stack( page, &stack_info );
     }
-    else if (err & EXCEPTION_WRITE_FAULT)
+    else if (!use_kernel_writewatch && err & EXCEPTION_WRITE_FAULT)
     {
         if (vprot & VPROT_WRITEWATCH)
         {
@@ -4334,11 +4480,11 @@ static NTSTATUS check_write_access( void *base, size_t size, BOOL *has_write_wat
     for (i = 0; i < size; i += page_size)
     {
         BYTE vprot = get_page_vprot( addr + i );
-        if (vprot & VPROT_WRITEWATCH) *has_write_watch = TRUE;
+        if (!use_kernel_writewatch && vprot & VPROT_WRITEWATCH) *has_write_watch = TRUE;
         if (!(get_unix_prot( vprot & ~VPROT_WRITEWATCH ) & PROT_WRITE))
             return STATUS_INVALID_USER_BUFFER;
     }
-    if (*has_write_watch)
+    if (!use_kernel_writewatch && *has_write_watch)
         mprotect_range( addr, size, 0, VPROT_WRITEWATCH );  /* temporarily enable write access */
     return STATUS_SUCCESS;
 }
@@ -4380,7 +4526,7 @@ ssize_t virtual_locked_read( int fd, void *addr, size_t size )
     int err = EFAULT;
 
     ssize_t ret = read( fd, addr, size );
-    if (ret != -1 || errno != EFAULT) return ret;
+    if (ret != -1 || use_kernel_writewatch || errno != EFAULT) return ret;
 
     server_enter_uninterrupted_section( &virtual_mutex, &sigset );
     if (!check_write_access( addr, size, &has_write_watch ))
@@ -4405,7 +4551,7 @@ ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset )
     int err = EFAULT;
 
     ssize_t ret = pread( fd, addr, size, offset );
-    if (ret != -1 || errno != EFAULT) return ret;
+    if (ret != -1 || use_kernel_writewatch || errno != EFAULT) return ret;
 
     server_enter_uninterrupted_section( &virtual_mutex, &sigset );
     if (!check_write_access( addr, size, &has_write_watch ))
@@ -4431,7 +4577,7 @@ ssize_t virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags )
     int err = EFAULT;
 
     ssize_t ret = recvmsg( fd, hdr, flags );
-    if (ret != -1 || errno != EFAULT) return ret;
+    if (ret != -1 || use_kernel_writewatch || errno != EFAULT) return ret;
 
     server_enter_uninterrupted_section( &virtual_mutex, &sigset );
     for (i = 0; i < hdr->msg_iovlen; i++)
@@ -6241,6 +6387,13 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T
         char *addr = base;
         char *end = addr + size;
 
+        if (use_kernel_writewatch)
+        {
+            if (!(status = kernel_get_write_watches( base, size, addresses, count, flags & WRITE_WATCH_FLAG_RESET )))
+                *granularity = page_size;
+            goto done;
+        }
+
         while (pos < *count && addr < end)
         {
             if (!(get_page_vprot( addr ) & VPROT_WRITEWATCH)) addresses[pos++] = addr;
@@ -6252,6 +6405,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T
     }
     else status = STATUS_INVALID_PARAMETER;
 
+done:
     server_leave_uninterrupted_section( &virtual_mutex, &sigset );
     return status;
 }
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index a6ac748754d..c61e91ba708 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7972,6 +7972,7 @@ static void test_write_watch(void)
     ok( count == 9 || !count /* Win 11 */, "wrong count %Iu\n", count );
     ok( !base[0], "data set\n" );
 
+    base[0x1000] = 1;
     send(src, "test message", sizeof("test message"), 0);
 
     ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE );
@@ -7980,10 +7981,19 @@ static void test_write_watch(void)
     ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base );
     ok( !memcmp( base + 0x4000, "message", 8 ), "wrong data %s\n", base + 0x4000 );
 
+    count = 64;
+    ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
+    ok( !ret, " GetWriteWatch failed %lu\n", GetLastError() );
+    todo_wine_if( count == 3 ) ok( count == 1, "wrong count %Iu\n", count );
+    todo_wine_if( count == 3 ) ok( results[0] == base + 0x1000, "got page %Iu.\n", ((char *)results[0] - base) / 0x1000 );
+
+    base[0x2000] = 1;
     count = 64;
     ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
     ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
-    ok( count == 0, "wrong count %Iu\n", count );
+    todo_wine_if( count == 4 ) ok( count == 2, "wrong count %Iu\n", count );
+    todo_wine_if( count == 4 ) ok( results[0] == base + 0x1000, "got page %Iu.\n", ((char *)results[0] - base) / 0x1000 );
+    todo_wine_if( count == 4 ) ok( results[1] == base + 0x2000, "got page %Iu.\n", ((char *)results[1] - base) / 0x1000 );
 
     memset( base, 0, size );
     count = 64;
@@ -8014,7 +8024,7 @@ static void test_write_watch(void)
     count = 64;
     ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
     ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
-    ok( count == 0, "wrong count %Iu\n", count );
+    todo_wine_if( count == 2 ) ok( count == 0, "wrong count %Iu\n", count );
 
     memset( base, 0, size );
     count = 64;
@@ -8043,7 +8053,7 @@ static void test_write_watch(void)
         count = 64;
         ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize );
         ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() );
-        ok( count == 0, "wrong count %Iu\n", count );
+        todo_wine_if( count == 1 ) ok( count == 0, "wrong count %Iu\n", count );
     }
     WSACloseEvent( event );
     closesocket( dest );

From d52d14844e20cd6198343e82bd45ed13c85ef7f7 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 11 Mar 2024 13:53:08 -0600
Subject: [PATCH 248/389] ntdll: Use kernel soft dirty flags for write watches
 support.

Requires custom kernel patches to have effect.

CW-Bug-Id: #23524
---
 dlls/ntdll/unix/virtual.c | 121 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 120 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 8cec203820f..b4d0cec3a21 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -338,6 +338,9 @@ static BYTE *pages_vprot;
 
 static int use_kernel_writewatch;
 static int uffd_fd, pagemap_fd;
+static int pagemap_reset_fd, clear_refs_fd;
+#define PAGE_FLAGS_BUFFER_LENGTH 1024
+#define PM_SOFT_DIRTY_PAGE (1ull << 57)
 
 static struct file_view *view_block_start, *view_block_end, *next_free_view;
 #ifdef _WIN64
@@ -376,18 +379,40 @@ void *anon_mmap_alloc( size_t size, int prot )
     return mmap( NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0 );
 }
 
+static void kernel_writewatch_softdirty_init(void)
+{
+    if ((pagemap_reset_fd = open( "/proc/self/pagemap_reset", O_RDONLY | O_CLOEXEC )) == -1) return;
+
+    if ((pagemap_fd = open( "/proc/self/pagemap", O_RDONLY | O_CLOEXEC )) == -1)
+    {
+        ERR( "Could not open pagemap file, error %s.\n", strerror( errno ));
+        exit(-1);
+    }
+    if ((clear_refs_fd = open( "/proc/self/clear_refs", O_WRONLY | O_CLOEXEC )) == -1)
+    {
+        ERR( "Could not open clear_refs file, error %s.\n", strerror( errno ));
+        exit(-1);
+    }
+    use_kernel_writewatch = 2;
+}
+
 static void kernel_writewatch_init(void)
 {
     struct uffdio_api uffdio_api;
 
     uffd_fd = syscall( __NR_userfaultfd, O_CLOEXEC | O_NONBLOCK );
-    if (uffd_fd == -1) return;
+    if (uffd_fd == -1)
+    {
+        kernel_writewatch_softdirty_init();
+        return;
+    }
 
     uffdio_api.api = UFFD_API;
     uffdio_api.features = UFFD_FEATURE_WP_ASYNC | UFFD_FEATURE_WP_UNPOPULATED;
     if (ioctl( uffd_fd, UFFDIO_API, &uffdio_api ) || uffdio_api.api != UFFD_API)
     {
         close( uffd_fd );
+        kernel_writewatch_softdirty_init();
         return;
     }
     pagemap_fd = open( "/proc/self/pagemap", O_CLOEXEC | O_RDONLY );
@@ -404,6 +429,21 @@ static void kernel_writewatch_reset( void *start, SIZE_T len )
 {
     struct pm_scan_arg arg = { 0 };
 
+    if (use_kernel_writewatch == 2)
+    {
+        char buffer[17];
+        ssize_t ret;
+
+        memset(buffer, 0, sizeof(buffer));
+        buffer[0] = '6';
+        *(ULONG64 *)&buffer[1] = (ULONG_PTR)start;
+        *(ULONG64 *)&buffer[1 + 8] = (ULONG_PTR)start + len;
+
+        if ((ret = write(clear_refs_fd, buffer, sizeof(buffer))) != sizeof(buffer))
+            ERR("Could not clear soft dirty bits, ret %zd, error %s.\n", ret, strerror(errno));
+        return;
+    }
+
     arg.size = sizeof(arg);
     arg.start = (UINT_PTR)start;
     arg.end = arg.start + len;
@@ -422,6 +462,12 @@ static void kernel_writewatch_register_range( struct file_view *view, void *base
     if (!(view->protect & VPROT_WRITEWATCH) || !use_kernel_writewatch) return;
 
     madvise( base, size, MADV_NOHUGEPAGE );
+    if (use_kernel_writewatch == 2)
+    {
+        kernel_writewatch_reset( base, size );
+        return;
+    }
+
     uffdio_register.range.start = (UINT_PTR)base;
     uffdio_register.range.len = size;
     uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
@@ -447,6 +493,77 @@ static void kernel_writewatch_register_range( struct file_view *view, void *base
     }
 }
 
+static NTSTATUS kernel_soft_dirty_get_write_watches( void *base, SIZE_T size, void **addresses, ULONG_PTR *count, BOOL reset )
+{
+    static UINT64 buffer[PAGE_FLAGS_BUFFER_LENGTH];
+    char *addr = base;
+    char *end = addr + size;
+    unsigned int i, length;
+    ssize_t read_length;
+    ULONG_PTR pos = 0;
+
+    if (reset)
+    {
+        if (is_win64)
+        {
+            addresses[0] = end;
+            if ((read_length = pread(pagemap_reset_fd, addresses, *count * sizeof(*addresses),
+                    ((ULONG_PTR)addr >> page_shift) * sizeof(*addresses))) == -1)
+            {
+                ERR("Error reading page flags, read_length %zd, error %s.\n", read_length, strerror(errno));
+                return STATUS_INVALID_ADDRESS;
+            }
+            *count = read_length / sizeof(*addresses);
+            return STATUS_SUCCESS;
+        }
+
+        while (pos < *count && addr < end)
+        {
+            length = min(PAGE_FLAGS_BUFFER_LENGTH, *count - pos);
+
+            buffer[0] = (ULONG_PTR)end;
+            if ((read_length = pread(pagemap_reset_fd, buffer, length * sizeof(*buffer),
+                    ((ULONG_PTR)addr >> page_shift) * sizeof(*buffer))) == -1)
+            {
+                ERR("Error reading page flags, read_length %zd, error %s.\n", read_length, strerror(errno));
+                return STATUS_INVALID_ADDRESS;
+            }
+            read_length /= sizeof(*buffer);
+            for (i = 0; i < read_length; ++i)
+            {
+                assert(pos < *count);
+                addresses[pos++] = (void *)(ULONG_PTR)buffer[i];
+            }
+            if (read_length < length)
+                break;
+            addr = (char *)(ULONG_PTR)buffer[read_length - 1] + page_size;
+        }
+        *count = pos;
+        return STATUS_SUCCESS;
+    }
+
+    while (pos < *count && addr < end)
+    {
+        length = min(PAGE_FLAGS_BUFFER_LENGTH, (end - addr) >> page_shift);
+
+        if ((read_length = pread(pagemap_fd, buffer, length * sizeof(*buffer),
+                ((ULONG_PTR)addr >> page_shift) * sizeof(*buffer))) != length * sizeof(*buffer))
+        {
+            ERR("Error reading page flags, read_length %zd, error %s.\n", read_length, strerror(errno));
+            return STATUS_INVALID_ADDRESS;
+        }
+        for (i = 0; i < length && pos < *count; ++i)
+        {
+            if (buffer[i] & PM_SOFT_DIRTY_PAGE)
+                addresses[pos++] = addr;
+
+            addr += page_size;
+        }
+    }
+    *count = pos;
+    return STATUS_SUCCESS;
+}
+
 static NTSTATUS kernel_get_write_watches( void *base, SIZE_T size, void **buffer, ULONG_PTR *count, BOOL reset )
 {
     SIZE_T buffer_len = count ? *count : 0;
@@ -458,6 +575,8 @@ static NTSTATUS kernel_get_write_watches( void *base, SIZE_T size, void **buffer
 
     assert( !(size & page_mask) );
 
+    if (use_kernel_writewatch == 2) return kernel_soft_dirty_get_write_watches( base, size, buffer, count, reset );
+
     arg.size = sizeof(arg);
     arg.vec = (UINT_PTR)rgns;
     arg.vec_len = ARRAY_SIZE(rgns);

From febbad5b6d551348e0981042cf69dd6e0b9cca9b Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Tue, 12 Mar 2024 14:05:22 +0200
Subject: [PATCH 249/389] HACK: winevulkan: Add option to WINE_HIDE_NVK.

---
 dlls/winevulkan/loader.c         | 19 +++++++++++++++----
 dlls/winevulkan/make_vulkan      |  3 +++
 dlls/winevulkan/vulkan.c         | 32 +++++++++++++++++++++++++++++---
 dlls/winevulkan/vulkan_loader.h  |  5 +++++
 dlls/winevulkan/vulkan_private.h |  5 +++++
 5 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c
index 3f6204139fb..84e9239a399 100644
--- a/dlls/winevulkan/loader.c
+++ b/dlls/winevulkan/loader.c
@@ -84,6 +84,12 @@ static BOOL is_available_device_function(VkDevice device, const char *name)
     return UNIX_CALL(is_available_device_function, &params);
 }
 
+static BOOL is_nvk(VkPhysicalDevice device)
+{
+    struct is_nvk_params params = { .device = device };
+    return UNIX_CALL(is_nvk, &params);
+}
+
 static void *alloc_vk_object(size_t size)
 {
     struct wine_vk_base *object = calloc(1, size);
@@ -416,7 +422,7 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2)
             device_node_mask);
 }
 
-static void fixup_device_id(UINT *vendor_id, UINT *device_id)
+static void fixup_device_id(UINT *vendor_id, UINT *device_id, BOOL is_nvk)
 {
     const char *sgi;
 
@@ -434,6 +440,11 @@ static void fixup_device_id(UINT *vendor_id, UINT *device_id)
     {
         *device_id = 0x687f; /* Radeon RX Vega 56/64 */
     }
+    else if (is_nvk && (sgi = getenv("WINE_HIDE_NVK")) && *sgi != '0')
+    {
+        *vendor_id = 0x1002; /* AMD */
+        *device_id = 0x73df; /* RX 6700XT */
+    }
 }
 
 void WINAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device,
@@ -448,7 +459,7 @@ void WINAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device,
     params.pProperties = properties;
     status = UNIX_CALL(vkGetPhysicalDeviceProperties, &params);
     assert(!status);
-    fixup_device_id(&properties->vendorID, &properties->deviceID);
+    fixup_device_id(&properties->vendorID, &properties->deviceID, is_nvk(physical_device));
 }
 
 void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,
@@ -464,7 +475,7 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,
     status = UNIX_CALL(vkGetPhysicalDeviceProperties2, &params);
     assert(!status);
     fill_luid_property(properties2);
-    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID);
+    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID, is_nvk(phys_dev));
 }
 
 void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev,
@@ -480,7 +491,7 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev,
     status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, &params);
     assert(!status);
     fill_luid_property(properties2);
-    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID);
+    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID, is_nvk(phys_dev));
 }
 
 VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info,
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 467eee61c2a..362f0321276 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2925,6 +2925,7 @@ class VkGenerator(object):
         f.write("    init_vulkan,\n")
         f.write("    vk_is_available_instance_function,\n")
         f.write("    vk_is_available_device_function,\n")
+        f.write("    vk_is_nvk,\n")
         for vk_func in self.registry.funcs.values():
             if not vk_func.needs_exposing():
                 continue
@@ -2949,6 +2950,7 @@ class VkGenerator(object):
         f.write("    init_vulkan,\n")
         f.write("    vk_is_available_instance_function32,\n")
         f.write("    vk_is_available_device_function32,\n")
+        f.write("    vk_is_nvk32,\n")
         for vk_func in self.registry.funcs.values():
             if not vk_func.needs_exposing():
                 continue
@@ -3133,6 +3135,7 @@ class VkGenerator(object):
         f.write("    unix_init,\n")
         f.write("    unix_is_available_instance_function,\n")
         f.write("    unix_is_available_device_function,\n")
+        f.write("    unix_is_nvk,\n")
         for vk_func in self.registry.funcs.values():
             if not vk_func.needs_exposing():
                 continue
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 885af7ae970..253e3db68f5 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -278,7 +278,8 @@ static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance
     struct wine_phys_dev *object;
     uint32_t num_host_properties, num_properties = 0;
     VkExtensionProperties *host_properties = NULL;
-    VkPhysicalDeviceProperties physdev_properties;
+    VkPhysicalDeviceProperties2 physdev_properties;
+    VkPhysicalDeviceVulkan12Properties vk12;
     BOOL have_external_memory_host = FALSE, have_external_memory_fd = FALSE, have_external_semaphore_fd = FALSE;
     VkResult res;
     unsigned int i, j;
@@ -290,8 +291,16 @@ static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance
     object->handle = handle;
     object->host_physical_device = phys_dev;
 
-    instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev, &physdev_properties);
-    object->api_version = physdev_properties.apiVersion;
+    memset(&vk12, 0, sizeof(vk12));
+    vk12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
+
+    memset(&physdev_properties, 0, sizeof(physdev_properties));
+    physdev_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
+    physdev_properties.pNext = &vk12;
+
+    instance->funcs.p_vkGetPhysicalDeviceProperties2(phys_dev, &physdev_properties);
+    object->api_version = physdev_properties.properties.apiVersion;
+    object->is_nvk = (vk12.driverID == VK_DRIVER_ID_MESA_NVK);
 
     handle->base.unix_handle = (uintptr_t)object;
     WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, handle, phys_dev, object);
@@ -4059,6 +4068,13 @@ NTSTATUS vk_is_available_device_function(void *arg)
     return !!vk_funcs->p_vkGetDeviceProcAddr(device->host_device, params->name);
 }
 
+NTSTATUS vk_is_nvk(void *arg)
+{
+    struct is_nvk_params *params = arg;
+    struct wine_phys_dev *device = wine_phys_dev_from_handle(params->device);
+    return !!device->is_nvk;
+}
+
 #endif /* _WIN64 */
 
 NTSTATUS vk_is_available_instance_function32(void *arg)
@@ -4087,6 +4103,16 @@ NTSTATUS vk_is_available_device_function32(void *arg)
     return !!vk_funcs->p_vkGetDeviceProcAddr(device->host_device, name);
 }
 
+NTSTATUS vk_is_nvk32(void *arg)
+{
+    struct
+    {
+        UINT32 device;
+    } *params = arg;
+    struct wine_phys_dev *device = wine_phys_dev_from_handle(UlongToPtr(params->device));
+    return !!device->is_nvk;
+}
+
 DECLSPEC_EXPORT VkDevice __wine_get_native_VkDevice(VkDevice handle)
 {
     struct wine_device *device = wine_device_from_handle(handle);
diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h
index 70efc2bfa73..d29ccd8ae08 100644
--- a/dlls/winevulkan/vulkan_loader.h
+++ b/dlls/winevulkan/vulkan_loader.h
@@ -147,6 +147,11 @@ struct is_available_device_function_params
     const char *name;
 };
 
+struct is_nvk_params
+{
+    VkPhysicalDevice device;
+};
+
 #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t)
 static inline void *wine_vk_find_struct_(void *s, VkStructureType t)
 {
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index ffae94adbe4..3a044f08dcc 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -211,6 +211,8 @@ struct wine_phys_dev
 
     uint32_t external_memory_align;
 
+    bool is_nvk;
+
     struct wine_vk_mapping mapping;
 };
 
@@ -351,6 +353,9 @@ NTSTATUS vk_is_available_device_function(void *arg);
 NTSTATUS vk_is_available_instance_function32(void *arg);
 NTSTATUS vk_is_available_device_function32(void *arg);
 
+NTSTATUS vk_is_nvk(void *arg);
+NTSTATUS vk_is_nvk32(void *arg);
+
 struct conversion_context
 {
     char buffer[2048];

From caa6104097b8b14001acd7ee787c8d814a9304d9 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Tue, 12 Mar 2024 14:05:40 +0200
Subject: [PATCH 250/389] HACK: winex11: Add option to WINE_HIDE_NVK.

---
 dlls/winex11.drv/display.c | 9 +++++++--
 dlls/winex11.drv/xrandr.c  | 5 +++++
 include/wine/gdi_driver.h  | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index d2c353250b9..22e9d79b64d 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -530,7 +530,7 @@ static const char *debugstr_devmodew( const DEVMODEW *devmode )
                              position );
 }
 
-static void fixup_device_id(UINT *vendor_id, UINT *device_id)
+static void fixup_device_id(UINT *vendor_id, UINT *device_id, BOOL is_nvk)
 {
     const char *sgi;
 
@@ -548,6 +548,11 @@ static void fixup_device_id(UINT *vendor_id, UINT *device_id)
     {
         *device_id = 0x687f; /* Radeon RX Vega 56/64 */
     }
+    else if (is_nvk && (sgi = getenv("WINE_HIDE_NVK")) && *sgi != '0')
+    {
+        *vendor_id = 0x1002; /* AMD */
+        *device_id = 0x73df; /* RX 6700XT */
+    }
 }
 
 BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param )
@@ -571,7 +576,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
 
     for (gpu = 0; gpu < gpu_count; gpu++)
     {
-        fixup_device_id( &gpus[gpu].vendor_id, &gpus[gpu].device_id );
+        fixup_device_id( &gpus[gpu].vendor_id, &gpus[gpu].device_id, gpus[gpu].is_nvk );
 
         device_manager->add_gpu( &gpus[gpu], param );
 
diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index 47accf1de6d..6011a198810 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -856,6 +856,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
     VkPhysicalDeviceMemoryProperties mem_properties;
     VkInstanceCreateInfo create_info;
     VkPhysicalDeviceIDProperties id;
+    VkPhysicalDeviceVulkan12Properties vk12;
     VkInstance vk_instance = NULL;
     VkDisplayKHR vk_display;
     DWORD len;
@@ -920,8 +921,11 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
             if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE)
                 continue;
 
+            memset( &vk12, 0, sizeof(vk12) );
+            vk12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
             memset( &id, 0, sizeof(id) );
             id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES;
+            id.pNext = &vk12;
             properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
             properties2.pNext = &id;
 
@@ -944,6 +948,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
             {
                 gpu->vendor_id = properties2.properties.vendorID;
                 gpu->device_id = properties2.properties.deviceID;
+                if (vk12.driverID == VK_DRIVER_ID_MESA_NVK) gpu->is_nvk = TRUE;
             }
             RtlUTF8ToUnicodeN( gpu->name, sizeof(gpu->name), &len, properties2.properties.deviceName,
                                strlen( properties2.properties.deviceName ) + 1 );
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 26562bfef2b..2b1dc3ca044 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -252,6 +252,7 @@ struct gdi_gpu
     UINT revision_id;
     GUID vulkan_uuid;     /* Vulkan device UUID */
     ULONGLONG memory_size;
+    BOOL is_nvk;
 };
 
 struct gdi_adapter

From 8d74eeb7ace5f6fc199e91bfad275b5925aa32c8 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshui@codeweavers.com>
Date: Tue, 12 Mar 2024 13:50:23 +0000
Subject: [PATCH 251/389] wm_reader: Fix order of streams in reinit_stream.

CW-Bug-Id: #23483
---
 dlls/winegstreamer/wm_reader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 95213b1580b..8014691def3 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1597,7 +1597,7 @@ static HRESULT reinit_stream(struct wm_reader *reader, bool read_compressed)
         struct wm_stream *stream = &reader->streams[i];
         struct wg_format format;
 
-        stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i);
+        stream->wg_stream = wg_parser_get_stream(reader->wg_parser, reader->stream_count - i - 1);
         stream->reader = reader;
         wg_parser_stream_get_preferred_format(stream->wg_stream, &format);
         if (stream->selection == WMT_ON)

From 32faf64f16dc9bec2edcef8ae9793048ec184863 Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 12 Mar 2024 12:15:53 -0300
Subject: [PATCH 252/389] Revert "HACK: gdiplus: Add HDC parameter back to gdi+
 internal functions."

This reverts commit 505f4dface671ca3a07ad7fc6eee818709a4b419.
---
 dlls/gdiplus/gdiplus_private.h |  4 +--
 dlls/gdiplus/graphics.c        | 52 +++++++++++++++++-----------------
 dlls/gdiplus/graphicspath.c    |  8 +++---
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 95d19080ff1..2b5dbee43e9 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -620,13 +620,13 @@ struct gdip_font_link_info {
 };
 
 
-typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics, HDC hdc,
+typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *sections,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
     INT underlined_index_count, void *user_data);
 
-GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
+GpStatus gdip_format_string(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data);
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 4b942bfaa09..707fa55cfda 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5163,7 +5163,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w
 }
 
 /* Populates gdip_font_link_info struct based on the base_font and input string */
-static void generate_font_link_info(GpGraphics *graphics, HDC hdc, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font,
+static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font,
                                     struct gdip_font_link_info *font_link_info)
 {
     IUnknown *unk;
@@ -5182,7 +5182,7 @@ static void generate_font_link_info(GpGraphics *graphics, HDC hdc, WCHAR *string
     IUnknown_Release(unk);
 
     get_font_hfont(graphics, base_font, NULL, &hfont, NULL, NULL);
-    IMLangFontLink_GetFontCodePages(iMLFL, hdc, hfont, &font_codepages);
+    IMLangFontLink_GetFontCodePages(iMLFL, graphics->hdc, hfont, &font_codepages);
 
     while (progress < length)
     {
@@ -5197,10 +5197,10 @@ static void generate_font_link_info(GpGraphics *graphics, HDC hdc, WCHAR *string
         }
         else
         {
-            IMLangFontLink_MapFont(iMLFL, hdc, string_codepages, hfont, &map_hfont);
-            old_font = SelectObject(hdc, map_hfont);
-            GdipCreateFontFromDC(hdc, &gpfont);
-            SelectObject(hdc, old_font);
+            IMLangFontLink_MapFont(iMLFL, graphics->hdc, string_codepages, hfont, &map_hfont);
+            old_font = SelectObject(graphics->hdc, map_hfont);
+            GdipCreateFontFromDC(graphics->hdc, &gpfont);
+            SelectObject(graphics->hdc, old_font);
             IMLangFontLink_ReleaseFont(iMLFL, map_hfont);
             section->font = gpfont;
         }
@@ -5214,7 +5214,7 @@ static void generate_font_link_info(GpGraphics *graphics, HDC hdc, WCHAR *string
     IMLangFontLink_Release(iMLFL);
 }
 
-static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, HDC hdc, LPCWSTR string,
+static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, LPCWSTR string,
                                             INT index, int length, int max_ext, LPINT fit, SIZE *size)
 {
     DWORD to_measure_length;
@@ -5236,9 +5236,9 @@ static void font_link_get_text_extent_point(struct gdip_font_link_info *font_lin
         to_measure_length = min(length - (i - index), section->end - i);
 
         get_font_hfont(graphics, section->font, NULL, &hfont, NULL, NULL);
-        oldhfont = SelectObject(hdc, hfont);
-        GetTextExtentExPointW(hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
-        SelectObject(hdc, oldhfont);
+        oldhfont = SelectObject(graphics->hdc, hfont);
+        GetTextExtentExPointW(graphics->hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
+        SelectObject(graphics->hdc, oldhfont);
         DeleteObject(hfont);
 
         max_ext -= sizeaux.cx;
@@ -5266,7 +5266,7 @@ static void release_font_link_info(struct gdip_font_link_info *font_link_info)
     }
 }
 
-GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
+GpStatus gdip_format_string(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data)
@@ -5348,10 +5348,10 @@ GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
 
     halign = format->align;
 
-    generate_font_link_info(graphics, hdc, stringdup, length, font, &font_link_info);
+    generate_font_link_info(graphics, stringdup, length, font, &font_link_info);
 
     while(sum < length){
-        font_link_get_text_extent_point(&font_link_info, graphics, hdc, stringdup, sum, length - sum, nwidth, &fit, &size);
+        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size);
         fitcpy = fit;
 
         if(fit == 0)
@@ -5399,7 +5399,7 @@ GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
         else
             lineend = fit;
 
-        font_link_get_text_extent_point(&font_link_info, graphics, hdc, stringdup, sum, lineend, nwidth, &j, &size);
+        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size);
 
         bounds.Width = size.cx;
 
@@ -5432,7 +5432,7 @@ GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
             if (hotkeyprefix_offsets[hotkeyprefix_end_pos] >= sum + lineend)
                 break;
 
-        stat = callback(graphics, hdc, stringdup, sum, lineend,
+        stat = callback(graphics, stringdup, sum, lineend,
             &font_link_info, rect, format, lineno, &bounds,
             &hotkeyprefix_offsets[hotkeyprefix_pos],
             hotkeyprefix_end_pos-hotkeyprefix_pos, user_data);
@@ -5499,7 +5499,7 @@ struct measure_ranges_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_ranges_callback(GpGraphics *graphics, HDC hdc,
+static GpStatus measure_ranges_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length,
     struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
@@ -5522,10 +5522,10 @@ static GpStatus measure_ranges_callback(GpGraphics *graphics, HDC hdc,
             range_rect.Y = bounds->Y / args->rel_height;
             range_rect.Height = bounds->Height / args->rel_height;
 
-            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, range_start - index, INT_MAX, NULL, &range_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_start - index, INT_MAX, NULL, &range_size);
             range_rect.X = (bounds->X + range_size.cx) / args->rel_width;
 
-            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, range_end - index, INT_MAX, NULL, &range_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_end - index, INT_MAX, NULL, &range_size);
             range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X;
 
             stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion);
@@ -5602,7 +5602,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
 
     gdi_transform_acquire(graphics);
 
-    stat = gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, stringFormat,
+    stat = gdip_format_string(graphics, string, length, font, &scaled_rect, stringFormat,
         (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5623,7 +5623,7 @@ struct measure_string_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_string_callback(GpGraphics *graphics, HDC hdc,
+static GpStatus measure_string_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length,
     struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
@@ -5726,7 +5726,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
 
     gdi_transform_acquire(graphics);
 
-    gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
         measure_string_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5751,7 +5751,7 @@ struct draw_string_args {
     REAL x, y, rel_width, rel_height, ascent;
 };
 
-static GpStatus draw_string_callback(GpGraphics *graphics, HDC hdc,
+static GpStatus draw_string_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length,
     struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
@@ -5775,7 +5775,7 @@ static GpStatus draw_string_callback(GpGraphics *graphics, HDC hdc,
 
         to_draw_length = min(length - (i - index), section->end - i);
         TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == font_link_info->base_font ? "base font" : "map");
-        font_link_get_text_extent_point(font_link_info, graphics, hdc, string, i, to_draw_length, 0, NULL, &size);
+        font_link_get_text_extent_point(font_link_info, graphics, string, i, to_draw_length, 0, NULL, &size);
         stat = draw_driver_string(graphics, &string[i], to_draw_length,
             section->font, format, args->brush, &position,
             DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
@@ -5801,10 +5801,10 @@ static GpStatus draw_string_callback(GpGraphics *graphics, HDC hdc,
             SIZE text_size;
             INT ofs = underlined_indexes[i] - index;
 
-            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, ofs, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs, INT_MAX, NULL, &text_size);
             start_x = text_size.cx / args->rel_width;
 
-            font_link_get_text_extent_point(font_link_info, graphics, hdc, string, index, ofs+1, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs+1, INT_MAX, NULL, &text_size);
             end_x = text_size.cx / args->rel_width;
 
             GdipFillRectangle(graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
@@ -5918,7 +5918,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
     GetTextMetricsW(hdc, &textmetric);
     args.ascent = textmetric.tmAscent / rel_height;
 
-    gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
         draw_string_callback, &args);
 
     gdi_transform_release(graphics);
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 0d1cfb2f9c5..20e0787de16 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -949,7 +949,7 @@ struct format_string_args
     float ascent;
 };
 
-static GpStatus format_string_callback(GpGraphics *graphics, HDC hdc,
+static GpStatus format_string_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *font_link_info,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, INT *underlined_indexes,
@@ -975,7 +975,7 @@ static GpStatus format_string_callback(GpGraphics *graphics, HDC hdc,
         TTPOLYGONHEADER *ph = NULL, *origph;
         char *start;
         DWORD len, ofs = 0;
-        len = GetGlyphOutlineW(hdc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
+        len = GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
         if (len == GDI_ERROR)
         {
             status = GenericError;
@@ -989,7 +989,7 @@ static GpStatus format_string_callback(GpGraphics *graphics, HDC hdc,
             status = OutOfMemory;
             break;
         }
-        GetGlyphOutlineW(hdc, string[i], GGO_BEZIER, &gm, len, start, &identity);
+        GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, len, start, &identity);
 
         ofs = 0;
         while (ofs < len)
@@ -1117,7 +1117,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     args.maxY = 0;
     args.scale = emSize / native_height;
     args.ascent = textmetric.tmAscent * args.scale;
-    status = gdip_format_string(graphics, dc, string, length, NULL, &scaled_layout_rect,
+    status = gdip_format_string(graphics, string, length, NULL, &scaled_layout_rect,
                                 format, TRUE, format_string_callback, &args);
 
     DeleteDC(dc);

From 505d621d48b90fda445825558473b3b47c79e156 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 23 Feb 2024 19:48:59 +0000
Subject: [PATCH 253/389] gdiplus: Switch to a struct for gdip_format_string
 callback args.

(cherry picked from commit f2c92c68a21bdda69df0bd24023a658e5e8f9032)
---
 dlls/gdiplus/gdiplus_private.h |  22 +++++--
 dlls/gdiplus/graphics.c        | 116 ++++++++++++++++-----------------
 dlls/gdiplus/graphicspath.c    |  24 +++----
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 2b5dbee43e9..c88b5407257 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -619,12 +619,22 @@ struct gdip_font_link_info {
     struct list sections;
 };
 
-
-typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *sections,
-    GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
-    INT lineno, const RectF *bounds, INT *underlined_indexes,
-    INT underlined_index_count, void *user_data);
+struct gdip_format_string_info {
+    GpGraphics *graphics;
+    GDIPCONST WCHAR *string;
+    INT index;
+    INT length;
+    struct gdip_font_link_info font_link_info;
+    GDIPCONST RectF *rect;
+    GDIPCONST GpStringFormat *format;
+    INT lineno;
+    const RectF *bounds;
+    INT *underlined_indexes;
+    INT underlined_index_count;
+    void *user_data;
+};
+
+typedef GpStatus (*gdip_format_string_callback)(struct gdip_format_string_info *info);
 
 GpStatus gdip_format_string(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 707fa55cfda..a7ddb7d996c 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5282,17 +5282,26 @@ GpStatus gdip_format_string(GpGraphics *graphics,
     INT *hotkeyprefix_offsets=NULL;
     INT hotkeyprefix_count=0;
     INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0;
-    struct gdip_font_link_info font_link_info = { 0 };
     BOOL seen_prefix = FALSE, unixstyle_newline = TRUE;
+    struct gdip_format_string_info info;
+
+    info.graphics = graphics;
+    info.rect = rect;
+    info.bounds = &bounds;
+    info.user_data = user_data;
 
     if(length == -1) length = lstrlenW(string);
 
     stringdup = calloc(length + 1, sizeof(WCHAR));
     if(!stringdup) return OutOfMemory;
 
+    info.string = stringdup;
+
     if (!format)
         format = &default_drawstring_format;
 
+    info.format = format;
+
     nwidth = (int)(rect->Width + 0.005f);
     nheight = (int)(rect->Height + 0.005f);
     if (ignore_empty_clip)
@@ -5348,10 +5357,10 @@ GpStatus gdip_format_string(GpGraphics *graphics,
 
     halign = format->align;
 
-    generate_font_link_info(graphics, stringdup, length, font, &font_link_info);
+    generate_font_link_info(graphics, stringdup, length, font, &info.font_link_info);
 
     while(sum < length){
-        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size);
+        font_link_get_text_extent_point(&info.font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size);
         fitcpy = fit;
 
         if(fit == 0)
@@ -5399,7 +5408,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
         else
             lineend = fit;
 
-        font_link_get_text_extent_point(&font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size);
+        font_link_get_text_extent_point(&info.font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size);
 
         bounds.Width = size.cx;
 
@@ -5432,10 +5441,13 @@ GpStatus gdip_format_string(GpGraphics *graphics,
             if (hotkeyprefix_offsets[hotkeyprefix_end_pos] >= sum + lineend)
                 break;
 
-        stat = callback(graphics, stringdup, sum, lineend,
-            &font_link_info, rect, format, lineno, &bounds,
-            &hotkeyprefix_offsets[hotkeyprefix_pos],
-            hotkeyprefix_end_pos-hotkeyprefix_pos, user_data);
+        info.index = sum;
+        info.length = lineend;
+        info.lineno = lineno;
+        info.underlined_indexes = &hotkeyprefix_offsets[hotkeyprefix_pos];
+        info.underlined_index_count = hotkeyprefix_end_pos-hotkeyprefix_pos;
+
+        stat = callback(&info);
 
         if (stat != Ok)
             break;
@@ -5464,7 +5476,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
             break;
     }
 
-    release_font_link_info(&font_link_info);
+    release_font_link_info(&info.font_link_info);
     free(stringdup);
     free(hotkeyprefix_offsets);
 
@@ -5499,34 +5511,30 @@ struct measure_ranges_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_ranges_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length,
-    struct gdip_font_link_info *font_link_info,
-    GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
-    INT lineno, const RectF *bounds, INT *underlined_indexes,
-    INT underlined_index_count, void *user_data)
+static GpStatus measure_ranges_callback(struct gdip_format_string_info *info)
 {
     int i;
     GpStatus stat = Ok;
-    struct measure_ranges_args *args = user_data;
+    struct measure_ranges_args *args = info->user_data;
+    CharacterRange *ranges = info->format->character_ranges;
 
-    for (i=0; i<format->range_count; i++)
+    for (i=0; i < info->format->range_count; i++)
     {
-        INT range_start = max(index, format->character_ranges[i].First);
-        INT range_end = min(index+length, format->character_ranges[i].First+format->character_ranges[i].Length);
+        INT range_start = max(info->index, ranges[i].First);
+        INT range_end = min(info->index + info->length, ranges[i].First + ranges[i].Length);
         if (range_start < range_end)
         {
             GpRectF range_rect;
             SIZE range_size;
 
-            range_rect.Y = bounds->Y / args->rel_height;
-            range_rect.Height = bounds->Height / args->rel_height;
+            range_rect.Y = info->bounds->Y / args->rel_height;
+            range_rect.Height = info->bounds->Height / args->rel_height;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_start - index, INT_MAX, NULL, &range_size);
-            range_rect.X = (bounds->X + range_size.cx) / args->rel_width;
+            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, range_start - info->index, INT_MAX, NULL, &range_size);
+            range_rect.X = (info->bounds->X + range_size.cx) / args->rel_width;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, range_end - index, INT_MAX, NULL, &range_size);
-            range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X;
+            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, range_end - info->index, INT_MAX, NULL, &range_size);
+            range_rect.Width = (info->bounds->X + range_size.cx) / args->rel_width - range_rect.X;
 
             stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion);
             if (stat != Ok)
@@ -5623,18 +5631,13 @@ struct measure_string_args {
     REAL rel_width, rel_height;
 };
 
-static GpStatus measure_string_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length,
-    struct gdip_font_link_info *font_link_info,
-    GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
-    INT lineno, const RectF *bounds, INT *underlined_indexes,
-    INT underlined_index_count, void *user_data)
+static GpStatus measure_string_callback(struct gdip_format_string_info *info)
 {
-    struct measure_string_args *args = user_data;
+    struct measure_string_args *args = info->user_data;
     REAL new_width, new_height;
 
-    new_width = bounds->Width / args->rel_width;
-    new_height = (bounds->Height + bounds->Y) / args->rel_height - args->bounds->Y;
+    new_width = info->bounds->Width / args->rel_width;
+    new_height = (info->bounds->Height + info->bounds->Y) / args->rel_height - args->bounds->Y;
 
     if (new_width > args->bounds->Width)
         args->bounds->Width = new_width;
@@ -5643,7 +5646,7 @@ static GpStatus measure_string_callback(GpGraphics *graphics,
         args->bounds->Height = new_height;
 
     if (args->codepointsfitted)
-        *args->codepointsfitted = index + length;
+        *args->codepointsfitted = info->index + info->length;
 
     if (args->linesfilled)
         (*args->linesfilled)++;
@@ -5751,63 +5754,58 @@ struct draw_string_args {
     REAL x, y, rel_width, rel_height, ascent;
 };
 
-static GpStatus draw_string_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length,
-    struct gdip_font_link_info *font_link_info,
-    GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
-    INT lineno, const RectF *bounds, INT *underlined_indexes,
-    INT underlined_index_count, void *user_data)
+static GpStatus draw_string_callback(struct gdip_format_string_info *info)
 {
-    struct draw_string_args *args = user_data;
-    int i = index;
+    struct draw_string_args *args = info->user_data;
+    int i = info->index;
     PointF position;
     SIZE size;
     DWORD to_draw_length;
     struct gdip_font_link_section *section;
     GpStatus stat = Ok;
 
-    position.X = args->x + bounds->X / args->rel_width;
-    position.Y = args->y + bounds->Y / args->rel_height + args->ascent;
+    position.X = args->x + info->bounds->X / args->rel_width;
+    position.Y = args->y + info->bounds->Y / args->rel_height + args->ascent;
 
-    LIST_FOR_EACH_ENTRY(section, &font_link_info->sections, struct gdip_font_link_section, entry)
+    LIST_FOR_EACH_ENTRY(section, &info->font_link_info.sections, struct gdip_font_link_section, entry)
     {
         if (i >= section->end) continue;
 
-        to_draw_length = min(length - (i - index), section->end - i);
-        TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == font_link_info->base_font ? "base font" : "map");
-        font_link_get_text_extent_point(font_link_info, graphics, string, i, to_draw_length, 0, NULL, &size);
-        stat = draw_driver_string(graphics, &string[i], to_draw_length,
-            section->font, format, args->brush, &position,
+        to_draw_length = min(info->length - (i - info->index), section->end - i);
+        TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == info->font_link_info.base_font ? "base font" : "map");
+        font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, i, to_draw_length, 0, NULL, &size);
+        stat = draw_driver_string(info->graphics, &info->string[i], to_draw_length,
+            section->font, info->format, args->brush, &position,
             DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
         position.X += size.cx / args->rel_width;
         i += to_draw_length;
-        if (stat != Ok || (i - index) >= length) break;
+        if (stat != Ok || (i - info->index) >= info->length) break;
     }
 
-    if (stat == Ok && underlined_index_count)
+    if (stat == Ok && info->underlined_index_count)
     {
         OUTLINETEXTMETRICW otm;
         REAL underline_y, underline_height;
         int i;
 
-        GetOutlineTextMetricsW(graphics->hdc, sizeof(otm), &otm);
+        GetOutlineTextMetricsW(info->graphics->hdc, sizeof(otm), &otm);
 
         underline_height = otm.otmsUnderscoreSize / args->rel_height;
         underline_y = position.Y - otm.otmsUnderscorePosition / args->rel_height - underline_height / 2;
 
-        for (i=0; i<underlined_index_count; i++)
+        for (i=0; i<info->underlined_index_count; i++)
         {
             REAL start_x, end_x;
             SIZE text_size;
-            INT ofs = underlined_indexes[i] - index;
+            INT ofs = info->underlined_indexes[i] - info->index;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, ofs, INT_MAX, NULL, &text_size);
             start_x = text_size.cx / args->rel_width;
 
-            font_link_get_text_extent_point(font_link_info, graphics, string, index, ofs+1, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, ofs+1, INT_MAX, NULL, &text_size);
             end_x = text_size.cx / args->rel_width;
 
-            GdipFillRectangle(graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
+            GdipFillRectangle(info->graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);
         }
     }
 
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 20e0787de16..8fbdae1a65a 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -949,33 +949,29 @@ struct format_string_args
     float ascent;
 };
 
-static GpStatus format_string_callback(GpGraphics *graphics,
-    GDIPCONST WCHAR *string, INT index, INT length, struct gdip_font_link_info *font_link_info,
-    GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
-    INT lineno, const RectF *bounds, INT *underlined_indexes,
-    INT underlined_index_count, void *priv)
+static GpStatus format_string_callback(struct gdip_format_string_info* info)
 {
     static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} };
-    struct format_string_args *args = priv;
+    struct format_string_args *args = info->user_data;
     GpPath *path = args->path;
     GpStatus status = Ok;
-    float x = rect->X + (bounds->X - rect->X) * args->scale;
-    float y = rect->Y + (bounds->Y - rect->Y) * args->scale;
+    float x = info->rect->X + (info->bounds->X - info->rect->X) * args->scale;
+    float y = info->rect->Y + (info->bounds->Y - info->rect->Y) * args->scale;
     int i;
 
-    if (underlined_index_count)
+    if (info->underlined_index_count)
         FIXME("hotkey underlines not drawn yet\n");
 
-    if (y + bounds->Height * args->scale > args->maxY)
-        args->maxY = y + bounds->Height * args->scale;
+    if (y + info->bounds->Height * args->scale > args->maxY)
+        args->maxY = y + info->bounds->Height * args->scale;
 
-    for (i = index; i < length + index; ++i)
+    for (i = info->index; i < info->length + info->index; ++i)
     {
         GLYPHMETRICS gm;
         TTPOLYGONHEADER *ph = NULL, *origph;
         char *start;
         DWORD len, ofs = 0;
-        len = GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
+        len = GetGlyphOutlineW(info->graphics->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
         if (len == GDI_ERROR)
         {
             status = GenericError;
@@ -989,7 +985,7 @@ static GpStatus format_string_callback(GpGraphics *graphics,
             status = OutOfMemory;
             break;
         }
-        GetGlyphOutlineW(graphics->hdc, string[i], GGO_BEZIER, &gm, len, start, &identity);
+        GetGlyphOutlineW(info->graphics->hdc, info->string[i], GGO_BEZIER, &gm, len, start, &identity);
 
         ofs = 0;
         while (ofs < len)

From fc7e28387b5de65267ec6ea52f273aa5d184ff7d Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 23 Feb 2024 20:05:12 +0000
Subject: [PATCH 254/389] gdiplus: Pass gdip_format_string_info to font link
 functions.

(cherry picked from commit 0d0d37bbea2c59820d35082007dbedc0bd531c65)
---
 dlls/gdiplus/graphics.c | 51 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index a7ddb7d996c..1a57a375489 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5163,8 +5163,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w
 }
 
 /* Populates gdip_font_link_info struct based on the base_font and input string */
-static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font,
-                                    struct gdip_font_link_info *font_link_info)
+static void generate_font_link_info(struct gdip_format_string_info *info, DWORD length, GDIPCONST GpFont *base_font)
 {
     IUnknown *unk;
     IMLangFontLink *iMLFL;
@@ -5174,21 +5173,21 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l
     struct gdip_font_link_section *section;
     DWORD font_codepages, string_codepages;
 
-    list_init(&font_link_info->sections);
-    font_link_info->base_font = base_font;
+    list_init(&info->font_link_info.sections);
+    info->font_link_info.base_font = base_font;
 
     GetGlobalFontLinkObject((void**)&unk);
     IUnknown_QueryInterface(unk, &IID_IMLangFontLink, (void**)&iMLFL);
     IUnknown_Release(unk);
 
-    get_font_hfont(graphics, base_font, NULL, &hfont, NULL, NULL);
-    IMLangFontLink_GetFontCodePages(iMLFL, graphics->hdc, hfont, &font_codepages);
+    get_font_hfont(info->graphics, base_font, NULL, &hfont, NULL, NULL);
+    IMLangFontLink_GetFontCodePages(iMLFL, info->graphics->hdc, hfont, &font_codepages);
 
     while (progress < length)
     {
         section = calloc(1, sizeof(*section));
         section->start = progress;
-        IMLangFontLink_GetStrCodePages(iMLFL, &string[progress], length - progress,
+        IMLangFontLink_GetStrCodePages(iMLFL, &info->string[progress], length - progress,
                                         font_codepages, &string_codepages, &processed);
 
         if (font_codepages & string_codepages)
@@ -5197,16 +5196,16 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l
         }
         else
         {
-            IMLangFontLink_MapFont(iMLFL, graphics->hdc, string_codepages, hfont, &map_hfont);
-            old_font = SelectObject(graphics->hdc, map_hfont);
-            GdipCreateFontFromDC(graphics->hdc, &gpfont);
-            SelectObject(graphics->hdc, old_font);
+            IMLangFontLink_MapFont(iMLFL, info->graphics->hdc, string_codepages, hfont, &map_hfont);
+            old_font = SelectObject(info->graphics->hdc, map_hfont);
+            GdipCreateFontFromDC(info->graphics->hdc, &gpfont);
+            SelectObject(info->graphics->hdc, old_font);
             IMLangFontLink_ReleaseFont(iMLFL, map_hfont);
             section->font = gpfont;
         }
 
         section->end = section->start + processed;
-        list_add_tail(&font_link_info->sections, &section->entry);
+        list_add_tail(&info->font_link_info.sections, &section->entry);
         progress += processed;
     }
 
@@ -5214,7 +5213,7 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l
     IMLangFontLink_Release(iMLFL);
 }
 
-static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, LPCWSTR string,
+static void font_link_get_text_extent_point(struct gdip_format_string_info *info,
                                             INT index, int length, int max_ext, LPINT fit, SIZE *size)
 {
     DWORD to_measure_length;
@@ -5229,16 +5228,16 @@ static void font_link_get_text_extent_point(struct gdip_font_link_info *font_lin
     if (fit)
         *fit = 0;
 
-    LIST_FOR_EACH_ENTRY(section, &font_link_info->sections, struct gdip_font_link_section, entry)
+    LIST_FOR_EACH_ENTRY(section, &info->font_link_info.sections, struct gdip_font_link_section, entry)
     {
         if (i >= section->end) continue;
 
         to_measure_length = min(length - (i - index), section->end - i);
 
-        get_font_hfont(graphics, section->font, NULL, &hfont, NULL, NULL);
-        oldhfont = SelectObject(graphics->hdc, hfont);
-        GetTextExtentExPointW(graphics->hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
-        SelectObject(graphics->hdc, oldhfont);
+        get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL);
+        oldhfont = SelectObject(info->graphics->hdc, hfont);
+        GetTextExtentExPointW(info->graphics->hdc, &info->string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
+        SelectObject(info->graphics->hdc, oldhfont);
         DeleteObject(hfont);
 
         max_ext -= sizeaux.cx;
@@ -5357,10 +5356,10 @@ GpStatus gdip_format_string(GpGraphics *graphics,
 
     halign = format->align;
 
-    generate_font_link_info(graphics, stringdup, length, font, &info.font_link_info);
+    generate_font_link_info(&info, length, font);
 
     while(sum < length){
-        font_link_get_text_extent_point(&info.font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size);
+        font_link_get_text_extent_point(&info, sum, length - sum, nwidth, &fit, &size);
         fitcpy = fit;
 
         if(fit == 0)
@@ -5408,7 +5407,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
         else
             lineend = fit;
 
-        font_link_get_text_extent_point(&info.font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size);
+        font_link_get_text_extent_point(&info, sum, lineend, nwidth, &j, &size);
 
         bounds.Width = size.cx;
 
@@ -5530,10 +5529,10 @@ static GpStatus measure_ranges_callback(struct gdip_format_string_info *info)
             range_rect.Y = info->bounds->Y / args->rel_height;
             range_rect.Height = info->bounds->Height / args->rel_height;
 
-            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, range_start - info->index, INT_MAX, NULL, &range_size);
+            font_link_get_text_extent_point(info, info->index, range_start - info->index, INT_MAX, NULL, &range_size);
             range_rect.X = (info->bounds->X + range_size.cx) / args->rel_width;
 
-            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, range_end - info->index, INT_MAX, NULL, &range_size);
+            font_link_get_text_extent_point(info, info->index, range_end - info->index, INT_MAX, NULL, &range_size);
             range_rect.Width = (info->bounds->X + range_size.cx) / args->rel_width - range_rect.X;
 
             stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion);
@@ -5773,7 +5772,7 @@ static GpStatus draw_string_callback(struct gdip_format_string_info *info)
 
         to_draw_length = min(info->length - (i - info->index), section->end - i);
         TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == info->font_link_info.base_font ? "base font" : "map");
-        font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, i, to_draw_length, 0, NULL, &size);
+        font_link_get_text_extent_point(info, i, to_draw_length, 0, NULL, &size);
         stat = draw_driver_string(info->graphics, &info->string[i], to_draw_length,
             section->font, info->format, args->brush, &position,
             DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL);
@@ -5799,10 +5798,10 @@ static GpStatus draw_string_callback(struct gdip_format_string_info *info)
             SIZE text_size;
             INT ofs = info->underlined_indexes[i] - info->index;
 
-            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, ofs, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(info, info->index, ofs, INT_MAX, NULL, &text_size);
             start_x = text_size.cx / args->rel_width;
 
-            font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, ofs+1, INT_MAX, NULL, &text_size);
+            font_link_get_text_extent_point(info, info->index, ofs+1, INT_MAX, NULL, &text_size);
             end_x = text_size.cx / args->rel_width;
 
             GdipFillRectangle(info->graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);

From fd4a312a302f04a7fd1501c84ab0c7cd123c457e Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 23 Feb 2024 20:19:14 +0000
Subject: [PATCH 255/389] gdiplus: Restore hdc argument to gdip_format_string.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56345
(cherry picked from commit c37fea89e6202e82e91d6af75f94441a76a9c130)
---
 dlls/gdiplus/gdiplus_private.h |  3 ++-
 dlls/gdiplus/graphics.c        | 27 ++++++++++++++-------------
 dlls/gdiplus/graphicspath.c    |  6 +++---
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index c88b5407257..1ae03d7126e 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -621,6 +621,7 @@ struct gdip_font_link_info {
 
 struct gdip_format_string_info {
     GpGraphics *graphics;
+    HDC hdc;
     GDIPCONST WCHAR *string;
     INT index;
     INT length;
@@ -636,7 +637,7 @@ struct gdip_format_string_info {
 
 typedef GpStatus (*gdip_format_string_callback)(struct gdip_format_string_info *info);
 
-GpStatus gdip_format_string(GpGraphics *graphics,
+GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data);
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 1a57a375489..2389cbf4f68 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5181,7 +5181,7 @@ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD
     IUnknown_Release(unk);
 
     get_font_hfont(info->graphics, base_font, NULL, &hfont, NULL, NULL);
-    IMLangFontLink_GetFontCodePages(iMLFL, info->graphics->hdc, hfont, &font_codepages);
+    IMLangFontLink_GetFontCodePages(iMLFL, info->hdc, hfont, &font_codepages);
 
     while (progress < length)
     {
@@ -5196,10 +5196,10 @@ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD
         }
         else
         {
-            IMLangFontLink_MapFont(iMLFL, info->graphics->hdc, string_codepages, hfont, &map_hfont);
-            old_font = SelectObject(info->graphics->hdc, map_hfont);
-            GdipCreateFontFromDC(info->graphics->hdc, &gpfont);
-            SelectObject(info->graphics->hdc, old_font);
+            IMLangFontLink_MapFont(iMLFL, info->hdc, string_codepages, hfont, &map_hfont);
+            old_font = SelectObject(info->hdc, map_hfont);
+            GdipCreateFontFromDC(info->hdc, &gpfont);
+            SelectObject(info->hdc, old_font);
             IMLangFontLink_ReleaseFont(iMLFL, map_hfont);
             section->font = gpfont;
         }
@@ -5235,9 +5235,9 @@ static void font_link_get_text_extent_point(struct gdip_format_string_info *info
         to_measure_length = min(length - (i - index), section->end - i);
 
         get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL);
-        oldhfont = SelectObject(info->graphics->hdc, hfont);
-        GetTextExtentExPointW(info->graphics->hdc, &info->string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
-        SelectObject(info->graphics->hdc, oldhfont);
+        oldhfont = SelectObject(info->hdc, hfont);
+        GetTextExtentExPointW(info->hdc, &info->string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux);
+        SelectObject(info->hdc, oldhfont);
         DeleteObject(hfont);
 
         max_ext -= sizeaux.cx;
@@ -5265,7 +5265,7 @@ static void release_font_link_info(struct gdip_font_link_info *font_link_info)
     }
 }
 
-GpStatus gdip_format_string(GpGraphics *graphics,
+GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,
     GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip,
     gdip_format_string_callback callback, void *user_data)
@@ -5285,6 +5285,7 @@ GpStatus gdip_format_string(GpGraphics *graphics,
     struct gdip_format_string_info info;
 
     info.graphics = graphics;
+    info.hdc = hdc;
     info.rect = rect;
     info.bounds = &bounds;
     info.user_data = user_data;
@@ -5609,7 +5610,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
 
     gdi_transform_acquire(graphics);
 
-    stat = gdip_format_string(graphics, string, length, font, &scaled_rect, stringFormat,
+    stat = gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, stringFormat,
         (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5728,7 +5729,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
 
     gdi_transform_acquire(graphics);
 
-    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE,
         measure_string_callback, &args);
 
     gdi_transform_release(graphics);
@@ -5787,7 +5788,7 @@ static GpStatus draw_string_callback(struct gdip_format_string_info *info)
         REAL underline_y, underline_height;
         int i;
 
-        GetOutlineTextMetricsW(info->graphics->hdc, sizeof(otm), &otm);
+        GetOutlineTextMetricsW(info->hdc, sizeof(otm), &otm);
 
         underline_height = otm.otmsUnderscoreSize / args->rel_height;
         underline_y = position.Y - otm.otmsUnderscorePosition / args->rel_height - underline_height / 2;
@@ -5915,7 +5916,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
     GetTextMetricsW(hdc, &textmetric);
     args.ascent = textmetric.tmAscent / rel_height;
 
-    gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE,
+    gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE,
         draw_string_callback, &args);
 
     gdi_transform_release(graphics);
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 8fbdae1a65a..4b272f539c4 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -971,7 +971,7 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info)
         TTPOLYGONHEADER *ph = NULL, *origph;
         char *start;
         DWORD len, ofs = 0;
-        len = GetGlyphOutlineW(info->graphics->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
+        len = GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
         if (len == GDI_ERROR)
         {
             status = GenericError;
@@ -985,7 +985,7 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info)
             status = OutOfMemory;
             break;
         }
-        GetGlyphOutlineW(info->graphics->hdc, info->string[i], GGO_BEZIER, &gm, len, start, &identity);
+        GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, len, start, &identity);
 
         ofs = 0;
         while (ofs < len)
@@ -1113,7 +1113,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     args.maxY = 0;
     args.scale = emSize / native_height;
     args.ascent = textmetric.tmAscent * args.scale;
-    status = gdip_format_string(graphics, string, length, NULL, &scaled_layout_rect,
+    status = gdip_format_string(graphics, dc, string, length, NULL, &scaled_layout_rect,
                                 format, TRUE, format_string_callback, &args);
 
     DeleteDC(dc);

From f6d58ded6b4be1c447fea0f1f3085fb7f0cab33b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 11 Oct 2021 11:17:19 +0200
Subject: [PATCH 256/389] wine.inf: Disable nvcuda.dll by default.

The nvcuda.dll stub presence may cause regressions when the games
successfully load and try to use it (like Divinity The Original Sin 2).
The library is enabled in proton script together with nvapi.dll.

Link: https://github.com/ValveSoftware/wine/pull/119

CW-Bug-Id: #23561
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index bcb4c80a4d1..1e5b16a53a6 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2867,6 +2867,7 @@ HKCU,Software\Wine\DllOverrides,"ucrtbase",0x2,"native,builtin"
 HKCU,Software\Wine\DllOverrides,"vcomp140",0x2,"native,builtin"
 HKCU,Software\Wine\DllOverrides,"vcruntime140",0x2,"native,builtin"
 HKCU,Software\Wine\DllOverrides,"atiadlxx",,"disabled"
+HKCU,Software\Wine\DllOverrides,"nvcuda",0x2,"disabled"
 ;;App-specific overrides to limit the number of resolutions
 HKCU,Software\Wine\AppDefaults\DarkSoulsIII.exe\X11 Driver,"LimitNumberOfResolutions",0x2,"32"
 HKCU,Software\Wine\AppDefaults\sekiro.exe\X11 Driver,"LimitNumberOfResolutions",0x2,"32"

From fb9ed24f5cfc1430508365286b7a884e42da2b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 13 Mar 2024 16:59:09 +0100
Subject: [PATCH 257/389] winex11: Only listen to RawButton and RawTouch events
 in the rawinput thread.

CW-Bug-Id: #23563
---
 dlls/winex11.drv/mouse.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 71711f609ae..655b0c67651 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -374,6 +374,7 @@ void x11drv_xinput2_init( struct x11drv_thread_data *data )
  */
 void X11DRV_XInput2_Enable( Display *display, Window window, long event_mask )
 {
+    struct x11drv_thread_data *data = x11drv_thread_data();
     unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)];
     BOOL raw = (window == None);
     XIEventMask mask;
@@ -388,11 +389,14 @@ void X11DRV_XInput2_Enable( Display *display, Window window, long event_mask )
     if (raw && event_mask)
     {
         XISetMask( mask_bits, XI_RawMotion );
-        XISetMask( mask_bits, XI_RawTouchBegin );
-        XISetMask( mask_bits, XI_RawTouchUpdate );
-        XISetMask( mask_bits, XI_RawTouchEnd );
-        XISetMask( mask_bits, XI_RawButtonPress );
-        XISetMask( mask_bits, XI_RawButtonRelease );
+        if (data->xi2_rawinput_only)
+        {
+            XISetMask( mask_bits, XI_RawTouchBegin );
+            XISetMask( mask_bits, XI_RawTouchUpdate );
+            XISetMask( mask_bits, XI_RawTouchEnd );
+            XISetMask( mask_bits, XI_RawButtonPress );
+            XISetMask( mask_bits, XI_RawButtonRelease );
+        }
     }
 
     XISetMask( mask_bits, XI_DeviceChanged );
@@ -2011,7 +2015,6 @@ static BOOL X11DRV_RawTouchEvent( XGenericEventCookie *xev )
     int flags = 0;
     POINT pos;
 
-    if (!thread_data->xi2_rawinput_only) return FALSE;
     if (!map_raw_event_coords( event, &input, &rawinput )) return FALSE;
     if (!(input.mi.dwFlags & MOUSEEVENTF_ABSOLUTE)) return FALSE;
     pos.x = input.mi.dx;

From a7888982b2e9f4f8f8020a905b8dddbee10617d6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 13 Mar 2024 11:55:42 -0600
Subject: [PATCH 258/389] amd_ags_x64: Do not fail context creation for NULL
 output GPU info.

CW-Bug-Id: #23474
---
 dlls/amd_ags_x64/amd_ags_x64_main.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/dlls/amd_ags_x64/amd_ags_x64_main.c b/dlls/amd_ags_x64/amd_ags_x64_main.c
index e1cb3609b99..75f74e86b20 100644
--- a/dlls/amd_ags_x64/amd_ags_x64_main.c
+++ b/dlls/amd_ags_x64/amd_ags_x64_main.c
@@ -867,7 +867,7 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         unsigned int i;
 
         if (!info)
-            return AGS_INVALID_ARGS;
+            goto done;
 
         TRACE("filling AGSGPUInfo_311.\n");
         if (!object->device_count)
@@ -906,7 +906,7 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         unsigned int i;
 
         if (!gpu_info)
-            return AGS_INVALID_ARGS;
+            goto done;
 
         TRACE("filling AGSGPUInfo_320.\n");
         if (!object->device_count)
@@ -946,7 +946,7 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         unsigned int i;
 
         if (!gpu_info)
-            return AGS_INVALID_ARGS;
+            goto done;
 
         if (!object->device_count)
         {
@@ -982,7 +982,7 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
     else
     {
         if (!gpu_info)
-            return AGS_INVALID_ARGS;
+            goto done;
 
         memset(gpu_info, 0, sizeof(*gpu_info));
         gpu_info->agsVersionMajor = AGS_VER_MAJOR(object->public_version);
@@ -994,6 +994,7 @@ AGSReturnCode WINAPI agsInit(AGSContext **context, const AGSConfiguration *confi
         gpu_info->devices = object->devices;
     }
 
+done:
     TRACE("Created context %p.\n", object);
 
     *context = object;
@@ -1008,7 +1009,7 @@ AGSReturnCode WINAPI agsInitialize(int ags_version, const AGSConfiguration *conf
 
     TRACE("ags_verison %d, context %p, config %p, gpu_info %p.\n", ags_version, context, config, gpu_info);
 
-    if (!context || !gpu_info)
+    if (!context)
         return AGS_INVALID_ARGS;
 
     if (config)
@@ -1023,11 +1024,14 @@ AGSReturnCode WINAPI agsInitialize(int ags_version, const AGSConfiguration *conf
         return ret;
     }
 
-    memset(gpu_info, 0, sizeof(*gpu_info));
-    gpu_info->driverVersion = driver_version;
-    gpu_info->radeonSoftwareVersion  = radeon_version;
-    gpu_info->numDevices = object->device_count;
-    gpu_info->devices = object->devices;
+    if (gpu_info)
+    {
+        memset(gpu_info, 0, sizeof(*gpu_info));
+        gpu_info->driverVersion = driver_version;
+        gpu_info->radeonSoftwareVersion  = radeon_version;
+        gpu_info->numDevices = object->device_count;
+        gpu_info->devices = object->devices;
+    }
 
     TRACE("Created context %p.\n", object);
 

From 0bfa27bdb256faf411e86d4bbd54dedcd3225157 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 13 Mar 2024 18:44:31 -0600
Subject: [PATCH 259/389] ntdll: Wait for thread suspension in
 NtSuspendThread().

CW-Bug-Id: #23552
---
 dlls/ntdll/unix/thread.c | 26 ++++++++++++++++++++++----
 server/protocol.def      |  6 ++++--
 server/thread.c          | 28 ++++++++++++++++++++++++----
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 64cad6e7c0e..c69d3de3e15 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -1611,22 +1611,40 @@ NTSTATUS WINAPI NtOpenThread( HANDLE *handle, ACCESS_MASK access,
 /******************************************************************************
  *              NtSuspendThread   (NTDLL.@)
  */
-NTSTATUS WINAPI NtSuspendThread( HANDLE handle, ULONG *count )
+NTSTATUS WINAPI NtSuspendThread( HANDLE handle, ULONG *ret_count )
 {
     BOOL self = FALSE;
-    unsigned int ret;
+    unsigned int ret, count = 0;
+    HANDLE wait_handle = NULL;
 
     SERVER_START_REQ( suspend_thread )
     {
         req->handle = wine_server_obj_handle( handle );
-        if (!(ret = wine_server_call( req )))
+        if (!(ret = wine_server_call( req )) || ret == STATUS_PENDING)
         {
             self = reply->count & 0x80000000;
-            if (count) *count = reply->count & 0x7fffffff;
+            count = reply->count & 0x7fffffff;;
+            wait_handle = wine_server_ptr_handle( reply->wait_handle );
         }
     }
     SERVER_END_REQ;
+
     if (self) usleep( 0 );
+
+    if (ret == STATUS_PENDING && wait_handle)
+    {
+        NtWaitForSingleObject( wait_handle, FALSE, NULL );
+
+        SERVER_START_REQ( suspend_thread )
+        {
+            req->handle = wine_server_obj_handle( handle );
+            req->waited_handle = wine_server_obj_handle( wait_handle );
+            ret = wine_server_call( req );
+        }
+        SERVER_END_REQ;
+    }
+
+    if (!ret && ret_count) *ret_count = count;
     return ret;
 }
 
diff --git a/server/protocol.def b/server/protocol.def
index 848afbcc19c..a223b4f4665 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1182,9 +1182,11 @@ typedef volatile struct input_shared_memory input_shm_t;
 
 /* Suspend a thread */
 @REQ(suspend_thread)
-    obj_handle_t handle;       /* thread handle */
+    obj_handle_t handle;        /* thread handle */
+    obj_handle_t waited_handle; /* handle waited on */
 @REPLY
-    int          count;        /* new suspend count */
+    int          count;         /* new suspend count */
+    obj_handle_t wait_handle;   /* handle to wait on */
 @END
 
 
diff --git a/server/thread.c b/server/thread.c
index a6039b35d9d..e54e83c178a 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1815,12 +1815,32 @@ DECL_HANDLER(suspend_thread)
 {
     struct thread *thread;
 
-    if ((thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME )))
+    if (req->waited_handle)
     {
-        if (thread->state == TERMINATED) set_error( STATUS_ACCESS_DENIED );
-        else reply->count = suspend_thread( thread );
-        release_object( thread );
+        struct context *context;
+
+        if (!(context = (struct context *)get_handle_obj( current->process, req->waited_handle,
+                                                          0, &context_ops )))
+            return;
+        close_handle( current->process, req->waited_handle ); /* avoid extra server call */
+        set_error( context->status );
+        release_object( context );
+        return;
     }
+
+    if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return;
+
+    if (thread->state != RUNNING) set_error( STATUS_ACCESS_DENIED );
+    else
+    {
+        reply->count = suspend_thread( thread );
+        if (!get_error() && thread != current && thread->context && thread->context->status == STATUS_PENDING)
+        {
+            set_error( STATUS_PENDING );
+            reply->wait_handle = alloc_handle( current->process, thread->context, SYNCHRONIZE, 0 );
+        }
+    }
+    release_object( thread );
 }
 
 /* resume a thread */

From f61fcf98ceaf919d4276461e3ebe23c85eb67302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 14 Mar 2024 16:22:21 +0100
Subject: [PATCH 260/389] server: Send WM_WINE_CLIPCURSOR to release cursor
 only when necessary.

CW-Bug-Id: #23569
---
 server/protocol.def | 1 +
 server/queue.c      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/protocol.def b/server/protocol.def
index a223b4f4665..ac14467f330 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -905,6 +905,7 @@ struct shared_cursor
     int                  y;
     unsigned int         last_change;      /* time of last position change */
     rectangle_t          clip;             /* cursor clip rectangle */
+    unsigned int         clip_flags;       /* cursor clip flags */
 };
 
 struct desktop_shared_memory
diff --git a/server/queue.c b/server/queue.c
index a41ae7583af..c1aebd56c29 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -616,6 +616,7 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig
 void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsigned int flags, int reset )
 {
     rectangle_t top_rect, new_rect;
+    unsigned int old_flags;
     int x, y;
 
     get_top_window_rectangle( desktop, &top_rect );
@@ -632,7 +633,9 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsig
 
     SHARED_WRITE_BEGIN( desktop, desktop_shm_t )
     {
+        old_flags = shared->cursor.clip_flags;
         shared->cursor.clip = new_rect;
+        shared->cursor.clip_flags = flags;
     }
     SHARED_WRITE_END
 
@@ -645,7 +648,8 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsig
     if (reset) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, flags, FALSE );
 
     /* notify foreground thread, of reset, or to apply new cursor clipping rect */
-    queue_cursor_message( desktop, 0, WM_WINE_CLIPCURSOR, flags, reset );
+    if (rect || reset || old_flags != SET_CURSOR_NOCLIP)
+        queue_cursor_message( desktop, 0, WM_WINE_CLIPCURSOR, flags, reset );
 }
 
 /* change the foreground input and reset the cursor clip rect */

From 559f14dbb8b73eeefec2d23592716e78c54fd667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 14 Mar 2024 18:09:17 +0100
Subject: [PATCH 261/389] server: Send WM_WINE_SETCURSOR message only when
 necessary.

CW-Bug-Id: #23569
---
 server/queue.c | 12 ++++++++++--
 server/user.h  |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/queue.c b/server/queue.c
index c1aebd56c29..23423a239f1 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -535,15 +535,20 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t
     struct thread_input *input;
     desktop->cursor_win = win;
 
-    if (updated && (input = get_desktop_cursor_thread_input( desktop )))
+    if (!updated) return 0;
+
+    if (!(input = get_desktop_cursor_thread_input( desktop )))
+        desktop->cursor_handle = -1;
+    else
     {
         user_handle_t handle = input->shared->cursor_count < 0 ? 0 : input->shared->cursor;
         /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */
         if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle );
         queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle );
+        desktop->cursor_handle = handle;
     }
 
-    return updated;
+    return 1;
 }
 
 static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y )
@@ -575,9 +580,12 @@ static void update_desktop_cursor_handle( struct desktop *desktop, struct thread
     if (input == get_desktop_cursor_thread_input( desktop ))
     {
         user_handle_t handle = input->shared->cursor_count < 0 ? 0 : input->shared->cursor, win = desktop->cursor_win;
+        if (handle == desktop->cursor_handle) return;
+
         /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */
         if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle );
         queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle );
+        desktop->cursor_handle = handle;
     }
 }
 
diff --git a/server/user.h b/server/user.h
index a6ef5fc1f83..f06c9ba6b6e 100644
--- a/server/user.h
+++ b/server/user.h
@@ -68,6 +68,7 @@ struct desktop
     struct thread_input *foreground_input; /* thread input of foreground thread */
     unsigned int         users;            /* processes and threads using this desktop */
     user_handle_t        cursor_win;       /* window that contains the cursor */
+    user_handle_t        cursor_handle;    /* last set cursor handle */
     unsigned char        keystate[256];    /* asynchronous key state */
     unsigned int         last_press_alt:1; /* last key press was Alt (used to determine msg on Alt release) */
     struct object       *shared_mapping;   /* desktop shared memory mapping */

From 4d57e823fb1f5c755f0b11946614b2d1285afb0b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 14 Mar 2024 13:53:56 -0600
Subject: [PATCH 262/389] fixup! bcrypt: Add support for none and OAEP-padded
 asymmetric key encryption.

CW-Bug-Id: #23572
---
 dlls/bcrypt/gnutls.c       |  2 +-
 dlls/bcrypt/tests/bcrypt.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 4abe0c354ed..553557e03d1 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2905,7 +2905,7 @@ static NTSTATUS key_asymmetric_encrypt_gcrypt( void *args )
     result_len = EXPORT_SIZE(result, key->u.a.bitlen / 8, 1);
     *ret_len = result_len;
 
-    if (params->output_len >= result_len) export_gnutls_datum(output, params->output_len, &result, 1);
+    if (params->output_len >= result_len) export_gnutls_datum(output, result_len, &result, 1);
     else if (params->output_len == 0) status = STATUS_SUCCESS;
     else status = STATUS_BUFFER_TOO_SMALL;
 
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 04b85be7b5e..96648bba3f7 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -2485,12 +2485,12 @@ static void test_rsa_encrypt(void)
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     ok(encrypted_size == 64, "got size of %ld\n", encrypted_size);
 
-    encrypted_a = malloc(encrypted_size);
+    encrypted_a = malloc(encrypted_size * 2);
     memset(encrypted_a, 0, encrypted_size);
-    encrypted_b = malloc(encrypted_size);
+    encrypted_b = malloc(encrypted_size * 2);
     memset(encrypted_b, 0xff, encrypted_size);
 
-    ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE);
+    ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, encrypted_a, encrypted_size * 2, &encrypted_size, BCRYPT_PAD_NONE);
     ok(ret == STATUS_INVALID_PARAMETER, "got %lx\n", ret);
 
     ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_a, 12, &encrypted_size, BCRYPT_PAD_NONE);
@@ -2537,12 +2537,12 @@ static void test_rsa_encrypt(void)
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     ok(encrypted_size == 64, "got size of %ld\n", encrypted_size);
 
-    encrypted_a = realloc(encrypted_a, encrypted_size);
-    memset(encrypted_a, 0, encrypted_size);
-    encrypted_b = realloc(encrypted_b, encrypted_size);
+    encrypted_a = realloc(encrypted_a, encrypted_size * 2);
+    memset(encrypted_a, 0, encrypted_size * 2);
+    encrypted_b = realloc(encrypted_b, encrypted_size * 2);
     memset(encrypted_b, 0, encrypted_size);
 
-    ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_OAEP);
+    ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_a, encrypted_size * 2, &encrypted_size, BCRYPT_PAD_OAEP);
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_OAEP);
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);

From 6e0a371976976bd64569e5e20e1d00afd464026a Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 14 Mar 2024 13:59:00 -0600
Subject: [PATCH 263/389] fixup! bcrypt: Add support for none and OAEP padded
 asymmetric key decryption.

CW-Bug-Id: #23572
---
 dlls/bcrypt/gnutls.c       | 2 +-
 dlls/bcrypt/tests/bcrypt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 553557e03d1..115219a64f6 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -3028,7 +3028,7 @@ static NTSTATUS key_asymmetric_decrypt_gcrypt( void *args )
     {
         status = STATUS_SUCCESS;
         if (flags == BCRYPT_PAD_NONE)
-            export_gnutls_datum(output, params->output_len, &result, 1);
+            export_gnutls_datum(output, result_len, &result, 1);
         else
             memcpy(output, result.data, result_len);
     }
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 96648bba3f7..511ee7634b6 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -2506,7 +2506,7 @@ static void test_rsa_encrypt(void)
     decrypted_size = 0xdeadbeef;
     BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE);
     ok(decrypted_size == sizeof(input_no_padding), "got %lu\n", decrypted_size);
-    BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_NONE);
+    BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size * 2, &decrypted_size, BCRYPT_PAD_NONE);
     ok(!memcmp(decrypted, input_no_padding, sizeof(input_no_padding)), "Decrypted output it's not what expected\n");
 
     encrypted_size = 60;
@@ -2553,7 +2553,7 @@ static void test_rsa_encrypt(void)
     ret = BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_OAEP);
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     ok(decrypted_size == sizeof(input), "got %lu\n", decrypted_size);
-    ret = BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_OAEP);
+    ret = BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, decrypted, decrypted_size * 2, &decrypted_size, BCRYPT_PAD_OAEP);
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n");
 

From 0a9d50f40494a1dd98d46317a22b21fa6a41ccff Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 14 Mar 2024 20:05:31 -0600
Subject: [PATCH 264/389] server: Ignore some ICMP-originated socket errors for
 connectionless sockets.

CW-Bug-Id: #23578
---
 server/sock.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/sock.c b/server/sock.c
index 3b9367a1b72..9877888b465 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -815,7 +815,7 @@ static void post_sock_messages( struct sock *sock )
     }
 }
 
-static inline int sock_error( struct sock *sock )
+static inline int sock_error( struct sock *sock, int *poll_event )
 {
     int error = 0;
     socklen_t len = sizeof(error);
@@ -841,8 +841,14 @@ static inline int sock_error( struct sock *sock )
             error = sock->errors[AFD_POLL_BIT_ACCEPT];
         break;
 
-    case SOCK_CONNECTED:
     case SOCK_CONNECTIONLESS:
+        if (error == ENETUNREACH || error == EHOSTUNREACH || error == ECONNRESET)
+        {
+            if (poll_event) *poll_event &= ~POLLERR;
+            return 0;
+        }
+        /* fallthrough */
+    case SOCK_CONNECTED:
         if (error == ECONNRESET || error == EPIPE)
         {
             sock->reset = 1;
@@ -1348,7 +1354,7 @@ static void sock_poll_event( struct fd *fd, int event )
         fprintf(stderr, "socket %p select event: %x\n", sock, event);
 
     if (event & (POLLERR | POLLHUP))
-        error = sock_error( sock );
+        error = sock_error( sock, &event );
 
     switch (sock->state)
     {
@@ -3121,7 +3127,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
             return;
         }
 
-        error = sock_error( sock );
+        error = sock_error( sock, NULL );
         if (!error)
         {
             for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i)

From 9a26c7cc237360a592ef5f71607c3a881788c393 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 15 Mar 2024 16:20:57 -0600
Subject: [PATCH 265/389] fixup! fshack: winex11: Always blit fs_hack in
 wglFlush and wglFinish when drawing to front buffer.

CW-Bug-Id: #23582
---
 dlls/winex11.drv/opengl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index cd8889f6091..23b22ccac25 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -2729,7 +2729,9 @@ static void wglDrawBuffer( GLenum buffer )
 
     TRACE( "buffer %#x.\n", buffer );
 
-    ctx->drawing_to_front = (buffer == GL_FRONT);
+    if (!ctx->current_draw_fbo || (ctx->fs_hack && ctx->current_draw_fbo == ctx->fs_hack_fbo))
+        ctx->drawing_to_front = (buffer == GL_FRONT || buffer == GL_FRONT_AND_BACK);
+
     if (ctx->fs_hack && ctx->current_draw_fbo == ctx->fs_hack_fbo)
     {
         TRACE( "Overriding %#x with GL_COLOR_ATTACHMENT0\n", buffer );

From 1dffce0cdfdd4ff9e4782504157d5f4933943f2b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 15 Mar 2024 19:52:04 -0600
Subject: [PATCH 266/389] ddraw: Store material handles in ddraw object.

CW-Bug-Id: #23583
---
 dlls/ddraw/ddraw.c         | 36 ++++++++++++++++++++++++++
 dlls/ddraw/ddraw_private.h | 52 ++++++++++++++++++++------------------
 dlls/ddraw/device.c        | 10 +-------
 dlls/ddraw/material.c      |  4 +--
 dlls/ddraw/viewport.c      |  2 +-
 5 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 8603f4a1113..f729a35d1bf 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -420,6 +420,8 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw)
  *****************************************************************************/
 static void ddraw_destroy(struct ddraw *This)
 {
+    unsigned int i;
+
     IDirectDraw7_SetCooperativeLevel(&This->IDirectDraw7_iface, NULL, DDSCL_NORMAL);
     IDirectDraw7_RestoreDisplayMode(&This->IDirectDraw7_iface);
 
@@ -441,6 +443,31 @@ static void ddraw_destroy(struct ddraw *This)
     wined3d_device_decref(This->wined3d_device);
     wined3d_decref(This->wined3d);
 
+    for (i = 0; i < This->handle_table.entry_count; ++i)
+    {
+        struct ddraw_handle_entry *entry = &This->handle_table.entries[i];
+
+        switch (entry->type)
+        {
+            case DDRAW_HANDLE_FREE:
+                break;
+
+            case DDRAW_HANDLE_MATERIAL:
+            {
+                struct d3d_material *m = entry->object;
+                FIXME("Material handle %#x (%p) not unset properly.\n", i + 1, m);
+                m->Handle = 0;
+                break;
+            }
+
+            default:
+                FIXME("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type);
+                break;
+        }
+    }
+
+    ddraw_handle_table_destroy(&This->handle_table);
+
     if (This->d3ddevice)
         This->d3ddevice->ddraw = NULL;
 
@@ -5125,6 +5152,15 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de
 
     list_init(&ddraw->surface_list);
 
+    if (!ddraw_handle_table_init(&ddraw->handle_table, 64))
+    {
+        ERR("Failed to initialize handle table.\n");
+        ddraw_handle_table_destroy(&ddraw->handle_table);
+        wined3d_device_decref(ddraw->wined3d_device);
+        wined3d_decref(ddraw->wined3d);
+        return DDERR_OUTOFMEMORY;
+    }
+
     if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device, NULL, WINED3D_SBT_PRIMARY, &ddraw->state)))
     {
         ERR("Failed to create the primary stateblock, hr %#lx.\n", hr);
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index b1fd015aa14..d0f3ebc967c 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -81,6 +81,31 @@ enum ddraw_device_state
     DDRAW_DEVICE_STATE_NOT_RESTORED,
 };
 
+#define DDRAW_INVALID_HANDLE ~0U
+
+enum ddraw_handle_type
+{
+    DDRAW_HANDLE_FREE,
+    DDRAW_HANDLE_MATERIAL,
+    DDRAW_HANDLE_MATRIX,
+    DDRAW_HANDLE_STATEBLOCK,
+    DDRAW_HANDLE_SURFACE,
+};
+
+struct ddraw_handle_entry
+{
+    void *object;
+    enum ddraw_handle_type type;
+};
+
+struct ddraw_handle_table
+{
+    struct ddraw_handle_entry *entries;
+    struct ddraw_handle_entry *free_entries;
+    UINT table_size;
+    UINT entry_count;
+};
+
 struct ddraw
 {
     /* Interfaces */
@@ -132,6 +157,8 @@ struct ddraw
      */
     struct list surface_list;
 
+    struct ddraw_handle_table handle_table;
+
     /* FVF management */
     struct FvfToDecl       *decls;
     UINT                    numConvertedDecls, declArraySize;
@@ -285,31 +312,6 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *
 struct ddraw_surface *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface);
 struct ddraw_surface *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface);
 
-#define DDRAW_INVALID_HANDLE ~0U
-
-enum ddraw_handle_type
-{
-    DDRAW_HANDLE_FREE,
-    DDRAW_HANDLE_MATERIAL,
-    DDRAW_HANDLE_MATRIX,
-    DDRAW_HANDLE_STATEBLOCK,
-    DDRAW_HANDLE_SURFACE,
-};
-
-struct ddraw_handle_entry
-{
-    void *object;
-    enum ddraw_handle_type type;
-};
-
-struct ddraw_handle_table
-{
-    struct ddraw_handle_entry *entries;
-    struct ddraw_handle_entry *free_entries;
-    UINT table_size;
-    UINT entry_count;
-};
-
 BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size);
 void ddraw_handle_table_destroy(struct ddraw_handle_table *t);
 DWORD ddraw_allocate_handle(struct ddraw_handle_table *t, void *object, enum ddraw_handle_type type);
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index bc1d91ee00b..b86ec044fa4 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -303,14 +303,6 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
                 case DDRAW_HANDLE_FREE:
                     break;
 
-                case DDRAW_HANDLE_MATERIAL:
-                {
-                    struct d3d_material *m = entry->object;
-                    FIXME("Material handle %#lx (%p) not unset properly.\n", i + 1, m);
-                    m->Handle = 0;
-                    break;
-                }
-
                 case DDRAW_HANDLE_MATRIX:
                 {
                     /* No FIXME here because this might happen because of sloppy applications. */
@@ -2936,7 +2928,7 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
         {
             struct d3d_material *m;
 
-            if (!(m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL)))
+            if (!(m = ddraw_get_object(&device->ddraw->handle_table, value - 1, DDRAW_HANDLE_MATERIAL)))
             {
                 WARN("Invalid material handle.\n");
                 wined3d_mutex_unlock();
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index d8cb41f1733..4f8266f00d2 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -143,7 +143,7 @@ static ULONG WINAPI d3d_material3_Release(IDirect3DMaterial3 *iface)
         if (material->Handle)
         {
             wined3d_mutex_lock();
-            ddraw_free_handle(&material->ddraw->d3ddevice->handle_table, material->Handle - 1, DDRAW_HANDLE_MATERIAL);
+            ddraw_free_handle(&material->ddraw->handle_table, material->Handle - 1, DDRAW_HANDLE_MATERIAL);
             wined3d_mutex_unlock();
         }
 
@@ -300,7 +300,7 @@ static HRESULT WINAPI d3d_material3_GetHandle(IDirect3DMaterial3 *iface,
     material->active_device = device_impl;
     if (!material->Handle)
     {
-        DWORD h = ddraw_allocate_handle(&device_impl->handle_table, material, DDRAW_HANDLE_MATERIAL);
+        DWORD h = ddraw_allocate_handle(&device_impl->ddraw->handle_table, material, DDRAW_HANDLE_MATERIAL);
         if (h == DDRAW_INVALID_HANDLE)
         {
             ERR("Failed to allocate a material handle.\n");
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 4eda2fe4763..db235721f75 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -627,7 +627,7 @@ static HRESULT WINAPI d3d_viewport_SetBackground(IDirect3DViewport3 *iface, D3DM
 
     wined3d_mutex_lock();
 
-    if (!(m = ddraw_get_object(&viewport->ddraw->d3ddevice->handle_table, material - 1, DDRAW_HANDLE_MATERIAL)))
+    if (!(m = ddraw_get_object(&viewport->ddraw->handle_table, material - 1, DDRAW_HANDLE_MATERIAL)))
     {
         WARN("Invalid material handle %#lx.\n", material);
         wined3d_mutex_unlock();

From 39ec99f05dc5a2281a684ce340dc40c8f72f525e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 15 Mar 2024 19:56:46 -0600
Subject: [PATCH 267/389] ddraw: Store surface handles in ddraw object.

CW-Bug-Id: #23583
---
 dlls/ddraw/ddraw.c         |  8 ++++++++
 dlls/ddraw/device.c        | 10 +---------
 dlls/ddraw/executebuffer.c |  4 ++--
 dlls/ddraw/surface.c       |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index f729a35d1bf..4d0bbc2654d 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -460,6 +460,14 @@ static void ddraw_destroy(struct ddraw *This)
                 break;
             }
 
+            case DDRAW_HANDLE_SURFACE:
+            {
+                struct ddraw_surface *surf = entry->object;
+                FIXME("Texture handle %#x (%p) not unset properly.\n", i + 1, surf);
+                surf->Handle = 0;
+                break;
+            }
+
             default:
                 FIXME("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type);
                 break;
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index b86ec044fa4..d34be880991 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -319,14 +319,6 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
                     break;
                 }
 
-                case DDRAW_HANDLE_SURFACE:
-                {
-                    struct ddraw_surface *surf = entry->object;
-                    FIXME("Texture handle %#lx (%p) not unset properly.\n", i + 1, surf);
-                    surf->Handle = 0;
-                    break;
-                }
-
                 default:
                     FIXME("Handle %#lx (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type);
                     break;
@@ -2760,7 +2752,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface,
                 break;
             }
 
-            surf = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_SURFACE);
+            surf = ddraw_get_object(&device->ddraw->handle_table, value - 1, DDRAW_HANDLE_SURFACE);
             if (!surf)
             {
                 WARN("Invalid texture handle.\n");
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index 320ce6649d4..f505eea37c6 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -347,13 +347,13 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
 
                     instr += size;
 
-                    if (!(dst = ddraw_get_object(&device->handle_table,
+                    if (!(dst = ddraw_get_object(&device->ddraw->handle_table,
                             ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE)))
                     {
                         WARN("Invalid destination texture handle %#lx.\n", ci->hDestTexture);
                         continue;
                     }
-                    if (!(src = ddraw_get_object(&device->handle_table,
+                    if (!(src = ddraw_get_object(&device->ddraw->handle_table,
                             ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE)))
                     {
                         WARN("Invalid source texture handle %#lx.\n", ci->hSrcTexture);
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 5836a49f4fd..1b9a3950be4 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5419,7 +5419,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface,
 
     if (!surface->Handle)
     {
-        DWORD h = ddraw_allocate_handle(&device_impl->handle_table, surface, DDRAW_HANDLE_SURFACE);
+        DWORD h = ddraw_allocate_handle(&device_impl->ddraw->handle_table, surface, DDRAW_HANDLE_SURFACE);
         if (h == DDRAW_INVALID_HANDLE)
         {
             ERR("Failed to allocate a texture handle.\n");
@@ -6030,7 +6030,7 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren
 
     /* Having a texture handle set implies that the device still exists. */
     if (surface->Handle)
-        ddraw_free_handle(&surface->ddraw->d3ddevice->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE);
+        ddraw_free_handle(&surface->ddraw->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE);
 
     /* Reduce the ddraw surface count. */
     list_remove(&surface->surface_list_entry);

From 1aae743bf28b003b2916c2da5d9c6e7bfac2d931 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 15 Mar 2024 20:12:04 -0600
Subject: [PATCH 268/389] ddraw: Support multiple devices per ddraw object.

CW-Bug-Id: #23583
---
 dlls/ddraw/ddraw.c         |  8 ++++++--
 dlls/ddraw/ddraw_private.h |  3 ++-
 dlls/ddraw/device.c        | 13 +++++--------
 dlls/ddraw/main.c          |  4 ++--
 dlls/ddraw/surface.c       | 19 ++++++++++++-------
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 4d0bbc2654d..bfb7721c34d 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -420,6 +420,7 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw)
  *****************************************************************************/
 static void ddraw_destroy(struct ddraw *This)
 {
+    struct d3d_device *device;
     unsigned int i;
 
     IDirectDraw7_SetCooperativeLevel(&This->IDirectDraw7_iface, NULL, DDSCL_NORMAL);
@@ -476,8 +477,10 @@ static void ddraw_destroy(struct ddraw *This)
 
     ddraw_handle_table_destroy(&This->handle_table);
 
-    if (This->d3ddevice)
-        This->d3ddevice->ddraw = NULL;
+    LIST_FOR_EACH_ENTRY(device, &This->d3ddevice_list, struct d3d_device, ddraw_entry)
+    {
+        device->ddraw = NULL;
+    }
 
     /* Now free the object */
     free(This);
@@ -5159,6 +5162,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de
     ddraw->immediate_context = wined3d_device_get_immediate_context(ddraw->wined3d_device);
 
     list_init(&ddraw->surface_list);
+    list_init(&ddraw->d3ddevice_list);
 
     if (!ddraw_handle_table_init(&ddraw->handle_table, 64))
     {
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index d0f3ebc967c..eed8c737037 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -142,7 +142,7 @@ struct ddraw
 
     /* D3D things */
     HWND                    d3d_window;
-    struct d3d_device *d3ddevice;
+    struct list             d3ddevice_list;
     int                     d3dversion;
 
     /* Various HWNDs */
@@ -335,6 +335,7 @@ struct d3d_device
     struct wined3d_device *wined3d_device;
     struct wined3d_device_context *immediate_context;
     struct ddraw *ddraw;
+    struct list ddraw_entry;
     IUnknown *rt_iface;
 
     struct wined3d_streaming_buffer vertex_buffer, index_buffer;
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index d34be880991..b0f0bd910dc 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -343,7 +343,10 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
         /* Releasing the render target above may have released the last
          * reference to the ddraw object. */
         if (This->ddraw)
-            This->ddraw->d3ddevice = NULL;
+        {
+            list_remove(&This->ddraw_entry);
+            This->ddraw = NULL;
+        }
 
         /* Now free the structure */
         free(This);
@@ -6874,7 +6877,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, c
     if (version != 1)
         IUnknown_AddRef(device->rt_iface);
 
-    ddraw->d3ddevice = device;
+    list_add_head(&ddraw->d3ddevice_list, &device->ddraw_entry);
 
     wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE,
             d3d_device_update_depth_stencil(device));
@@ -6922,12 +6925,6 @@ HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_su
         return DDERR_OUTOFMEMORY;
     }
 
-    if (ddraw->d3ddevice)
-    {
-        FIXME("Only one Direct3D device per DirectDraw object supported.\n");
-        return DDERR_INVALIDPARAMS;
-    }
-
     if (!(object = calloc(1, sizeof(*object))))
     {
         ERR("Failed to allocate device memory.\n");
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 1ba2900704f..52f82e3c256 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -874,8 +874,8 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
                 WARN("DirectDraw object %p has reference counts {%lu, %lu, %lu, %lu, %lu}.\n",
                         ddraw, ddraw->ref7, ddraw->ref4, ddraw->ref3, ddraw->ref2, ddraw->ref1);
 
-                if (ddraw->d3ddevice)
-                    WARN("DirectDraw object %p has Direct3D device %p attached.\n", ddraw, ddraw->d3ddevice);
+                if (!list_empty(&ddraw->d3ddevice_list))
+                    WARN("DirectDraw object %p has Direct3D device(s) attached.\n", ddraw);
 
                 LIST_FOR_EACH_ENTRY(surface, &ddraw->surface_list, struct ddraw_surface, surface_list_entry)
                 {
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 1b9a3950be4..37563c56c3c 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1986,6 +1986,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *
  *****************************************************************************/
 static HRESULT ddraw_surface_attach_surface(struct ddraw_surface *This, struct ddraw_surface *Surf)
 {
+    struct d3d_device *device;
+
     TRACE("surface %p, attachment %p.\n", This, Surf);
 
     if(Surf == This)
@@ -2012,8 +2014,10 @@ static HRESULT ddraw_surface_attach_surface(struct ddraw_surface *This, struct d
     This->next_attached = Surf;
 
     /* Check if the WineD3D depth stencil needs updating */
-    if (This->ddraw->d3ddevice)
-        d3d_device_update_depth_stencil(This->ddraw->d3ddevice);
+    LIST_FOR_EACH_ENTRY(device, &This->ddraw->d3ddevice_list, struct d3d_device, ddraw_entry)
+    {
+        d3d_device_update_depth_stencil(device);
+    }
 
     wined3d_mutex_unlock();
 
@@ -6733,18 +6737,19 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
         if (ddraw->cooperative_level & DDSCL_EXCLUSIVE)
         {
             struct wined3d_swapchain_desc swapchain_desc;
+            struct d3d_device *device;
 
             wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc);
             swapchain_desc.backbuffer_width = mode.width;
             swapchain_desc.backbuffer_height = mode.height;
             swapchain_desc.backbuffer_format = mode.format_id;
 
-            if (ddraw->d3ddevice)
+            LIST_FOR_EACH_ENTRY(device, &ddraw->d3ddevice_list, struct d3d_device, ddraw_entry)
             {
-                if (ddraw->d3ddevice->recording)
-                    wined3d_stateblock_decref(ddraw->d3ddevice->recording);
-                ddraw->d3ddevice->recording = NULL;
-                ddraw->d3ddevice->update_state = ddraw->d3ddevice->state;
+                if (device->recording)
+                    wined3d_stateblock_decref(device->recording);
+                device->recording = NULL;
+                device->update_state = device->state;
             }
             wined3d_stateblock_reset(ddraw->state);
 

From 1237265a381818d8f549ccce9127e4d4689dec20 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 15 Mar 2024 21:40:03 -0600
Subject: [PATCH 269/389] ddraw/tests: Add tests for multiple devices.

CW-Bug-Id: #23583
---
 dlls/ddraw/tests/ddraw1.c |  80 +++++++++++++++++++++++++
 dlls/ddraw/tests/ddraw2.c | 121 +++++++++++++++++++++++++++++++++++---
 dlls/ddraw/tests/ddraw4.c |  98 +++++++++++++++++++++++++++---
 dlls/ddraw/tests/ddraw7.c |  62 ++++++++++++++++---
 4 files changed, 338 insertions(+), 23 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 02d6adbb433..88569d01bf5 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -15457,6 +15457,85 @@ static void test_enum_devices(void)
     ok(!refcount, "Device has %lu references left.\n", refcount);
 }
 
+static void test_multiple_devices(void)
+{
+    D3DTEXTUREHANDLE texture_handle, texture_handle2;
+    D3DMATERIALHANDLE mat_handle, mat_handle2;
+    IDirect3DViewport *viewport, *viewport2;
+    IDirect3DDevice *device, *device2;
+    IDirectDrawSurface *texture_surf;
+    IDirect3DMaterial *material;
+    DDSURFACEDESC surface_desc;
+    IDirect3DTexture *texture;
+    IDirectDraw *ddraw;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    window = create_window();
+    ddraw = create_ddraw();
+    ok(!!ddraw, "Failed to create a ddraw object.\n");
+
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, &IID_IDirect3DHALDevice)))
+    {
+        skip("Failed to create a 3D device, skipping test.\n");
+        DestroyWindow(window);
+        return;
+    }
+
+    device2 = create_device_ex(ddraw, window, DDSCL_NORMAL, &IID_IDirect3DHALDevice);
+    ok(!!device2, "got NULL.\n");
+
+    viewport = create_viewport(device, 0, 0, 640, 480);
+    viewport2 = create_viewport(device2, 0, 0, 640, 480);
+
+    material = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+    hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    ok(mat_handle == mat_handle2, "got different handles.\n");
+
+    hr = IDirect3DMaterial_GetHandle(material, device2, &mat_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    todo_wine ok(mat_handle != mat_handle2, "got same handles.\n");
+
+    hr = IDirect3DViewport_SetBackground(viewport, mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DViewport_SetBackground(viewport2, mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    memset(&surface_desc, 0, sizeof(surface_desc));
+    surface_desc.dwSize = sizeof(surface_desc);
+    surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
+    surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
+    surface_desc.dwWidth = 256;
+    surface_desc.dwHeight = 256;
+    hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &texture_surf, NULL);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirectDrawSurface_QueryInterface(texture_surf, &IID_IDirect3DTexture2, (void **)&texture);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DTexture_GetHandle(texture, device, &texture_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DTexture_GetHandle(texture, device2, &texture_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    ok(texture_handle != texture_handle2, "got same handles.\n");
+
+    IDirect3DTexture_Release(texture);
+    IDirectDrawSurface_Release(texture_surf);
+    IDirect3DMaterial_Release(material);
+    IDirect3DViewport_Release(viewport);
+    IDirect3DViewport_Release(viewport2);
+
+    refcount = IDirect3DDevice_Release(device);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirect3DDevice_Release(device2);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+
+    IDirectDraw_Release(ddraw);
+    DestroyWindow(window);
+}
+
 START_TEST(ddraw1)
 {
     DDDEVICEIDENTIFIER identifier;
@@ -15576,4 +15655,5 @@ START_TEST(ddraw1)
     run_for_each_device_type(test_texture_wrong_caps);
     test_filling_convention();
     test_enum_devices();
+    test_multiple_devices();
 }
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index f4cc5df0558..1ddb36b3b4f 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -462,7 +462,8 @@ static IDirectDraw2 *create_ddraw(void)
     return ddraw2;
 }
 
-static IDirect3DDevice2 *create_device_ex(IDirectDraw2 *ddraw, HWND window, DWORD coop_level, const GUID *device_guid)
+static IDirect3DDevice2 *create_device_ex(IDirectDraw2 *ddraw, HWND window, DWORD coop_level, const GUID *device_guid,
+        IDirectDrawSurface **ret_surface)
 {
     /* Prefer 16 bit depth buffers because Nvidia gives us an unpadded D24 buffer if we ask
      * for 24 bit and handles such buffers incorrectly in DDBLT_DEPTHFILL. AMD only supports
@@ -541,13 +542,17 @@ static IDirect3DDevice2 *create_device_ex(IDirectDraw2 *ddraw, HWND window, DWOR
     }
 
     IDirect3D2_Release(d3d);
-    IDirectDrawSurface_Release(surface);
+    if (ret_surface)
+        *ret_surface = surface;
+    else
+        IDirectDrawSurface_Release(surface);
+
     return device;
 }
 
 static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, DWORD coop_level)
 {
-    return create_device_ex(ddraw, window, coop_level, &IID_IDirect3DHALDevice);
+    return create_device_ex(ddraw, window, coop_level, &IID_IDirect3DHALDevice, NULL);
 }
 
 static IDirect3DViewport2 *create_viewport(IDirect3DDevice2 *device, UINT x, UINT y, UINT w, UINT h)
@@ -1330,7 +1335,7 @@ static void test_depth_blit(const GUID *device_guid)
     window = create_window();
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         IDirectDraw2_Release(ddraw);
@@ -1856,7 +1861,7 @@ static void test_zenable(const GUID *device_guid)
     window = create_window();
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         IDirectDraw2_Release(ddraw);
@@ -1971,7 +1976,7 @@ static void test_ck_rgba(const GUID *device_guid)
     window = create_window();
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         IDirectDraw2_Release(ddraw);
@@ -5204,7 +5209,7 @@ static void test_rt_caps(const GUID *device_guid)
     window = create_window();
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         IDirectDraw2_Release(ddraw);
@@ -15692,7 +15697,7 @@ static void test_texture_wrong_caps(const GUID *device_guid)
     window = create_window();
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -16442,6 +16447,105 @@ static void run_for_each_device_type(void (*test_func)(const GUID *))
     test_func(&IID_IDirect3DRGBDevice);
 }
 
+static void test_multiple_devices(void)
+{
+    D3DTEXTUREHANDLE texture_handle, texture_handle2;
+    IDirectDrawSurface *surface, *texture_surf;
+    D3DMATERIALHANDLE mat_handle, mat_handle2;
+    IDirect3DViewport2 *viewport, *viewport2;
+    IDirect3DDevice2 *device, *device2;
+    IDirect3DMaterial2 *material;
+    DDSURFACEDESC surface_desc;
+    IDirect3DTexture2 *texture;
+    IDirectDraw2 *ddraw;
+    IDirect3D2 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    window = create_window();
+    ddraw = create_ddraw();
+    ok(!!ddraw, "Failed to create a ddraw object.\n");
+
+    if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, &IID_IDirect3DHALDevice, &surface)))
+    {
+        skip("Failed to create a 3D device, skipping test.\n");
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice2_GetDirect3D(device, &d3d);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    viewport = create_viewport(device, 0, 0, 640, 480);
+    viewport2 = create_viewport(device2, 0, 0, 640, 480);
+    hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice2_SetCurrentViewport(device2, viewport);
+    ok(hr == DDERR_INVALIDPARAMS, "got %#lx.\n", hr);
+    hr = IDirect3DDevice2_SetCurrentViewport(device2, viewport2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    material = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+    hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    ok(mat_handle == mat_handle2, "got different handles.\n");
+
+    hr = IDirect3DMaterial2_GetHandle(material, device2, &mat_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    todo_wine ok(mat_handle != mat_handle2, "got same handles.\n");
+
+    hr = IDirect3DDevice2_SetLightState(device, D3DLIGHTSTATE_MATERIAL, mat_handle);
+    ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = IDirect3DDevice2_SetLightState(device2, D3DLIGHTSTATE_MATERIAL, mat_handle);
+    ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = IDirect3DDevice2_SetLightState(device, D3DLIGHTSTATE_MATERIAL, mat_handle2);
+    ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
+
+    hr = IDirect3DViewport2_SetBackground(viewport, mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DViewport2_SetBackground(viewport2, mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    memset(&surface_desc, 0, sizeof(surface_desc));
+    surface_desc.dwSize = sizeof(surface_desc);
+    surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
+    surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
+    surface_desc.dwWidth = 256;
+    surface_desc.dwHeight = 256;
+    hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &texture_surf, NULL);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirectDrawSurface_QueryInterface(texture_surf, &IID_IDirect3DTexture2, (void **)&texture);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DTexture2_GetHandle(texture, device, &texture_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DTexture2_GetHandle(texture, device2, &texture_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    ok(texture_handle == texture_handle2, "got different handles.\n");
+
+    IDirect3DTexture2_Release(texture);
+    IDirectDrawSurface_Release(texture_surf);
+    IDirect3DMaterial2_Release(material);
+    IDirect3DViewport2_Release(viewport);
+    IDirect3DViewport2_Release(viewport2);
+
+    refcount = IDirect3DDevice2_Release(device);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirect3DDevice2_Release(device2);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirectDrawSurface_Release(surface);
+    ok(!refcount, "Surface has %lu references left.\n", refcount);
+
+    IDirectDraw2_Release(ddraw);
+    IDirect3D2_Release(d3d);
+    DestroyWindow(window);
+}
+
 START_TEST(ddraw2)
 {
     DDDEVICEIDENTIFIER identifier;
@@ -16567,4 +16671,5 @@ START_TEST(ddraw2)
     run_for_each_device_type(test_texture_wrong_caps);
     test_filling_convention();
     test_enum_devices();
+    test_multiple_devices();
 }
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 4811053a231..8c850ca2c93 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -450,7 +450,8 @@ static IDirectDraw4 *create_ddraw(void)
     return ddraw4;
 }
 
-static IDirect3DDevice3 *create_device_ex(HWND window, DWORD coop_level, const GUID *device_guid)
+static IDirect3DDevice3 *create_device_ex(HWND window, DWORD coop_level, const GUID *device_guid,
+        IDirectDrawSurface4 **ret_surface)
 {
     IDirectDrawSurface4 *surface, *ds;
     IDirect3DDevice3 *device = NULL;
@@ -539,16 +540,22 @@ static IDirect3DDevice3 *create_device_ex(HWND window, DWORD coop_level, const G
 
     hr = IDirect3D3_CreateDevice(d3d3, device_guid, surface, &device, NULL);
     IDirect3D3_Release(d3d3);
-    IDirectDrawSurface4_Release(surface);
     if (FAILED(hr))
+    {
+        IDirectDrawSurface4_Release(surface);
         return NULL;
+    }
+    if (ret_surface)
+        *ret_surface = surface;
+    else
+        IDirectDrawSurface4_Release(surface);
 
     return device;
 }
 
 static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
 {
-    return create_device_ex(window, coop_level, &IID_IDirect3DHALDevice);
+    return create_device_ex(window, coop_level, &IID_IDirect3DHALDevice, NULL);
 }
 
 static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
@@ -1506,7 +1513,7 @@ static void test_depth_blit(const GUID *device_guid)
     D3DRECT d3drect;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -2101,7 +2108,7 @@ static void test_zenable(const GUID *device_guid)
     HRESULT hr;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -2213,7 +2220,7 @@ static void test_ck_rgba(const GUID *device_guid)
     HRESULT hr;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -18750,7 +18757,7 @@ static void test_texture_wrong_caps(const GUID *device_guid)
     HRESULT hr;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -19506,6 +19513,82 @@ static void test_enum_devices(void)
     ok(!refcount, "Device has %lu references left.\n", refcount);
 }
 
+static void test_multiple_devices(void)
+{
+    D3DMATERIALHANDLE mat_handle, mat_handle2;
+    IDirect3DViewport3 *viewport, *viewport2;
+    IDirect3DDevice3 *device, *device2;
+    IDirect3DMaterial3 *material;
+    IDirectDrawSurface4 *surface;
+    IDirectDraw4 *ddraw;
+    IDirect3D3 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    window = create_window();
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, &IID_IDirect3DHALDevice, &surface)))
+    {
+        skip("Failed to create a 3D device, skipping test.\n");
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice3_GetDirect3D(device, &d3d);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device2, NULL);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    viewport = create_viewport(device, 0, 0, 640, 480);
+    viewport2 = create_viewport(device2, 0, 0, 640, 480);
+    hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice3_SetCurrentViewport(device2, viewport);
+    ok(hr == DDERR_INVALIDPARAMS, "got %#lx.\n", hr);
+    hr = IDirect3DDevice3_SetCurrentViewport(device2, viewport2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    material = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+    hr = IDirect3DMaterial3_GetHandle(material, device, &mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DMaterial3_GetHandle(material, device, &mat_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    ok(mat_handle == mat_handle2, "got different handles.\n");
+
+    hr = IDirect3DMaterial3_GetHandle(material, device2, &mat_handle2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    todo_wine ok(mat_handle != mat_handle2, "got same handles.\n");
+
+    hr = IDirect3DDevice3_SetLightState(device, D3DLIGHTSTATE_MATERIAL, mat_handle);
+    ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = IDirect3DDevice3_SetLightState(device2, D3DLIGHTSTATE_MATERIAL, mat_handle);
+    ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = IDirect3DDevice3_SetLightState(device, D3DLIGHTSTATE_MATERIAL, mat_handle2);
+    ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
+
+    hr = IDirect3DViewport3_SetBackground(viewport, mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DViewport3_SetBackground(viewport2, mat_handle);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    IDirect3DMaterial3_Release(material);
+    IDirect3DViewport3_Release(viewport);
+    IDirect3DViewport3_Release(viewport2);
+
+    refcount = IDirect3DDevice3_Release(device);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirect3DDevice3_Release(device2);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirectDrawSurface4_Release(surface);
+    ok(!refcount, "Surface has %lu references left.\n", refcount);
+    IDirectDraw4_Release(ddraw);
+    IDirect3D3_Release(d3d);
+    DestroyWindow(window);
+}
+
 START_TEST(ddraw4)
 {
     DDDEVICEIDENTIFIER identifier;
@@ -19647,4 +19730,5 @@ START_TEST(ddraw4)
     run_for_each_device_type(test_texture_wrong_caps);
     test_filling_convention();
     test_enum_devices();
+    test_multiple_devices();
 }
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 2771a4ed368..2ec1ab611e4 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -498,7 +498,8 @@ static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7
     return DDENUMRET_OK;
 }
 
-static IDirect3DDevice7 *create_device_ex(HWND window, DWORD coop_level, const GUID *device_guid)
+static IDirect3DDevice7 *create_device_ex(HWND window, DWORD coop_level, const GUID *device_guid,
+        IDirectDrawSurface7 **ret_surface)
 {
     IDirectDrawSurface7 *surface, *ds;
     IDirect3DDevice7 *device = NULL;
@@ -586,9 +587,16 @@ static IDirect3DDevice7 *create_device_ex(HWND window, DWORD coop_level, const G
 
     hr = IDirect3D7_CreateDevice(d3d7, device_guid, surface, &device);
     IDirect3D7_Release(d3d7);
-    IDirectDrawSurface7_Release(surface);
     if (FAILED(hr))
+    {
+        IDirectDrawSurface7_Release(surface);
         return NULL;
+    }
+
+    if (ret_surface)
+        *ret_surface = surface;
+    else
+        IDirectDrawSurface7_Release(surface);
 
     return device;
 }
@@ -615,7 +623,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
 
     IDirect3D7_Release(d3d7);
 
-    return create_device_ex(window, coop_level, device_guid);
+    return create_device_ex(window, coop_level, device_guid, NULL);
 }
 
 static bool init_3d_test_context_guid(struct ddraw_test_context *context, const GUID *device_guid)
@@ -625,7 +633,7 @@ static bool init_3d_test_context_guid(struct ddraw_test_context *context, const
     memset(context, 0, sizeof(*context));
 
     context->window = create_window();
-    if (!(context->device = create_device_ex(context->window, DDSCL_NORMAL, device_guid)))
+    if (!(context->device = create_device_ex(context->window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a D3D device.\n");
         DestroyWindow(context->window);
@@ -1586,7 +1594,7 @@ static void test_depth_blit(const GUID *device_guid)
     HWND window;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -1844,7 +1852,7 @@ static void test_zenable(const GUID *device_guid)
     HRESULT hr;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -1948,7 +1956,7 @@ static void test_ck_rgba(const GUID *device_guid)
     HRESULT hr;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -19134,7 +19142,7 @@ static void test_texture_wrong_caps(const GUID *device_guid)
     HRESULT hr;
 
     window = create_window();
-    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid, NULL)))
     {
         skip("Failed to create a 3D device, skipping test.\n");
         DestroyWindow(window);
@@ -20001,6 +20009,43 @@ static void run_for_each_device_type(void (*test_func)(const GUID *))
     winetest_pop_context();
 }
 
+static void test_multiple_devices(void)
+{
+    IDirect3DDevice7 *device, *device2;
+    IDirectDrawSurface7 *surface;
+    IDirectDraw7 *ddraw;
+    IDirect3D7 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    window = create_window();
+    if (!(device = create_device_ex(window, DDSCL_NORMAL, &IID_IDirect3DTnLHalDevice, &surface)))
+    {
+        skip("Failed to create a 3D device, skipping test.\n");
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice7_GetDirect3D(device, &d3d);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+    hr = IDirect3DDevice7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device2);
+    ok(hr == D3D_OK, "got %#lx.\n", hr);
+
+    refcount = IDirect3DDevice3_Release(device);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirect3DDevice3_Release(device2);
+    ok(!refcount, "Device has %lu references left.\n", refcount);
+    refcount = IDirectDrawSurface4_Release(surface);
+    ok(!refcount, "Surface has %lu references left.\n", refcount);
+    IDirectDraw4_Release(ddraw);
+    IDirect3D3_Release(d3d);
+    DestroyWindow(window);
+}
+
 START_TEST(ddraw7)
 {
     DDDEVICEIDENTIFIER2 identifier;
@@ -20176,4 +20221,5 @@ START_TEST(ddraw7)
     test_enum_devices();
     run_for_each_device_type(test_user_memory);
     test_flip_3d();
+    test_multiple_devices();
 }

From 80e81815f5fadbdb31ec7bea79411452e9aa1273 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Mon, 18 Mar 2024 13:08:40 +0200
Subject: [PATCH 270/389] Revert "HACK: winex11: Add option to WINE_HIDE_NVK."

This reverts commit caa6104097b8b14001acd7ee787c8d814a9304d9.
---
 dlls/winex11.drv/display.c | 9 ++-------
 dlls/winex11.drv/xrandr.c  | 5 -----
 include/wine/gdi_driver.h  | 1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index 22e9d79b64d..d2c353250b9 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -530,7 +530,7 @@ static const char *debugstr_devmodew( const DEVMODEW *devmode )
                              position );
 }
 
-static void fixup_device_id(UINT *vendor_id, UINT *device_id, BOOL is_nvk)
+static void fixup_device_id(UINT *vendor_id, UINT *device_id)
 {
     const char *sgi;
 
@@ -548,11 +548,6 @@ static void fixup_device_id(UINT *vendor_id, UINT *device_id, BOOL is_nvk)
     {
         *device_id = 0x687f; /* Radeon RX Vega 56/64 */
     }
-    else if (is_nvk && (sgi = getenv("WINE_HIDE_NVK")) && *sgi != '0')
-    {
-        *vendor_id = 0x1002; /* AMD */
-        *device_id = 0x73df; /* RX 6700XT */
-    }
 }
 
 BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param )
@@ -576,7 +571,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
 
     for (gpu = 0; gpu < gpu_count; gpu++)
     {
-        fixup_device_id( &gpus[gpu].vendor_id, &gpus[gpu].device_id, gpus[gpu].is_nvk );
+        fixup_device_id( &gpus[gpu].vendor_id, &gpus[gpu].device_id );
 
         device_manager->add_gpu( &gpus[gpu], param );
 
diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index 6011a198810..47accf1de6d 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -856,7 +856,6 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
     VkPhysicalDeviceMemoryProperties mem_properties;
     VkInstanceCreateInfo create_info;
     VkPhysicalDeviceIDProperties id;
-    VkPhysicalDeviceVulkan12Properties vk12;
     VkInstance vk_instance = NULL;
     VkDisplayKHR vk_display;
     DWORD len;
@@ -921,11 +920,8 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
             if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE)
                 continue;
 
-            memset( &vk12, 0, sizeof(vk12) );
-            vk12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
             memset( &id, 0, sizeof(id) );
             id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES;
-            id.pNext = &vk12;
             properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
             properties2.pNext = &id;
 
@@ -948,7 +944,6 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
             {
                 gpu->vendor_id = properties2.properties.vendorID;
                 gpu->device_id = properties2.properties.deviceID;
-                if (vk12.driverID == VK_DRIVER_ID_MESA_NVK) gpu->is_nvk = TRUE;
             }
             RtlUTF8ToUnicodeN( gpu->name, sizeof(gpu->name), &len, properties2.properties.deviceName,
                                strlen( properties2.properties.deviceName ) + 1 );
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 2b1dc3ca044..26562bfef2b 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -252,7 +252,6 @@ struct gdi_gpu
     UINT revision_id;
     GUID vulkan_uuid;     /* Vulkan device UUID */
     ULONGLONG memory_size;
-    BOOL is_nvk;
 };
 
 struct gdi_adapter

From bb0a3a750d007077eb787d1637c00ee0ad1c46c6 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Mon, 18 Mar 2024 13:08:45 +0200
Subject: [PATCH 271/389] Revert "HACK: winevulkan: Add option to
 WINE_HIDE_NVK."

This reverts commit febbad5b6d551348e0981042cf69dd6e0b9cca9b.
---
 dlls/winevulkan/loader.c         | 19 ++++---------------
 dlls/winevulkan/make_vulkan      |  3 ---
 dlls/winevulkan/vulkan.c         | 32 +++-----------------------------
 dlls/winevulkan/vulkan_loader.h  |  5 -----
 dlls/winevulkan/vulkan_private.h |  5 -----
 5 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c
index 84e9239a399..3f6204139fb 100644
--- a/dlls/winevulkan/loader.c
+++ b/dlls/winevulkan/loader.c
@@ -84,12 +84,6 @@ static BOOL is_available_device_function(VkDevice device, const char *name)
     return UNIX_CALL(is_available_device_function, &params);
 }
 
-static BOOL is_nvk(VkPhysicalDevice device)
-{
-    struct is_nvk_params params = { .device = device };
-    return UNIX_CALL(is_nvk, &params);
-}
-
 static void *alloc_vk_object(size_t size)
 {
     struct wine_vk_base *object = calloc(1, size);
@@ -422,7 +416,7 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2)
             device_node_mask);
 }
 
-static void fixup_device_id(UINT *vendor_id, UINT *device_id, BOOL is_nvk)
+static void fixup_device_id(UINT *vendor_id, UINT *device_id)
 {
     const char *sgi;
 
@@ -440,11 +434,6 @@ static void fixup_device_id(UINT *vendor_id, UINT *device_id, BOOL is_nvk)
     {
         *device_id = 0x687f; /* Radeon RX Vega 56/64 */
     }
-    else if (is_nvk && (sgi = getenv("WINE_HIDE_NVK")) && *sgi != '0')
-    {
-        *vendor_id = 0x1002; /* AMD */
-        *device_id = 0x73df; /* RX 6700XT */
-    }
 }
 
 void WINAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device,
@@ -459,7 +448,7 @@ void WINAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device,
     params.pProperties = properties;
     status = UNIX_CALL(vkGetPhysicalDeviceProperties, &params);
     assert(!status);
-    fixup_device_id(&properties->vendorID, &properties->deviceID, is_nvk(physical_device));
+    fixup_device_id(&properties->vendorID, &properties->deviceID);
 }
 
 void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,
@@ -475,7 +464,7 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,
     status = UNIX_CALL(vkGetPhysicalDeviceProperties2, &params);
     assert(!status);
     fill_luid_property(properties2);
-    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID, is_nvk(phys_dev));
+    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID);
 }
 
 void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev,
@@ -491,7 +480,7 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev,
     status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, &params);
     assert(!status);
     fill_luid_property(properties2);
-    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID, is_nvk(phys_dev));
+    fixup_device_id(&properties2->properties.vendorID, &properties2->properties.deviceID);
 }
 
 VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info,
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 362f0321276..467eee61c2a 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2925,7 +2925,6 @@ class VkGenerator(object):
         f.write("    init_vulkan,\n")
         f.write("    vk_is_available_instance_function,\n")
         f.write("    vk_is_available_device_function,\n")
-        f.write("    vk_is_nvk,\n")
         for vk_func in self.registry.funcs.values():
             if not vk_func.needs_exposing():
                 continue
@@ -2950,7 +2949,6 @@ class VkGenerator(object):
         f.write("    init_vulkan,\n")
         f.write("    vk_is_available_instance_function32,\n")
         f.write("    vk_is_available_device_function32,\n")
-        f.write("    vk_is_nvk32,\n")
         for vk_func in self.registry.funcs.values():
             if not vk_func.needs_exposing():
                 continue
@@ -3135,7 +3133,6 @@ class VkGenerator(object):
         f.write("    unix_init,\n")
         f.write("    unix_is_available_instance_function,\n")
         f.write("    unix_is_available_device_function,\n")
-        f.write("    unix_is_nvk,\n")
         for vk_func in self.registry.funcs.values():
             if not vk_func.needs_exposing():
                 continue
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 253e3db68f5..885af7ae970 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -278,8 +278,7 @@ static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance
     struct wine_phys_dev *object;
     uint32_t num_host_properties, num_properties = 0;
     VkExtensionProperties *host_properties = NULL;
-    VkPhysicalDeviceProperties2 physdev_properties;
-    VkPhysicalDeviceVulkan12Properties vk12;
+    VkPhysicalDeviceProperties physdev_properties;
     BOOL have_external_memory_host = FALSE, have_external_memory_fd = FALSE, have_external_semaphore_fd = FALSE;
     VkResult res;
     unsigned int i, j;
@@ -291,16 +290,8 @@ static struct wine_phys_dev *wine_vk_physical_device_alloc(struct wine_instance
     object->handle = handle;
     object->host_physical_device = phys_dev;
 
-    memset(&vk12, 0, sizeof(vk12));
-    vk12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES;
-
-    memset(&physdev_properties, 0, sizeof(physdev_properties));
-    physdev_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
-    physdev_properties.pNext = &vk12;
-
-    instance->funcs.p_vkGetPhysicalDeviceProperties2(phys_dev, &physdev_properties);
-    object->api_version = physdev_properties.properties.apiVersion;
-    object->is_nvk = (vk12.driverID == VK_DRIVER_ID_MESA_NVK);
+    instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev, &physdev_properties);
+    object->api_version = physdev_properties.apiVersion;
 
     handle->base.unix_handle = (uintptr_t)object;
     WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, handle, phys_dev, object);
@@ -4068,13 +4059,6 @@ NTSTATUS vk_is_available_device_function(void *arg)
     return !!vk_funcs->p_vkGetDeviceProcAddr(device->host_device, params->name);
 }
 
-NTSTATUS vk_is_nvk(void *arg)
-{
-    struct is_nvk_params *params = arg;
-    struct wine_phys_dev *device = wine_phys_dev_from_handle(params->device);
-    return !!device->is_nvk;
-}
-
 #endif /* _WIN64 */
 
 NTSTATUS vk_is_available_instance_function32(void *arg)
@@ -4103,16 +4087,6 @@ NTSTATUS vk_is_available_device_function32(void *arg)
     return !!vk_funcs->p_vkGetDeviceProcAddr(device->host_device, name);
 }
 
-NTSTATUS vk_is_nvk32(void *arg)
-{
-    struct
-    {
-        UINT32 device;
-    } *params = arg;
-    struct wine_phys_dev *device = wine_phys_dev_from_handle(UlongToPtr(params->device));
-    return !!device->is_nvk;
-}
-
 DECLSPEC_EXPORT VkDevice __wine_get_native_VkDevice(VkDevice handle)
 {
     struct wine_device *device = wine_device_from_handle(handle);
diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h
index d29ccd8ae08..70efc2bfa73 100644
--- a/dlls/winevulkan/vulkan_loader.h
+++ b/dlls/winevulkan/vulkan_loader.h
@@ -147,11 +147,6 @@ struct is_available_device_function_params
     const char *name;
 };
 
-struct is_nvk_params
-{
-    VkPhysicalDevice device;
-};
-
 #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t)
 static inline void *wine_vk_find_struct_(void *s, VkStructureType t)
 {
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index 3a044f08dcc..ffae94adbe4 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -211,8 +211,6 @@ struct wine_phys_dev
 
     uint32_t external_memory_align;
 
-    bool is_nvk;
-
     struct wine_vk_mapping mapping;
 };
 
@@ -353,9 +351,6 @@ NTSTATUS vk_is_available_device_function(void *arg);
 NTSTATUS vk_is_available_instance_function32(void *arg);
 NTSTATUS vk_is_available_device_function32(void *arg);
 
-NTSTATUS vk_is_nvk(void *arg);
-NTSTATUS vk_is_nvk32(void *arg);
-
 struct conversion_context
 {
     char buffer[2048];

From 770284796b29305734bbc7f1649499385efc51fa Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 20:33:52 -0600
Subject: [PATCH 272/389] winex11.drv: HACK: Don't clip child windows for C&C
 Red Alert 2.

CW-Bug-Id: #23585
---
 dlls/winex11.drv/opengl.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 23b22ccac25..04bf487cb6b 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1480,8 +1480,18 @@ static enum dc_gl_layered_type get_gl_layered_type( HWND hwnd )
 
 static BOOL drawable_needs_clipping( HWND hwnd, BOOL known_child )
 {
-    if (known_child) return TRUE;
-    return NtUserGetWindowRelative( hwnd, GW_CHILD ) || NtUserGetAncestor( hwnd, GA_PARENT ) != NtUserGetDesktopWindow();
+    static int no_child_clipping_cached = -1;
+
+    if (no_child_clipping_cached == -1)
+    {
+        const char *sgi = getenv( "SteamGameId" );
+
+        no_child_clipping_cached = sgi && !strcmp( sgi, "2229850" );
+        if (no_child_clipping_cached) FIXME( "HACK: disabling child GL window clipping.\n" );
+    }
+
+    if (known_child && !no_child_clipping_cached) return TRUE;
+    return (!no_child_clipping_cached && NtUserGetWindowRelative( hwnd, GW_CHILD )) || NtUserGetAncestor( hwnd, GA_PARENT ) != NtUserGetDesktopWindow();
 }
 
 /***********************************************************************

From 226fd24f268adf78017ca8c24bbf5804d86a0b3d Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 20:38:13 -0600
Subject: [PATCH 273/389] winex11.drv: HACK: Don't clip child windows for C&C
 Tiberian Sun.

CW-Bug-Id: #23586
---
 dlls/winex11.drv/opengl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 04bf487cb6b..23eb26420fa 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1486,7 +1486,7 @@ static BOOL drawable_needs_clipping( HWND hwnd, BOOL known_child )
     {
         const char *sgi = getenv( "SteamGameId" );
 
-        no_child_clipping_cached = sgi && !strcmp( sgi, "2229850" );
+        no_child_clipping_cached = sgi && (!strcmp( sgi, "2229850" ) || !strcmp( sgi, "2229880" ));
         if (no_child_clipping_cached) FIXME( "HACK: disabling child GL window clipping.\n" );
     }
 

From 5f248f71e82a12ca1ea0d4e8987f32cc4f4117a1 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 19 Mar 2024 15:04:35 -0600
Subject: [PATCH 274/389] fixup! HACK: winex11, winevulkan: Support faking GPU
 PCI IDs.

CW-Bug-Id: #23596
---
 dlls/winevulkan/loader.c   | 2 +-
 dlls/winex11.drv/display.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c
index 3f6204139fb..dbb44c556f6 100644
--- a/dlls/winevulkan/loader.c
+++ b/dlls/winevulkan/loader.c
@@ -430,7 +430,7 @@ static void fixup_device_id(UINT *vendor_id, UINT *device_id)
         *vendor_id = 0x10de; /* NVIDIA */
         *device_id = 0x2487; /* RTX 3060 */
     }
-    else if (*vendor_id == 0x1002 && *device_id == 0x163f && (sgi = getenv("WINE_HIDE_VANGOGH_GPU")) && *sgi != '0')
+    else if (*vendor_id == 0x1002 && (*device_id == 0x163f || *device_id == 0x1435) && (sgi = getenv("WINE_HIDE_VANGOGH_GPU")) && *sgi != '0')
     {
         *device_id = 0x687f; /* Radeon RX Vega 56/64 */
     }
diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index d2c353250b9..a0cd93bac0f 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -544,7 +544,7 @@ static void fixup_device_id(UINT *vendor_id, UINT *device_id)
         *vendor_id = 0x10de; /* NVIDIA */
         *device_id = 0x2487; /* RTX 3060 */
     }
-    else if (*vendor_id == 0x1002 && *device_id == 0x163f && (sgi = getenv("WINE_HIDE_VANGOGH_GPU")) && *sgi != '0')
+    else if (*vendor_id == 0x1002 && (*device_id == 0x163f || *device_id == 0x1435) && (sgi = getenv("WINE_HIDE_VANGOGH_GPU")) && *sgi != '0')
     {
         *device_id = 0x687f; /* Radeon RX Vega 56/64 */
     }

From 1b960417ebd65867877e0b87aea11f47d1f7efe3 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Wed, 28 Feb 2024 16:40:50 +0000
Subject: [PATCH 275/389] gdiplus: Fix crash in GdipAddPathString.

Apparently, 1454ffe7ddf01226aacec07836d4afa62fecd3fa introduced
the assumption that the font passed to gdip_format_string is
non-NULL, and GdipAddPathString wasn't passing it in.

(cherry picked from commit 1ee1f2e9d78fb3c8da21618c8fef1b4129f200f3)
---
 dlls/gdiplus/graphicspath.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 4b272f539c4..61a6182613d 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -1093,7 +1093,6 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     }
 
     get_log_fontW(font, graphics, &lfw);
-    GdipDeleteFont(font);
     GdipDeleteGraphics(graphics);
 
     hfont = CreateFontIndirectW(&lfw);
@@ -1102,6 +1101,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
         WARN("Failed to create font\n");
         DeleteDC(dc);
         GdipDeletePath(backup);
+        GdipDeleteFont(font);
         return GenericError;
     }
 
@@ -1113,11 +1113,12 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     args.maxY = 0;
     args.scale = emSize / native_height;
     args.ascent = textmetric.tmAscent * args.scale;
-    status = gdip_format_string(graphics, dc, string, length, NULL, &scaled_layout_rect,
+    status = gdip_format_string(graphics, dc, string, length, font, &scaled_layout_rect,
                                 format, TRUE, format_string_callback, &args);
 
     DeleteDC(dc);
     DeleteObject(hfont);
+    GdipDeleteFont(font);
 
     if (status != Ok) /* free backup */
     {

From be0d9ed9fb8a9102d703d4f3ace21863870f3adc Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 1 Mar 2024 18:54:33 +0000
Subject: [PATCH 276/389] gdiplus: Fix use after free in GdipAddPathString.

(cherry picked from commit 3ca8204837ffa56064c61981fcb5128981f17196)
---
 dlls/gdiplus/graphicspath.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 61a6182613d..430097d8ee5 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -1093,7 +1093,6 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     }
 
     get_log_fontW(font, graphics, &lfw);
-    GdipDeleteGraphics(graphics);
 
     hfont = CreateFontIndirectW(&lfw);
     if (!hfont)
@@ -1119,6 +1118,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     DeleteDC(dc);
     DeleteObject(hfont);
     GdipDeleteFont(font);
+    GdipDeleteGraphics(graphics);
 
     if (status != Ok) /* free backup */
     {

From 1accbc7e9e8d9afd5935e24e0e40e75c7bf4cd3d Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 1 Mar 2024 19:27:30 +0000
Subject: [PATCH 277/389] gdiplus: Implement font linking in GdipAddPathString.

(cherry picked from commit 55f71fd846423338e2029cdce3714903e601bb8e)
---
 dlls/gdiplus/gdiplus_private.h |  4 ++++
 dlls/gdiplus/graphics.c        |  2 +-
 dlls/gdiplus/graphicspath.c    | 25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 1ae03d7126e..0b302a405ea 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -127,6 +127,10 @@ extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1,
 extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj,
     REAL tension, REAL *x, REAL *y);
 
+extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font,
+                           GDIPCONST GpStringFormat *format, HFONT *hfont,
+                           LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix);
+
 extern void free_installed_fonts(void);
 
 extern BOOL lengthen_path(GpPath *path, INT len);
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 2389cbf4f68..ce852e7c940 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2296,7 +2296,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf)
     lstrcpyW(lf->lfFaceName, font->family->FamilyName);
 }
 
-static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font,
+void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font,
                            GDIPCONST GpStringFormat *format, HFONT *hfont,
                            LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix)
 {
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 430097d8ee5..38a195a1371 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -953,6 +953,9 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info)
 {
     static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} };
     struct format_string_args *args = info->user_data;
+    struct gdip_font_link_section *section = LIST_ENTRY(list_head(&info->font_link_info.sections), struct gdip_font_link_section, entry);
+    HFONT hfont = NULL, oldhfont = NULL;
+    int section_start = -1;
     GpPath *path = args->path;
     GpStatus status = Ok;
     float x = info->rect->X + (info->bounds->X - info->rect->X) * args->scale;
@@ -971,6 +974,22 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info)
         TTPOLYGONHEADER *ph = NULL, *origph;
         char *start;
         DWORD len, ofs = 0;
+
+        while (i >= section->end)
+            section = LIST_ENTRY(list_next(&info->font_link_info.sections, &section->entry), struct gdip_font_link_section, entry);
+
+        if (section_start != section->start)
+        {
+            if (hfont)
+            {
+                SelectObject(info->hdc, oldhfont);
+                DeleteObject(hfont);
+            }
+            get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL);
+            oldhfont = SelectObject(info->hdc, hfont);
+            section_start = section->start;
+        }
+
         len = GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity);
         if (len == GDI_ERROR)
         {
@@ -1037,6 +1056,12 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info)
             break;
     }
 
+    if (hfont)
+    {
+        SelectObject(info->hdc, oldhfont);
+        DeleteObject(hfont);
+    }
+
     return status;
 }
 

From e37b5447fed96b93f9d710333fdd2f9fc6863b4e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 21 Mar 2024 17:45:47 -0600
Subject: [PATCH 278/389] ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for
 making surface in vidmem.

CW-Bug-Id: #23605
---
 dlls/ddraw/surface.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 37563c56c3c..20f79c9453d 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6813,11 +6813,19 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
     {
         if (!(desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)))
         {
-            unsigned int bind_flags = WINED3D_BIND_SHADER_RESOURCE;
+            unsigned int bind_flags = 0;
             DWORD usage = 0;
 
             if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
+            {
                 usage |= WINED3DUSAGE_LEGACY_CUBEMAP;
+                bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
+            }
+            else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
+            {
+                bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
+            }
+
             if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
                 bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
             else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)

From 3720269799f1e74711e5eb95e03d685d174cdd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 22 Mar 2024 18:56:05 +0100
Subject: [PATCH 279/389] HACK: winex11: Disable pointer grab wait with
 gamescope.

CW-Bug-Id: #23595
---
 dlls/winex11.drv/event.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index ab151e28350..48903cd5623 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -263,6 +263,9 @@ static void wait_grab_pointer( Display *display )
 {
     RECT rect;
 
+    /* unnecessary on gamescope, windows cannot be moved with the mouse */
+    if (wm_is_steamcompmgr( display )) return;
+
     /* release cursor grab held by any Wine process */
     NtUserGetClipCursor( &rect );
     NtUserClipCursor( NULL );

From 6c5bf956ab2350a32051e7b63e1a0aff081e6c1b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 22 Mar 2024 21:07:20 -0600
Subject: [PATCH 280/389] win32u: Avoid writing past allocated memory in
 peek_message().

CW-Bug-Id: #23606
---
 dlls/win32u/message.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index 7bb3c393483..b9fb0c52e95 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -522,7 +522,7 @@ BOOL set_keyboard_auto_repeat( BOOL enable )
  * Unpack a message received from another process.
  */
 static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam,
-                            void **buffer, size_t size )
+                            void **buffer, size_t size, size_t buffer_size )
 {
     size_t minsize = 0;
     union packed_structs *ps = *buffer;
@@ -585,7 +585,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
         break;
     case WM_GETTEXT:
     case WM_ASKCBFORMATNAME:
-        if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), size )) return FALSE;
+        if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), buffer_size )) return FALSE;
         break;
     case WM_WININICHANGE:
         if (!*lparam) return TRUE;
@@ -726,17 +726,17 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
         minsize = sizeof(SCROLLINFO);
         break;
     case SBM_GETSCROLLINFO:
-        if (!get_buffer_space( buffer, sizeof(SCROLLINFO), size )) return FALSE;
+        if (!get_buffer_space( buffer, sizeof(SCROLLINFO), buffer_size )) return FALSE;
         break;
     case SBM_GETSCROLLBARINFO:
-        if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), size )) return FALSE;
+        if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), buffer_size )) return FALSE;
         break;
     case EM_GETSEL:
     case SBM_GETRANGE:
     case CB_GETEDITSEL:
         if (*wparam || *lparam)
         {
-            if (!get_buffer_space( buffer, 2 * sizeof(DWORD), size )) return FALSE;
+            if (!get_buffer_space( buffer, 2 * sizeof(DWORD), buffer_size )) return FALSE;
             if (*wparam) *wparam = (WPARAM)*buffer;
             if (*lparam) *lparam = (LPARAM)((DWORD *)*buffer + 1);
         }
@@ -744,7 +744,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
     case EM_GETRECT:
     case LB_GETITEMRECT:
     case CB_GETDROPPEDCONTROLRECT:
-        if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE;
+        if (!get_buffer_space( buffer, sizeof(RECT), buffer_size )) return FALSE;
         break;
     case EM_SETRECT:
     case EM_SETRECTNP:
@@ -755,7 +755,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
         WORD *len_ptr, len;
         if (size < sizeof(WORD)) return FALSE;
         len = *(WORD *)*buffer;
-        if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), size )) return FALSE;
+        if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), buffer_size )) return FALSE;
         len_ptr = *buffer;
         len_ptr[0] = len_ptr[1] = len;
         *lparam = (LPARAM)(len_ptr + 1);
@@ -780,26 +780,24 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
         break;
     case CB_GETLBTEXT:
     {
-        size_t prev_size = size;
         if (combobox_has_strings( hwnd ))
             size = (send_message( hwnd, CB_GETLBTEXTLEN, *wparam, 0 ) + 1) * sizeof(WCHAR);
         else
             size = sizeof(ULONG_PTR);
-        if (!get_buffer_space( buffer, size, prev_size )) return FALSE;
+        if (!get_buffer_space( buffer, size, buffer_size )) return FALSE;
         break;
     }
     case LB_GETTEXT:
     {
-        size_t prev_size = size;
         if (listbox_has_strings( hwnd ))
             size = (send_message( hwnd, LB_GETTEXTLEN, *wparam, 0 ) + 1) * sizeof(WCHAR);
         else
             size = sizeof(ULONG_PTR);
-        if (!get_buffer_space( buffer, size, prev_size )) return FALSE;
+        if (!get_buffer_space( buffer, size, buffer_size )) return FALSE;
         break;
     }
     case LB_GETSELITEMS:
-        if (!get_buffer_space( buffer, *wparam * sizeof(UINT), size )) return FALSE;
+        if (!get_buffer_space( buffer, *wparam * sizeof(UINT), buffer_size )) return FALSE;
         break;
     case WM_NEXTMENU:
     {
@@ -814,7 +812,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
     case WM_SIZING:
     case WM_MOVING:
         minsize = sizeof(RECT);
-        if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE;
+        if (!get_buffer_space( buffer, sizeof(RECT), buffer_size )) return FALSE;
         break;
     case WM_MDICREATE:
     {
@@ -880,7 +878,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
     }
     case WM_MDIGETACTIVE:
         if (!*lparam) return TRUE;
-        if (!get_buffer_space( buffer, sizeof(BOOL), size )) return FALSE;
+        if (!get_buffer_space( buffer, sizeof(BOOL), buffer_size )) return FALSE;
         break;
     case WM_DEVICECHANGE:
         if (!(*wparam & 0x8000)) return TRUE;
@@ -2899,7 +2897,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags,
                 memcpy( buffer, buffer_init, buffer_size );
             }
             if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam,
-                                 &info.msg.lParam, &buffer, size ))
+                                 &info.msg.lParam, &buffer, size, buffer_size ))
                 continue;
             break;
         case MSG_CALLBACK:
@@ -2983,7 +2981,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags,
                 memcpy( buffer, buffer_init, buffer_size );
             }
             if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam,
-                                 &info.msg.lParam, &buffer, size ))
+                                 &info.msg.lParam, &buffer, size, buffer_size ))
             {
                 /* ignore it */
                 reply_message( &info, 0, &info.msg );

From 5c21e1acb6c506f06b8edd105018dba59c92f909 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 22 Mar 2024 21:46:45 -0600
Subject: [PATCH 281/389] win32u: Avoid leaking previous buffer in
 get_buffer_space().

CW-Bug-Id: #23606
---
 dlls/win32u/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index b9fb0c52e95..7308a4d8196 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -471,7 +471,7 @@ static inline void push_string( struct packed_message *data, LPCWSTR str )
 /* make sure that there is space for 'size' bytes in buffer, growing it if needed */
 static inline void *get_buffer_space( void **buffer, size_t size, size_t prev_size )
 {
-    if (prev_size < size) *buffer = malloc( size );
+    if (prev_size < size) *buffer = realloc( *buffer, size );
     return *buffer;
 }
 

From cebce6db231eebc61643dc60cb0a8a4bf65c7450 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 13:22:12 -0600
Subject: [PATCH 282/389] kernelbase: HACK: Force CEF swiftshader for Aisling
 and the Tavern of Elves/nw.exe.

CW-Bug-Id: #23612
---
 dlls/bcrypt/gnutls.c      | 1 +
 dlls/kernelbase/process.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 115219a64f6..cd0caa287a5 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2774,6 +2774,7 @@ static NTSTATUS key_asymmetric_decrypt( void *args )
 #if defined(HAVE_GCRYPT_H) && defined(SONAME_LIBGCRYPT)
 const char * gcrypt_hash_algorithm_name(LPCWSTR alg_id)
 {
+    ERR("qqqqq alg_id %s.\n", debugstr_w(alg_id));
     if (!wcscmp( alg_id, BCRYPT_SHA1_ALGORITHM ))   return "sha1";
     if (!wcscmp( alg_id, BCRYPT_SHA256_ALGORITHM )) return "sha256";
     if (!wcscmp( alg_id, BCRYPT_SHA384_ALGORITHM )) return "sha384";
diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index 7ea75b58a9b..a0ab56ba533 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -597,6 +597,7 @@ static const WCHAR *hack_append_command_line( const WCHAR *cmd )
         {L"UplayWebCore.exe", L" --use-angle=vulkan"},
         {L"Paradox Launcher.exe", L" --use-angle=gl"},
         {L"Montaro\\nw.exe", L" --use-gl=swiftshader"},
+        {L"Aisling and the Tavern of Elves\\nw.exe", L" --use-gl=swiftshader"},
         {L"\\EOSOverlayRenderer-Win64-Shipping.exe", L" --use-gl=swiftshader --in-process-gpu"},
         {L"\\EpicOnlineServicesUIHelper", L" --use-angle=vulkan"},
         {L"OlympiaRising.exe", L" --use-gl=swiftshader"},

From c8e2f13da6213ae903a8a40c26bc4f8fc86f216b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 13:36:21 -0600
Subject: [PATCH 283/389] kernelbase: HACK: Force CEF swiftshader for Snares of
 Ruin 2.

---
 dlls/kernelbase/process.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index a0ab56ba533..838d139210b 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -598,6 +598,7 @@ static const WCHAR *hack_append_command_line( const WCHAR *cmd )
         {L"Paradox Launcher.exe", L" --use-angle=gl"},
         {L"Montaro\\nw.exe", L" --use-gl=swiftshader"},
         {L"Aisling and the Tavern of Elves\\nw.exe", L" --use-gl=swiftshader"},
+        {L"Snares of Ruin 2\\SoR2.exe", L" --use-gl=swiftshader"},
         {L"\\EOSOverlayRenderer-Win64-Shipping.exe", L" --use-gl=swiftshader --in-process-gpu"},
         {L"\\EpicOnlineServicesUIHelper", L" --use-angle=vulkan"},
         {L"OlympiaRising.exe", L" --use-gl=swiftshader"},

From e105593252d3783bbdc187335440e08a67e09052 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 13:43:29 -0600
Subject: [PATCH 284/389] amend! kernelbase: HACK: Force CEF swiftshader for
 Snares of Ruin 2.

kernelbase: HACK: Force CEF swiftshader for Snares of Ruin 2.

CW-Bug-Id: #23613

From 7da85962247fab696507c3ff190d16b90a73a61e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 14:33:48 -0600
Subject: [PATCH 285/389] fixup! kernelbase: HACK: Force CEF swiftshader for
 Aisling and the Tavern of Elves/nw.exe.

CW-Bug-Id: #23613
---
 dlls/bcrypt/gnutls.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index cd0caa287a5..115219a64f6 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2774,7 +2774,6 @@ static NTSTATUS key_asymmetric_decrypt( void *args )
 #if defined(HAVE_GCRYPT_H) && defined(SONAME_LIBGCRYPT)
 const char * gcrypt_hash_algorithm_name(LPCWSTR alg_id)
 {
-    ERR("qqqqq alg_id %s.\n", debugstr_w(alg_id));
     if (!wcscmp( alg_id, BCRYPT_SHA1_ALGORITHM ))   return "sha1";
     if (!wcscmp( alg_id, BCRYPT_SHA256_ALGORITHM )) return "sha256";
     if (!wcscmp( alg_id, BCRYPT_SHA384_ALGORITHM )) return "sha384";

From 027486bd1fae4cea0f8e005cd022f544b1c9a799 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 16:24:01 -0600
Subject: [PATCH 286/389] wintypes: Report some API contracts as present in
 api_information_statics_IsApiContractPresentByMajor().

CW-Bug-Id: #23614
---
 dlls/wintypes/main.c           | 25 +++++++++++++++++++++++--
 dlls/wintypes/tests/wintypes.c | 26 ++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c
index d5bfb5ad11c..7d59ab92c41 100644
--- a/dlls/wintypes/main.c
+++ b/dlls/wintypes/main.c
@@ -34,6 +34,27 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wintypes);
 
+static const struct
+{
+    const WCHAR *name;
+    unsigned int max_major;
+}
+present_contracts[] =
+{
+    { L"Windows.Foundation.UniversalApiContract", 10, },
+};
+
+static BOOLEAN is_api_contract_present( const HSTRING hname, unsigned int version )
+{
+    const WCHAR *name = WindowsGetStringRawBuffer( hname, NULL );
+    unsigned int i;
+
+    for (i = 0; i < ARRAY_SIZE(present_contracts); ++i)
+        if (!wcsicmp( name, present_contracts[i].name )) return version <= present_contracts[i].max_major;
+
+    return FALSE;
+}
+
 struct wintypes
 {
     IActivationFactory IActivationFactory_iface;
@@ -280,13 +301,13 @@ static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent
 static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor(
         IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value)
 {
-    FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface,
+    FIXME("iface %p, contract_name %s, major_version %u, value %p semi-stub.\n", iface,
             debugstr_hstring(contract_name), major_version, value);
 
     if (!contract_name)
         return E_INVALIDARG;
 
-    *value = FALSE;
+    *value = is_api_contract_present( contract_name, major_version );
     return S_OK;
 }
 
diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c
index dd6401c212b..0703582d325 100644
--- a/dlls/wintypes/tests/wintypes.c
+++ b/dlls/wintypes/tests/wintypes.c
@@ -33,12 +33,23 @@
 
 static void test_IApiInformationStatics(void)
 {
+    static const struct
+    {
+        const WCHAR *name;
+        unsigned int max_major;
+    }
+    present_contracts[] =
+    {
+        { L"Windows.Foundation.UniversalApiContract", 10, },
+    };
+
     static const WCHAR *class_name = L"Windows.Foundation.Metadata.ApiInformation";
     IAgileObject *agile_object = NULL, *tmp_agile_object = NULL;
     IInspectable *inspectable = NULL, *tmp_inspectable = NULL;
     IApiInformationStatics *statics = NULL;
     IActivationFactory *factory = NULL;
     HSTRING str, str2;
+    unsigned int i, j;
     BOOLEAN ret;
     HRESULT hr;
 
@@ -424,6 +435,21 @@ static void test_IApiInformationStatics(void)
 
     WindowsDeleteString(str);
 
+    /* Test API contracts presence. */
+    for (i = 0; i < ARRAY_SIZE(present_contracts); ++i)
+    {
+        hr = WindowsCreateString(present_contracts[i].name, wcslen(present_contracts[i].name), &str);
+        ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+        for (j = 0; j <= present_contracts[i].max_major; ++j)
+        {
+            ret = FALSE;
+            hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, i, &ret);
+            ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx, i %u, major %u.\n", hr, i, j);
+            ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE, i %u, major %u.\n", i, j);
+        }
+        WindowsDeleteString(str);
+    }
+
     IApiInformationStatics_Release(statics);
     IAgileObject_Release(agile_object);
     IInspectable_Release(inspectable);

From 3c02a644fa723aa901fe2b29fd1ddf48243daee4 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 16:02:02 -0600
Subject: [PATCH 287/389] windows.perception.stub: Add stub
 IHolographicSpaceInterop interface.

CW-Bug-Id: #23614
---
 .../holographicspace.c                        | 33 +++++++++++++++++++
 dlls/windows.perception.stub/private.h        |  1 +
 .../tests/perception.c                        |  2 ++
 include/Makefile.in                           |  1 +
 include/holographicspaceinterop.idl           | 27 +++++++++++++++
 5 files changed, 64 insertions(+)
 create mode 100644 include/holographicspaceinterop.idl

diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c
index 8a12147f4a8..53e6be0e712 100644
--- a/dlls/windows.perception.stub/holographicspace.c
+++ b/dlls/windows.perception.stub/holographicspace.c
@@ -27,6 +27,7 @@ struct holographicspace
     IActivationFactory IActivationFactory_iface;
     IHolographicSpaceStatics2 IHolographicSpaceStatics2_iface;
     IHolographicSpaceStatics3 IHolographicSpaceStatics3_iface;
+    IHolographicSpaceInterop IHolographicSpaceInterop_iface;
     LONG ref;
 };
 
@@ -65,6 +66,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID
         return S_OK;
     }
 
+    if (IsEqualGUID( iid, &IID_IHolographicSpaceInterop ))
+    {
+        *out = &impl->IHolographicSpaceInterop_iface;
+        IInspectable_AddRef( *out );
+        return S_OK;
+    }
+
     FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
     *out = NULL;
     return E_NOINTERFACE;
@@ -193,11 +201,36 @@ static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl
     holographicspace_statics3_get_IsConfigured,
 };
 
+DEFINE_IINSPECTABLE( holographicspace_interop, IHolographicSpaceInterop, struct holographicspace, IActivationFactory_iface )
+
+static HRESULT WINAPI holographicspace_interop_CreateForWindow( IHolographicSpaceInterop *iface,
+                                                                HWND window, REFIID iid, void **holographic_space )
+{
+    FIXME( "iface %p, window %p, iid %s, holographic_space %p.\n", iface, window, debugstr_guid( iid ), holographic_space );
+
+    *holographic_space = NULL;
+    return E_NOTIMPL;
+}
+
+static const struct IHolographicSpaceInteropVtbl holographicspace_interop_vtbl =
+{
+    holographicspace_interop_QueryInterface,
+    holographicspace_interop_AddRef,
+    holographicspace_interop_Release,
+    /* IInspectable methods */
+    holographicspace_interop_GetIids,
+    holographicspace_interop_GetRuntimeClassName,
+    holographicspace_interop_GetTrustLevel,
+    /* IHolographicSpaceInterop methods */
+    holographicspace_interop_CreateForWindow,
+};
+
 static struct holographicspace holographicspace_statics =
 {
     {&factory_vtbl},
     {&holographicspace_statics2_vtbl},
     {&holographicspace_statics3_vtbl},
+    {&holographicspace_interop_vtbl},
     1,
 };
 
diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h
index a6ae62916e1..ceaa2944174 100644
--- a/dlls/windows.perception.stub/private.h
+++ b/dlls/windows.perception.stub/private.h
@@ -36,6 +36,7 @@
 #include "windows.perception.spatial.surfaces.h"
 #define WIDL_using_Windows_Graphics_Holographic
 #include "windows.graphics.holographic.h"
+#include "holographicspaceinterop.h"
 
 extern IActivationFactory *observer_factory;
 extern IActivationFactory *holographicspace_factory;
diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c
index d0bee4eb247..8714f44be4a 100644
--- a/dlls/windows.perception.stub/tests/perception.c
+++ b/dlls/windows.perception.stub/tests/perception.c
@@ -32,6 +32,7 @@
 #include "windows.perception.spatial.surfaces.h"
 #define WIDL_using_Windows_Graphics_Holographic
 #include "windows.graphics.holographic.h"
+#include "holographicspaceinterop.h"
 
 #include "wine/test.h"
 
@@ -121,6 +122,7 @@ static void test_HolographicSpaceStatics(void)
     check_interface( factory, &IID_IUnknown );
     check_interface( factory, &IID_IInspectable );
     check_interface( factory, &IID_IAgileObject );
+    check_interface( factory, &IID_IHolographicSpaceInterop );
 
     hr = IActivationFactory_QueryInterface( factory, &IID_IHolographicSpaceStatics2, (void **)&holographicspace_statics2 );
     if (hr == E_NOINTERFACE) /* win1607 */
diff --git a/include/Makefile.in b/include/Makefile.in
index d4a166e265c..7149a364db8 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -345,6 +345,7 @@ SOURCES = \
 	highlevelmonitorconfigurationapi.h \
 	hlguids.h \
 	hlink.idl \
+	holographicspaceinterop.idl \
 	hrtfapoapi.idl \
 	hstring.idl \
 	htiface.idl \
diff --git a/include/holographicspaceinterop.idl b/include/holographicspaceinterop.idl
new file mode 100644
index 00000000000..913f60bc7a0
--- /dev/null
+++ b/include/holographicspaceinterop.idl
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 Paul Gofman for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+import "inspectable.idl";
+
+[
+    uuid(5c4ee536-6a98-4b86-a170-587013d6fd4b),
+]
+interface IHolographicSpaceInterop : IInspectable
+{
+    HRESULT CreateForWindow( [in] HWND window, [in] REFIID iid, [out, iid_is(iid)] void **holographic_space);
+}

From bbdf832ee7bd0db38fe760c028dd7118d19aafc1 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 25 Mar 2024 16:21:46 -0600
Subject: [PATCH 288/389] windows.perception.stub: HACK: Set WS_EX_NOACTIVATE
 for window in holographicspace_interop_CreateForWindow().

CW-Bug-Id: #23614
---
 dlls/windows.perception.stub/Makefile.in        | 2 +-
 dlls/windows.perception.stub/holographicspace.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/windows.perception.stub/Makefile.in b/dlls/windows.perception.stub/Makefile.in
index 18c90e697c4..9583b64bb89 100644
--- a/dlls/windows.perception.stub/Makefile.in
+++ b/dlls/windows.perception.stub/Makefile.in
@@ -1,5 +1,5 @@
 MODULE  = windows.perception.stub.dll
-IMPORTS = combase
+IMPORTS = combase user32
 
 SOURCES = \
 	classes.idl \
diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c
index 53e6be0e712..f51be10a9c1 100644
--- a/dlls/windows.perception.stub/holographicspace.c
+++ b/dlls/windows.perception.stub/holographicspace.c
@@ -208,6 +208,9 @@ static HRESULT WINAPI holographicspace_interop_CreateForWindow( IHolographicSpac
 {
     FIXME( "iface %p, window %p, iid %s, holographic_space %p.\n", iface, window, debugstr_guid( iid ), holographic_space );
 
+    FIXME( "HACK: Setting WS_EX_NOACTIVATE for %p.\n", window );
+    SetWindowLongW( window, GWL_EXSTYLE, WS_EX_NOACTIVATE );
+
     *holographic_space = NULL;
     return E_NOTIMPL;
 }

From 9807df9ab164df2a4a350e2320d67c8d2fc194d8 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Mon, 7 Aug 2023 17:30:05 +0800
Subject: [PATCH 289/389] mf: Make session_get_node_object() more robust.

It's possible that a state object pointer not in the topology node collection gets passed to
session_get_node_object(). Instead of returning the last node when the object is not found, we
should return a NULL so that the state of the last node is not changed by mistake.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
(cherry picked from commit a00b30bfbf499679cb5fc356e5fdb7f9c4334dfb)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mf/session.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index a3cf57ab047..ef707dea4de 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2864,10 +2864,10 @@ static struct topo_node *session_get_node_object(struct media_session *session,
     LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry)
     {
         if (node->type == node_type && object == node->object.object)
-            break;
+            return node;
     }
 
-    return node;
+    return NULL;
 }
 
 static BOOL session_set_node_object_state(struct media_session *session, IUnknown *object,

From a46a5ee7b214cc10184dd8921d69c30991deda6d Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Wed, 16 Aug 2023 15:17:58 +0800
Subject: [PATCH 290/389] mf: Add a session_flush_nodes() helper.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
(cherry picked from commit 8173d3b0ab3c620aaaa73b114b22826d2c4c20c4)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mf/session.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index ef707dea4de..d38e7cc0f6b 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -912,6 +912,19 @@ static HRESULT session_subscribe_sources(struct media_session *session)
     return hr;
 }
 
+static void session_flush_nodes(struct media_session *session)
+{
+    struct topo_node *node;
+
+    LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry)
+    {
+        if (node->type == MF_TOPOLOGY_OUTPUT_NODE)
+            IMFStreamSink_Flush(node->object.sink_stream);
+        else if (node->type == MF_TOPOLOGY_TRANSFORM_NODE)
+            IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0);
+    }
+}
+
 static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position)
 {
     struct media_source *source;
@@ -2892,7 +2905,6 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
     struct media_source *src;
     struct media_sink *sink;
     enum object_state state;
-    struct topo_node *node;
     BOOL changed = FALSE;
     DWORD i, count;
     HRESULT hr;
@@ -2988,21 +3000,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
             if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED))
                 break;
 
-            LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry)
-            {
-                switch (node->type)
-                {
-                    case MF_TOPOLOGY_OUTPUT_NODE:
-                        IMFStreamSink_Flush(node->object.sink_stream);
-                        break;
-                    case MF_TOPOLOGY_TRANSFORM_NODE:
-                        IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0);
-                        break;
-                    default:
-                        ;
-                }
-            }
-
+            session_flush_nodes(session);
             session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE);
 
             if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS)

From 69e83049c9cf5e239a2fca60cac86a16368b30b7 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 8 Aug 2023 15:24:34 +0800
Subject: [PATCH 291/389] mf/tests: Add a create_test_topology() helper.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
(cherry picked from commit c1223d0be0d566cc520a1fba2734877537d5058c)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mf/tests/mf.c | 80 +++++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 0a34329bd75..35d22839032 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4995,6 +4995,48 @@ static void test_sample_grabber_is_mediatype_supported(void)
     IMFSampleGrabberSinkCallback_Release(grabber_callback);
 }
 
+/* create a test topology with the specified source and sink */
+static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate)
+{
+    IMFTopologyNode *src_node, *sink_node;
+    IMFPresentationDescriptor *pd;
+    IMFTopology *topology = NULL;
+    IMFStreamDescriptor *sd;
+    BOOL selected;
+    HRESULT hr;
+
+    hr = MFCreateTopology(&topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFTopology_AddNode(topology, sink_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFTopology_AddNode(topology, src_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(selected, "got selected %u.\n", !!selected);
+    init_source_node(source, -1, src_node, pd, sd);
+    hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate);
+    ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
+    hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER);
+    ok(hr == S_OK, "Failed to set connect method, hr %#lx.\n", hr);
+    hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    IMFStreamDescriptor_Release(sd);
+    IMFPresentationDescriptor_Release(pd);
+    IMFTopologyNode_Release(src_node);
+    IMFTopologyNode_Release(sink_node);
+    return topology;
+}
+
 static void test_sample_grabber_orientation(GUID subtype)
 {
     media_type_desc video_rgb32_desc =
@@ -5004,17 +5046,13 @@ static void test_sample_grabber_orientation(GUID subtype)
     };
 
     struct test_grabber_callback *grabber_callback;
-    IMFTopologyNode *src_node, *sink_node;
-    IMFPresentationDescriptor *pd;
     IMFAsyncCallback *callback;
     IMFActivate *sink_activate;
     IMFMediaType *output_type;
     IMFMediaSession *session;
-    IMFStreamDescriptor *sd;
     IMFMediaSource *source;
     IMFTopology *topology;
     PROPVARIANT propvar;
-    BOOL selected;
     HRESULT hr;
     DWORD res;
 
@@ -5038,30 +5076,6 @@ static void test_sample_grabber_orientation(GUID subtype)
     hr = MFCreateMediaSession(NULL, &session);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
-    hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = MFCreateTopology(&topology);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFTopology_AddNode(topology, sink_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFTopology_AddNode(topology, src_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd);
-    ok(selected, "got selected %u.\n", !!selected);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    init_source_node(source, -1, src_node, pd, sd);
-    IMFTopologyNode_Release(src_node);
-    IMFPresentationDescriptor_Release(pd);
-    IMFStreamDescriptor_Release(sd);
-
     hr = MFCreateMediaType(&output_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     init_media_type(output_type, video_rgb32_desc, -1);
@@ -5069,15 +5083,7 @@ static void test_sample_grabber_orientation(GUID subtype)
     ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
     IMFMediaType_Release(output_type);
 
-    hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate);
-    ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
-    hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER);
-    ok(hr == S_OK, "Failed to set connect method, hr %#lx.\n", hr);
-    IMFTopologyNode_Release(sink_node);
-
-    hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
+    topology = create_test_topology(source, sink_activate);
     hr = IMFMediaSession_SetTopology(session, 0, topology);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IMFTopology_Release(topology);

From ba94fc6d74cb1ba10b5d9cc57cb6edd7a58753d6 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 24 Oct 2023 12:42:12 -0500
Subject: [PATCH 292/389] mf: Support seeking while a session is started.

(cherry picked from commit 9c82ce962bc51f6386c68f96111269c7f884d55a)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mf/session.c | 63 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index d38e7cc0f6b..6590f001a00 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -93,6 +93,7 @@ enum session_state
     SESSION_STATE_STARTING_SOURCES,
     SESSION_STATE_PREROLLING_SINKS,
     SESSION_STATE_STARTING_SINKS,
+    SESSION_STATE_RESTARTING_SOURCES,
     SESSION_STATE_STARTED,
     SESSION_STATE_PAUSING_SINKS,
     SESSION_STATE_PAUSING_SOURCES,
@@ -929,6 +930,7 @@ static void session_start(struct media_session *session, const GUID *time_format
 {
     struct media_source *source;
     struct topo_node *topo_node;
+    MFTIME duration;
     HRESULT hr;
     UINT i;
 
@@ -981,8 +983,36 @@ static void session_start(struct media_session *session, const GUID *time_format
             session->state = SESSION_STATE_STARTING_SOURCES;
             break;
         case SESSION_STATE_STARTED:
-            FIXME("Seeking is not implemented.\n");
-            session_command_complete(session);
+            /* Check for invalid positions */
+            LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
+            {
+                hr = IMFPresentationDescriptor_GetUINT64(source->pd, &MF_PD_DURATION, (UINT64 *)&duration);
+                if (SUCCEEDED(hr) && IsEqualGUID(time_format, &GUID_NULL)
+                        && start_position->vt == VT_I8 && start_position->hVal.QuadPart > duration)
+                {
+                    WARN("Start position %s out of range, hr %#lx.\n", wine_dbgstr_longlong(start_position->hVal.QuadPart), hr);
+                    session_command_complete_with_event(session, MESessionStarted, MF_E_INVALID_POSITION, NULL);
+                    return;
+                }
+            }
+
+            /* Stop sources */
+            LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
+            {
+                if (FAILED(hr = IMFMediaSource_Stop(source->source)))
+                {
+                    WARN("Failed to stop media source %p, hr %#lx.\n", source->source, hr);
+                    session_command_complete_with_event(session, MESessionStarted, hr, NULL);
+                    return;
+                }
+            }
+
+            session->presentation.time_format = *time_format;
+            session->presentation.start_position.vt = VT_EMPTY;
+            PropVariantCopy(&session->presentation.start_position, start_position);
+
+            /* SESSION_STATE_STARTED -> SESSION_STATE_RESTARTING_SOURCES -> SESSION_STATE_STARTED */
+            session->state = SESSION_STATE_RESTARTING_SOURCES;
             break;
         default:
             session_command_complete_with_event(session, MESessionStarted, MF_E_INVALIDREQUEST, NULL);
@@ -2901,6 +2931,7 @@ static BOOL session_set_node_object_state(struct media_session *session, IUnknow
 static void session_set_source_object_state(struct media_session *session, IUnknown *object,
         MediaEventType event_type)
 {
+    struct media_source *source;
     IMFStreamSink *stream_sink;
     struct media_source *src;
     struct media_sink *sink;
@@ -2952,6 +2983,15 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
 
             session_set_presentation_clock(session);
 
+            /* If sinks are already started, start session immediately. This can happen when doing a
+             * seek from SESSION_STATE_STARTED */
+            if (session_is_output_nodes_state(session, OBJ_STATE_STARTED)
+                    && SUCCEEDED(session_start_clock(session)))
+            {
+                session_set_started(session);
+                return;
+            }
+
             if ((session->presentation.flags & SESSION_FLAG_NEEDS_PREROLL) && session_is_output_nodes_state(session, OBJ_STATE_STOPPED))
             {
                 MFTIME preroll_time = 0;
@@ -2989,6 +3029,25 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
             else if (SUCCEEDED(session_start_clock(session)))
                 session->state = SESSION_STATE_STARTING_SINKS;
 
+            break;
+        case SESSION_STATE_RESTARTING_SOURCES:
+            if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED))
+                break;
+
+            session_flush_nodes(session);
+
+            /* Start sources */
+            LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
+            {
+                if (FAILED(hr = IMFMediaSource_Start(source->source, source->pd,
+                        &session->presentation.time_format, &session->presentation.start_position)))
+                {
+                    WARN("Failed to start media source %p, hr %#lx.\n", source->source, hr);
+                    session_command_complete_with_event(session, MESessionStarted, hr, NULL);
+                    return;
+                }
+            }
+            session->state = SESSION_STATE_STARTING_SOURCES;
             break;
         case SESSION_STATE_PAUSING_SOURCES:
             if (!session_is_source_nodes_state(session, OBJ_STATE_PAUSED))

From dfce0a5d5df21bc0e7cc60c16e820c1a7537589f Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Mon, 7 Aug 2023 11:52:20 +0800
Subject: [PATCH 293/389] mf/tests: Test IMFMediaSession::Start().

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
(cherry picked from commit 6b853a9354dfe62df838b255b4af33b423e74642)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mf/tests/mf.c | 960 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 952 insertions(+), 8 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 35d22839032..e6ae0a922d1 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -2075,6 +2075,7 @@ static IMFMediaSource *create_media_source(const WCHAR *name, const WCHAR *mime)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL,
             &obj_type, (IUnknown **)&source);
+    todo_wine_if(hr == MF_E_UNEXPECTED) /* Gitlab CI Debian runner */
     ok(hr == S_OK || broken(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE), "Unexpected hr %#lx.\n", hr);
     IMFSourceResolver_Release(resolver);
     IMFByteStream_Release(stream);
@@ -2086,6 +2087,626 @@ static IMFMediaSource *create_media_source(const WCHAR *name, const WCHAR *mime)
     return source;
 }
 
+enum object_state
+{
+    SOURCE_START,
+    SOURCE_PAUSE,
+    SOURCE_STOP,
+    SOURCE_SHUTDOWN,
+    SINK_ON_CLOCK_START,
+    SINK_ON_CLOCK_PAUSE,
+    SINK_ON_CLOCK_STOP,
+    SINK_ON_CLOCK_RESTART,
+    SINK_ON_CLOCK_SETRATE,
+};
+
+#define MAX_OBJECT_STATE 1024
+
+struct object_state_record
+{
+    enum object_state states[MAX_OBJECT_STATE];
+    unsigned int state_count;
+};
+static struct object_state_record actual_object_state_record;
+
+#define add_object_state(a, b) _add_object_state(__LINE__, a, b)
+static void _add_object_state(int line, struct object_state_record *record, enum object_state state)
+{
+    ok_(__FILE__, line)(record->state_count < MAX_OBJECT_STATE, "exceeded state_count maximum %d.\n", MAX_OBJECT_STATE);
+    if (record->state_count < MAX_OBJECT_STATE)
+        record->states[record->state_count++] = state;
+}
+
+#define compare_object_states(a, b) _compare_object_states(__LINE__, a, b)
+static void _compare_object_states(int line, const struct object_state_record *r1,
+        const struct object_state_record *r2)
+{
+    ok_(__FILE__, line)(r1->state_count == r2->state_count, "State count not equal.\n");
+    if (r1->state_count == r2->state_count)
+        ok_(__FILE__, line)(!memcmp(r1->states, r2->states, sizeof(enum object_state) * r1->state_count), "Got different states.\n");
+}
+
+enum source_state
+{
+    SOURCE_STOPPED,
+    SOURCE_RUNNING,
+    SOURCE_PAUSED,
+};
+
+struct test_media_stream
+{
+    IMFMediaStream IMFMediaStream_iface;
+    IMFMediaEventQueue *event_queue;
+    IMFStreamDescriptor *sd;
+    IMFMediaSource *source;
+    LONGLONG sample_duration;
+    LONGLONG sample_time;
+    BOOL is_new;
+    LONG refcount;
+};
+
+static struct test_media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface)
+{
+    return CONTAINING_RECORD(iface, struct test_media_stream, IMFMediaStream_iface);
+}
+
+static HRESULT WINAPI test_media_stream_QueryInterface(IMFMediaStream *iface, REFIID riid, void **out)
+{
+    if (IsEqualIID(riid, &IID_IMFMediaStream)
+            || IsEqualIID(riid, &IID_IMFMediaEventGenerator)
+            || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *out = iface;
+    }
+    else
+    {
+        *out = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IMFMediaStream_AddRef(iface);
+    return S_OK;
+}
+
+static ULONG WINAPI test_media_stream_AddRef(IMFMediaStream *iface)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    return InterlockedIncrement(&stream->refcount);
+}
+
+static ULONG WINAPI test_media_stream_Release(IMFMediaStream *iface)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    ULONG refcount = InterlockedDecrement(&stream->refcount);
+
+    if (!refcount)
+    {
+        IMFMediaEventQueue_Release(stream->event_queue);
+        free(stream);
+    }
+
+    return refcount;
+}
+
+static HRESULT WINAPI test_media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, IMFMediaEvent **event)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event);
+}
+
+static HRESULT WINAPI test_media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsyncCallback *callback, IUnknown *state)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state);
+}
+
+static HRESULT WINAPI test_media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncResult *result, IMFMediaEvent **event)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event);
+}
+
+static HRESULT WINAPI test_media_stream_QueueEvent(IMFMediaStream *iface, MediaEventType event_type, REFGUID ext_type,
+        HRESULT hr, const PROPVARIANT *value)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value);
+}
+
+static HRESULT WINAPI test_media_stream_GetMediaSource(IMFMediaStream *iface, IMFMediaSource **source)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    *source = stream->source;
+    IMFMediaSource_AddRef(*source);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI test_media_stream_GetStreamDescriptor(IMFMediaStream *iface, IMFStreamDescriptor **sd)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+
+    *sd = stream->sd;
+    IMFStreamDescriptor_AddRef(*sd);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token)
+{
+    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
+    IMFMediaBuffer *buffer;
+    IMFSample *sample;
+    HRESULT hr;
+
+    hr = MFCreateSample(&sample);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (stream->sample_duration)
+    {
+        hr = IMFSample_SetSampleDuration(sample, stream->sample_duration);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        hr = IMFSample_SetSampleTime(sample, stream->sample_time);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        stream->sample_time += stream->sample_duration;
+    }
+    else
+    {
+        hr = IMFSample_SetSampleTime(sample, 123);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        hr = IMFSample_SetSampleDuration(sample, 1);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    }
+
+    if (token)
+        IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token);
+
+    /* Reader expects buffers, empty samples are considered an error. */
+    hr = MFCreateMemoryBuffer(8, &buffer);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFSample_AddBuffer(sample, buffer);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaBuffer_Release(buffer);
+
+    hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample, &GUID_NULL, S_OK,
+            (IUnknown *)sample);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFSample_Release(sample);
+
+    return S_OK;
+}
+
+static const IMFMediaStreamVtbl test_media_stream_vtbl =
+{
+    test_media_stream_QueryInterface,
+    test_media_stream_AddRef,
+    test_media_stream_Release,
+    test_media_stream_GetEvent,
+    test_media_stream_BeginGetEvent,
+    test_media_stream_EndGetEvent,
+    test_media_stream_QueueEvent,
+    test_media_stream_GetMediaSource,
+    test_media_stream_GetStreamDescriptor,
+    test_media_stream_RequestSample,
+};
+
+#define TEST_SOURCE_NUM_STREAMS 3
+
+struct test_seek_source
+{
+    IMFMediaSource IMFMediaSource_iface;
+    IMFMediaEventQueue *event_queue;
+    IMFPresentationDescriptor *pd;
+    struct test_media_stream *streams[TEST_SOURCE_NUM_STREAMS];
+    enum source_state state;
+    unsigned stream_count;
+    CRITICAL_SECTION cs;
+    BOOL seekable;
+    LONG refcount;
+};
+
+static struct test_seek_source *impl_test_seek_source_from_IMFMediaSource(IMFMediaSource *iface)
+{
+    return CONTAINING_RECORD(iface, struct test_seek_source, IMFMediaSource_iface);
+}
+
+static HRESULT WINAPI test_seek_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out)
+{
+    if (IsEqualIID(riid, &IID_IMFMediaSource)
+            || IsEqualIID(riid, &IID_IMFMediaEventGenerator)
+            || IsEqualIID(riid, &IID_IUnknown))
+    {
+        *out = iface;
+    }
+    else
+    {
+        *out = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IMFMediaSource_AddRef(iface);
+    return S_OK;
+}
+
+static ULONG WINAPI test_seek_source_AddRef(IMFMediaSource *iface)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    return InterlockedIncrement(&source->refcount);
+}
+
+static ULONG WINAPI test_seek_source_Release(IMFMediaSource *iface)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    ULONG refcount = InterlockedDecrement(&source->refcount);
+
+    if (!refcount)
+    {
+        IMFMediaEventQueue_Release(source->event_queue);
+        free(source);
+    }
+
+    return refcount;
+}
+
+static HRESULT WINAPI test_seek_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event);
+}
+
+static HRESULT WINAPI test_seek_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state);
+}
+
+static HRESULT WINAPI test_seek_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event);
+}
+
+static HRESULT WINAPI test_seek_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type,
+        HRESULT hr, const PROPVARIANT *value)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value);
+}
+
+static HRESULT WINAPI test_seek_source_GetCharacteristics(IMFMediaSource *iface, DWORD *flags)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+
+    if (source->seekable)
+        *flags = MFMEDIASOURCE_CAN_PAUSE | MFMEDIASOURCE_CAN_SEEK;
+    else
+        *flags = MFMEDIASOURCE_CAN_PAUSE;
+    return S_OK;
+}
+
+static HRESULT WINAPI test_seek_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **pd)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    IMFStreamDescriptor *sds[ARRAY_SIZE(source->streams)];
+    IMFMediaType *media_type;
+    HRESULT hr = S_OK;
+    int i;
+
+    EnterCriticalSection(&source->cs);
+
+    if (source->pd)
+    {
+        *pd = source->pd;
+        IMFPresentationDescriptor_AddRef(*pd);
+    }
+    else
+    {
+        for (i = 0; i < source->stream_count; ++i)
+        {
+            hr = MFCreateMediaType(&media_type);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+            hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+            hr = MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+            IMFMediaType_Release(media_type);
+        }
+
+        hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFPresentationDescriptor_SetUINT64(source->pd, &MF_PD_DURATION, 10 * 10000000);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFPresentationDescriptor_SelectStream(source->pd, 0);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        for (i = 0; i < source->stream_count; ++i)
+            IMFStreamDescriptor_Release(sds[i]);
+
+        *pd = source->pd;
+        IMFPresentationDescriptor_AddRef(*pd);
+    }
+
+    LeaveCriticalSection(&source->cs);
+
+    return hr;
+}
+
+static BOOL is_stream_selected(IMFPresentationDescriptor *pd, DWORD index)
+{
+    IMFStreamDescriptor *sd;
+    BOOL selected = FALSE;
+
+    if (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, index, &selected, &sd)))
+        IMFStreamDescriptor_Release(sd);
+
+    return selected;
+}
+
+static HRESULT WINAPI test_seek_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *pd, const GUID *time_format,
+        const PROPVARIANT *start_position)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    MediaEventType event_type;
+    PROPVARIANT var;
+    HRESULT hr;
+    int i;
+
+    add_object_state(&actual_object_state_record, SOURCE_START);
+
+    ok(time_format && IsEqualGUID(time_format, &GUID_NULL), "Unexpected time format %s.\n",
+            wine_dbgstr_guid(time_format));
+    ok(start_position && (start_position->vt == VT_I8 || start_position->vt == VT_EMPTY),
+            "Unexpected position type.\n");
+
+    /* This is what makes IMFMediaSession::Start() seeking fail, not the lacking of MFMEDIASOURCE_CAN_SEEK.
+     * Without this, IMFMediaSession::Start() seeking succeeds even with the missing MFMEDIASOURCE_CAN_SEEK.
+     * If this is check is not here, the first IMFMediaSession::Start() call to a non-zero position
+     * succeeds somehow on Windows 10, then all following seeks fails and no MESessionStarted events */
+    if (!source->seekable && start_position && start_position->vt == VT_I8 && start_position->hVal.QuadPart)
+        return E_FAIL;
+
+    EnterCriticalSection(&source->cs);
+
+    event_type = source->state != SOURCE_STOPPED ? MESourceSeeked : MESourceStarted;
+    hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    for (i = 0; i < source->stream_count; ++i)
+    {
+        if (!is_stream_selected(pd, i))
+            continue;
+
+        var.vt = VT_UNKNOWN;
+        var.punkVal = (IUnknown *)&source->streams[i]->IMFMediaStream_iface;
+        event_type = source->streams[i]->is_new ? MENewStream : MEUpdatedStream;
+        source->streams[i]->is_new = FALSE;
+        hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, &var);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        event_type = source->state != SOURCE_STOPPED ? MEStreamSeeked : MEStreamStarted;
+        hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL,
+                S_OK, NULL);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    }
+
+    source->state = SOURCE_RUNNING;
+
+    LeaveCriticalSection(&source->cs);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI test_seek_source_Stop(IMFMediaSource *iface)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    MediaEventType event_type;
+    HRESULT hr;
+    int i;
+
+    add_object_state(&actual_object_state_record, SOURCE_STOP);
+
+    EnterCriticalSection(&source->cs);
+
+    event_type = MESourceStopped;
+    hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    for (i = 0; i < source->stream_count; ++i)
+    {
+        if (!is_stream_selected(source->pd, i))
+            continue;
+
+        event_type = MEStreamStopped;
+        hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL,
+                S_OK, NULL);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    }
+
+    source->state = SOURCE_STOPPED;
+
+    LeaveCriticalSection(&source->cs);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI test_seek_source_Pause(IMFMediaSource *iface)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    MediaEventType event_type;
+    HRESULT hr;
+    int i;
+
+    add_object_state(&actual_object_state_record, SOURCE_PAUSE);
+
+    EnterCriticalSection(&source->cs);
+
+    event_type = MESourcePaused;
+    hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    for (i = 0; i < source->stream_count; ++i)
+    {
+        if (!is_stream_selected(source->pd, i))
+            continue;
+
+        event_type = MEStreamPaused;
+        hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL,
+                S_OK, NULL);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    }
+
+    source->state = SOURCE_PAUSED;
+    LeaveCriticalSection(&source->cs);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI test_seek_source_Shutdown(IMFMediaSource *iface)
+{
+    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
+    HRESULT hr;
+
+    add_object_state(&actual_object_state_record, SOURCE_SHUTDOWN);
+
+    hr = IMFMediaEventQueue_Shutdown(source->event_queue);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    return S_OK;
+}
+
+static const IMFMediaSourceVtbl test_seek_source_vtbl =
+{
+    test_seek_source_QueryInterface,
+    test_seek_source_AddRef,
+    test_seek_source_Release,
+    test_seek_source_GetEvent,
+    test_seek_source_BeginGetEvent,
+    test_seek_source_EndGetEvent,
+    test_seek_source_QueueEvent,
+    test_seek_source_GetCharacteristics,
+    test_seek_source_CreatePresentationDescriptor,
+    test_seek_source_Start,
+    test_seek_source_Stop,
+    test_seek_source_Pause,
+    test_seek_source_Shutdown,
+};
+
+static HRESULT WINAPI test_seek_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj)
+{
+    if (IsEqualIID(riid, &IID_IMFClockStateSink) ||
+        IsEqualIID(riid, &IID_IUnknown))
+    {
+        *obj = iface;
+        IMFClockStateSink_AddRef(iface);
+        return S_OK;
+    }
+
+    *obj = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI test_seek_clock_sink_AddRef(IMFClockStateSink *iface)
+{
+   return 2;
+}
+
+static ULONG WINAPI test_seek_clock_sink_Release(IMFClockStateSink *iface)
+{
+   return 1;
+}
+
+static HRESULT WINAPI test_seek_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME system_time, LONGLONG offset)
+{
+   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_START);
+   return S_OK;
+}
+
+static HRESULT WINAPI test_seek_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME system_time)
+{
+   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_STOP);
+   return S_OK;
+}
+
+static HRESULT WINAPI test_seek_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME system_time)
+{
+   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_PAUSE);
+   return S_OK;
+}
+
+static HRESULT WINAPI test_seek_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME system_time)
+{
+   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_RESTART);
+   return S_OK;
+}
+
+static HRESULT WINAPI test_seek_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME system_time, float rate)
+{
+   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_SETRATE);
+   return S_OK;
+}
+
+static const IMFClockStateSinkVtbl test_seek_clock_sink_vtbl =
+{
+   test_seek_clock_sink_QueryInterface,
+   test_seek_clock_sink_AddRef,
+   test_seek_clock_sink_Release,
+   test_seek_clock_sink_OnClockStart,
+   test_seek_clock_sink_OnClockStop,
+   test_seek_clock_sink_OnClockPause,
+   test_seek_clock_sink_OnClockRestart,
+   test_seek_clock_sink_OnClockSetRate,
+};
+
+static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMediaSource *source)
+{
+    struct test_media_stream *stream;
+    IMFPresentationDescriptor *pd;
+    BOOL selected;
+    HRESULT hr;
+
+    stream = calloc(1, sizeof(*stream));
+    stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl;
+    stream->refcount = 1;
+    hr = MFCreateEventQueue(&stream->event_queue);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    stream->source = source;
+    IMFMediaSource_AddRef(stream->source);
+    stream->is_new = TRUE;
+
+    IMFMediaSource_CreatePresentationDescriptor(source, &pd);
+    IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, stream_index, &selected, &stream->sd);
+    IMFPresentationDescriptor_Release(pd);
+
+    return stream;
+}
+
+static IMFMediaSource *create_test_seek_source(BOOL seekable)
+{
+    struct test_seek_source *source;
+    int i;
+
+    source = calloc(1, sizeof(*source));
+    source->IMFMediaSource_iface.lpVtbl = &test_seek_source_vtbl;
+    source->refcount = 1;
+    source->stream_count = 1;
+    source->seekable = seekable;
+    MFCreateEventQueue(&source->event_queue);
+    InitializeCriticalSection(&source->cs);
+    for (i = 0; i < source->stream_count; ++i)
+        source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface);
+
+    return &source->IMFMediaSource_iface;
+}
+
 static void test_media_session_events(void)
 {
     static const media_type_desc audio_float_44100 =
@@ -2887,27 +3508,27 @@ static ULONG WINAPI test_grabber_callback_Release(IMFSampleGrabberSinkCallback *
 
 static HRESULT WINAPI test_grabber_callback_OnClockStart(IMFSampleGrabberSinkCallback *iface, MFTIME time, LONGLONG offset)
 {
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockStop(IMFSampleGrabberSinkCallback *iface, MFTIME time)
 {
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockPause(IMFSampleGrabberSinkCallback *iface, MFTIME time)
 {
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockRestart(IMFSampleGrabberSinkCallback *iface, MFTIME time)
 {
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockSetRate(IMFSampleGrabberSinkCallback *iface, MFTIME time, float rate)
 {
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnSetPresentationClock(IMFSampleGrabberSinkCallback *iface,
@@ -4995,8 +5616,8 @@ static void test_sample_grabber_is_mediatype_supported(void)
     IMFSampleGrabberSinkCallback_Release(grabber_callback);
 }
 
-/* create a test topology with the specified source and sink */
-static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate)
+/* create a test topology with the specified source and sink, and return duration if required */
+static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate, UINT64 *duration)
 {
     IMFTopologyNode *src_node, *sink_node;
     IMFPresentationDescriptor *pd;
@@ -5022,6 +5643,11 @@ static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *si
     hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(selected, "got selected %u.\n", !!selected);
+    if (duration)
+    {
+        hr = IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, duration);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    }
     init_source_node(source, -1, src_node, pd, sd);
     hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate);
     ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
@@ -5083,7 +5709,7 @@ static void test_sample_grabber_orientation(GUID subtype)
     ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
     IMFMediaType_Release(output_type);
 
-    topology = create_test_topology(source, sink_activate);
+    topology = create_test_topology(source, sink_activate, NULL);
     hr = IMFMediaSession_SetTopology(session, 0, topology);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IMFTopology_Release(topology);
@@ -7282,6 +7908,323 @@ static void test_MFCreateSequencerSegmentOffset(void)
     PropVariantClear(&propvar);
 }
 
+static void test_media_session_Start(void)
+{
+    static const struct object_state_record expected_object_state_records[] =
+    {
+        {{SOURCE_START, SINK_ON_CLOCK_START}, 2},
+        {{SOURCE_STOP, SOURCE_START, SINK_ON_CLOCK_START}, 3},
+        {{SOURCE_STOP, SOURCE_START, SINK_ON_CLOCK_START}, 3},
+    };
+    media_type_desc video_rgb32_desc =
+    {
+        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
+        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
+    };
+    static const MFTIME allowed_error = 5000000;
+    IMFClockStateSink test_seek_clock_sink = {&test_seek_clock_sink_vtbl};
+    struct test_grabber_callback *grabber_callback;
+    IMFPresentationClock *presentation_clock;
+    enum source_state initial_state;
+    IMFActivate *sink_activate;
+    IMFAsyncCallback *callback;
+    IMFMediaType *output_type;
+    IMFMediaSession *session;
+    IMFMediaSource *source;
+    IMFTopology *topology;
+    MFTIME time, old_time;
+    PROPVARIANT propvar;
+    IMFClock *clock;
+    UINT64 duration;
+    DWORD caps;
+    HRESULT hr;
+
+    hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
+    ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr);
+
+    if (!(source = create_media_source(L"test.mp4", L"video/mp4")))
+    {
+        todo_wine /* Gitlab CI Debian runner */
+        win_skip("MP4 media source is not supported, skipping tests.\n");
+        MFShutdown();
+        return;
+    }
+
+    grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
+    hr = MFCreateMediaType(&output_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(output_type, video_rgb32_desc, -1);
+    hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
+    ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
+    IMFMediaType_Release(output_type);
+
+    hr = MFCreateMediaSession(NULL, &session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    topology = create_test_topology(source, sink_activate, &duration);
+    hr = IMFMediaSession_SetTopology(session, 0, topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFTopology_Release(topology);
+
+    hr = IMFMediaSession_GetClock(session, &clock);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFClock_Release(clock);
+
+    propvar.vt = VT_EMPTY;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    callback = create_test_callback(TRUE);
+    hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    /* Seek to 1s */
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(llabs(time - 10000000) <= allowed_error, "Unexpected time %I64d.\n", time);
+
+    /* Seek to beyond duration */
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = duration + 10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == MF_E_INVALID_POSITION, "Unexpected hr %#lx.\n", hr);
+
+    /* Seek to negative position */
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = -10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(llabs(time - (-10000000)) <= allowed_error, "Unexpected time %I64d.\n", time);
+
+    /* Seek backwards to 0s */
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 0;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(llabs(time) <= allowed_error, "Unexpected time %I64d.\n", time);
+
+    /* Seek to 1s while in paused state */
+    hr = IMFMediaSession_Pause(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionPaused, 1000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(llabs(time - 10000000) <= allowed_error, "Unexpected time %I64d.\n", time);
+    old_time = time;
+
+    /* Expected the presentation clock is running */
+    Sleep(100);
+    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(time > old_time, "Unexpected time %I64d.\n", time);
+
+    hr = IMFMediaSession_Stop(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaSession_Close(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    /* Media session is shut down */
+    hr = IMFMediaSource_Shutdown(source);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaSession_Shutdown(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, NULL);
+    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
+
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
+
+    propvar.vt = VT_EMPTY;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
+
+    IMFPresentationClock_Release(presentation_clock);
+    IMFMediaSource_Release(source);
+    IMFAsyncCallback_Release(callback);
+    /* sometimes briefly leaking */
+    IMFMediaSession_Release(session);
+    IMFActivate_ShutdownObject(sink_activate);
+    IMFActivate_Release(sink_activate);
+    IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface);
+
+    /* Unseekable media source */
+    source = create_test_seek_source(FALSE);
+    hr = IMFMediaSource_GetCharacteristics(source, &caps);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok((caps & MFMEDIASOURCE_CAN_SEEK) == 0, "Got unexpected caps %#lx.\n", caps);
+    grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
+    hr = MFCreateMediaType(&output_type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_media_type(output_type, video_rgb32_desc, -1);
+    hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
+    ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
+    IMFMediaType_Release(output_type);
+
+    hr = MFCreateMediaSession(NULL, &session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    topology = create_test_topology(source, sink_activate, &duration);
+    hr = IMFMediaSession_SetTopology(session, 0, topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFTopology_Release(topology);
+
+    hr = IMFMediaSession_GetClock(session, &clock);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFClock_Release(clock);
+
+    propvar.vt = VT_EMPTY;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    callback = create_test_callback(TRUE);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaSession_GetSessionCapabilities(session, &caps);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok((caps & MFSESSIONCAP_SEEK) == 0, "Got unexpected caps %#lx\n", caps);
+
+    /* Seek to 1s */
+    propvar.vt = VT_I8;
+    propvar.hVal.QuadPart = 10000000;
+    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
+    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
+    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(llabs(time) <= allowed_error, "Unexpected time %I64d.\n", time);
+
+    hr = IMFMediaSession_Stop(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaSession_Close(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaSession_Shutdown(session);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaSource_Shutdown(source);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    IMFPresentationClock_Release(presentation_clock);
+    IMFAsyncCallback_Release(callback);
+    IMFMediaSession_Release(session);
+    IMFMediaSource_Release(source);
+    IMFActivate_ShutdownObject(sink_activate);
+    IMFActivate_Release(sink_activate);
+    IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface);
+
+    /* Test object state transitions */
+    for (initial_state = SOURCE_STOPPED; initial_state <= SOURCE_PAUSED; initial_state++)
+    {
+        winetest_push_context("Test %d", initial_state);
+
+        source = create_test_seek_source(TRUE);
+        callback = create_test_callback(TRUE);
+
+        grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
+        hr = MFCreateMediaType(&output_type);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        init_media_type(output_type, video_rgb32_desc, -1);
+        hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
+        ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
+        IMFMediaType_Release(output_type);
+
+        hr = MFCreateMediaSession(NULL, &session);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        topology = create_test_topology(source, sink_activate, &duration);
+        hr = IMFMediaSession_SetTopology(session, 0, topology);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        IMFTopology_Release(topology);
+
+        hr = IMFMediaSession_GetClock(session, &clock);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFPresentationClock_AddClockStateSink(presentation_clock, &test_seek_clock_sink);
+        ok(hr == S_OK, "Failed to add a sink, hr %#lx.\n", hr);
+        IMFClock_Release(clock);
+
+        if (initial_state == SOURCE_RUNNING || initial_state == SOURCE_PAUSED)
+        {
+            propvar.vt = VT_EMPTY;
+            hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        }
+        if (initial_state == SOURCE_PAUSED)
+        {
+            hr = IMFMediaSession_Pause(session);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            hr = wait_media_event(session, callback, MESessionPaused, 5000, &propvar);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        }
+
+        /* Seek to 1s */
+        memset(&actual_object_state_record, 0, sizeof(actual_object_state_record));
+
+        propvar.vt = VT_I8;
+        propvar.hVal.QuadPart = 10000000;
+        hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        todo_wine_if(initial_state == SOURCE_PAUSED)
+        compare_object_states(&actual_object_state_record, &expected_object_state_records[initial_state]);
+
+        hr = IMFMediaSession_Stop(session);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFMediaSession_Close(session);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFMediaSession_Shutdown(session);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        hr = IMFMediaSource_Shutdown(source);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        IMFPresentationClock_RemoveClockStateSink(presentation_clock, &test_seek_clock_sink);
+        IMFPresentationClock_Release(presentation_clock);
+        IMFAsyncCallback_Release(callback);
+        IMFMediaSession_Release(session);
+        IMFMediaSource_Release(source);
+        IMFActivate_ShutdownObject(sink_activate);
+        IMFActivate_Release(sink_activate);
+        IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface);
+        winetest_pop_context();
+    }
+
+    hr = MFShutdown();
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+}
+
 START_TEST(mf)
 {
     init_functions();
@@ -7318,4 +8261,5 @@ START_TEST(mf)
     test_MFRequireProtectedEnvironment();
     test_mpeg4_media_sink();
     test_MFCreateSequencerSegmentOffset();
+    test_media_session_Start();
 }

From 283cde7ab8a1d3551cfae38f333c3de1ab779103 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 28 Jul 2023 18:04:30 +0800
Subject: [PATCH 294/389] mfmediaengine: Implement
 IMFMediaEngineEx::SetCurrentTime().

(cherry picked from commit 2bcc87b30301bef3c77601d31d87fa93e60d79d5)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mfmediaengine/main.c | 59 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 3e05626f238..c6f82ec055b 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -94,6 +94,7 @@ enum media_engine_flags
     FLAGS_ENGINE_NEW_FRAME = 0x8000,
     FLAGS_ENGINE_SOURCE_PENDING = 0x10000,
     FLAGS_ENGINE_PLAY_PENDING = 0x20000,
+    FLAGS_ENGINE_SEEKING = 0x40000,
 };
 
 struct vec3
@@ -164,6 +165,7 @@ struct media_engine
     {
         IMFMediaSource *source;
         IMFPresentationDescriptor *pd;
+        PROPVARIANT start_position;
     } presentation;
     struct effects video_effects;
     struct effects audio_effects;
@@ -978,7 +980,14 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
             break;
         }
         case MESessionStarted:
-
+            EnterCriticalSection(&engine->cs);
+            if (engine->flags & FLAGS_ENGINE_SEEKING)
+            {
+                media_engine_set_flag(engine, FLAGS_ENGINE_SEEKING | FLAGS_ENGINE_IS_ENDED, FALSE);
+                IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKED, 0, 0);
+                IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);
+            }
+            LeaveCriticalSection(&engine->cs);
             IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAYING, 0, 0);
             break;
         case MESessionEnded:
@@ -1339,10 +1348,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
 
 static void media_engine_start_playback(struct media_engine *engine)
 {
-    PROPVARIANT var;
-
-    var.vt = VT_EMPTY;
-    IMFMediaSession_Start(engine->session, &GUID_NULL, &var);
+    IMFMediaSession_Start(engine->session, &GUID_NULL, &engine->presentation.start_position);
+    /* Reset the playback position to the current position */
+    engine->presentation.start_position.vt = VT_EMPTY;
 }
 
 static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
@@ -1770,6 +1778,10 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface)
     {
         ret = engine->duration;
     }
+    else if (engine->flags & FLAGS_ENGINE_PAUSED && engine->presentation.start_position.vt == VT_I8)
+    {
+        ret = (double)engine->presentation.start_position.hVal.QuadPart / 10000000;
+    }
     else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime)))
     {
         ret = mftime_to_seconds(clocktime);
@@ -1779,17 +1791,50 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface)
     return ret;
 }
 
+static HRESULT media_engine_set_current_time(struct media_engine *engine, double seektime)
+{
+    PROPVARIANT position;
+    DWORD caps;
+    HRESULT hr;
+
+    hr = IMFMediaSession_GetSessionCapabilities(engine->session, &caps);
+    if (FAILED(hr) || !(caps & MFSESSIONCAP_SEEK))
+        return hr;
+
+    position.vt = VT_I8;
+    position.hVal.QuadPart = min(max(0, seektime), engine->duration) * 10000000;
+
+    if (IMFMediaEngineEx_IsPaused(&engine->IMFMediaEngineEx_iface))
+    {
+        engine->presentation.start_position = position;
+        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKING, 0, 0);
+        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKED, 0, 0);
+        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);
+        return S_OK;
+    }
+
+    if (SUCCEEDED(hr = IMFMediaSession_Start(engine->session, &GUID_NULL, &position)))
+    {
+        media_engine_set_flag(engine, FLAGS_ENGINE_SEEKING, TRUE);
+        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKING, 0, 0);
+    }
+
+    return hr;
+}
+
 static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngineEx *iface, double time)
 {
     struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
-    HRESULT hr = E_NOTIMPL;
+    HRESULT hr;
 
-    FIXME("(%p, %f): stub.\n", iface, time);
+    TRACE("%p, %f.\n", iface, time);
 
     EnterCriticalSection(&engine->cs);
 
     if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)
         hr = MF_E_SHUTDOWN;
+    else
+        hr = media_engine_set_current_time(engine, time);
 
     LeaveCriticalSection(&engine->cs);
 

From cab32f60ad8cbed6613656f7b89fa97b49f7046a Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 20 Feb 2024 15:21:56 +0800
Subject: [PATCH 295/389] mfmediaengine: Implement
 IMFMediaEngineEx::SetCurrentTimeEx().

(cherry picked from commit 283d4bab2229c4accae8453f24c76319741dec96)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mfmediaengine/main.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index c6f82ec055b..f6ea0cf3e59 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -3027,9 +3027,24 @@ static HRESULT WINAPI media_engine_SetRealTimeMode(IMFMediaEngineEx *iface, BOOL
 
 static HRESULT WINAPI media_engine_SetCurrentTimeEx(IMFMediaEngineEx *iface, double seektime, MF_MEDIA_ENGINE_SEEK_MODE mode)
 {
-    FIXME("%p, %f, %#x stub.\n", iface, seektime, mode);
+    struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("%p, %f, %#x.\n", iface, seektime, mode);
+
+    if (mode)
+        FIXME("mode %#x is ignored.\n", mode);
+
+    EnterCriticalSection(&engine->cs);
+
+    if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)
+        hr = MF_E_SHUTDOWN;
+    else
+        hr = media_engine_set_current_time(engine, seektime);
+
+    LeaveCriticalSection(&engine->cs);
+
+    return hr;
 }
 
 static HRESULT WINAPI media_engine_EnableTimeUpdateTimer(IMFMediaEngineEx *iface, BOOL enable)

From e9b0c55ec27c464482847d057cc22721121d30e9 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 20 Feb 2024 15:22:25 +0800
Subject: [PATCH 296/389] mfmediaengine/tests: Test
 IMFMediaEngineEx::SetCurrentTime/Ex().

(cherry picked from commit de89f777271a2b3fe2ab7fd7779bb6a0a70c09c4)

CW-Bug-Id: #22486
CW-Bug-Id: #22799
---
 dlls/mfmediaengine/tests/mfmediaengine.c | 201 +++++++++++++++++++++++
 1 file changed, 201 insertions(+)

diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index f9489f3dcb5..c7fabbe218f 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -2183,6 +2183,11 @@ struct test_seek_notify
 {
     IMFMediaEngineNotify IMFMediaEngineNotify_iface;
     HANDLE playing_event;
+    HANDLE seeking_event;
+    HANDLE seeked_event;
+    HANDLE time_update_event;
+    BOOL seeking_event_received;
+    BOOL time_update_event_received;
     HRESULT expected_error;
     HRESULT error;
     LONG refcount;
@@ -2222,6 +2227,9 @@ static ULONG WINAPI test_seek_notify_Release(IMFMediaEngineNotify *iface)
     if (!refcount)
     {
         CloseHandle(notify->playing_event);
+        CloseHandle(notify->seeking_event);
+        CloseHandle(notify->seeked_event);
+        CloseHandle(notify->time_update_event);
         free(notify);
     }
 
@@ -2238,6 +2246,17 @@ static HRESULT WINAPI test_seek_notify_EventNotify(IMFMediaEngineNotify *iface,
     case MF_MEDIA_ENGINE_EVENT_PLAYING:
         SetEvent(notify->playing_event);
         break;
+    case MF_MEDIA_ENGINE_EVENT_SEEKING:
+        notify->seeking_event_received = TRUE;
+        SetEvent(notify->seeking_event);
+        break;
+    case MF_MEDIA_ENGINE_EVENT_SEEKED:
+        SetEvent(notify->seeked_event);
+        break;
+    case MF_MEDIA_ENGINE_EVENT_TIMEUPDATE:
+        notify->time_update_event_received = TRUE;
+        SetEvent(notify->time_update_event);
+        break;
     case MF_MEDIA_ENGINE_EVENT_ERROR:
         ok(param2 == notify->expected_error, "Unexpected error %#lx\n", param2);
         notify->error = param2;
@@ -2262,7 +2281,13 @@ static struct test_seek_notify *create_seek_notify(void)
     object = calloc(1, sizeof(*object));
     object->IMFMediaEngineNotify_iface.lpVtbl = &test_seek_notify_vtbl;
     object->playing_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+    object->seeking_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+    object->seeked_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+    object->time_update_event = CreateEventW(NULL, FALSE, FALSE, NULL);
     ok(!!object->playing_event, "Failed to create an event, error %lu.\n", GetLastError());
+    ok(!!object->seeking_event, "Failed to create an event, error %lu.\n", GetLastError());
+    ok(!!object->seeked_event, "Failed to create an event, error %lu.\n", GetLastError());
+    ok(!!object->time_update_event, "Failed to create an event, error %lu.\n", GetLastError());
     object->refcount = 1;
     return object;
 }
@@ -2504,6 +2529,181 @@ static void test_media_extension(void)
     IMFMediaEngineExtension_Release(&extension->IMFMediaEngineExtension_iface);
 }
 
+#define test_seek_result(a, b, c) _test_seek_result(__LINE__, a, b, c)
+static void _test_seek_result(int line, IMFMediaEngineEx *media_engine,
+        struct test_seek_notify *notify, double expected_time)
+{
+    static const double allowed_error = 0.05;
+    static const int timeout = 1000;
+    double time;
+    DWORD res;
+
+    ok(notify->seeking_event_received, "Seeking event not received.\n");
+    notify->seeking_event_received = FALSE;
+    res = WaitForSingleObject(notify->seeking_event, timeout);
+    ok_(__FILE__, line)(!res, "Waiting for seeking event returned %#lx.\n", res);
+    res = WaitForSingleObject(notify->seeked_event, timeout);
+    ok_(__FILE__, line)(!res, "Waiting for seeked event returned %#lx.\n", res);
+    res = WaitForSingleObject(notify->time_update_event, timeout);
+    ok_(__FILE__, line)(!res, "Waiting for ready event returned %#lx.\n", res);
+    time = IMFMediaEngineEx_GetCurrentTime(media_engine);
+    ok_(__FILE__, line)(compare_double(time, expected_time, allowed_error), "Unexpected time %lf.\n", time);
+}
+
+static void test_SetCurrentTime(void)
+{
+    static const double allowed_error = 0.05;
+    static const int timeout = 1000;
+    IMFByteStream *stream, *unseekable_stream = NULL;
+    double time, duration, start, end;
+    struct test_seek_notify *notify;
+    IMFMediaEngineEx *media_engine;
+    ULONG refcount;
+    HRESULT hr;
+    DWORD res;
+    BOOL ret;
+    BSTR url;
+
+    notify = create_seek_notify();
+    hr = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_B8G8R8X8_UNORM,
+            &IID_IMFMediaEngineEx, (void **)&media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);
+
+    stream = load_resource(L"i420-64x64.avi", L"video/avi");
+    url = SysAllocString(L"i420-64x64.avi");
+    hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, stream, url);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaEngineEx_Play(media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    res = WaitForSingleObject(notify->playing_event, 5000);
+    ok(!res, "Unexpected res %#lx.\n", res);
+
+    duration = IMFMediaEngineEx_GetDuration(media_engine);
+    ok(duration > 0, "Got invalid duration.\n");
+    start = 0;
+    end = duration;
+
+    /* Test playing state */
+    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, end);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        test_seek_result(media_engine, notify, end);
+
+    /* Test seeking with a negative position */
+    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, -1);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        test_seek_result(media_engine, notify, 0);
+
+    /* Test seeking beyond duration */
+    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, end + 1);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        test_seek_result(media_engine, notify, end);
+
+    hr = IMFMediaEngineEx_SetCurrentTimeEx(media_engine, start, MF_MEDIA_ENGINE_SEEK_MODE_NORMAL);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        test_seek_result(media_engine, notify, start);
+
+    hr = IMFMediaEngineEx_SetCurrentTimeEx(media_engine, end, MF_MEDIA_ENGINE_SEEK_MODE_APPROXIMATE);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        test_seek_result(media_engine, notify, end);
+
+    /* Test paused state */
+    hr = IMFMediaEngineEx_Pause(media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, start);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        ok(notify->seeking_event_received, "Seeking event not received.\n");
+        notify->seeking_event_received = FALSE;
+        ok(notify->time_update_event_received, "Time update event not received.\n");
+        notify->time_update_event_received = FALSE;
+        res = WaitForSingleObject(notify->seeking_event, timeout);
+        ok(!res, "Unexpected res %#lx.\n", res);
+        res = WaitForSingleObject(notify->seeked_event, timeout);
+        ok(res == WAIT_TIMEOUT || res == 0, /* No timeout sometimes on Win10+ */
+                "Unexpected res %#lx.\n", res);
+        res = WaitForSingleObject(notify->time_update_event, timeout);
+        ok(!res, "Unexpected res %#lx.\n", res);
+        time = IMFMediaEngineEx_GetCurrentTime(media_engine);
+        ok(compare_double(time, start, allowed_error), "Unexpected time %lf.\n", time);
+    }
+
+    Sleep(end * 1000);
+
+    ret = IMFMediaEngineEx_IsPaused(media_engine);
+    ok(ret, "Unexpected ret %d.\n", ret);
+    time = IMFMediaEngineEx_GetCurrentTime(media_engine);
+    ok(compare_double(time, start, allowed_error)
+            || broken(time >= end) /* Windows 11 21H2 AMD GPU TestBot */, "Unexpected time %lf.\n", time);
+
+    hr = IMFMediaEngineEx_Play(media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    res = WaitForSingleObject(notify->seeked_event, timeout);
+    ok(res == WAIT_TIMEOUT, "Unexpected res %#lx.\n", res);
+
+    /* Media engine is shut down */
+    hr = IMFMediaEngineEx_Shutdown(media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, start);
+    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
+    hr = IMFMediaEngineEx_SetCurrentTimeEx(media_engine, start, MF_MEDIA_ENGINE_SEEK_MODE_NORMAL);
+    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
+
+    refcount = IMFMediaEngineEx_Release(media_engine);
+    todo_wine
+    ok(!refcount, "Got unexpected refcount %lu.\n", refcount);
+
+    /* Unseekable bytestreams */
+    notify = create_seek_notify();
+    hr = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_B8G8R8X8_UNORM,
+            &IID_IMFMediaEngineEx, (void **)&media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);
+    unseekable_stream = create_unseekable_stream(stream);
+    hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, unseekable_stream, url);
+    todo_wine
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    if (FAILED(hr))
+        goto done;
+
+    hr = IMFMediaEngineEx_Play(media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    notify->expected_error = MF_E_INVALIDREQUEST;
+    res = WaitForSingleObject(notify->playing_event, 5000);
+    ok(res == S_OK, "Unexpected res %#lx.\n", res);
+
+    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, end);
+    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+    {
+        ok(!notify->seeking_event_received, "Seeking event received.\n");
+        res = WaitForSingleObject(notify->seeking_event, timeout);
+        ok(res == WAIT_TIMEOUT, "Unexpected res %#lx.\n", res);
+        res = WaitForSingleObject(notify->seeked_event, timeout);
+        ok(res == WAIT_TIMEOUT, "Unexpected res %#lx.\n", res);
+        res = WaitForSingleObject(notify->time_update_event, timeout);
+        ok(!res, "Unexpected res %#lx.\n", res);
+    }
+
+done:
+    hr = IMFMediaEngineEx_Shutdown(media_engine);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    refcount = IMFMediaEngineEx_Release(media_engine);
+    ok(!refcount || broken(refcount == 1) /* Win8.1 */, "Got unexpected refcount %lu.\n", refcount);
+    IMFByteStream_Release(unseekable_stream);
+    SysFreeString(url);
+    IMFByteStream_Release(stream);
+}
+
 START_TEST(mfmediaengine)
 {
     HRESULT hr;
@@ -2539,6 +2739,7 @@ START_TEST(mfmediaengine)
     test_GetDuration();
     test_GetSeekable();
     test_media_extension();
+    test_SetCurrentTime();
 
     IMFMediaEngineClassFactory_Release(factory);
 

From 7f3a30f73e1b563689ce7aaf944dc77071b79684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 4 Mar 2024 20:05:59 +0100
Subject: [PATCH 297/389] winegstreamer: Remove pixel-aspect-ratio attribute
 which we don't support.

CW-Bug-Id: #23478
---
 dlls/winegstreamer/wg_format.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index e6fc0f7b351..6a1e6ac15b4 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -653,6 +653,7 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format)
 
             /* Remove fields which we don't specify but might have some default value */
             gst_structure_remove_fields(structure, "colorimetry", "chroma-site", NULL);
+            gst_structure_remove_fields(structure, "pixel-aspect-ratio", NULL);
         }
     }
     return caps;

From d4ff683aacb5d995c59695d98133adede2daef8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 26 Mar 2024 16:51:37 +0100
Subject: [PATCH 298/389] winegstreamer: Set GST_DEBUG if not set, based on
 WINEDEBUG channels.

---
 dlls/winegstreamer/main.c    | 10 +++++++++-
 dlls/winegstreamer/unixlib.c |  9 +++++++++
 dlls/winegstreamer/unixlib.h |  7 +++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 0276aa947b4..992f6b3ae98 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -33,6 +33,8 @@
 #include "wmcodecdsp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+WINE_DECLARE_DEBUG_CHANNEL(mfplat);
+WINE_DECLARE_DEBUG_CHANNEL(wmvcore);
 
 DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 DEFINE_GUID(MEDIASUBTYPE_VC1S,MAKEFOURCC('V','C','1','S'),0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);
@@ -1005,9 +1007,15 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out)
 
 static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx)
 {
+    struct wg_init_gstreamer_params params =
+    {
+        .trace_on = TRACE_ON(mfplat) || TRACE_ON(quartz) || TRACE_ON(wmvcore),
+        .warn_on = WARN_ON(mfplat) || WARN_ON(quartz) || WARN_ON(wmvcore),
+        .err_on = ERR_ON(mfplat) || ERR_ON(quartz) || ERR_ON(wmvcore),
+    };
     HINSTANCE handle;
 
-    if (WINE_UNIX_CALL(unix_wg_init_gstreamer, NULL))
+    if (WINE_UNIX_CALL(unix_wg_init_gstreamer, &params))
         return FALSE;
 
     /* Unloading glib is a bad idea.. it installs atexit handlers,
diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c
index 4ac667350d0..3c51c83b348 100644
--- a/dlls/winegstreamer/unixlib.c
+++ b/dlls/winegstreamer/unixlib.c
@@ -247,6 +247,7 @@ bool push_event(GstPad *pad, GstEvent *event)
 
 NTSTATUS wg_init_gstreamer(void *arg)
 {
+    struct wg_init_gstreamer_params *params = arg;
     static GstGLContext *gl_context;
 
     char arg0[] = "wine";
@@ -273,6 +274,14 @@ NTSTATUS wg_init_gstreamer(void *arg)
         setenv("GST_REGISTRY_1_0", gst_reg, 1);
     }
 
+    if (params->trace_on)
+        setenv("GST_DEBUG", "WINE:9,protonmediaconverter:9,4", FALSE);
+    if (params->warn_on)
+        setenv("GST_DEBUG", "WINE:3,protonmediaconverter:3,3", FALSE);
+    if (params->err_on)
+        setenv("GST_DEBUG", "WINE:1,protonmediaconverter:1,1", FALSE);
+    setenv("GST_DEBUG_NO_COLOR", "1", FALSE);
+
     /* GStreamer installs a temporary SEGV handler when it loads plugins
      * to initialize its registry calling exit(-1) when any fault is caught.
      * We need to make sure any signal reaches our signal handlers to catch
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 1e74a36764f..fe21a24f6f5 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -236,6 +236,13 @@ typedef UINT64 wg_source_t;
 typedef UINT64 wg_transform_t;
 typedef UINT64 wg_muxer_t;
 
+struct wg_init_gstreamer_params
+{
+    UINT8 trace_on;
+    UINT8 warn_on;
+    UINT8 err_on;
+};
+
 struct wg_parser_create_params
 {
     wg_parser_t parser;

From cd09f433a4ad41dad28617bf8a780afce5099053 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 26 Mar 2024 15:40:35 -0600
Subject: [PATCH 299/389] fixup! ntdll: Implement CPU topology override.

CW-Bug-Id: #22223
---
 dlls/ntdll/unix/system.c | 71 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 4a1e41e7e42..8e2736b05b0 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -242,7 +242,7 @@ static pthread_mutex_t timezone_mutex = PTHREAD_MUTEX_INITIALIZER;
 static struct
 {
     struct cpu_topology_override mapping;
-    BOOL smt;
+    ULONG_PTR siblings_mask[MAXIMUM_PROCESSORS];
 }
 cpu_override;
 
@@ -574,9 +574,13 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info )
 
 #endif /* End architecture specific feature detection for CPUs */
 
+static void fill_performance_core_info(void);
+static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR *mask);
+
 static void fill_cpu_override(unsigned int host_cpu_count)
 {
     const char *env_override = getenv("WINE_CPU_TOPOLOGY");
+    BOOL smt = FALSE;
     unsigned int i;
     char *s;
 
@@ -593,6 +597,58 @@ static void fill_cpu_override(unsigned int host_cpu_count)
         goto error;
     }
 
+    if (!*s)
+    {
+        /* Auto assign given number of logical CPUs. */
+        static const char core_info[] = "/sys/devices/system/cpu/cpu%u/topology/%s";
+        char name[MAX_PATH];
+        unsigned int attempt, count, j;
+        ULONG_PTR masks[MAXIMUM_PROCESSORS];
+
+        if (cpu_override.mapping.cpu_count >= host_cpu_count)
+        {
+            TRACE( "Override cpu count %u >= host cpu count %u.\n", cpu_override.mapping.cpu_count, host_cpu_count );
+            cpu_override.mapping.cpu_count = 0;
+            return;
+        }
+
+        fill_performance_core_info();
+
+        for (i = 0; i < host_cpu_count; ++i)
+        {
+            snprintf(name, sizeof(name), core_info, i, "thread_siblings");
+            masks[i] = 0;
+            sysfs_parse_bitmap(name, &masks[i]);
+        }
+        for (attempt = 0; attempt < 3; ++attempt)
+        {
+            count = 0;
+            for (i = 0; i < host_cpu_count && count < cpu_override.mapping.cpu_count; ++i)
+            {
+                if (attempt < 2 && performance_cores_capacity)
+                {
+                    if (i / 32 >= performance_cores_capacity) break;
+                    if (!(performance_cores[i / 32] & (1 << (i % 32)))) goto skip_cpu;
+                }
+                cpu_override.mapping.host_cpu_id[count] = i;
+                cpu_override.siblings_mask[count] = (ULONG_PTR)1 << count;
+                for (j = 0; j < count; ++j)
+                {
+                    if (!(masks[cpu_override.mapping.host_cpu_id[j]] & masks[i])) continue;
+                    if (attempt < 1) goto skip_cpu;
+                    cpu_override.siblings_mask[j] |= (ULONG_PTR)1 << count;
+                    cpu_override.siblings_mask[count] |= (ULONG_PTR)1 << j;
+                }
+                ++count;
+skip_cpu:
+                ;
+            }
+            if (count == cpu_override.mapping.cpu_count) break;
+        }
+        assert( count == cpu_override.mapping.cpu_count );
+        goto done;
+    }
+
     if (tolower(*s) == 's')
     {
         cpu_override.mapping.cpu_count *= 2;
@@ -601,7 +657,7 @@ static void fill_cpu_override(unsigned int host_cpu_count)
             ERR("Logical CPU count exceeds limit %u.\n", MAXIMUM_PROCESSORS);
             goto error;
         }
-        cpu_override.smt = TRUE;
+        smt = TRUE;
         ++s;
     }
     if (*s != ':')
@@ -624,6 +680,8 @@ static void fill_cpu_override(unsigned int host_cpu_count)
         }
 
         cpu_override.mapping.host_cpu_id[i] = strtol(s, &next, 10);
+        if (smt) cpu_override.siblings_mask[i] = (ULONG_PTR)3 << (i & ~1);
+        else     cpu_override.siblings_mask[i] = (ULONG_PTR)1 << i;
         if (next == s)
             goto error;
         if (cpu_override.mapping.host_cpu_id[i] >= host_cpu_count)
@@ -637,6 +695,7 @@ static void fill_cpu_override(unsigned int host_cpu_count)
     if (*s)
         goto error;
 
+done:
     if (ERR_ON(ntdll))
     {
         MESSAGE("wine: overriding CPU configuration, %u logical CPUs, host CPUs ", cpu_override.mapping.cpu_count);
@@ -955,6 +1014,8 @@ static void fill_performance_core_info(void)
     char op = ',';
     ULONG *p;
 
+    if (performance_cores_capacity) return;
+
     fpcore_list = fopen("/sys/devices/cpu_core/cpus", "r");
     if (!fpcore_list) return;
 
@@ -1070,7 +1131,7 @@ static NTSTATUS create_logical_proc_info(void)
             snprintf(name, sizeof(name), core_info, i, "thread_siblings");
             if (cpu_override.mapping.cpu_count)
             {
-                thread_mask = cpu_override.smt ? (ULONG_PTR)0x3 << (i & ~1) : (ULONG_PTR)1 << i;
+                thread_mask = cpu_override.siblings_mask[i];
             }
             else
             {
@@ -1081,7 +1142,9 @@ static NTSTATUS create_logical_proc_info(void)
 
             if (cpu_override.mapping.cpu_count)
             {
-                phys_core = cpu_override.smt ? i / 2 : i;
+                assert( thread_mask );
+                for (phys_core = 0; ; ++phys_core)
+                    if (thread_mask & ((ULONG_PTR)1 << phys_core)) break;
             }
             else
             {

From 86961195d589a8ed9894e4cc4d324f6bc664badc Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 26 Mar 2024 17:27:42 -0600
Subject: [PATCH 300/389] Revert "ntdll: Validate xstate alignment in
 validate_context_xstate()."

This reverts commit f3757df4074d132647aa74be1428b9948ff0a7ad.

CW-Bug-Id: #23244
---
 dlls/ntdll/tests/exception.c | 14 --------------
 dlls/ntdll/unix/thread.c     |  2 --
 2 files changed, 16 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index bb62d4627a5..76190aef75a 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -10895,7 +10895,6 @@ static void test_extended_context(void)
     CONTEXT_EX *context_ex;
     CONTEXT *context;
     unsigned data[8];
-    NTSTATUS status;
     HANDLE thread;
     ULONG64 mask;
     XSTATE *xs;
@@ -11689,19 +11688,6 @@ static void test_extended_context(void)
     thread = CreateThread(NULL, 0, test_extended_context_thread, 0, CREATE_SUSPENDED, NULL);
     ok(!!thread, "Failed to create thread.\n");
 
-    /* Unaligned xstate. */
-    length = sizeof(context_buffer);
-    memset(context_buffer, 0xcc, sizeof(context_buffer));
-    bret = pInitializeContext(context_buffer, CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT,
-            &context, &length);
-    ok(bret, "Got unexpected bret %#x.\n", bret);
-    context_ex = (CONTEXT_EX *)(context + 1);
-    context_ex->XState.Offset += 0x10;
-    status = pNtGetContextThread(thread, context);
-    ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#lx.\n", status);
-    status = pNtGetContextThread(GetCurrentThread(), context);
-    ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#lx.\n", status);
-
     bret = pInitializeContext(context_buffer, CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT,
             &context, &length);
     ok(bret, "Got unexpected bret %#x.\n", bret);
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index c69d3de3e15..7416de09168 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -173,8 +173,6 @@ BOOL validate_context_xstate( CONTEXT *context )
         || context_ex->XState.Length > sizeof(XSTATE))
         return FALSE;
 
-    if (((ULONG_PTR)context_ex + context_ex->XState.Offset) & 63) return FALSE;
-
     return TRUE;
 }
 

From 50c1fd57ee3723ccf7a3981f8b8cd3e0c0106691 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 26 Mar 2024 17:27:43 -0600
Subject: [PATCH 301/389] Revert "ntdll: Validate context xstate at once in
 NtGetContextThread()."

This reverts commit 92fe92017e5b6e1cee22b2d4d6b86dbb5014e5c9.

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 4 ++--
 dlls/ntdll/unix/signal_x86_64.c | 4 ++--
 dlls/ntdll/unix/thread.c        | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 5b7d460372c..eb23dd3dc83 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1050,8 +1050,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
     BOOL use_cached_debug_regs = FALSE;
     NTSTATUS ret;
 
-    if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
-
     if (self && needed_flags & CONTEXT_DEBUG_REGISTERS)
     {
         /* debug registers require a server call if hw breakpoints are enabled */
@@ -1151,6 +1149,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
             unsigned int mask;
 
+            if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
+
             mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
             xstate->Mask = frame->xstate.Mask & mask;
             xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index f0467def51f..df90157a474 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1088,8 +1088,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
     BOOL use_cached_debug_regs = FALSE;
     BOOL self = (handle == GetCurrentThread());
 
-    if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
-
     if (self && needed_flags & CONTEXT_DEBUG_REGISTERS)
     {
         /* debug registers require a server call if hw breakpoints are enabled */
@@ -1180,6 +1178,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
         unsigned int mask;
 
+        if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
+
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 7416de09168..c09e5fb9d54 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -165,8 +165,6 @@ BOOL validate_context_xstate( CONTEXT *context )
 {
     CONTEXT_EX *context_ex;
 
-    if (!((context->ContextFlags & 0x40) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX))) return TRUE;
-
     context_ex = (CONTEXT_EX *)(context + 1);
 
     if (context_ex->XState.Length < offsetof(XSTATE, YmmContext)

From dbb8d07b0445764eae4680d4dbb81df1f38f52e8 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 26 Mar 2024 17:27:44 -0600
Subject: [PATCH 302/389] Revert "ntdll: Factor out validate_context_xstate()
 function."

This reverts commit 96e3ee88b6b23d47ef6ef21adacaee0f72351e05.

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   |  4 +++-
 dlls/ntdll/unix/signal_x86_64.c |  4 +++-
 dlls/ntdll/unix/thread.c        | 17 -----------------
 dlls/ntdll/unix/unix_private.h  |  1 -
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index eb23dd3dc83..98e5e26ffa3 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1149,7 +1149,9 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
             unsigned int mask;
 
-            if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
+            if (context_ex->XState.Length < offsetof(XSTATE, YmmContext)
+                || context_ex->XState.Length > sizeof(XSTATE))
+                return STATUS_INVALID_PARAMETER;
 
             mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
             xstate->Mask = frame->xstate.Mask & mask;
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index df90157a474..1953179d76b 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1178,7 +1178,9 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
         unsigned int mask;
 
-        if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
+        if (context_ex->XState.Length < offsetof(XSTATE, YmmContext)
+            || context_ex->XState.Length > sizeof(XSTATE))
+            return STATUS_INVALID_PARAMETER;
 
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
         xstate->Mask = frame->xstate.Mask & mask;
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index c09e5fb9d54..73f252853fe 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -158,23 +158,6 @@ void fpu_to_fpux( XMM_SAVE_AREA32 *fpux, const I386_FLOATING_SAVE_AREA *fpu )
 }
 
 
-/***********************************************************************
- *           validate_context_xstate
- */
-BOOL validate_context_xstate( CONTEXT *context )
-{
-    CONTEXT_EX *context_ex;
-
-    context_ex = (CONTEXT_EX *)(context + 1);
-
-    if (context_ex->XState.Length < offsetof(XSTATE, YmmContext)
-        || context_ex->XState.Length > sizeof(XSTATE))
-        return FALSE;
-
-    return TRUE;
-}
-
-
 /***********************************************************************
  *           get_server_context_flags
  */
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index cf6b9ab0c53..8ba8950fb55 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -235,7 +235,6 @@ extern void DECLSPEC_NORETURN abort_process( int status );
 extern void DECLSPEC_NORETURN exit_process( int status );
 extern void wait_suspend( CONTEXT *context );
 extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance );
-extern BOOL validate_context_xstate( CONTEXT *context );
 extern NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USHORT machine );
 extern NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT machine );
 extern unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,

From 96ebd03463e65cc98fa4bfa3a39f6ce39ab65dd7 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 18 Jan 2024 15:17:39 -0600
Subject: [PATCH 303/389] ntdll: Fix exception list offset in
 call_user_mode_callback / user_mode_callback_return.

(cherry picked from commit 39304daf4d7bdf9d3e617108e4ae4bd6bd7c7d25)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_x86_64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 1953179d76b..403112b4ff3 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1620,7 +1620,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback,
                    "movq %rax,0xa8(%rsp)\n\t"  /* frame->syscall_cfa */
                    "movq 0x328(%r8),%r10\n\t"  /* amd64_thread_data()->syscall_frame */
                    "movq (%r8),%rax\n\t"       /* NtCurrentTeb()->Tib.ExceptionList */
-                   "movq %rax,0x408(%rsp)\n\t"
+                   "movq %rax,0x400(%rsp)\n\t"
                    "movl 0xb0(%r10),%r14d\n\t" /* prev_frame->syscall_flags */
                    "movl %r14d,0xb0(%rsp)\n\t" /* frame->syscall_flags */
                    "movq %r10,0xa0(%rsp)\n\t"  /* frame->prev_frame */
@@ -1653,7 +1653,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return,
                    __ASM_CFI(".cfi_rel_offset %r13,-0x18\n\t")
                    __ASM_CFI(".cfi_rel_offset %r14,-0x20\n\t")
                    __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t")
-                   "movq 0x408(%r10),%rax\n\t" /* exception list */
+                   "movq 0x400(%r10),%rax\n\t" /* exception list */
                    "movq %rax,0(%rcx)\n\t"     /* teb->Tib.ExceptionList */
                    "movq -0x38(%rbp),%r10\n\t"  /* ret_ptr */
                    "movq -0x40(%rbp),%r11\n\t"  /* ret_len */

From 8c4c32747666cd864d51611922ae894649a3f7e5 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 31 Jan 2024 14:24:24 -0600
Subject: [PATCH 304/389] ntdll: Don't hardcode xstate feature mask.

(cherry picked from commit 1e0728c5d48d87b38c54f655702bf2e639aa4f34)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 61 +++++++++++++++++----------------
 dlls/ntdll/unix/signal_x86_64.c | 61 +++++++++++++++++++++------------
 dlls/ntdll/unix/system.c        |  4 +++
 dlls/ntdll/unix/unix_private.h  |  9 +++++
 4 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 98e5e26ffa3..b20303d1b52 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -525,6 +525,7 @@ struct x86_thread_data
     UINT               dr7;           /* 1f0 */
     SYSTEM_SERVICE_TABLE *syscall_table; /* 1f4 syscall table */
     struct syscall_frame *syscall_frame; /* 1f8 frame pointer on syscall entry */
+    UINT64             xstate_features_mask;   /* 1fc  */
 };
 
 C_ASSERT( sizeof(struct x86_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) );
@@ -609,8 +610,6 @@ struct xcontext
     ULONG64 host_compaction_mask;
 };
 
-extern BOOL xstate_compaction_enabled;
-
 static inline XSTATE *xstate_from_context( const CONTEXT *context )
 {
     CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1);
@@ -832,7 +831,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si
         context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS;
         memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) );
         if (!fpu) fpux_to_fpu( &context->FloatSave, fpux );
-        if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = XState_sig(fpux)))
+        if (xstate_extended_features() && (xs = XState_sig(fpux)))
         {
             context_init_xstate( context, xs );
             xcontext->host_compaction_mask = xs->CompactionMask;
@@ -936,7 +935,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     DWORD flags = context->ContextFlags & ~CONTEXT_i386;
     BOOL self = (handle == GetCurrentThread());
 
-    if ((flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX))
+    if ((flags & CONTEXT_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
@@ -944,7 +943,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
         if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) ||
             context_ex->XState.Length > sizeof(XSTATE))
             return STATUS_INVALID_PARAMETER;
-        if ((xs->Mask & XSTATE_MASK_GSSE) && (context_ex->XState.Length < sizeof(XSTATE)))
+        if ((xs->Mask & xstate_extended_features()) && (context_ex->XState.Length < sizeof(XSTATE)))
             return STATUS_BUFFER_OVERFLOW;
     }
     else flags &= ~CONTEXT_XSTATE;
@@ -1143,7 +1142,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
 
             context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS;
         }
-        if ((needed_flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX))
+        if ((needed_flags & CONTEXT_XSTATE) && xstate_extended_features())
         {
             CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
             XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
@@ -1153,7 +1152,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
                 || context_ex->XState.Length > sizeof(XSTATE))
                 return STATUS_INVALID_PARAMETER;
 
-            mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
+            mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
             xstate->Mask = frame->xstate.Mask & mask;
             xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
             memset( xstate->Reserved, 0, sizeof(xstate->Reserved) );
@@ -1502,7 +1501,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr,
 
         context_init_xstate( &stack->context, dst_xs );
         memset( dst_xs, 0, offsetof(XSTATE, YmmContext) );
-        dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000004 : 0;
+        dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
         if (src_xs->Mask & 4)
         {
             dst_xs->Mask = 4;
@@ -1604,7 +1603,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
 
         context_init_xstate( &stack->context, dst_xs );
         memset( dst_xs, 0, offsetof(XSTATE, YmmContext) );
-        dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000004 : 0;
+        dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
         if (src_xs->Mask & 4)
         {
             dst_xs->Mask = 4;
@@ -2518,6 +2517,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
     ldt_set_fs( thread_data->fs, teb );
     thread_data->gs = get_gs();
     thread_data->syscall_table = KeServiceDescriptorTable;
+    thread_data->xstate_features_mask = xstate_supported_features_mask;
 
     context.SegCs  = get_cs();
     context.SegDs  = get_ds();
@@ -2553,6 +2553,8 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
     *ctx = context;
     ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS;
     memset( frame, 0, sizeof(*frame) );
+    if (xstate_compaction_enabled)
+        frame->xstate.CompactionMask = 0x8000000000000000 | xstate_supported_features_mask;
     NtSetContextThread( GetCurrentThread(), ctx );
 
     stack = (DWORD *)ctx;
@@ -2654,26 +2656,27 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                    "addl %fs:0x1f4,%ebx\n\t"       /* x86_thread_data()->syscall_table */
                    "testl $3,(%ecx)\n\t"           /* frame->syscall_flags & (SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC) */
                    "jz 2f\n\t"
-                   "movl $7,%eax\n\t"
-                   "xorl %edx,%edx\n\t"
-                   "movl %edx,0x240(%ecx)\n\t"
-                   "movl %edx,0x244(%ecx)\n\t"
-                   "movl %edx,0x248(%ecx)\n\t"
-                   "movl %edx,0x24c(%ecx)\n\t"
-                   "movl %edx,0x250(%ecx)\n\t"
-                   "movl %edx,0x254(%ecx)\n\t"
+                   "movl %fs:0x1fc,%eax\n\t"       /* x86_thread_data()->xstate_features_mask */
+                   "movl %fs:0x200,%edx\n\t"       /* x86_thread_data()->xstate_features_mask high dword */
+                   "xorl %edi,%edi\n\t"
+                   "movl %edi,0x240(%ecx)\n\t"
+                   "movl %edi,0x244(%ecx)\n\t"
+                   "movl %edi,0x248(%ecx)\n\t"
+                   "movl %edi,0x24c(%ecx)\n\t"
+                   "movl %edi,0x250(%ecx)\n\t"
+                   "movl %edi,0x254(%ecx)\n\t"
                    "testl $2,(%ecx)\n\t"           /* frame->syscall_flags & SYSCALL_HAVE_XSAVEC */
                    "jz 1f\n\t"
-                   "movl %edx,0x258(%ecx)\n\t"
-                   "movl %edx,0x25c(%ecx)\n\t"
-                   "movl %edx,0x260(%ecx)\n\t"
-                   "movl %edx,0x264(%ecx)\n\t"
-                   "movl %edx,0x268(%ecx)\n\t"
-                   "movl %edx,0x26c(%ecx)\n\t"
-                   "movl %edx,0x270(%ecx)\n\t"
-                   "movl %edx,0x274(%ecx)\n\t"
-                   "movl %edx,0x278(%ecx)\n\t"
-                   "movl %edx,0x27c(%ecx)\n\t"
+                   "movl %edi,0x258(%ecx)\n\t"
+                   "movl %edi,0x25c(%ecx)\n\t"
+                   "movl %edi,0x260(%ecx)\n\t"
+                   "movl %edi,0x264(%ecx)\n\t"
+                   "movl %edi,0x268(%ecx)\n\t"
+                   "movl %edi,0x26c(%ecx)\n\t"
+                   "movl %edi,0x270(%ecx)\n\t"
+                   "movl %edi,0x274(%ecx)\n\t"
+                   "movl %edi,0x278(%ecx)\n\t"
+                   "movl %edi,0x27c(%ecx)\n\t"
                    /* The xsavec instruction is not supported by
                     * binutils < 2.25. */
                    ".byte 0x0f, 0xc7, 0x61, 0x40\n\t" /* xsavec 0x40(%ecx) */
@@ -2718,8 +2721,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                    "testl $3,%ecx\n\t"             /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */
                    "jz 1f\n\t"
                    "movl %eax,%esi\n\t"
-                   "movl $7,%eax\n\t"
-                   "xorl %edx,%edx\n\t"
+                   "movl %fs:0x1fc,%eax\n\t"       /* x86_thread_data()->xstate_features_mask */
+                   "movl %fs:0x200,%edx\n\t"       /* x86_thread_data()->xstate_features_mask high dword */
                    "xrstor 0x40(%esp)\n\t"
                    "movl %esi,%eax\n\t"
                    "jmp 3f\n"
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 403112b4ff3..8a63ffdd8d6 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -452,6 +452,8 @@ struct amd64_thread_data
     struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */
     SYSTEM_SERVICE_TABLE *syscall_table; /* 0330 syscall table */
     DWORD                 fs;            /* 0338 WOW TEB selector */
+    DWORD                 align;
+    UINT64                xstate_features_mask;  /* 0340 */
 };
 
 C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) );
@@ -459,6 +461,7 @@ C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pth
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_table ) == 0x330 );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x338 );
+C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, xstate_features_mask ) == 0x340 );
 
 static inline struct amd64_thread_data *amd64_thread_data(void)
 {
@@ -488,8 +491,6 @@ struct xcontext
     ULONG64 host_compaction_mask;
 };
 
-extern BOOL xstate_compaction_enabled;
-
 static inline XSTATE *xstate_from_context( const CONTEXT *context )
 {
     CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1);
@@ -910,7 +911,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex
         context->ContextFlags |= CONTEXT_FLOATING_POINT;
         context->FltSave = *FPU_sig(sigcontext);
         context->MxCsr = context->FltSave.MxCsr;
-        if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext))))
+        if (xstate_extended_features() && (xs = XState_sig(FPU_sig(sigcontext))))
         {
             /* xcontext and sigcontext are both on the signal stack, so we can
              * just reference sigcontext without overflowing 32 bit XState.Offset */
@@ -940,7 +941,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon
     amd64_thread_data()->dr7 = context->Dr7;
     set_sigcontext( context, sigcontext );
     if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->FltSave;
-    if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext))))
+    if (xstate_extended_features() && (xs = XState_sig(FPU_sig(sigcontext))))
         xs->CompactionMask = xcontext->host_compaction_mask;
     leave_handler( sigcontext );
 }
@@ -989,7 +990,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     BOOL self = (handle == GetCurrentThread());
     struct syscall_frame *frame = amd64_thread_data()->syscall_frame;
 
-    if ((flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX))
+    if ((flags & CONTEXT_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
@@ -997,7 +998,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
         if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) ||
             context_ex->XState.Length > sizeof(XSTATE))
             return STATUS_INVALID_PARAMETER;
-        if ((xs->Mask & XSTATE_MASK_GSSE) && (context_ex->XState.Length < sizeof(XSTATE)))
+        if ((xs->Mask & xstate_extended_features()) && (context_ex->XState.Length < sizeof(XSTATE)))
             return STATUS_BUFFER_OVERFLOW;
     }
     else flags &= ~CONTEXT_XSTATE;
@@ -1172,7 +1173,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         context->MxCsr = context->FltSave.MxCsr;
         context->ContextFlags |= CONTEXT_FLOATING_POINT;
     }
-    if ((needed_flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX))
+    if ((needed_flags & CONTEXT_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
@@ -1182,7 +1183,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             || context_ex->XState.Length > sizeof(XSTATE))
             return STATUS_INVALID_PARAMETER;
 
-        mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
+        mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
         memset( xstate->Reserved, 0, sizeof(xstate->Reserved) );
@@ -1406,7 +1407,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
             context_ex->XState.Length > sizeof(XSTATE))
             return STATUS_INVALID_PARAMETER;
 
-        mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE;
+        mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
         memset( xstate->Reserved, 0, sizeof(xstate->Reserved) );
@@ -1471,7 +1472,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec
         assert( !((ULONG_PTR)&stack->xstate & 63) );
         context_init_xstate( &stack->context, &stack->xstate );
         memset( &stack->xstate, 0, offsetof(XSTATE, YmmContext) );
-        stack->xstate.CompactionMask = xstate_compaction_enabled ? 0x8000000000000004 : 0;
+        stack->xstate.CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
         if (src_xs->Mask & 4)
         {
             stack->xstate.Mask = 4;
@@ -2832,6 +2833,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
     I386_CONTEXT *wow_context;
 
     thread_data->syscall_table = KeServiceDescriptorTable;
+    thread_data->xstate_features_mask = xstate_supported_features_mask;
 
 #if defined __linux__
     arch_prctl( ARCH_SET_GS, teb );
@@ -2904,6 +2906,8 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
     *ctx = context;
     ctx->ContextFlags = CONTEXT_FULL;
     memset( frame, 0, sizeof(*frame) );
+    if (xstate_compaction_enabled)
+        frame->xstate.CompactionMask = 0x8000000000000000 | xstate_supported_features_mask;
     NtSetContextThread( GetCurrentThread(), ctx );
 
     frame->cs  = cs64_sel;
@@ -3001,18 +3005,25 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                    "movl 0xb0(%rcx),%r14d\n\t"     /* frame->syscall_flags */
                    "testl $3,%r14d\n\t"            /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */
                    "jz 2f\n\t"
-                   "movl $7,%eax\n\t"
-                   "xorl %edx,%edx\n\t"
-                   "movq %rdx,0x2c0(%rcx)\n\t"
-                   "movq %rdx,0x2c8(%rcx)\n\t"
-                   "movq %rdx,0x2d0(%rcx)\n\t"
+#ifdef __APPLE__
+                   "movq %gs:0x30,%rdx\n\t"
+                   "movl 0x340(%rdx),%eax\n\t"
+                   "movl 0x344(%rdx),%edx\n\t"
+#else
+                   "movl %gs:0x340,%eax\n\t"       /* amd64_thread_data()->xstate_features_mask */
+                   "movl %gs:0x344,%edx\n\t"       /* amd64_thread_data()->xstate_features_mask high dword */
+#endif
+                   "xorq %rbp,%rbp\n\t"
+                   "movq %rbp,0x2c0(%rcx)\n\t"
+                   "movq %rbp,0x2c8(%rcx)\n\t"
+                   "movq %rbp,0x2d0(%rcx)\n\t"
                    "testl $2,%r14d\n\t"            /* SYSCALL_HAVE_XSAVEC */
                    "jz 1f\n\t"
-                   "movq %rdx,0x2d8(%rcx)\n\t"
-                   "movq %rdx,0x2e0(%rcx)\n\t"
-                   "movq %rdx,0x2e8(%rcx)\n\t"
-                   "movq %rdx,0x2f0(%rcx)\n\t"
-                   "movq %rdx,0x2f8(%rcx)\n\t"
+                   "movq %rbp,0x2d8(%rcx)\n\t"
+                   "movq %rbp,0x2e0(%rcx)\n\t"
+                   "movq %rbp,0x2e8(%rcx)\n\t"
+                   "movq %rbp,0x2f0(%rcx)\n\t"
+                   "movq %rbp,0x2f8(%rcx)\n\t"
                    /* The xsavec instruction is not supported by
                     * binutils < 2.25. */
                    ".byte 0x48, 0x0f, 0xc7, 0xa1, 0xc0, 0x00, 0x00, 0x00\n\t" /* xsavec64 0xc0(%rcx) */
@@ -3114,8 +3125,14 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                    "2:\ttestl $3,%r14d\n\t"        /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */
                    "jz 3f\n\t"
                    "movq %rax,%r11\n\t"
-                   "movl $7,%eax\n\t"
-                   "xorl %edx,%edx\n\t"
+#ifdef __APPLE__
+                   "movq %gs:0x30,%rdx\n\t"
+                   "movl 0x340(%rdx),%eax\n\t"
+                   "movl 0x344(%rdx),%edx\n\t"
+#else
+                   "movl %gs:0x340,%eax\n\t"       /* amd64_thread_data()->xstate_features_mask */
+                   "movl %gs:0x344,%edx\n\t"       /* amd64_thread_data()->xstate_features_mask high dword */
+#endif
                    "xrstor64 0xc0(%rcx)\n\t"
                    "movq %r11,%rax\n\t"
                    "movl 0xb4(%rcx),%edx\n\t"      /* frame->restore_flags */
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 8e2736b05b0..8ed7b792b60 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -255,6 +255,7 @@ cpu_override;
 #if defined(__i386__) || defined(__x86_64__)
 
 BOOL xstate_compaction_enabled = FALSE;
+UINT64 xstate_supported_features_mask;
 
 #define AUTH	0x68747541	/* "Auth" */
 #define ENTI	0x69746e65	/* "enti" */
@@ -404,6 +405,9 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info )
         {
             do_cpuid( 0x0000000d, 1, regs3 ); /* get XSAVE details */
             if (regs3[0] & 2) xstate_compaction_enabled = TRUE;
+            xstate_supported_features_mask = 3;
+            if (features & CPU_FEATURE_AVX)
+                xstate_supported_features_mask |= (UINT64)1 << XSTATE_AVX;
         }
 
         if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD)
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 8ba8950fb55..7fc5932c1ff 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -227,6 +227,15 @@ extern int server_pipe( int fd[2] );
 
 extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux );
 extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu );
+
+extern BOOL xstate_compaction_enabled;
+extern UINT64 xstate_supported_features_mask;
+
+static inline UINT64 xstate_extended_features(void)
+{
+    return xstate_supported_features_mask & ~(UINT64)3;
+}
+
 extern void *get_cpu_area( USHORT machine );
 extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid );
 extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE_T commit_size );

From 46ad15dcd3d8628c0aafde2e5ed1c6d838fdd624 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 31 Jan 2024 16:12:58 -0600
Subject: [PATCH 305/389] ntdll: Don't hardcode xstate size in syscall frame.

(cherry picked from commit 7ae488a2bb58501684c6475d4942277b852475fc)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   |  53 ++++++++--------
 dlls/ntdll/unix/signal_x86_64.c | 104 +++++++++++++++++++-------------
 dlls/ntdll/unix/system.c        |  21 +++++++
 dlls/ntdll/unix/unix_private.h  |   3 +
 include/winnt.h                 |   8 +++
 5 files changed, 123 insertions(+), 66 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index b20303d1b52..4f192e1df63 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -508,10 +508,10 @@ struct syscall_frame
     /* Leave space for the whole set of YMM registers. They're not used in
      * 32-bit mode, but some processors fault if they're not in writable memory.
      */
-    DECLSPEC_ALIGN(64) XSTATE xstate;     /* 240 */
+    DECLSPEC_ALIGN(64) XSAVE_AREA_HEADER xstate; /* 240 */
 };
 
-C_ASSERT( sizeof(struct syscall_frame) == 0x380 );
+C_ASSERT( sizeof(struct syscall_frame) == 0x280 );
 
 struct x86_thread_data
 {
@@ -526,12 +526,14 @@ struct x86_thread_data
     SYSTEM_SERVICE_TABLE *syscall_table; /* 1f4 syscall table */
     struct syscall_frame *syscall_frame; /* 1f8 frame pointer on syscall entry */
     UINT64             xstate_features_mask;   /* 1fc  */
+    UINT               xstate_features_size;   /* 204 */
 };
 
 C_ASSERT( sizeof(struct x86_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_table ) == 0x1f4 );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_frame ) == 0x1f8 );
+C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, xstate_features_size ) == 0x204 );
 
 /* flags to control the behavior of the syscall dispatcher */
 #define SYSCALL_HAVE_XSAVE    1
@@ -938,12 +940,13 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     if ((flags & CONTEXT_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
+        XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
-        if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) ||
-            context_ex->XState.Length > sizeof(XSTATE))
+        if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
+            context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
             return STATUS_INVALID_PARAMETER;
-        if ((xs->Mask & xstate_extended_features()) && (context_ex->XState.Length < sizeof(XSTATE)))
+        if ((xs->Mask & xstate_extended_features())
+            && (context_ex->XState.Length < xstate_get_size( xs->CompactionMask, xs->Mask )))
             return STATUS_BUFFER_OVERFLOW;
     }
     else flags &= ~CONTEXT_XSTATE;
@@ -1019,14 +1022,9 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     if (flags & CONTEXT_XSTATE)
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
+        XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
-        if (xs->Mask & XSTATE_MASK_GSSE)
-        {
-            frame->xstate.Mask |= XSTATE_MASK_GSSE;
-            frame->xstate.YmmContext = xs->YmmContext;
-        }
-        else frame->xstate.Mask &= ~XSTATE_MASK_GSSE;
+        copy_xstate( &frame->xstate, xs, xs->Mask );
     }
 
     frame->restore_flags |= flags & ~CONTEXT_INTEGER;
@@ -1145,21 +1143,22 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         if ((needed_flags & CONTEXT_XSTATE) && xstate_extended_features())
         {
             CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-            XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
-            unsigned int mask;
+            XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
+            UINT64 mask;
 
-            if (context_ex->XState.Length < offsetof(XSTATE, YmmContext)
-                || context_ex->XState.Length > sizeof(XSTATE))
+            if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
+                context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
                 return STATUS_INVALID_PARAMETER;
 
             mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
             xstate->Mask = frame->xstate.Mask & mask;
             xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
-            memset( xstate->Reserved, 0, sizeof(xstate->Reserved) );
+            memset( xstate->Reserved2, 0, sizeof(xstate->Reserved2) );
             if (xstate->Mask)
             {
-                if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW;
-                xstate->YmmContext = frame->xstate.YmmContext;
+                if (context_ex->XState.Length < xstate_get_size( xstate->CompactionMask, xstate->Mask ))
+                    return STATUS_BUFFER_OVERFLOW;
+                copy_xstate( xstate, &frame->xstate, xstate->Mask );
             }
         }
         if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386))
@@ -1500,7 +1499,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr,
         XSTATE *dst_xs = (XSTATE *)(((ULONG_PTR)stack->xstate + 63) & ~63);
 
         context_init_xstate( &stack->context, dst_xs );
-        memset( dst_xs, 0, offsetof(XSTATE, YmmContext) );
+        memset( dst_xs, 0, sizeof(XSAVE_AREA_HEADER) );
         dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
         if (src_xs->Mask & 4)
         {
@@ -1640,7 +1639,8 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback,
                    __ASM_CFI(".cfi_rel_offset %edi,-12\n\t")
                    "movl 0x18(%ebp),%edx\n\t"  /* teb */
                    "pushl 0(%edx)\n\t"         /* teb->Tib.ExceptionList */
-                   "subl $0x380,%esp\n\t"      /* sizeof(struct syscall_frame) */
+                   "subl $0x280,%esp\n\t"      /* sizeof(struct syscall_frame) */
+                   "subl %fs:0x204,%esp\n\t"   /* x86_thread_data()->xstate_features_size */
                    "andl $~63,%esp\n\t"
                    "leal 8(%ebp),%eax\n\t"
                    "movl %eax,0x38(%esp)\n\t"  /* frame->syscall_cfa */
@@ -2440,6 +2440,7 @@ NTSTATUS signal_alloc_thread( TEB *teb )
     else thread_data->fs = gdt_fs_sel;
 
     teb->WOW32Reserved = __wine_syscall_dispatcher;
+    thread_data->xstate_features_size = xstate_features_size;
     return STATUS_SUCCESS;
 }
 
@@ -2468,7 +2469,9 @@ void signal_init_process(void)
     struct sigaction sig_act;
     void *kernel_stack = (char *)ntdll_get_thread_data()->kernel_stack + kernel_stack_size;
 
-    x86_thread_data()->syscall_frame = (struct syscall_frame *)kernel_stack - 1;
+    x86_thread_data()->syscall_frame = (struct syscall_frame *)((ULONG_PTR)((char *)kernel_stack
+                                       - sizeof(struct syscall_frame) - xstate_features_size) & ~(ULONG_PTR)63);
+    x86_thread_data()->xstate_features_size = xstate_features_size;
 
     if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_FXSR) syscall_flags |= SYSCALL_HAVE_FXSAVE;
     if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) syscall_flags |= SYSCALL_HAVE_XSAVE;
@@ -2518,6 +2521,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
     thread_data->gs = get_gs();
     thread_data->syscall_table = KeServiceDescriptorTable;
     thread_data->xstate_features_mask = xstate_supported_features_mask;
+    assert( thread_data->xstate_features_size == xstate_features_size );
 
     context.SegCs  = get_cs();
     context.SegDs  = get_ds();
@@ -2596,7 +2600,8 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
                    "movl 0x1f8(%ecx),%eax\n\t"  /* x86_thread_data()->syscall_frame */
                    "orl %eax,%eax\n\t"
                    "jnz 1f\n\t"
-                   "leal -0x380(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */
+                   "leal -0x280(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */
+                   "subl %fs:0x204,%eax\n\t"    /* x86_thread_data()->xstate_features_size */
                    "andl $~63,%eax\n\t"
                    "movl %eax,0x1f8(%ecx)\n"    /* x86_thread_data()->syscall_frame */
                    /* switch to kernel stack */
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 8a63ffdd8d6..fb97bf4d598 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -435,10 +435,12 @@ struct syscall_frame
     DWORD                 restore_flags; /* 00b4 */
     DWORD                 align[2];      /* 00b8 */
     XMM_SAVE_AREA32       xsave;         /* 00c0 */
-    DECLSPEC_ALIGN(64) XSTATE xstate;    /* 02c0 */
+    DECLSPEC_ALIGN(64) XSAVE_AREA_HEADER xstate;    /* 02c0 */
 };
 
-C_ASSERT( sizeof( struct syscall_frame ) == 0x400);
+C_ASSERT( offsetof( struct syscall_frame, xsave ) == 0xc0 );
+C_ASSERT( offsetof( struct syscall_frame, xstate ) == 0x2c0 );
+C_ASSERT( sizeof( struct syscall_frame ) == 0x300);
 
 struct amd64_thread_data
 {
@@ -452,7 +454,7 @@ struct amd64_thread_data
     struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */
     SYSTEM_SERVICE_TABLE *syscall_table; /* 0330 syscall table */
     DWORD                 fs;            /* 0338 WOW TEB selector */
-    DWORD                 align;
+    DWORD                 xstate_features_size;  /* 033c */
     UINT64                xstate_features_mask;  /* 0340 */
 };
 
@@ -461,6 +463,7 @@ C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pth
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_table ) == 0x330 );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x338 );
+C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, xstate_features_size ) == 0x33c );
 C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, xstate_features_mask ) == 0x340 );
 
 static inline struct amd64_thread_data *amd64_thread_data(void)
@@ -993,12 +996,13 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     if ((flags & CONTEXT_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
+        XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
-        if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) ||
-            context_ex->XState.Length > sizeof(XSTATE))
+        if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
+            context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
             return STATUS_INVALID_PARAMETER;
-        if ((xs->Mask & xstate_extended_features()) && (context_ex->XState.Length < sizeof(XSTATE)))
+        if ((xs->Mask & xstate_extended_features())
+            && (context_ex->XState.Length < xstate_get_size( xs->CompactionMask, xs->Mask )))
             return STATUS_BUFFER_OVERFLOW;
     }
     else flags &= ~CONTEXT_XSTATE;
@@ -1063,14 +1067,9 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     if (flags & CONTEXT_XSTATE)
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
+        XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
-        if (xs->Mask & XSTATE_MASK_GSSE)
-        {
-            frame->xstate.Mask |= XSTATE_MASK_GSSE;
-            memcpy( &frame->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) );
-        }
-        else frame->xstate.Mask &= ~XSTATE_MASK_GSSE;
+        copy_xstate( &frame->xstate, xs, xs->Mask );
     }
 
     frame->restore_flags |= flags & ~CONTEXT_INTEGER;
@@ -1176,21 +1175,22 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
     if ((needed_flags & CONTEXT_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
-        unsigned int mask;
+        XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
+        UINT64 mask;
 
-        if (context_ex->XState.Length < offsetof(XSTATE, YmmContext)
-            || context_ex->XState.Length > sizeof(XSTATE))
+        if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
+            context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
             return STATUS_INVALID_PARAMETER;
 
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
-        memset( xstate->Reserved, 0, sizeof(xstate->Reserved) );
+        memset( xstate->Reserved2, 0, sizeof(xstate->Reserved2) );
         if (xstate->Mask)
         {
-            if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW;
-            memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) );
+            if (context_ex->XState.Length < xstate_get_size( xstate->CompactionMask, xstate->Mask ))
+                return STATUS_BUFFER_OVERFLOW;
+            copy_xstate( xstate, &frame->xstate, xstate->Mask );
         }
     }
     if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64))
@@ -1309,14 +1309,9 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size )
     if (flags & CONTEXT_I386_XSTATE)
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
+        XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
-        if (xs->Mask & XSTATE_MASK_GSSE)
-        {
-            frame->xstate.Mask |= XSTATE_MASK_GSSE;
-            memcpy( &frame->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) );
-        }
-        else frame->xstate.Mask &= ~XSTATE_MASK_GSSE;
+        copy_xstate( &frame->xstate, xs, xs->Mask );
         frame->restore_flags |= CONTEXT_XSTATE;
     }
     return STATUS_SUCCESS;
@@ -1397,24 +1392,25 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
         fpux_to_fpu( &context->FloatSave, &frame->xsave );
         context->ContextFlags |= CONTEXT_I386_FLOATING_POINT;
     }
-    if ((needed_flags & CONTEXT_I386_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX))
+    if ((needed_flags & CONTEXT_I386_XSTATE) && xstate_extended_features())
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
-        XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset);
-        unsigned int mask;
+        XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
+        UINT64 mask;
 
-        if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) ||
-            context_ex->XState.Length > sizeof(XSTATE))
+        if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
+            context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
             return STATUS_INVALID_PARAMETER;
 
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
-        memset( xstate->Reserved, 0, sizeof(xstate->Reserved) );
+        memset( xstate->Reserved2, 0, sizeof(xstate->Reserved2) );
         if (xstate->Mask)
         {
-            if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW;
-            memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) );
+            if (context_ex->XState.Length < xstate_get_size( xstate->CompactionMask, xstate->Mask ))
+                return STATUS_BUFFER_OVERFLOW;
+            copy_xstate( xstate, &frame->xstate, xstate->Mask );
         }
     }
     return STATUS_SUCCESS;
@@ -1573,7 +1569,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
     {
         assert( !((ULONG_PTR)&stack->xstate & 63) );
         context_init_xstate( &stack->context, &stack->xstate );
-        memcpy( &stack->xstate, &frame->xstate, sizeof(frame->xstate) );
+        memcpy( &stack->xstate, &frame->xstate, sizeof(XSAVE_AREA_HEADER) + xstate_features_size );
     }
     else context_init_xstate( &stack->context, NULL );
 
@@ -1615,13 +1611,20 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback,
                    "fnstcw -0x2c(%rbp)\n\t"
                    "movq %rsi,-0x38(%rbp)\n\t" /* ret_ptr */
                    "movq %rdx,-0x40(%rbp)\n\t" /* ret_len */
-                   "subq $0x408,%rsp\n\t"      /* sizeof(struct syscall_frame) + exception */
+                   "subq $0x308,%rsp\n\t"      /* sizeof(struct syscall_frame) + exception */
+#ifdef __APPLE__
+                   "movq %gs:0x30,%rsi\n\t"
+                   "movl 0x33c(%rsi),%esi\n\t"
+#else
+                   "movl %gs:0x33c,%esi\n\t"   /* amd64_thread_data()->xstate_features_size */
+#endif
+                   "subq %rsi,%rsp\n\t"
                    "andq $~63,%rsp\n\t"
                    "leaq 0x10(%rbp),%rax\n\t"
                    "movq %rax,0xa8(%rsp)\n\t"  /* frame->syscall_cfa */
                    "movq 0x328(%r8),%r10\n\t"  /* amd64_thread_data()->syscall_frame */
                    "movq (%r8),%rax\n\t"       /* NtCurrentTeb()->Tib.ExceptionList */
-                   "movq %rax,0x400(%rsp)\n\t"
+                   "movq %rax,0x300(%rsp,%rsi)\n\t"
                    "movl 0xb0(%r10),%r14d\n\t" /* prev_frame->syscall_flags */
                    "movl %r14d,0xb0(%rsp)\n\t" /* frame->syscall_flags */
                    "movq %r10,0xa0(%rsp)\n\t"  /* frame->prev_frame */
@@ -1654,7 +1657,13 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return,
                    __ASM_CFI(".cfi_rel_offset %r13,-0x18\n\t")
                    __ASM_CFI(".cfi_rel_offset %r14,-0x20\n\t")
                    __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t")
-                   "movq 0x400(%r10),%rax\n\t" /* exception list */
+#ifdef __APPLE__
+                   "movq %gs:0x30,%rax\n\t"
+                   "movl 0x33c(%rax),%eax\n\t"
+#else
+                   "movl %gs:0x33c,%eax\n\t"   /* amd64_thread_data()->xstate_features_size */
+#endif
+                   "movq 0x300(%r10,%rax),%rax\n\t" /* exception list */
                    "movq %rax,0(%rcx)\n\t"     /* teb->Tib.ExceptionList */
                    "movq -0x38(%rbp),%r10\n\t"  /* ret_ptr */
                    "movq -0x40(%rbp),%r11\n\t"  /* ret_len */
@@ -2651,6 +2660,7 @@ NTSTATUS signal_alloc_thread( TEB *teb )
         }
         else thread_data->fs = fs32_sel;
     }
+    thread_data->xstate_features_size = xstate_features_size;
     return STATUS_SUCCESS;
 }
 
@@ -2737,7 +2747,9 @@ void signal_init_process(void)
     WOW_TEB *wow_teb = get_wow_teb( NtCurrentTeb() );
     void *ptr, *kernel_stack = (char *)ntdll_get_thread_data()->kernel_stack + kernel_stack_size;
 
-    amd64_thread_data()->syscall_frame = (struct syscall_frame *)kernel_stack - 1;
+    amd64_thread_data()->syscall_frame = (struct syscall_frame *)((ULONG_PTR)((char *)kernel_stack
+                                         - sizeof(struct syscall_frame) - xstate_features_size) & ~(ULONG_PTR)63);
+    amd64_thread_data()->xstate_features_size = xstate_features_size;
 
     /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */
     ptr = (char *)user_shared_data + page_size;
@@ -2834,6 +2846,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
 
     thread_data->syscall_table = KeServiceDescriptorTable;
     thread_data->xstate_features_mask = xstate_supported_features_mask;
+    assert( thread_data->xstate_features_size == xstate_features_size );
 
 #if defined __linux__
     arch_prctl( ARCH_SET_GS, teb );
@@ -2950,7 +2963,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
                    "movq 0x328(%rcx),%r8\n\t"      /* amd64_thread_data()->syscall_frame */
                    "orq %r8,%r8\n\t"
                    "jnz 1f\n\t"
-                   "leaq -0x400(%rsp),%r8\n\t"     /* sizeof(struct syscall_frame) */
+                   "leaq -0x300(%rsp),%r8\n\t"     /* sizeof(struct syscall_frame) */
+#ifdef __APPLE__
+                   "movq %gs:0x30,%rax\n\t"
+                   "movl 0x33c(%rax),%eax\n\t"
+#else
+                   "movl %gs:0x33c,%eax\n\t"       /* amd64_thread_data()->xstate_features_size */
+#endif
+                   "subq %rax,%r8\n\t"
                    "andq $~63,%r8\n\t"
                    "movq %r8,0x328(%rcx)\n"        /* amd64_thread_data()->syscall_frame */
                    /* switch to kernel stack */
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 8ed7b792b60..eaf1f559d71 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -256,6 +256,23 @@ cpu_override;
 
 BOOL xstate_compaction_enabled = FALSE;
 UINT64 xstate_supported_features_mask;
+UINT64 xstate_features_size;
+
+unsigned int xstate_get_size( UINT64 compaction_mask, UINT64 mask )
+{
+    if (!(mask & ((UINT64)1 << XSTATE_AVX))) return sizeof(XSAVE_AREA_HEADER);
+    return sizeof(XSAVE_AREA_HEADER) + sizeof(YMMCONTEXT);
+}
+
+void copy_xstate( XSAVE_AREA_HEADER *dst, XSAVE_AREA_HEADER *src, UINT64 mask )
+{
+    mask &= xstate_extended_features() & src->Mask;
+    if (src->CompactionMask) mask &= src->CompactionMask;
+    if (dst->CompactionMask) mask &= dst->CompactionMask;
+    dst->Mask = (dst->Mask & ~xstate_extended_features()) | mask;
+    if (mask & ((UINT64)1 << XSTATE_AVX))
+        *(YMMCONTEXT *)(dst + 1) = *(YMMCONTEXT *)(src + 1);
+}
 
 #define AUTH	0x68747541	/* "Auth" */
 #define ENTI	0x69746e65	/* "enti" */
@@ -408,6 +425,10 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info )
             xstate_supported_features_mask = 3;
             if (features & CPU_FEATURE_AVX)
                 xstate_supported_features_mask |= (UINT64)1 << XSTATE_AVX;
+            xstate_features_size = xstate_get_size( xstate_compaction_enabled ? 0x8000000000000000
+                                   | xstate_supported_features_mask : 0, xstate_supported_features_mask )
+                                   - sizeof(XSAVE_AREA_HEADER);
+            xstate_features_size = (xstate_features_size + 15) & ~15;
         }
 
         if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD)
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 7fc5932c1ff..77a3de4c5d0 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -230,6 +230,9 @@ extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu
 
 extern BOOL xstate_compaction_enabled;
 extern UINT64 xstate_supported_features_mask;
+extern UINT64 xstate_features_size;
+extern unsigned int xstate_get_size( UINT64 compaction_mask, UINT64 mask );
+extern void copy_xstate( XSAVE_AREA_HEADER *dst, XSAVE_AREA_HEADER *src, UINT64 mask );
 
 static inline UINT64 xstate_extended_features(void)
 {
diff --git a/include/winnt.h b/include/winnt.h
index 0e1a197d423..0f7c9430bfd 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1470,6 +1470,14 @@ typedef struct _XSTATE_CONFIGURATION
     ULONG64 EnabledUserVisibleSupervisorFeatures;
 } XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION;
 
+typedef struct _XSAVE_AREA_HEADER
+{
+    DWORD64 Mask;
+    DWORD64 CompactionMask;
+    DWORD64 Reserved2[6];
+}
+XSAVE_AREA_HEADER, *PXSAVE_AREA_HEADER;
+
 typedef struct _YMMCONTEXT
 {
     M128A Ymm0;

From 5878caa9e259a429bfb23ee00c49339b39bbac24 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 31 Jan 2024 16:26:16 -0600
Subject: [PATCH 306/389] ntdll: Don't hardcode xstate size in exception stack
 layout.

(cherry picked from commit dfe2b717a622fd551053d880d2185281fb237a65)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 63 +++++++++++++++------------------
 dlls/ntdll/unix/signal_x86_64.c | 47 ++++++++++++------------
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 4f192e1df63..b2bdb3a7e20 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -151,7 +151,7 @@ typedef struct ucontext
 
 #define FPU_sig(context)     ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs))
 #define FPUX_sig(context)    (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XSAVE_FORMAT *)(FPU_sig(context) + 1) : NULL)
-#define XState_sig(fpu)      (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSTATE *)(fpu + 1) : NULL)
+#define XState_sig(fpu)      (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSAVE_AREA_HEADER *)(fpu + 1) : NULL)
 
 #ifdef __ANDROID__
 /* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */
@@ -443,12 +443,10 @@ struct exc_stack_layout
     EXCEPTION_RECORD  rec;           /* 008 */
     CONTEXT           context;       /* 058 */
     CONTEXT_EX        context_ex;    /* 324 */
-    BYTE xstate[sizeof(XSTATE)+64];  /* 33c extra space to allow for 64-byte alignment */
-    DWORD             align;         /* 4bc */
+    DWORD             align;         /* 33c */
 };
 C_ASSERT( offsetof(struct exc_stack_layout, context) == 0x58 );
-C_ASSERT( offsetof(struct exc_stack_layout, xstate) == 0x33c );
-C_ASSERT( sizeof(struct exc_stack_layout) == 0x4c0 );
+C_ASSERT( sizeof(struct exc_stack_layout) == 0x340 );
 
 /* stack layout when calling KiUserApcDispatcher */
 struct apc_stack_layout
@@ -612,12 +610,12 @@ struct xcontext
     ULONG64 host_compaction_mask;
 };
 
-static inline XSTATE *xstate_from_context( const CONTEXT *context )
+static inline XSAVE_AREA_HEADER *xstate_from_context( const CONTEXT *context )
 {
     CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1);
 
     if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) return NULL;
-    return (XSTATE *)((char *)xctx + xctx->XState.Offset);
+    return (XSAVE_AREA_HEADER *)((char *)xctx + xctx->XState.Offset);
 }
 
 static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer )
@@ -630,7 +628,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer )
 
     if (xstate_buffer)
     {
-        xctx->XState.Length = sizeof(XSTATE);
+        xctx->XState.Length = sizeof(XSAVE_AREA_HEADER) + xstate_features_size;
         xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx;
         context->ContextFlags |= CONTEXT_XSTATE;
 
@@ -828,7 +826,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si
     }
     if (fpux)
     {
-        XSTATE *xs;
+        XSAVE_AREA_HEADER *xs;
 
         context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS;
         memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) );
@@ -880,16 +878,12 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t
     if (fpu) *fpu = context->FloatSave;
     if (fpux)
     {
-        XSTATE *src_xs, *dst_xs;
+        XSAVE_AREA_HEADER *xs;
 
         memcpy( fpux, context->ExtendedRegisters, sizeof(*fpux) );
 
-        if ((dst_xs = XState_sig(fpux)) && (src_xs = xstate_from_context( context )))
-        {
-            memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) );
-            dst_xs->Mask |= src_xs->Mask;
-            dst_xs->CompactionMask = xcontext->host_compaction_mask;
-        }
+        if (xstate_extended_features() && (xs = XState_sig(fpux)))
+            xs->CompactionMask = xcontext->host_compaction_mask;
     }
     if (!fpu && !fpux) restore_fpu( context );
 }
@@ -1475,8 +1469,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr,
                                    EXCEPTION_RECORD *rec, struct xcontext *xcontext )
 {
     CONTEXT *context = &xcontext->c;
-    XSTATE *src_xs;
+    XSAVE_AREA_HEADER *src_xs;
     struct exc_stack_layout *stack;
+    size_t stack_size;
+    unsigned int xstate_size;
     NTSTATUS status = send_debug_event( rec, context, TRUE );
 
     if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
@@ -1488,7 +1484,9 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr,
     /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */
     if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--;
 
-    stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec );
+    xstate_size = sizeof(XSAVE_AREA_HEADER) + xstate_features_size;
+    stack_size = (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr - sizeof(*stack) - xstate_size) & ~(ULONG_PTR)63);
+    stack = virtual_setup_exception( stack_ptr, stack_size, rec );
     stack->rec_ptr      = &stack->rec;
     stack->context_ptr  = &stack->context;
     stack->rec          = *rec;
@@ -1496,16 +1494,13 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr,
 
     if ((src_xs = xstate_from_context( context )))
     {
-        XSTATE *dst_xs = (XSTATE *)(((ULONG_PTR)stack->xstate + 63) & ~63);
+        XSAVE_AREA_HEADER *dst_xs = (XSAVE_AREA_HEADER *)(stack + 1);
 
+        assert( !((ULONG_PTR)dst_xs & 63) );
         context_init_xstate( &stack->context, dst_xs );
-        memset( dst_xs, 0, sizeof(XSAVE_AREA_HEADER) );
+        memset( dst_xs, 0, sizeof(*dst_xs) );
         dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
-        if (src_xs->Mask & 4)
-        {
-            dst_xs->Mask = 4;
-            memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) );
-        }
+        copy_xstate( dst_xs, src_xs, src_xs->Mask );
     }
     else
     {
@@ -1586,11 +1581,14 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
 {
     struct syscall_frame *frame = x86_thread_data()->syscall_frame;
     ULONG esp = (frame->esp - sizeof(struct exc_stack_layout)) & ~3;
-    struct exc_stack_layout *stack = (struct exc_stack_layout *)esp;
-    XSTATE *src_xs;
+    struct exc_stack_layout *stack;
+    XSAVE_AREA_HEADER *src_xs;
+    unsigned int xstate_size;
 
     if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--;
 
+    xstate_size = sizeof(XSAVE_AREA_HEADER) + xstate_features_size;
+    stack = (struct exc_stack_layout *)((esp - sizeof(*stack) - xstate_size) & ~(ULONG_PTR)63);
     stack->rec_ptr      = &stack->rec;
     stack->context_ptr  = &stack->context;
     stack->rec          = *rec;
@@ -1598,16 +1596,13 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
 
     if ((src_xs = xstate_from_context( context )))
     {
-        XSTATE *dst_xs = (XSTATE *)(((ULONG_PTR)stack->xstate + 63) & ~63);
+        XSAVE_AREA_HEADER *dst_xs = (XSAVE_AREA_HEADER *)(stack + 1);
 
         context_init_xstate( &stack->context, dst_xs );
-        memset( dst_xs, 0, offsetof(XSTATE, YmmContext) );
+        assert( !((ULONG_PTR)dst_xs & 63) );
+        memset( dst_xs, 0, sizeof(*dst_xs) );
         dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
-        if (src_xs->Mask & 4)
-        {
-            dst_xs->Mask = 4;
-            memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) );
-        }
+        copy_xstate( dst_xs, src_xs, src_xs->Mask );
     }
     else
     {
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index fb97bf4d598..8c77bcbd970 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -151,7 +151,7 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel,
 #define TRAP_sig(context)    ((context)->uc_mcontext.gregs[REG_TRAPNO])
 #define ERROR_sig(context)   ((context)->uc_mcontext.gregs[REG_ERR])
 #define FPU_sig(context)     ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs))
-#define XState_sig(fpu)      (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSTATE *)(fpu + 1) : NULL)
+#define XState_sig(fpu)      (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSAVE_AREA_HEADER *)(fpu + 1) : NULL)
 
 #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
 
@@ -370,11 +370,10 @@ struct exc_stack_layout
     ULONG64              align;          /* 588 */
     struct machine_frame machine_frame;  /* 590 */
     ULONG64              align2;         /* 5b8 */
-    XSTATE               xstate;         /* 5c0 */
 };
 C_ASSERT( offsetof(struct exc_stack_layout, rec) == 0x4f0 );
 C_ASSERT( offsetof(struct exc_stack_layout, machine_frame) == 0x590 );
-C_ASSERT( sizeof(struct exc_stack_layout) == 0x700 );
+C_ASSERT( sizeof(struct exc_stack_layout) == 0x5c0 );
 
 /* stack layout when calling KiUserApcDispatcher */
 struct apc_stack_layout
@@ -494,12 +493,12 @@ struct xcontext
     ULONG64 host_compaction_mask;
 };
 
-static inline XSTATE *xstate_from_context( const CONTEXT *context )
+static inline XSAVE_AREA_HEADER *xstate_from_context( const CONTEXT *context )
 {
     CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1);
 
     if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) return NULL;
-    return (XSTATE *)((char *)xctx + xctx->XState.Offset);
+    return (XSAVE_AREA_HEADER *)((char *)xctx + xctx->XState.Offset);
 }
 
 static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer )
@@ -512,7 +511,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer )
 
     if (xstate_buffer)
     {
-        xctx->XState.Length = sizeof(XSTATE);
+        xctx->XState.Length = sizeof(XSAVE_AREA_HEADER) + xstate_features_size;
         xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx;
         context->ContextFlags |= CONTEXT_XSTATE;
 
@@ -909,7 +908,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex
     context->Dr7    = amd64_thread_data()->dr7;
     if (FPU_sig(sigcontext))
     {
-        XSTATE *xs;
+        XSAVE_AREA_HEADER *xs;
 
         context->ContextFlags |= CONTEXT_FLOATING_POINT;
         context->FltSave = *FPU_sig(sigcontext);
@@ -934,7 +933,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex
 static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcontext )
 {
     const CONTEXT *context = &xcontext->c;
-    XSTATE *xs;
+    XSAVE_AREA_HEADER *xs;
 
     amd64_thread_data()->dr0 = context->Dr0;
     amd64_thread_data()->dr1 = context->Dr1;
@@ -1427,7 +1426,8 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec
     struct exc_stack_layout *stack;
     size_t stack_size;
     NTSTATUS status;
-    XSTATE *src_xs;
+    XSAVE_AREA_HEADER *src_xs;
+    unsigned int xstate_size;
 
     if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP)
     {
@@ -1456,7 +1456,8 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec
     /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */
     if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--;
 
-    stack_size = (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr - sizeof(*stack)) & ~(ULONG_PTR)63);
+    xstate_size = sizeof(XSAVE_AREA_HEADER) + xstate_features_size;
+    stack_size = (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr - sizeof(*stack) - xstate_size) & ~(ULONG_PTR)63);
     stack = virtual_setup_exception( stack_ptr, stack_size, rec );
     stack->rec               = *rec;
     stack->context           = *context;
@@ -1465,15 +1466,12 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec
 
     if ((src_xs = xstate_from_context( context )))
     {
-        assert( !((ULONG_PTR)&stack->xstate & 63) );
-        context_init_xstate( &stack->context, &stack->xstate );
-        memset( &stack->xstate, 0, offsetof(XSTATE, YmmContext) );
-        stack->xstate.CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
-        if (src_xs->Mask & 4)
-        {
-            stack->xstate.Mask = 4;
-            memcpy( &stack->xstate.YmmContext, &src_xs->YmmContext, sizeof(stack->xstate.YmmContext) );
-        }
+        XSAVE_AREA_HEADER *dst_xs = (XSAVE_AREA_HEADER *)(stack + 1);
+        assert( !((ULONG_PTR)dst_xs & 63) );
+        context_init_xstate( &stack->context, dst_xs );
+        memset( dst_xs, 0, sizeof(*dst_xs) );
+        dst_xs->CompactionMask = xstate_compaction_enabled ? 0x8000000000000000 | xstate_extended_features() : 0;
+        copy_xstate( dst_xs, src_xs, src_xs->Mask );
     }
     else
     {
@@ -1560,16 +1558,19 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context
     struct syscall_frame *frame = amd64_thread_data()->syscall_frame;
     struct exc_stack_layout *stack;
     NTSTATUS status = NtSetContextThread( GetCurrentThread(), context );
+    unsigned int xstate_size;
 
     if (status) return status;
-    stack = (struct exc_stack_layout *)((context->Rsp - sizeof(*stack)) & ~(ULONG_PTR)63);
+    xstate_size = sizeof(XSAVE_AREA_HEADER) + xstate_features_size;
+    stack = (struct exc_stack_layout *)((context->Rsp - sizeof(*stack) - xstate_size) & ~(ULONG_PTR)63);
     memmove( &stack->context, context, sizeof(*context) );
 
     if ((context->ContextFlags & CONTEXT_XSTATE) == CONTEXT_XSTATE)
     {
-        assert( !((ULONG_PTR)&stack->xstate & 63) );
-        context_init_xstate( &stack->context, &stack->xstate );
-        memcpy( &stack->xstate, &frame->xstate, sizeof(XSAVE_AREA_HEADER) + xstate_features_size );
+        XSAVE_AREA_HEADER *dst_xs = (XSAVE_AREA_HEADER *)(stack + 1);
+        assert( !((ULONG_PTR)dst_xs & 63) );
+        context_init_xstate( &stack->context, dst_xs );
+        memcpy( dst_xs, &frame->xstate, sizeof(XSAVE_AREA_HEADER) + xstate_features_size );
     }
     else context_init_xstate( &stack->context, NULL );
 

From ddebce5c37f7fe03be50f72c16d90f1843a3ff91 Mon Sep 17 00:00:00 2001
From: Brendan Shanks <bshanks@codeweavers.com>
Date: Tue, 20 Feb 2024 21:49:36 -0800
Subject: [PATCH 307/389] ntdll: On x86_64, don't access %gs in
 signal_start_thread().

%gs is not set until call_init_thunk().
Also, adjust other TEB accesses to be consistent with the surrounding
functions.

Fixes a crash on macOS introduced by 7ae488a2bb58501684c6475d4942277b852475fc
("ntdll: Don't hardcode xstate size in syscall frame.")

(cherry picked from commit e628eb2c6ff84ff347d78b0c7a601665a51dbcef)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   |  4 ++--
 dlls/ntdll/unix/signal_x86_64.c | 21 +++------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index b2bdb3a7e20..bb97279fc43 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1635,7 +1635,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback,
                    "movl 0x18(%ebp),%edx\n\t"  /* teb */
                    "pushl 0(%edx)\n\t"         /* teb->Tib.ExceptionList */
                    "subl $0x280,%esp\n\t"      /* sizeof(struct syscall_frame) */
-                   "subl %fs:0x204,%esp\n\t"   /* x86_thread_data()->xstate_features_size */
+                   "subl 0x204(%edx),%esp\n\t" /* x86_thread_data()->xstate_features_size */
                    "andl $~63,%esp\n\t"
                    "leal 8(%ebp),%eax\n\t"
                    "movl %eax,0x38(%esp)\n\t"  /* frame->syscall_cfa */
@@ -2596,7 +2596,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
                    "orl %eax,%eax\n\t"
                    "jnz 1f\n\t"
                    "leal -0x280(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */
-                   "subl %fs:0x204,%eax\n\t"    /* x86_thread_data()->xstate_features_size */
+                   "subl 0x204(%ecx),%eax\n\t"  /* x86_thread_data()->xstate_features_size */
                    "andl $~63,%eax\n\t"
                    "movl %eax,0x1f8(%ecx)\n"    /* x86_thread_data()->syscall_frame */
                    /* switch to kernel stack */
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 8c77bcbd970..06a3eb6d5c7 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1613,12 +1613,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback,
                    "movq %rsi,-0x38(%rbp)\n\t" /* ret_ptr */
                    "movq %rdx,-0x40(%rbp)\n\t" /* ret_len */
                    "subq $0x308,%rsp\n\t"      /* sizeof(struct syscall_frame) + exception */
-#ifdef __APPLE__
-                   "movq %gs:0x30,%rsi\n\t"
-                   "movl 0x33c(%rsi),%esi\n\t"
-#else
-                   "movl %gs:0x33c,%esi\n\t"   /* amd64_thread_data()->xstate_features_size */
-#endif
+                   "movl 0x33c(%r8),%esi\n\t"  /* amd64_thread_data()->xstate_features_size */
                    "subq %rsi,%rsp\n\t"
                    "andq $~63,%rsp\n\t"
                    "leaq 0x10(%rbp),%rax\n\t"
@@ -1658,12 +1653,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return,
                    __ASM_CFI(".cfi_rel_offset %r13,-0x18\n\t")
                    __ASM_CFI(".cfi_rel_offset %r14,-0x20\n\t")
                    __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t")
-#ifdef __APPLE__
-                   "movq %gs:0x30,%rax\n\t"
-                   "movl 0x33c(%rax),%eax\n\t"
-#else
-                   "movl %gs:0x33c,%eax\n\t"   /* amd64_thread_data()->xstate_features_size */
-#endif
+                   "movl 0x33c(%rcx),%eax\n\t" /* amd64_thread_data()->xstate_features_size */
                    "movq 0x300(%r10,%rax),%rax\n\t" /* exception list */
                    "movq %rax,0(%rcx)\n\t"     /* teb->Tib.ExceptionList */
                    "movq -0x38(%rbp),%r10\n\t"  /* ret_ptr */
@@ -2965,12 +2955,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
                    "orq %r8,%r8\n\t"
                    "jnz 1f\n\t"
                    "leaq -0x300(%rsp),%r8\n\t"     /* sizeof(struct syscall_frame) */
-#ifdef __APPLE__
-                   "movq %gs:0x30,%rax\n\t"
-                   "movl 0x33c(%rax),%eax\n\t"
-#else
-                   "movl %gs:0x33c,%eax\n\t"       /* amd64_thread_data()->xstate_features_size */
-#endif
+                   "movl 0x33c(%rcx),%eax\n\t"     /* amd64_thread_data()->xstate_features_size */
                    "subq %rax,%r8\n\t"
                    "andq $~63,%r8\n\t"
                    "movq %r8,0x328(%rcx)\n"        /* amd64_thread_data()->syscall_frame */

From 107d15ab18663cebfb7d4597a0e8e81181070cf1 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 1 Feb 2024 11:47:42 -0600
Subject: [PATCH 308/389] ntdll: Mind context compaction mask in
 context_from_server().

(cherry picked from commit ba1e2d5dda84f64bd784ae1797ad2825d8b8f096)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 17 ++---------------
 dlls/ntdll/unix/signal_x86_64.c |  5 -----
 dlls/ntdll/unix/thread.c        |  8 ++++----
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index bb97279fc43..42eb89af586 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -607,7 +607,6 @@ struct xcontext
 {
     CONTEXT c;
     CONTEXT_EX c_ex;
-    ULONG64 host_compaction_mask;
 };
 
 static inline XSAVE_AREA_HEADER *xstate_from_context( const CONTEXT *context )
@@ -831,11 +830,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si
         context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS;
         memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) );
         if (!fpu) fpux_to_fpu( &context->FloatSave, fpux );
-        if (xstate_extended_features() && (xs = XState_sig(fpux)))
-        {
-            context_init_xstate( context, xs );
-            xcontext->host_compaction_mask = xs->CompactionMask;
-        }
+        if (xstate_extended_features() && (xs = XState_sig(fpux))) context_init_xstate( context, xs );
     }
     if (!fpu && !fpux) save_fpu( context );
 }
@@ -876,15 +871,7 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t
     SS_sig(sigcontext)  = context->SegSs;
 
     if (fpu) *fpu = context->FloatSave;
-    if (fpux)
-    {
-        XSAVE_AREA_HEADER *xs;
-
-        memcpy( fpux, context->ExtendedRegisters, sizeof(*fpux) );
-
-        if (xstate_extended_features() && (xs = XState_sig(fpux)))
-            xs->CompactionMask = xcontext->host_compaction_mask;
-    }
+    if (fpux) memcpy( fpux, context->ExtendedRegisters, sizeof(*fpux) );
     if (!fpu && !fpux) restore_fpu( context );
 }
 
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 06a3eb6d5c7..2143d42b8c6 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -490,7 +490,6 @@ struct xcontext
 {
     CONTEXT c;
     CONTEXT_EX c_ex;
-    ULONG64 host_compaction_mask;
 };
 
 static inline XSAVE_AREA_HEADER *xstate_from_context( const CONTEXT *context )
@@ -919,7 +918,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex
              * just reference sigcontext without overflowing 32 bit XState.Offset */
             context_init_xstate( context, xs );
             assert( xcontext->c_ex.XState.Offset == (BYTE *)xs - (BYTE *)&xcontext->c_ex );
-            xcontext->host_compaction_mask = xs->CompactionMask;
         }
     }
 }
@@ -933,7 +931,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex
 static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcontext )
 {
     const CONTEXT *context = &xcontext->c;
-    XSAVE_AREA_HEADER *xs;
 
     amd64_thread_data()->dr0 = context->Dr0;
     amd64_thread_data()->dr1 = context->Dr1;
@@ -943,8 +940,6 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon
     amd64_thread_data()->dr7 = context->Dr7;
     set_sigcontext( context, sigcontext );
     if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->FltSave;
-    if (xstate_extended_features() && (xs = XState_sig(FPU_sig(sigcontext))))
-        xs->CompactionMask = xcontext->host_compaction_mask;
     leave_handler( sigcontext );
 }
 
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 73f252853fe..244305c9df6 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -688,7 +688,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
 
             xs->Mask &= ~4;
-            if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004;
+            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
             for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
             {
                 if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
@@ -762,7 +762,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
 
             xs->Mask &= ~4;
-            if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004;
+            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
             for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
             {
                 if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
@@ -837,7 +837,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
 
             xs->Mask &= ~4;
-            if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004;
+            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
             for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
             {
                 if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
@@ -919,7 +919,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
 
             xs->Mask &= ~4;
-            if (user_shared_data->XState.CompactionEnabled) xs->CompactionMask = 0x8000000000000004;
+            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
             for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
             {
                 if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;

From c892efab0835ade9e4c9a7c0c7aac5ea315f7b96 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 1 Feb 2024 12:17:14 -0600
Subject: [PATCH 309/389] ntdll: Don't copy xstate from / to syscall frame in
 usr1_handler().

(cherry picked from commit efd3d31082645fab83c6a4994705654edafa9163)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 44 ++++++++++++++++++++++++---------
 dlls/ntdll/unix/signal_x86_64.c | 34 +++++++++++++++++++------
 2 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 42eb89af586..35d9b1df2bb 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -2138,24 +2138,46 @@ static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext )
  */
 static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 {
-    struct xcontext xcontext;
+    ucontext_t *ucontext = sigcontext;
 
     init_handler( sigcontext );
-    if (is_inside_syscall( sigcontext ))
+
+    if (is_inside_syscall( ucontext ))
     {
-        DECLSPEC_ALIGN(64) XSTATE xs;
-        xcontext.c.ContextFlags = CONTEXT_FULL;
-        context_init_xstate( &xcontext.c, &xs );
+        struct syscall_frame *frame = x86_thread_data()->syscall_frame;
+        ULONG64 saved_compaction = 0;
+        struct xcontext *context;
 
-        NtGetContextThread( GetCurrentThread(), &xcontext.c );
-        wait_suspend( &xcontext.c );
-        NtSetContextThread( GetCurrentThread(), &xcontext.c );
+        context = (struct xcontext *)(((ULONG_PTR)ESP_sig(ucontext) - sizeof(*context)) & ~15);
+        if ((char *)context < (char *)ntdll_get_thread_data()->kernel_stack)
+        {
+            ERR_(seh)( "kernel stack overflow.\n" );
+            return;
+        }
+        context->c.ContextFlags = CONTEXT_FULL;
+        NtGetContextThread( GetCurrentThread(), &context->c );
+        if (xstate_extended_features())
+        {
+            context_init_xstate( &context->c, &frame->xstate );
+            saved_compaction = frame->xstate.CompactionMask;
+        }
+        wait_suspend( &context->c );
+        if (xstate_extended_features()) frame->xstate.CompactionMask = saved_compaction;
+        if (context->c.ContextFlags & 0x40)
+        {
+            /* xstate is updated directly in frame's xstate */
+            context->c.ContextFlags &= ~0x40;
+            frame->restore_flags |= 0x40;
+        }
+        NtSetContextThread( GetCurrentThread(), &context->c );
     }
     else
     {
-        save_context( &xcontext, sigcontext );
-        wait_suspend( &xcontext.c );
-        restore_context( &xcontext, sigcontext );
+        struct xcontext context;
+
+        save_context( &context, ucontext );
+        wait_suspend( &context.c );
+        restore_context( &context, ucontext );
     }
 }
 
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 2143d42b8c6..2b4483644a5 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2493,20 +2493,40 @@ static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 {
     ucontext_t *ucontext = init_handler( sigcontext );
-    struct xcontext context;
 
     if (is_inside_syscall( ucontext ))
     {
-        DECLSPEC_ALIGN(64) XSTATE xs;
-        context.c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS;
-        context_init_xstate( &context.c, &xs );
+        struct syscall_frame *frame = amd64_thread_data()->syscall_frame;
+        ULONG64 saved_compaction = 0;
+        struct xcontext *context;
 
-        NtGetContextThread( GetCurrentThread(), &context.c );
-        wait_suspend( &context.c );
-        NtSetContextThread( GetCurrentThread(), &context.c );
+        context = (struct xcontext *)(((ULONG_PTR)RSP_sig(ucontext) - sizeof(*context)) & ~15);
+        if ((char *)context < (char *)ntdll_get_thread_data()->kernel_stack)
+        {
+            ERR_(seh)( "kernel stack overflow.\n" );
+            return;
+        }
+        context->c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS;
+        NtGetContextThread( GetCurrentThread(), &context->c );
+        if (xstate_extended_features())
+        {
+            context_init_xstate( &context->c, &frame->xstate );
+            saved_compaction = frame->xstate.CompactionMask;
+        }
+        wait_suspend( &context->c );
+        if (xstate_extended_features()) frame->xstate.CompactionMask = saved_compaction;
+        if (context->c.ContextFlags & 0x40)
+        {
+            /* xstate is updated directly in frame's xstate */
+            context->c.ContextFlags &= ~0x40;
+            frame->restore_flags |= 0x40;
+        }
+        NtSetContextThread( GetCurrentThread(), &context->c );
     }
     else
     {
+        struct xcontext context;
+
         save_context( &context, ucontext );
         wait_suspend( &context.c );
         restore_context( &context, ucontext );

From bb92f28d605f6a07deb9f3c800990b443113d0b9 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 18 Jan 2024 11:51:36 -0600
Subject: [PATCH 310/389] ntdll: Support generic xstate config in context
 manipulation functions.

(cherry picked from commit beec1b57fbaf9034a05051ea2ceeba0ffdbf0857)

CW-Bug-Id: #23244
---
 dlls/ntdll/exception.c | 121 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 102 insertions(+), 19 deletions(-)

diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 7a230237f0c..d4b5f901e10 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -797,6 +797,52 @@ static const struct context_parameters *context_get_parameters( ULONG context_fl
     return NULL;
 }
 
+/* offset is from the start of XSAVE_AREA_HEADER. */
+static int next_compacted_xstate_offset( int off, UINT64 compaction_mask, int feature_idx )
+{
+    const UINT64 feature_mask = (UINT64)1 << feature_idx;
+
+    if (compaction_mask & feature_mask) off += user_shared_data->XState.Features[feature_idx].Size;
+    if (user_shared_data->XState.AlignedFeatures & (feature_mask << 1))
+        off = (off + 63) & ~63;
+    return off;
+}
+
+/* size includes XSAVE_AREA_HEADER but not XSAVE_FORMAT (legacy save area). */
+static int xstate_get_compacted_size( UINT64 mask )
+{
+    UINT64 compaction_mask;
+    unsigned int i;
+    int off;
+
+    compaction_mask = ((UINT64)1 << 63) | mask;
+    mask >>= 2;
+    off = sizeof(XSAVE_AREA_HEADER);
+    i = 2;
+    while (mask)
+    {
+        if (mask == 1) return off + user_shared_data->XState.Features[i].Size;
+        off = next_compacted_xstate_offset( off, compaction_mask, i );
+        mask >>= 1;
+        ++i;
+    }
+    return off;
+}
+
+static int xstate_get_size( UINT64 mask )
+{
+    unsigned int i;
+
+    mask >>= 2;
+    if (!mask) return sizeof(XSAVE_AREA_HEADER);
+    i = 2;
+    while (mask != 1)
+    {
+        mask >>= 1;
+        ++i;
+    }
+    return user_shared_data->XState.Features[i].Offset + user_shared_data->XState.Features[i].Size - sizeof(XSAVE_FORMAT);
+}
 
 /**********************************************************************
  *              RtlGetExtendedContextLength2    (NTDLL.@)
@@ -822,12 +868,12 @@ NTSTATUS WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length
     if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) ))
         return STATUS_NOT_SUPPORTED;
 
-    compaction_mask &= supported_mask;
-
-    size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63;
+    size = p->context_size + p->context_ex_size + 63;
 
-    if (compaction_mask & supported_mask & (1 << XSTATE_AVX))
-        size += sizeof(YMMCONTEXT);
+    compaction_mask &= supported_mask & ~(ULONG64)3;
+    if (user_shared_data->XState.CompactionEnabled) size += xstate_get_compacted_size( compaction_mask );
+    else if (compaction_mask)                       size += xstate_get_size( compaction_mask );
+    else                                            size += sizeof(XSAVE_AREA_HEADER);
 
     *length = size;
     return STATUS_SUCCESS;
@@ -878,11 +924,11 @@ NTSTATUS WINAPI RtlInitializeExtendedContext2( void *context, ULONG context_flag
         xs = (XSTATE *)(((ULONG_PTR)c_ex + p->context_ex_size + 63) & ~(ULONG_PTR)63);
 
         c_ex->XState.Offset = (ULONG_PTR)xs - (ULONG_PTR)c_ex;
-        c_ex->XState.Length = offsetof(XSTATE, YmmContext);
         compaction_mask &= supported_mask;
 
-        if (compaction_mask & (1 << XSTATE_AVX))
-            c_ex->XState.Length += sizeof(YMMCONTEXT);
+        if (user_shared_data->XState.CompactionEnabled) c_ex->XState.Length = xstate_get_compacted_size( compaction_mask );
+        else if (compaction_mask & ~(ULONG64)3)         c_ex->XState.Length = xstate_get_size( compaction_mask );
+        else                                            c_ex->XState.Length = sizeof(XSAVE_AREA_HEADER);
 
         memset( xs, 0, c_ex->XState.Length );
         if (user_shared_data->XState.CompactionEnabled)
@@ -916,6 +962,10 @@ NTSTATUS WINAPI RtlInitializeExtendedContext( void *context, ULONG context_flags
 void * WINAPI RtlLocateExtendedFeature2( CONTEXT_EX *context_ex, ULONG feature_id,
         XSTATE_CONFIGURATION *xstate_config, ULONG *length )
 {
+    UINT64 feature_mask = (ULONG64)1 << feature_id;
+    XSAVE_AREA_HEADER *xs;
+    unsigned int offset, i;
+
     TRACE( "context_ex %p, feature_id %lu, xstate_config %p, length %p.\n",
             context_ex, feature_id, xstate_config, length );
 
@@ -931,16 +981,31 @@ void * WINAPI RtlLocateExtendedFeature2( CONTEXT_EX *context_ex, ULONG feature_i
         return NULL;
     }
 
-    if (feature_id != XSTATE_AVX)
+    if (feature_id < 2 || feature_id >= 64)
         return NULL;
 
+    xs = (XSAVE_AREA_HEADER *)((BYTE *)context_ex + context_ex->XState.Offset);
+
     if (length)
-        *length = sizeof(YMMCONTEXT);
+        *length = xstate_config->Features[feature_id].Size;
+
+    if (xstate_config->CompactionEnabled)
+    {
+        if (!(xs->CompactionMask & feature_mask)) return NULL;
+        offset = sizeof(XSAVE_AREA_HEADER);
+        for (i = 2; i < feature_id; ++i)
+            offset = next_compacted_xstate_offset( offset, xs->CompactionMask, i );
+    }
+    else
+    {
+        if (!(feature_mask & xstate_config->EnabledFeatures)) return NULL;
+        offset = xstate_config->Features[feature_id].Offset - sizeof(XSAVE_FORMAT);
+    }
 
-    if (context_ex->XState.Length < sizeof(XSTATE))
+    if (context_ex->XState.Length < offset + xstate_config->Features[feature_id].Size)
         return NULL;
 
-    return (BYTE *)context_ex + context_ex->XState.Offset + offsetof(XSTATE, YmmContext);
+    return (BYTE *)xs + offset;
 }
 
 
@@ -1070,8 +1135,9 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src
 NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CONTEXT_EX *src )
 {
     const struct context_parameters *p;
-    XSTATE *dst_xs, *src_xs;
+    XSAVE_AREA_HEADER *dst_xs, *src_xs;
     ULONG64 feature_mask;
+    unsigned int i, off, size;
 
     TRACE( "dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src );
 
@@ -1086,18 +1152,35 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO
     if (!(context_flags & 0x40))
         return STATUS_SUCCESS;
 
-    if (dst->XState.Length < offsetof(XSTATE, YmmContext))
+    if (dst->XState.Length < sizeof(XSAVE_AREA_HEADER))
         return STATUS_BUFFER_OVERFLOW;
 
-    dst_xs = (XSTATE *)((BYTE *)dst + dst->XState.Offset);
-    src_xs = (XSTATE *)((BYTE *)src + src->XState.Offset);
+    dst_xs = (XSAVE_AREA_HEADER *)((BYTE *)dst + dst->XState.Offset);
+    src_xs = (XSAVE_AREA_HEADER *)((BYTE *)src + src->XState.Offset);
 
-    memset(dst_xs, 0, offsetof(XSTATE, YmmContext));
+    memset(dst_xs, 0, sizeof(XSAVE_AREA_HEADER));
     dst_xs->Mask = (src_xs->Mask & ~(ULONG64)3) & feature_mask;
     dst_xs->CompactionMask = user_shared_data->XState.CompactionEnabled
             ? ((ULONG64)1 << 63) | (src_xs->CompactionMask & feature_mask) : 0;
 
-    if (dst_xs->Mask & 4 && src->XState.Length >= sizeof(XSTATE) && dst->XState.Length >= sizeof(XSTATE))
-        memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) );
+
+    if (dst_xs->CompactionMask) feature_mask &= dst_xs->CompactionMask;
+    feature_mask = dst_xs->Mask >> 2;
+
+    i = 2;
+    off = sizeof(XSAVE_AREA_HEADER);
+    while (1)
+    {
+        if (feature_mask & 1)
+        {
+            if (!dst_xs->CompactionMask) off = user_shared_data->XState.Features[i].Offset - sizeof(XSAVE_FORMAT);
+            size = user_shared_data->XState.Features[i].Size;
+            if (src->XState.Length < off + size || dst->XState.Length < off + size) break;
+            memcpy( (BYTE *)dst_xs + off, (BYTE *)src_xs + off, size );
+        }
+        if (!(feature_mask >>= 1)) break;
+        if (dst_xs->CompactionMask) off = next_compacted_xstate_offset( off, dst_xs->CompactionMask, i);
+        ++i;
+    }
     return STATUS_SUCCESS;
 }

From d80d7511cc111e6eb8d11651257791844c3efd0e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 4 Mar 2024 19:54:54 -0600
Subject: [PATCH 311/389] ntdll: Respect red zone in usr1_handler() on x64.

Fixes a regression introduced by
efd3d31082645fab83c6a4994705654edafa9163.

(cherry picked from commit 6f55a13169797dd073575c052a6418e3cecbcfad)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_x86_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 2b4483644a5..3932e64678f 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2500,7 +2500,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
         ULONG64 saved_compaction = 0;
         struct xcontext *context;
 
-        context = (struct xcontext *)(((ULONG_PTR)RSP_sig(ucontext) - sizeof(*context)) & ~15);
+        context = (struct xcontext *)(((ULONG_PTR)RSP_sig(ucontext) - 128 /* red zone */ - sizeof(*context)) & ~15);
         if ((char *)context < (char *)ntdll_get_thread_data()->kernel_stack)
         {
             ERR_(seh)( "kernel stack overflow.\n" );

From ab0effdc579524a6ca67c34b4491f83d50b1f1b1 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 13:00:30 -0600
Subject: [PATCH 312/389] ntdll: Only save AVX xstate in
 wine_syscall_dispatcher.

(cherry picked from commit 7ae23ad7758418012c3d2d40a3acfed5af18afaa)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 6 +++++-
 dlls/ntdll/unix/signal_x86_64.c | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 35d9b1df2bb..d781bd8b12c 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1005,6 +1005,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
+        if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         copy_xstate( &frame->xstate, xs, xs->Mask );
     }
 
@@ -1131,6 +1132,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
                 context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
                 return STATUS_INVALID_PARAMETER;
 
+            if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
             mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
             xstate->Mask = frame->xstate.Mask & mask;
             xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
@@ -2158,6 +2160,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
         NtGetContextThread( GetCurrentThread(), &context->c );
         if (xstate_extended_features())
         {
+            if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
             context_init_xstate( &context->c, &frame->xstate );
             saved_compaction = frame->xstate.CompactionMask;
         }
@@ -2666,7 +2669,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                    "testl $3,(%ecx)\n\t"           /* frame->syscall_flags & (SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC) */
                    "jz 2f\n\t"
                    "movl %fs:0x1fc,%eax\n\t"       /* x86_thread_data()->xstate_features_mask */
-                   "movl %fs:0x200,%edx\n\t"       /* x86_thread_data()->xstate_features_mask high dword */
+                   "xorl %edx,%edx\n\t"
+                   "andl $7,%eax\n\t"
                    "xorl %edi,%edi\n\t"
                    "movl %edi,0x240(%ecx)\n\t"
                    "movl %edi,0x244(%ecx)\n\t"
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 3932e64678f..1f23d166263 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1063,6 +1063,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
+        if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         copy_xstate( &frame->xstate, xs, xs->Mask );
     }
 
@@ -1176,6 +1177,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
             return STATUS_INVALID_PARAMETER;
 
+        if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
@@ -1305,6 +1307,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size )
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
 
+        if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         copy_xstate( &frame->xstate, xs, xs->Mask );
         frame->restore_flags |= CONTEXT_XSTATE;
     }
@@ -1396,6 +1399,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
             context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
             return STATUS_INVALID_PARAMETER;
 
+        if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
         xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0;
@@ -2510,6 +2514,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
         NtGetContextThread( GetCurrentThread(), &context->c );
         if (xstate_extended_features())
         {
+            if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
             context_init_xstate( &context->c, &frame->xstate );
             saved_compaction = frame->xstate.CompactionMask;
         }
@@ -3029,11 +3034,11 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
 #ifdef __APPLE__
                    "movq %gs:0x30,%rdx\n\t"
                    "movl 0x340(%rdx),%eax\n\t"
-                   "movl 0x344(%rdx),%edx\n\t"
 #else
                    "movl %gs:0x340,%eax\n\t"       /* amd64_thread_data()->xstate_features_mask */
-                   "movl %gs:0x344,%edx\n\t"       /* amd64_thread_data()->xstate_features_mask high dword */
 #endif
+                   "xorl %edx,%edx\n\t"
+                   "andl $7,%eax\n\t"
                    "xorq %rbp,%rbp\n\t"
                    "movq %rbp,0x2c0(%rcx)\n\t"
                    "movq %rbp,0x2c8(%rcx)\n\t"

From d2c4325fc196fffdfaec4369d618dc7b015c6df6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 8 Feb 2024 14:09:12 -0600
Subject: [PATCH 313/389] ntdll: Preserve untouched parts of xstate in
 NtSetContextThread().

(cherry picked from commit a10da8a42a25c6b72d863767461b85e1f3f0ea12)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   | 2 ++
 dlls/ntdll/unix/signal_x86_64.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index d781bd8b12c..fe0e0ed771b 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1004,9 +1004,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
+        UINT64 mask = frame->xstate.Mask;
 
         if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         copy_xstate( &frame->xstate, xs, xs->Mask );
+        if (xs->CompactionMask) frame->xstate.Mask |= mask & ~xs->CompactionMask;
     }
 
     frame->restore_flags |= flags & ~CONTEXT_INTEGER;
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 1f23d166263..c7f2e627ed3 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1062,9 +1062,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
     {
         CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1);
         XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
+        UINT64 mask = frame->xstate.Mask;
 
         if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         copy_xstate( &frame->xstate, xs, xs->Mask );
+        if (xs->CompactionMask) frame->xstate.Mask |= mask & ~xs->CompactionMask;
     }
 
     frame->restore_flags |= flags & ~CONTEXT_INTEGER;

From 505deaf044461f21dccfba23fc6de90795182dda Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 17 Jan 2024 16:33:33 -0600
Subject: [PATCH 314/389] ntdll: Support generic xstate in Unix-side
 manipulation functions.

(cherry picked from commit 6bc2c092327bae6cbf73b75fd33581ee5140a285)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/signal_i386.c   |  2 ++
 dlls/ntdll/unix/signal_x86_64.c |  4 +++
 dlls/ntdll/unix/system.c        | 48 ++++++++++++++++++++++++++++++---
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index fe0e0ed771b..d36636fdcf1 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1144,6 +1144,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
                 if (context_ex->XState.Length < xstate_get_size( xstate->CompactionMask, xstate->Mask ))
                     return STATUS_BUFFER_OVERFLOW;
                 copy_xstate( xstate, &frame->xstate, xstate->Mask );
+                /* copy_xstate may use avx in memcpy, restore xstate not to break the tests. */
+                frame->restore_flags |= CONTEXT_XSTATE;
             }
         }
         if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386))
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index c7f2e627ed3..d821cf1293b 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1189,6 +1189,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             if (context_ex->XState.Length < xstate_get_size( xstate->CompactionMask, xstate->Mask ))
                 return STATUS_BUFFER_OVERFLOW;
             copy_xstate( xstate, &frame->xstate, xstate->Mask );
+            /* copy_xstate may use avx in memcpy, restore xstate not to break the tests. */
+            frame->restore_flags |= CONTEXT_XSTATE;
         }
     }
     if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64))
@@ -1411,6 +1413,8 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
             if (context_ex->XState.Length < xstate_get_size( xstate->CompactionMask, xstate->Mask ))
                 return STATUS_BUFFER_OVERFLOW;
             copy_xstate( xstate, &frame->xstate, xstate->Mask );
+            /* copy_xstate may use avx in memcpy, restore xstate not to break the tests. */
+            frame->restore_flags |= CONTEXT_XSTATE;
         }
     }
     return STATUS_SUCCESS;
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index eaf1f559d71..ea4f1958f6a 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -258,20 +258,60 @@ BOOL xstate_compaction_enabled = FALSE;
 UINT64 xstate_supported_features_mask;
 UINT64 xstate_features_size;
 
+static int xstate_feature_offset[64] = {0, 0, 576};
+static int xstate_feature_size[64] = {0, 0, 256};
+static UINT64 xstate_aligned_features;
+
+static int next_xstate_offset( int off, UINT64 compaction_mask, int feature_idx )
+{
+    const UINT64 feature_mask = (UINT64)1 << feature_idx;
+
+    if (!compaction_mask) return xstate_feature_offset[feature_idx + 1] - sizeof(XSAVE_FORMAT);
+
+    if (compaction_mask & feature_mask) off += xstate_feature_size[feature_idx];
+    if (xstate_aligned_features & (feature_mask << 1))
+        off = (off + 63) & ~63;
+    return off;
+}
+
 unsigned int xstate_get_size( UINT64 compaction_mask, UINT64 mask )
 {
-    if (!(mask & ((UINT64)1 << XSTATE_AVX))) return sizeof(XSAVE_AREA_HEADER);
-    return sizeof(XSAVE_AREA_HEADER) + sizeof(YMMCONTEXT);
+    unsigned int i;
+    int off;
+
+    mask >>= 2;
+    off = sizeof(XSAVE_AREA_HEADER);
+    i = 2;
+    while (mask)
+    {
+        if (mask == 1) return off + xstate_feature_size[i];
+        off = next_xstate_offset( off, compaction_mask, i );
+        mask >>= 1;
+        ++i;
+    }
+    return off;
 }
 
 void copy_xstate( XSAVE_AREA_HEADER *dst, XSAVE_AREA_HEADER *src, UINT64 mask )
 {
+    unsigned int i;
+    int src_off, dst_off;
+
     mask &= xstate_extended_features() & src->Mask;
     if (src->CompactionMask) mask &= src->CompactionMask;
     if (dst->CompactionMask) mask &= dst->CompactionMask;
     dst->Mask = (dst->Mask & ~xstate_extended_features()) | mask;
-    if (mask & ((UINT64)1 << XSTATE_AVX))
-        *(YMMCONTEXT *)(dst + 1) = *(YMMCONTEXT *)(src + 1);
+    mask >>= 2;
+    src_off = dst_off = sizeof(XSAVE_AREA_HEADER);
+    i = 2;
+    while (1)
+    {
+        if (mask & 1) memcpy( (char *)dst + dst_off, (char *)src + src_off, xstate_feature_size[i] );
+        if (!(mask >>= 1)) break;
+        src_off = next_xstate_offset( src_off, src->CompactionMask, i );
+        dst_off = next_xstate_offset( dst_off, dst->CompactionMask, i );
+        ++i;
+    }
 }
 
 #define AUTH	0x68747541	/* "Auth" */

From ee7854f3ece4cccd847945a6e0cdc53fbbccfd4e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 15:00:06 -0600
Subject: [PATCH 315/389] ntdll: Factor out xstate_from_server() function.

(cherry picked from commit 25e0a2580758282d679dafa557b2c1771410e970)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/thread.c | 82 +++++++++++++---------------------------
 1 file changed, 26 insertions(+), 56 deletions(-)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 244305c9df6..7ae18a38ce1 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -610,6 +610,28 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
 }
 
 
+/***********************************************************************
+ *           xstate_from_server
+ *
+ * Copy xstate from the server format.
+ */
+static void xstate_from_server( CONTEXT_EX *xctx, const context_t *from )
+{
+    XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
+    unsigned int i;
+
+    xs->Mask &= ~4;
+    if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
+    for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
+    {
+        if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
+        memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) );
+        xs->Mask |= 4;
+        break;
+    }
+}
+
+
 /***********************************************************************
  *           context_from_server
  *
@@ -683,20 +705,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             memcpy( to->ExtendedRegisters, from->ext.i386_regs, sizeof(to->ExtendedRegisters) );
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_I386_XSTATE))
-        {
-            CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1);
-            XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
-
-            xs->Mask &= ~4;
-            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
-            for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
-            {
-                if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
-                memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) );
-                xs->Mask |= 4;
-                break;
-            }
-        }
+            xstate_from_server( (CONTEXT_EX *)(to + 1), from );
         return STATUS_SUCCESS;
     }
 
@@ -757,20 +766,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             to->Dr7 = from->debug.x86_64_regs.dr7;
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_I386_XSTATE))
-        {
-            CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1);
-            XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
-
-            xs->Mask &= ~4;
-            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
-            for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
-            {
-                if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
-                memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) );
-                xs->Mask |= 4;
-                break;
-            }
-        }
+            xstate_from_server( (CONTEXT_EX *)(to + 1), from );
         return STATUS_SUCCESS;
     }
 
@@ -832,20 +828,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             to->Dr7 = from->debug.x86_64_regs.dr7;
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_AMD64_XSTATE))
-        {
-            CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1);
-            XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
-
-            xs->Mask &= ~4;
-            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
-            for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
-            {
-                if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
-                memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) );
-                xs->Mask |= 4;
-                break;
-            }
-        }
+            xstate_from_server( (CONTEXT_EX *)(to + 1), from );
         return STATUS_SUCCESS;
     }
 
@@ -914,20 +897,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             to->Dr7 = from->debug.i386_regs.dr7;
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_AMD64_XSTATE))
-        {
-            CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1);
-            XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
-
-            xs->Mask &= ~4;
-            if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
-            for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
-            {
-                if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;
-                memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) );
-                xs->Mask |= 4;
-                break;
-            }
-        }
+            xstate_from_server( (CONTEXT_EX *)(to + 1), from );
         return STATUS_SUCCESS;
     }
 

From 172e161dea502cfea96846017a8dffb6b464f442 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 15:29:50 -0600
Subject: [PATCH 316/389] ntdll: Factor out context_to_server() function.

(cherry picked from commit a9d77d098928f6521bef7c1b1739429b8fe11ebd)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/thread.c | 46 ++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 7ae18a38ce1..d821fe848c7 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -224,6 +224,20 @@ static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_
 }
 
 
+/***********************************************************************
+ *           xstate_to_server
+ *
+ * Copy xstate to the server format.
+ */
+static void xstate_to_server( context_t *to, const CONTEXT_EX *xctx )
+{
+    const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset);
+
+    to->flags |= SERVER_CTX_YMM_REGISTERS;
+    if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) );
+}
+
+
 /***********************************************************************
  *           context_to_server
  *
@@ -300,13 +314,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
             memcpy( to->ext.i386_regs, from->ExtendedRegisters, sizeof(to->ext.i386_regs) );
         }
         if (flags & CONTEXT_I386_XSTATE)
-        {
-            const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1);
-            const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset);
-
-            to->flags |= SERVER_CTX_YMM_REGISTERS;
-            if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) );
-        }
+            xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
         return STATUS_SUCCESS;
     }
 
@@ -364,13 +372,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
             fpu_to_fpux( (XMM_SAVE_AREA32 *)to->fp.x86_64_regs.fpregs, &from->FloatSave );
         }
         if (flags & CONTEXT_I386_XSTATE)
-        {
-            const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1);
-            const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset);
-
-            to->flags |= SERVER_CTX_YMM_REGISTERS;
-            if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) );
-        }
+            xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
         return STATUS_SUCCESS;
     }
 
@@ -431,13 +433,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
             to->debug.x86_64_regs.dr7 = from->Dr7;
         }
         if (flags & CONTEXT_AMD64_XSTATE)
-        {
-            const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1);
-            const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset);
-
-            to->flags |= SERVER_CTX_YMM_REGISTERS;
-            if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) );
-        }
+            xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
         return STATUS_SUCCESS;
     }
 
@@ -502,13 +498,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
             to->debug.i386_regs.dr7 = from->Dr7;
         }
         if (flags & CONTEXT_AMD64_XSTATE)
-        {
-            const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1);
-            const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset);
-
-            to->flags |= SERVER_CTX_YMM_REGISTERS;
-            if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) );
-        }
+            xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
         return STATUS_SUCCESS;
     }
 

From 6f25b751a19312e383caa04b79b8978425bf8090 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 15:14:50 -0600
Subject: [PATCH 317/389] ntdll: Mind generic xstate masks in server context
 conversion.

(cherry picked from commit 3dea242677be1ca7f18ca95b6d9d0aacc5c3f1b9)

CW-Bug-Id: #23244
---
 dlls/ntdll/unix/thread.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index d821fe848c7..25bc747df70 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -233,6 +233,7 @@ static void xstate_to_server( context_t *to, const CONTEXT_EX *xctx )
 {
     const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset);
 
+    if (xs->CompactionMask && !(xs->CompactionMask & 4)) return;
     to->flags |= SERVER_CTX_YMM_REGISTERS;
     if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) );
 }
@@ -610,8 +611,14 @@ static void xstate_from_server( CONTEXT_EX *xctx, const context_t *from )
     XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
     unsigned int i;
 
-    xs->Mask &= ~4;
-    if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004;
+    xs->Mask &= ~(ULONG64)4;
+
+    if (xs->CompactionMask)
+    {
+        xs->CompactionMask &= ~(UINT64)3;
+        if (!(xs->CompactionMask & 4)) return;
+    }
+
     for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++)
     {
         if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;

From 09031e48d5b6d04b5e4f51b3cc3542186a7d8d6c Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 18 Jan 2024 12:59:26 -0600
Subject: [PATCH 318/389] ntdll: Support more xstate features.

(cherry picked from commit 29c73ee17335b30f3f49c8b3562742c6a35b482c)

CW-Bug-Id: #23244
---
 dlls/ntdll/tests/exception.c |  2 +-
 dlls/ntdll/unix/system.c     | 40 +++++++++++++++++++++----
 programs/wineboot/wineboot.c | 58 ++++++++++++++++++++++++++----------
 3 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 76190aef75a..50f407c4a52 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -10600,7 +10600,7 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI
     }
     else
     {
-        ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
+        ok((xs->Mask & 7) == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
         /* The save area has garbage if xsaveopt is available, so we can't test
          * its contents. */
 
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index ea4f1958f6a..2a3f107e26b 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -258,8 +258,8 @@ BOOL xstate_compaction_enabled = FALSE;
 UINT64 xstate_supported_features_mask;
 UINT64 xstate_features_size;
 
-static int xstate_feature_offset[64] = {0, 0, 576};
-static int xstate_feature_size[64] = {0, 0, 256};
+static int xstate_feature_offset[64];
+static int xstate_feature_size[64];
 static UINT64 xstate_aligned_features;
 
 static int next_xstate_offset( int off, UINT64 compaction_mask, int feature_idx )
@@ -353,6 +353,21 @@ __ASM_GLOBAL_FUNC( do_cpuid,
                    "ret" )
 #endif
 
+extern UINT64 do_xgetbv( unsigned int cx);
+#ifdef __i386__
+__ASM_GLOBAL_FUNC( do_xgetbv,
+                   "movl 4(%esp),%ecx\n\t"
+                   "xgetbv\n\t"
+                   "ret" )
+#else
+__ASM_GLOBAL_FUNC( do_xgetbv,
+                   "movl %edi,%ecx\n\t"
+                   "xgetbv\n\t"
+                   "shlq $32,%rdx\n\t"
+                   "orq %rdx,%rax\n\t"
+                   "ret" )
+#endif
+
 #ifdef __i386__
 extern int have_cpuid(void);
 __ASM_GLOBAL_FUNC( have_cpuid,
@@ -411,8 +426,11 @@ static void get_cpuid_name( char *buffer )
 
 static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info )
 {
+    static const ULONG64 wine_xstate_supported_features = 0xff; /* XSTATE_AVX, XSTATE_MPX_BNDREGS, XSTATE_MPX_BNDCSR,
+                                                                 * XSTATE_AVX512_KMASK, XSTATE_AVX512_ZMM_H, XSTATE_AVX512_ZMM */
     unsigned int regs[4], regs2[4], regs3[4];
     ULONGLONG features;
+    unsigned int i;
 
 #if defined(__i386__)
     info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL;
@@ -462,13 +480,25 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info )
         {
             do_cpuid( 0x0000000d, 1, regs3 ); /* get XSAVE details */
             if (regs3[0] & 2) xstate_compaction_enabled = TRUE;
-            xstate_supported_features_mask = 3;
-            if (features & CPU_FEATURE_AVX)
-                xstate_supported_features_mask |= (UINT64)1 << XSTATE_AVX;
+
+            do_cpuid( 0x0000000d, 0, regs3 ); /* get user xstate features */
+            xstate_supported_features_mask = ((ULONG64)regs3[3] << 32) | regs3[0];
+            xstate_supported_features_mask &= do_xgetbv( 0 ) & wine_xstate_supported_features;
+            TRACE("xstate_supported_features_mask %#llx.\n", (long long)xstate_supported_features_mask);
+            for (i = 2; i < 64; ++i)
+            {
+                if (!(xstate_supported_features_mask & ((ULONG64)1 << i))) continue;
+                do_cpuid( 0x0000000d, i, regs3 ); /* get user xstate features */
+                xstate_feature_offset[i] = regs3[1];
+                xstate_feature_size[i] = regs3[0];
+                if (regs3[2] & 2) xstate_aligned_features |= (ULONG64)1 << i;
+                TRACE("xstate[%d] offset %d, size %d, aligned %d.\n", i, xstate_feature_offset[i], xstate_feature_size[i], !!(regs3[2] & 2));
+            }
             xstate_features_size = xstate_get_size( xstate_compaction_enabled ? 0x8000000000000000
                                    | xstate_supported_features_mask : 0, xstate_supported_features_mask )
                                    - sizeof(XSAVE_AREA_HEADER);
             xstate_features_size = (xstate_features_size + 15) & ~15;
+            TRACE("xstate_features_size %lld.\n", (long long)xstate_features_size);
         }
 
         if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 0ea276f6876..ff6bd6cc38c 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -195,10 +195,27 @@ static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value )
 
 #if defined(__i386__) || defined(__x86_64__)
 
+extern UINT64 WINAPI do_xgetbv( unsigned int cx);
+#ifdef __i386__
+__ASM_STDCALL_FUNC( do_xgetbv, 4,
+                   "movl 4(%esp),%ecx\n\t"
+                   "xgetbv\n\t"
+                   "ret $4" )
+#else
+__ASM_GLOBAL_FUNC( do_xgetbv,
+                   "xgetbv\n\t"
+                   "shlq $32,%rdx\n\t"
+                   "orq %rdx,%rax\n\t"
+                   "ret" )
+#endif
+
 static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data)
 {
+    static const ULONG64 wine_xstate_supported_features = 0xfc; /* XSTATE_AVX, XSTATE_MPX_BNDREGS, XSTATE_MPX_BNDCSR,
+                                                                 * XSTATE_AVX512_KMASK, XSTATE_AVX512_ZMM_H, XSTATE_AVX512_ZMM */
     XSTATE_CONFIGURATION *xstate = &data->XState;
-    unsigned int i;
+    ULONG64 supported_mask;
+    unsigned int i, off;
     int regs[4];
 
     if (!data->ProcessorFeatures[PF_AVX_INSTRUCTIONS_AVAILABLE])
@@ -217,29 +234,40 @@ static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data)
 
     __cpuidex(regs, 0xd, 0);
     TRACE("XSAVE details %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]);
-    if (!(regs[0] & XSTATE_AVX))
+    supported_mask = ((ULONG64)regs[3] << 32) | regs[0];
+    supported_mask &= do_xgetbv(0) & wine_xstate_supported_features;
+    if (!(supported_mask >> 2))
         return;
 
-    xstate->EnabledFeatures = (1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX);
+    xstate->EnabledFeatures = (1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | supported_mask;
     xstate->EnabledVolatileFeatures = xstate->EnabledFeatures;
-    xstate->Size = sizeof(XSAVE_FORMAT) + sizeof(XSTATE);
     xstate->AllFeatureSize = regs[1];
-    xstate->AllFeatures[0] = offsetof(XSAVE_FORMAT, XmmRegisters);
-    xstate->AllFeatures[1] = sizeof(M128A) * 16;
-    xstate->AllFeatures[2] = sizeof(YMMCONTEXT);
-
-    for (i = 0; i < 3; ++i)
-        xstate->Features[i].Size = xstate->AllFeatures[i];
-
-    xstate->Features[1].Offset = xstate->Features[0].Size;
-    xstate->Features[2].Offset = sizeof(XSAVE_FORMAT) + offsetof(XSTATE, YmmContext);
 
     __cpuidex(regs, 0xd, 1);
     xstate->OptimizedSave = regs[0] & 1;
     xstate->CompactionEnabled = !!(regs[0] & 2);
 
-    __cpuidex(regs, 0xd, 2);
-    TRACE("XSAVE feature 2 %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]);
+    xstate->Features[0].Size = xstate->AllFeatures[0] = offsetof(XSAVE_FORMAT, XmmRegisters);
+    xstate->Features[1].Size = xstate->AllFeatures[1] = sizeof(M128A) * 16;
+    xstate->Features[1].Offset = xstate->Features[0].Size;
+    off = sizeof(XSAVE_FORMAT) + sizeof(XSAVE_AREA_HEADER);
+    supported_mask >>= 2;
+    for (i = 2; supported_mask; ++i, supported_mask >>= 1)
+    {
+        if (!(supported_mask & 1)) continue;
+        __cpuidex( regs, 0xd, i );
+        xstate->Features[i].Offset = regs[1];
+        xstate->Features[i].Size = xstate->AllFeatures[i] = regs[0];
+        if (regs[2] & 2)
+        {
+            xstate->AlignedFeatures |= (ULONG64)1 << i;
+            off = (off + 63) & ~63;
+        }
+        off += xstate->Features[i].Size;
+        TRACE("xstate[%d] offset %lu, size %lu, aligned %d.\n", i, xstate->Features[i].Offset, xstate->Features[i].Size, !!(regs[2] & 2));
+    }
+    xstate->Size = xstate->CompactionEnabled ? off : xstate->Features[i - 1].Offset + xstate->Features[i - 1].Size;
+    TRACE("xstate size %lu, compacted %d, optimized %d.\n", xstate->Size, xstate->CompactionEnabled, xstate->OptimizedSave);
 }
 
 static BOOL is_tsc_trusted_by_the_kernel(void)

From 7e4b498161dbdca51cfc15db0e76d1d0e9bc7737 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 18 Mar 2024 13:29:11 -0600
Subject: [PATCH 319/389] ntdll/tests: Add more tests for xstate.

(cherry picked from commit bb47eb9f723053c512136362a167ddb1cc565d71)

CW-Bug-Id: #23244
---
 dlls/ntdll/tests/exception.c | 100 +++++++++++++++++++++++++++++++----
 1 file changed, 90 insertions(+), 10 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 50f407c4a52..ad806ded587 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -10546,11 +10546,12 @@ static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35,
 
 static BOOL test_extended_context_modified_state;
 static BOOL xsaveopt_enabled, compaction_enabled;
+static ULONG64 xstate_supported_features;
 
 static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
         CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher)
 {
-    static const ULONG64 expected_compaction_mask = 0x8000000000000004;
+    const ULONG64 expected_compaction_mask = (0x8000000000000000 | xstate_supported_features) & ~(ULONG64)3;
     CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1);
     unsigned int *context_ymm_data;
     DWORD expected_min_offset;
@@ -10588,7 +10589,7 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI
 
     if (compaction_enabled)
         ok((xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask,
-                "Got compaction mask %#I64x.\n", xs->CompactionMask);
+                "Got compaction mask %#I64x, expected %#I64x.\n", xs->CompactionMask, expected_compaction_mask);
     else
         ok(!xs->CompactionMask, "Got compaction mask %#I64x.\n", xs->CompactionMask);
 
@@ -10883,7 +10884,8 @@ static void test_extended_context(void)
     };
     const struct context_parameters *context_arch;
 
-    const ULONG64 supported_features = 7, supported_compaction_mask = supported_features | ((ULONG64)1 << 63);
+    const ULONG64 supported_features = 0xff;
+    const ULONG64 supported_compaction_mask = supported_features | ((ULONG64)1 << 63);
     ULONG expected_length, expected_length_xstate, context_flags, expected_offset, max_xstate_length;
     ULONG64 enabled_features, expected_compaction;
     DECLSPEC_ALIGN(64) BYTE context_buffer2[4096];
@@ -10921,6 +10923,7 @@ static void test_extended_context(void)
         xsaveopt_enabled = regs[0] & 1;
         compaction_enabled = regs[0] & 2;
     }
+    xstate_supported_features = enabled_features & supported_features;
 
     /* Test context manipulation functions. */
     length = 0xdeadbeef;
@@ -11391,7 +11394,7 @@ static void test_extended_context(void)
 
         xs->Mask = 0xdeadbeef;
         xs->CompactionMask = 0xdeadbeef;
-        bret = pSetXStateFeaturesMask(context, 7);
+        bret = pSetXStateFeaturesMask(context, xstate_supported_features);
         ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x.\n", bret);
         context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
         ok(context_flags == (bret ? flags_fpx : flags),
@@ -11405,8 +11408,8 @@ static void test_extended_context(void)
         mask = 0xdeadbeef;
         bret = pGetXStateFeaturesMask(context, &mask);
         if (flags & CONTEXT_NATIVE)
-            ok(bret && mask == (enabled_features & supported_features),
-                    "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
+            ok(bret && mask == xstate_supported_features,
+                    "Got unexpected bret %#x, mask %s, flags %#lx (enabled_features & supported_features %#I64x).\n", bret, wine_dbgstr_longlong(mask), flags, xstate_supported_features);
         else
             ok(!bret && mask == 0xdeadbeef,
                     "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
@@ -11631,6 +11634,14 @@ static void test_extended_context(void)
             &context, &length);
     memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext));
     ok(bret, "Got unexpected bret %#x.\n", bret);
+
+    /* clear potentially leftover xstate */
+    pSetXStateFeaturesMask(context, 0);
+    context->ContextFlags = CONTEXT_XSTATE;
+    SetThreadContext(GetCurrentThread(), context);
+
+    context->ContextFlags = CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT;
+
     pSetXStateFeaturesMask(context, ~(ULONG64)0);
     *(void **)(call_func_code_reset_ymm_state + call_func_offsets.func_addr) = GetThreadContext;
     *(void **)(call_func_code_reset_ymm_state + call_func_offsets.func_param1) = (void *)GetCurrentThread();
@@ -11648,12 +11659,12 @@ static void test_extended_context(void)
     ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
             context->ContextFlags);
 
-    expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0;
+    expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | (xstate_supported_features & ~(UINT64)3) : 0;
 
     xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset);
     ok((xs->Mask & supported_features) == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
     ok((xs->CompactionMask & (supported_features | ((ULONG64)1 << 63))) == expected_compaction,
-            "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask));
+            "Got unexpected CompactionMask %s (expected %#I64x).\n", wine_dbgstr_longlong(xs->CompactionMask), expected_compaction);
 
     for (i = 4; i < 8; ++i)
         ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i);
@@ -11663,6 +11674,36 @@ static void test_extended_context(void)
                 || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]),
                 "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
 
+    /* Test setting context which has only part of xstate in CompactionMask. */
+    if (compaction_enabled && enabled_features & ((ULONG64)1 << XSTATE_AVX512_KMASK))
+    {
+        *(void **)(call_func_code_set_ymm0 + call_func_offsets.func_addr) = SetThreadContext;
+        *(void **)(call_func_code_set_ymm0 + call_func_offsets.func_param1) = (void *)GetCurrentThread();
+        *(void **)(call_func_code_set_ymm0 + call_func_offsets.func_param2) = context;
+        *(void **)(call_func_code_set_ymm0 + call_func_offsets.ymm0_save) = data;
+        memcpy(code_mem, call_func_code_set_ymm0, sizeof(call_func_code_set_ymm0));
+        context->ContextFlags = CONTEXT_XSTATE;
+        xs->CompactionMask = 0x8000000000000000 | ((ULONG64)1 << XSTATE_AVX512_KMASK);
+        xs->Mask = 0;
+        memcpy(data, test_extended_context_data, sizeof(data));
+        bret = func();
+        ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
+        /* Setting a context with only part of xstate in CompactionMask doesn't change missing parts. */
+        for (i = 4; i < 8; ++i)
+            ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i);
+
+        memcpy(data, test_extended_context_data, sizeof(data));
+        xs->CompactionMask |= XSTATE_MASK_GSSE;
+        bret = func();
+        ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
+        for (i = 4; i < 8; ++i)
+            ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i);
+    }
+    else
+    {
+        skip("avx512 is not available, skipping test.\n");
+    }
+
     /* Test fault exception context. */
     memset(data, 0xff, sizeof(data));
     xs->Mask = 0;
@@ -11699,9 +11740,10 @@ static void test_extended_context(void)
     bret = GetThreadContext(thread, context);
     ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
     todo_wine_if (!xsaveopt_enabled)
-        ok((xs->Mask & supported_features) == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
+    ok((xs->Mask & supported_features) == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
     ok((xs->CompactionMask & supported_compaction_mask) == expected_compaction,
-            "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask));
+            "Got unexpected CompactionMask %I64x, expected %I64x.\n", xs->CompactionMask,
+            expected_compaction);
 
     for (i = 0; i < 16 * 4; ++i)
         ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc),
@@ -11782,6 +11824,44 @@ static void test_extended_context(void)
                     "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
     }
 
+    if (compaction_enabled && enabled_features & ((ULONG64)1 << XSTATE_AVX512_KMASK))
+    {
+        ULONG64 saved_mask;
+        ULONG *d;
+
+        saved_mask = xs->CompactionMask;
+        xs->Mask = XSTATE_MASK_GSSE;
+        xs->CompactionMask = 0x8000000000000000 | xs->Mask;
+        *(ULONG *)&xs->YmmContext = 0x11111111;
+        bret = SetThreadContext(thread, context);
+        ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
+
+        xs->Mask = (ULONG64)1 << XSTATE_AVX512_KMASK;
+        xs->CompactionMask = 0x8000000000000000 | xs->Mask;
+        *(ULONG *)&xs->YmmContext = 0x22222222;
+        bret = SetThreadContext(thread, context);
+        ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
+
+        xs->CompactionMask = saved_mask;
+        bret = GetThreadContext(thread, context);
+        ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
+
+        todo_wine_if(xs->Mask == XSTATE_MASK_GSSE)
+        ok((xs->Mask & (XSTATE_MASK_GSSE | ((ULONG64)1 << XSTATE_AVX512_KMASK)))
+                == (XSTATE_MASK_GSSE | ((ULONG64)1 << XSTATE_AVX512_KMASK)), "got Mask %#I64x.\n", xs->Mask);
+        d = pLocateXStateFeature(context, XSTATE_AVX, NULL);
+        ok(!!d, "Got NULL.\n");
+        ok(*d == 0x11111111, "got %#lx.\n", *d);
+
+        d = pLocateXStateFeature(context, XSTATE_AVX512_KMASK, NULL);
+        ok(!!d, "Got NULL.\n");
+        todo_wine ok(*d == 0x22222222, "got %#lx.\n", *d);
+    }
+    else
+    {
+        skip("avx512 is not available, skipping test.\n");
+    }
+
     bret = ResumeThread(thread);
     ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
 

From 0e9e2656590cfe95930a434035227958eaef52ac Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 16 Jun 2022 13:41:44 -0500
Subject: [PATCH 320/389] ntdll: Factor out validate_context_xstate() function.

CW-Bug-Id: #20821
---
 dlls/ntdll/unix/signal_i386.c   |  4 +---
 dlls/ntdll/unix/signal_x86_64.c |  4 +---
 dlls/ntdll/unix/thread.c        | 17 +++++++++++++++++
 dlls/ntdll/unix/unix_private.h  |  1 +
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index d36636fdcf1..c5e7c3ffa98 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1130,9 +1130,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
             UINT64 mask;
 
-            if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
-                context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
-                return STATUS_INVALID_PARAMETER;
+            if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
 
             if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
             mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index d821cf1293b..d292c97f517 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1175,9 +1175,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
         UINT64 mask;
 
-        if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
-            context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
-            return STATUS_INVALID_PARAMETER;
+        if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
 
         if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 25bc747df70..3e71286d6bf 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -158,6 +158,23 @@ void fpu_to_fpux( XMM_SAVE_AREA32 *fpux, const I386_FLOATING_SAVE_AREA *fpu )
 }
 
 
+/***********************************************************************
+ *           validate_context_xstate
+ */
+BOOL validate_context_xstate( CONTEXT *context )
+{
+    CONTEXT_EX *context_ex;
+
+    context_ex = (CONTEXT_EX *)(context + 1);
+
+    if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||
+        context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
+        return FALSE;
+
+    return TRUE;
+}
+
+
 /***********************************************************************
  *           get_server_context_flags
  */
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 77a3de4c5d0..967422d9288 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -247,6 +247,7 @@ extern void DECLSPEC_NORETURN abort_process( int status );
 extern void DECLSPEC_NORETURN exit_process( int status );
 extern void wait_suspend( CONTEXT *context );
 extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance );
+extern BOOL validate_context_xstate( CONTEXT *context );
 extern NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USHORT machine );
 extern NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT machine );
 extern unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,

From b2712bd4c10a3ab2b7426b1a62695ceb9675f87a Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 16 Jun 2022 13:50:10 -0500
Subject: [PATCH 321/389] ntdll: Validate context xstate at once in
 NtGetContextThread().

CW-Bug-Id: #20821
---
 dlls/ntdll/unix/signal_i386.c   | 4 ++--
 dlls/ntdll/unix/signal_x86_64.c | 4 ++--
 dlls/ntdll/unix/thread.c        | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index c5e7c3ffa98..b87fc077602 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1031,6 +1031,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
     BOOL use_cached_debug_regs = FALSE;
     NTSTATUS ret;
 
+    if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
+
     if (self && needed_flags & CONTEXT_DEBUG_REGISTERS)
     {
         /* debug registers require a server call if hw breakpoints are enabled */
@@ -1130,8 +1132,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
             UINT64 mask;
 
-            if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
-
             if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
             mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
             xstate->Mask = frame->xstate.Mask & mask;
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index d292c97f517..453be6ca1b3 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1085,6 +1085,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
     BOOL use_cached_debug_regs = FALSE;
     BOOL self = (handle == GetCurrentThread());
 
+    if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
+
     if (self && needed_flags & CONTEXT_DEBUG_REGISTERS)
     {
         /* debug registers require a server call if hw breakpoints are enabled */
@@ -1175,8 +1177,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         XSAVE_AREA_HEADER *xstate = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset);
         UINT64 mask;
 
-        if (!validate_context_xstate( context )) return STATUS_INVALID_PARAMETER;
-
         if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features();
         mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & xstate_extended_features();
         xstate->Mask = frame->xstate.Mask & mask;
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 3e71286d6bf..0f5fbbb9adc 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -165,6 +165,8 @@ BOOL validate_context_xstate( CONTEXT *context )
 {
     CONTEXT_EX *context_ex;
 
+    if (!((context->ContextFlags & 0x40) && xstate_extended_features())) return TRUE;
+
     context_ex = (CONTEXT_EX *)(context + 1);
 
     if (context_ex->XState.Length < sizeof(XSAVE_AREA_HEADER) ||

From d1edf798432cf613f60a4d7702a676cb7bac94cd Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 16 Jun 2022 13:25:39 -0500
Subject: [PATCH 322/389] ntdll: Validate xstate alignment in
 validate_context_xstate().

CW-Bug-Id: #20821
---
 dlls/ntdll/tests/exception.c | 14 ++++++++++++++
 dlls/ntdll/unix/thread.c     |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index ad806ded587..3a15c1ac7ab 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -10897,6 +10897,7 @@ static void test_extended_context(void)
     CONTEXT_EX *context_ex;
     CONTEXT *context;
     unsigned data[8];
+    NTSTATUS status;
     HANDLE thread;
     ULONG64 mask;
     XSTATE *xs;
@@ -11729,6 +11730,19 @@ static void test_extended_context(void)
     thread = CreateThread(NULL, 0, test_extended_context_thread, 0, CREATE_SUSPENDED, NULL);
     ok(!!thread, "Failed to create thread.\n");
 
+    /* Unaligned xstate. */
+    length = sizeof(context_buffer);
+    memset(context_buffer, 0xcc, sizeof(context_buffer));
+    bret = pInitializeContext(context_buffer, CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT,
+            &context, &length);
+    ok(bret, "Got unexpected bret %#x.\n", bret);
+    context_ex = (CONTEXT_EX *)(context + 1);
+    context_ex->XState.Offset += 0x10;
+    status = pNtGetContextThread(thread, context);
+    ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#lx.\n", status);
+    status = pNtGetContextThread(GetCurrentThread(), context);
+    ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#lx.\n", status);
+
     bret = pInitializeContext(context_buffer, CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT,
             &context, &length);
     ok(bret, "Got unexpected bret %#x.\n", bret);
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 0f5fbbb9adc..812302bf346 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -173,6 +173,8 @@ BOOL validate_context_xstate( CONTEXT *context )
         context_ex->XState.Length > sizeof(XSAVE_AREA_HEADER) + xstate_features_size)
         return FALSE;
 
+    if (((ULONG_PTR)context_ex + context_ex->XState.Offset) & 63) return FALSE;
+
     return TRUE;
 }
 

From 85541b13fc1e768e5b3ce8d7cea35f9e933062f8 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 27 Mar 2024 17:16:46 -0600
Subject: [PATCH 323/389] opengl32: HACK: Fixup shaders for Joe Danger 2: The
 Movie.

CW-Bug-Id: #23619
---
 dlls/opengl32/wgl.c | 70 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 7d77296f199..f7dc81daea9 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1297,21 +1297,60 @@ static char *fixup_shader( GLsizei count, const GLchar *const*string, const GLin
     static int needs_fixup = -1;
     static unsigned int once;
 
-    const char add_ext[] = "#version 120\r\n"
-                         "#extension GL_ARB_explicit_uniform_location : enable\r\n"
-                         "#extension GL_ARB_explicit_attrib_location : enable\r\n";
-    const char search_str[] = "uniform mat4 boneMatrices[NBONES];";
-    const char prepend_str[] = "layout(location = 2) ";
-    unsigned int search_len, new_len;
+    static const struct
+    {
+        const char *gameid;
+        const char *add_ext;
+        const char *search_str;
+        const char *prepend_str;
+    }
+    replace[] =
+    {
+        {
+            "333420",
+
+            /* add_ext */
+            "#version 120\r\n"
+            "#extension GL_ARB_explicit_uniform_location : enable\r\n"
+            "#extension GL_ARB_explicit_attrib_location : enable\r\n",
+            /* search_str */
+            "uniform mat4 boneMatrices[NBONES];",
+            /* replace_str */
+            "layout(location = 2) ",
+        },
+        {
+            "242110",
+            /* add_ext */
+            "#version 120\r\n",
+        },
+    };
+    static const char *add_ext;
+    static const char *search_str;
+    static const char *prepend_str;
+    static unsigned int add_ext_len, search_len, prepend_len;
+    unsigned int new_len;
     const char *p, *next;
     BOOL found = FALSE;
     char *new, *out;
 
     if (needs_fixup == -1)
     {
-      const char *sgi = getenv("SteamGameId");
+        const char *sgi = getenv("SteamGameId");
+        unsigned int i;
 
-      needs_fixup = sgi && !strcmp( sgi, "333420" );
+        for (i = 0; i < ARRAY_SIZE(replace); ++i)
+            if (!strcmp( sgi, replace[i].gameid )) break;
+
+        needs_fixup = i < ARRAY_SIZE(replace);
+        if (needs_fixup)
+        {
+            add_ext = replace[i].add_ext;
+            add_ext_len = add_ext ? strlen(add_ext) : 0;
+            search_str = replace[i].search_str;
+            search_len = search_str ? strlen(search_str) : 0;
+            prepend_str = replace[i].prepend_str;
+            prepend_len = prepend_str ? strlen(prepend_str) : 0;
+        }
     }
 
     if (!needs_fixup) return NULL;
@@ -1322,12 +1361,13 @@ static char *fixup_shader( GLsizei count, const GLchar *const*string, const GLin
       FIXME( "HACK: Fixing up shader.\n" );
 
     TRACE( "Appending extension string.\n" );
-    new_len = strlen( *string ) + sizeof(prepend_str) - 1 + sizeof(add_ext);
+    new_len = strlen( *string ) + prepend_len + add_ext_len + 1;
     new = out = malloc( new_len );
-    memcpy( out, add_ext, sizeof(add_ext) - 1 );
-    out += sizeof(add_ext) - 1;
+    memcpy( out, add_ext, add_ext_len );
+    out += add_ext_len;
+
+    if (!search_str) goto skip_search;
 
-    search_len = sizeof(search_str) - 1;
     next = *string;
     while (*(p = next))
     {
@@ -1338,8 +1378,8 @@ static char *fixup_shader( GLsizei count, const GLchar *const*string, const GLin
           TRACE( "Adding explicit location.\n" );
           memcpy( out, *string, p - *string );
           out += p - *string;
-          memcpy( out, prepend_str, sizeof(prepend_str) - 1 );
-          out += sizeof(prepend_str) - 1;
+          memcpy( out, prepend_str, prepend_len );
+          out += prepend_len;
           strcpy( out, p );
           found = TRUE;
           break;
@@ -1347,6 +1387,8 @@ static char *fixup_shader( GLsizei count, const GLchar *const*string, const GLin
 
       while (*next == '\n' || *next == '\r') ++next;
     }
+
+skip_search:
     if (!found)
       strcpy( out, *string );
 

From a2b0f81add60786eb3dad417de1f98ec6e4395cb Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 28 Mar 2024 09:58:25 -0600
Subject: [PATCH 324/389] opengl32: HACK: Fixup shaders for Joe Danger.

CW-Bug-Id: #23619
---
 dlls/opengl32/wgl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index f7dc81daea9..251e177ad9c 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1323,6 +1323,11 @@ static char *fixup_shader( GLsizei count, const GLchar *const*string, const GLin
             /* add_ext */
             "#version 120\r\n",
         },
+        {
+            "229890",
+            /* add_ext */
+            "#version 120\r\n",
+        },
     };
     static const char *add_ext;
     static const char *search_str;

From 557bda3ae56c8a849e3b48ec30681f5c47a70ee6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 28 Mar 2024 11:18:03 -0600
Subject: [PATCH 325/389] winegstreamer: HACK: Disable MF_SA_D3D11_AWARE for
 The Finals.

CW-Bug-Id: #23621
---
 dlls/winegstreamer/video_decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index 3e42d04d75a..44e5c4821f2 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -830,7 +830,7 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U
 
     {
         const char *sgi;
-        if ((sgi = getenv("SteamGameId")) && ((!strcmp(sgi, "2009100")) || (!strcmp(sgi, "2555360"))))
+        if ((sgi = getenv("SteamGameId")) && ((!strcmp(sgi, "2073850")) || (!strcmp(sgi, "2009100")) || (!strcmp(sgi, "2555360"))))
             IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, FALSE);
     }
 

From 227315680433b4122a994069c08d993ed0c4281d Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 28 Mar 2024 12:40:37 -0600
Subject: [PATCH 326/389] avifil32: Update lCurrentFrame in
 IGetFrame_fnGetFrame().

CW-Bug-Id: #23631
---
 dlls/avifil32/getframe.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c
index c6df7339256..0b58c3f064f 100644
--- a/dlls/avifil32/getframe.c
+++ b/dlls/avifil32/getframe.c
@@ -254,6 +254,8 @@ static LPVOID  WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
     } /* for (lNext < lPos) */
   } /* if (This->lCurrentFrame != lPos) */
 
+  This->lCurrentFrame = lPos;
+
   return (This->hic == NULL ? This->lpInFormat : This->lpOutFormat);
 }
 

From 9c3f4f0958ec374a5480535b56683b2581bde418 Mon Sep 17 00:00:00 2001
From: Ziqing Hui <zhui@codeweavers.com>
Date: Wed, 15 Nov 2023 11:43:21 +0800
Subject: [PATCH 327/389] winegstreamer: Integrate media-converter to
 winegstreamer.

CW-Bug-Id: #23225
---
 dlls/winegstreamer/Makefile.in                |    8 +-
 .../winegstreamer/media-converter/audioconv.c | 1102 +++++++++++++++++
 .../media-converter/audioconvbin.c            |  148 +++
 .../winegstreamer/media-converter/fossilize.c |  722 +++++++++++
 dlls/winegstreamer/media-converter/lib.c      |  329 +++++
 .../media-converter/media-converter.h         |  287 +++++
 dlls/winegstreamer/media-converter/murmur3.c  |  371 ++++++
 .../winegstreamer/media-converter/videoconv.c |  938 ++++++++++++++
 dlls/winegstreamer/unixlib.c                  |    9 +
 9 files changed, 3913 insertions(+), 1 deletion(-)
 create mode 100644 dlls/winegstreamer/media-converter/audioconv.c
 create mode 100644 dlls/winegstreamer/media-converter/audioconvbin.c
 create mode 100644 dlls/winegstreamer/media-converter/fossilize.c
 create mode 100644 dlls/winegstreamer/media-converter/lib.c
 create mode 100644 dlls/winegstreamer/media-converter/media-converter.h
 create mode 100644 dlls/winegstreamer/media-converter/murmur3.c
 create mode 100644 dlls/winegstreamer/media-converter/videoconv.c

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 9cae96c5ebc..ac38a1b8964 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -32,4 +32,10 @@ SOURCES = \
 	winegstreamer_classes.idl \
 	wm_reader.c \
 	wma_decoder.c \
-	wmv_decoder.c
+	wmv_decoder.c \
+	media-converter/audioconv.c \
+	media-converter/audioconvbin.c \
+	media-converter/fossilize.c \
+	media-converter/lib.c \
+	media-converter/murmur3.c \
+	media-converter/videoconv.c
diff --git a/dlls/winegstreamer/media-converter/audioconv.c b/dlls/winegstreamer/media-converter/audioconv.c
new file mode 100644
index 00000000000..71612cbfddd
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/audioconv.c
@@ -0,0 +1,1102 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* Algorithm
+ * ---------
+ *
+ * The application feeds encoded audio into XAudio2 in chunks. Since we don't have access to all
+ * chunks in a stream on initialization (as we do with the video converter), we continuously hash
+ * the stream as it is sent to us. Each "chunk" is identified as the hash of the entire stream up
+ * to that chunk.
+ *
+ * Since chunks are small (~2 kilobytes), this leads to a significant possibility of two different
+ * streams having identical intro chunks (imagine two streams that start with several seconds of
+ * silence). This means we need a tree of chunks. Suppose two incoming streams with chunks that
+ * hash as shown (i.e. identical intro chunks that diverge later):
+ *
+ * Stream 1: [AA BB CC DD]
+ *
+ * Stream 2: [AA BB YY ZZ]
+ *
+ * We record a tree and the transcoder will walk it depth-first in order to reconstruct each unique
+ * stream:
+ *
+ * AA => aa.ptna
+ * AA+BB => bb.ptna
+ * AA+BB+CC => cc.ptna
+ * AA+BB+CC+DD => dd.ptna
+ * AA+BB+YY => yy.ptna
+ * AA+BB+YY+ZZ => zz.ptna
+ *
+ * Upon playback, we chain each transcoded stream chunk together as the packets come in:
+ *
+ * AA -> start stream with aa.ptna
+ * BB -> play bb.ptna
+ * CC -> play cc.ptna
+ * DD -> play dd.ptna
+ *
+ * or:
+ *
+ * AA -> start stream with aa.ptna
+ * BB -> play bb.ptna
+ * YY -> play yy.ptna
+ * ZZ -> play zz.ptna
+ *
+ * or:
+ *
+ * AA -> start stream with aa.ptna
+ * NN -> not recognized, instead play blank.ptna and mark this stream as needs-transcoding
+ * OO -> play blank.ptna
+ * PP -> play blank.ptna
+ * When the Stream is destroyed, we'll record AA+NN+OO+PP into the needs-transcode database
+ * for the transcoder to convert later.
+ *
+ *
+ * Physical Format
+ * ---------------
+ *
+ * All stored values are little-endian.
+ *
+ * Transcoded audio is stored in the "transcoded" Fossilize database under the
+ * AUDIO_CONV_FOZ_TAG_PTNADATA tag. Each chunk is stored in one entry with as many of the following
+ * "Proton Audio" (ptna) packets as are required to store the entire transcoded chunk:
+ *
+ *     uint32_t packet_header: Information about the upcoming packet, see bitmask:
+ *        MSB [FFFF PPPP PPPP PPPP PPPP LLLL LLLL LLLL] LSB
+ *        L: Number of _bytes_ in this packet following this header.
+ *        P: Number of _samples_ at the end of this packet which are padding and should be skipped.
+ *        F: Flag bits:
+ *           0x1: This packet is an Opus header
+ *           0x2, 0x4, 0x8: Reserved for future use.
+ *
+ *     If the Opus header flag is set:
+ *        Following packet is an Opus identification header, as defined in RFC 7845 "Ogg
+ *        Encapsulation for the Opus Audio Codec" Section 5.1.
+ *        <https://tools.ietf.org/html/rfc7845#section-5.1>
+ *
+ *     If the header flag is not set:
+ *        Following packet is raw Opus data to be sent to an Opus decoder.
+ *
+ *
+ * If we encounter a stream which needs transcoding, we record the buffers and metadata in
+ * a Fossilize database. The database has three tag types:
+ *
+ * AUDIO_CONV_FOZ_TAG_STREAM: This identifies each unique stream of buffers. For example:
+ *   [hash(AA+BB+CC+DD)] -> [AA, BB, CC, DD]
+ *   [hash(AA+BB+XX+YY)] -> [AA, BB, XX, YY]
+ *
+ * AUDIO_CONV_FOZ_TAG_AUDIODATA: This contans the actual encoded audio data. For example:
+ *   [AA] -> [AA's buffer data]
+ *   [BB] -> [BB's buffer data]
+ *
+ * AUDIO_CONV_FOZ_TAG_CODECINFO: This contans the codec data required to decode the buffer. Only
+ * the "head" of each stream is recorded. For example:
+ *   [AA] -> [
+ *     uint32_t wmaversion                 (from WAVEFORMATEX.wFormatTag)
+ *     uint32_t bitrate                    (from WAVEFORMATEX.nAvgBytesPerSec)
+ *     uint32_t channels                   (WAVEFORMATEX.nChannels)
+ *     uint32_t rate                       (WAVEFORMATEX.nSamplesPerSec)
+ *     uint32_t block_align                (WAVEFORMATEX.nBlockAlign)
+ *     uint32_t depth                      (WAVEFORMATEX.wBitsPerSample)
+ *     char[remainder of entry] codec_data (codec data which follows WAVEFORMATEX)
+ *   ]
+ *
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+#include <gst/audio/audio.h>
+#include <errno.h>
+#include <string.h>
+#include <assert.h>
+
+GST_DEBUG_CATEGORY_EXTERN(media_converter_debug);
+#undef GST_CAT_DEFAULT
+#define GST_CAT_DEFAULT media_converter_debug
+
+#define AUDIO_CONV_ENCODED_LENGTH_MASK  0x00000fff /* 4kB fits in here. */
+#define AUDIO_CONV_PADDING_LENGTH_MASK  0x0ffff000 /* 120ms of samples at 48kHz fits in here. */
+#define AUDIO_CONV_PADDING_LENGTH_SHIFT 12
+#define AUDIO_CONV_FLAG_MASK            0xf0000000
+#define AUDIO_CONV_FLAG_HEADER          0x10000000 /* This chunk is the Opus header. */
+#define _AUDIO_CONV_FLAG_RESERVED1      0x20000000 /* Not yet used */
+#define _AUDIO_CONV_FLAG_RESERVED2      0x40000000 /* Not yet used */
+#define _AUDIO_CONV_FLAG_V2             0x80000000 /* Indicates a "version 2" header, process somehow differently (TBD). */
+
+/* Properties of the "blank" audio file. */
+#define _BLANK_AUDIO_FILE_LENGTH_MS 10.0
+#define _BLANK_AUDIO_FILE_RATE      48000.0
+
+#define AUDIO_CONV_FOZ_TAG_STREAM    0
+#define AUDIO_CONV_FOZ_TAG_CODECINFO 1
+#define AUDIO_CONV_FOZ_TAG_AUDIODATA 2
+#define AUDIO_CONV_FOZ_TAG_PTNADATA  3
+#define AUDIO_CONV_FOZ_NUM_TAGS      4
+
+typedef enum
+{
+    NO_LOOP,
+    LOOPING,
+    LOOP_ENDED,
+    LOOP_ERROR,
+} loop_state;
+
+struct buffer_entry
+{
+    struct payload_hash hash;
+    GstBuffer *buffer;
+};
+
+/* Followed by codec_data_size bytes codec data. */
+struct need_transcode_head
+{
+    size_t codec_data_size;
+    uint32_t wmaversion;
+    uint32_t bitrate;
+    uint32_t channels;
+    uint32_t rate;
+    uint32_t block_align;
+    uint32_t depth;
+} __attribute__((packed));
+
+/* Represents a Stream, a sequence of buffers. */
+struct stream_state
+{
+    struct murmur3_128_state hash_state;
+    struct payload_hash current_hash;
+    GList *buffers;      /* Entry type: struct buffer_entry. */
+    GList *loop_buffers; /* Entry type: struct buffer_entry. */
+    struct need_transcode_head *codec_info;
+    bool needs_dump;
+};
+
+struct stream_state_serializer
+{
+    struct stream_state *state;
+    int index;
+};
+
+struct audio_conv_state
+{
+    bool sent_header;
+    struct need_transcode_head *codec_data;
+    struct murmur3_128_state hash_state;
+    struct murmur3_128_state loop_hash_state;
+    struct stream_state *stream_state;
+    struct fozdb *read_fozdb;
+};
+
+typedef struct
+{
+    GstElement element;
+    GstPad *sink_pad, *src_pad;
+    pthread_mutex_t state_mutex;
+    struct audio_conv_state *state;
+} AudioConv;
+
+typedef struct
+{
+    GstElementClass class;
+} AudioConvClass;
+
+G_DEFINE_TYPE(AudioConv, audio_conv, GST_TYPE_ELEMENT);
+#define AUDIO_CONV_TYPE (audio_conv_get_type())
+#define AUDIO_CONV(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AUDIO_CONV_TYPE, AudioConv))
+#define parent_class    (audio_conv_parent_class)
+GST_ELEMENT_REGISTER_DEFINE(protonaudioconverter, "protonaudioconverter",
+        GST_RANK_MARGINAL, AUDIO_CONV_TYPE);
+
+static GstStaticPadTemplate audio_conv_sink_template = GST_STATIC_PAD_TEMPLATE("sink",
+        GST_PAD_SINK, GST_PAD_ALWAYS,
+        GST_STATIC_CAPS("audio/x-wma;"));
+
+static GstStaticPadTemplate audio_conv_src_template = GST_STATIC_PAD_TEMPLATE("src",
+        GST_PAD_SRC, GST_PAD_ALWAYS,
+        GST_STATIC_CAPS("audio/x-opus;"));
+
+static struct dump_fozdb dump_fozdb = {PTHREAD_MUTEX_INITIALIZER, NULL, false};
+
+static struct buffer_entry *buffer_entry_create(struct payload_hash *hash, GstBuffer *buffer)
+{
+    struct buffer_entry *entry = calloc(1, sizeof(*entry));
+    entry->hash = *hash;
+    entry->buffer = gst_buffer_ref(buffer);
+    return entry;
+}
+
+static void buffer_entry_release(void *arg)
+{
+    struct buffer_entry *entry = arg;
+    gst_buffer_unref(entry->buffer);
+    free(entry);
+}
+
+static bool dumping_disabled(void)
+{
+    return option_enabled("MEDIACONV_AUDIO_DONT_DUMP");
+}
+
+static bool hash_data(const uint8_t *data, size_t size, struct murmur3_128_state *hash_state, struct payload_hash *hash)
+{
+    struct bytes_reader reader;
+    bytes_reader_init(&reader, data, size);
+    return murmur3_128_full(&reader, bytes_reader_read, hash_state, hash);
+}
+
+static int dump_fozdb_open_audio(bool create)
+{
+    return dump_fozdb_open(&dump_fozdb, create, "MEDIACONV_AUDIO_DUMP_FILE", AUDIO_CONV_FOZ_NUM_TAGS);
+}
+
+static void dump_fozdb_discard_transcoded(void)
+{
+    GList *chunks_to_discard = NULL, *chunks_to_keep = NULL, *chunks = NULL, *list_iter;
+    struct payload_hash chunk_id, *stream_id;
+    struct fozdb *read_fozdb;
+    char *read_fozdb_path;
+    GHashTableIter iter;
+    int ret;
+
+    if (dump_fozdb.already_cleaned)
+        return;
+    dump_fozdb.already_cleaned = true;
+
+    if (discarding_disabled())
+        return;
+    if (!file_exists(getenv("MEDIACONV_AUDIO_DUMP_FILE")))
+        return;
+
+    if ((dump_fozdb_open_audio(false)) < 0)
+        return;
+
+    if (!(read_fozdb_path = getenv("MEDIACONV_AUDIO_TRANSCODED_FILE")))
+    {
+        GST_ERROR("Env MEDIACONV_AUDIO_TRANSCODED_FILE not set.");
+        return;
+    }
+
+    if ((ret = fozdb_create(read_fozdb_path, O_RDONLY, true /* Read-only?  */, AUDIO_CONV_FOZ_NUM_TAGS, &read_fozdb)) < 0)
+    {
+        GST_ERROR("Failed to create read fozdb, ret %d.", ret);
+        return;
+    }
+
+    fozdb_iter_tag(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_STREAM, &iter);
+    while (g_hash_table_iter_next(&iter, (void *)&stream_id, NULL))
+    {
+        uint32_t chunks_size, i;
+        size_t read_size;
+
+        if (fozdb_entry_size(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_STREAM, stream_id, &chunks_size) == CONV_OK)
+        {
+            uint8_t *buffer = calloc(1, chunks_size);
+            if (fozdb_read_entry_data(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_STREAM, stream_id,
+                    0, buffer, chunks_size, &read_size, true) == CONV_OK)
+            {
+                GList *stream_chunks = NULL;
+                bool has_all = true;
+
+                for (i = 0; i < read_size / sizeof(chunk_id); ++i)
+                {
+                    payload_hash_from_bytes(&chunk_id, buffer + i * sizeof(chunk_id));
+                    if (!fozdb_has_entry(read_fozdb, AUDIO_CONV_FOZ_TAG_PTNADATA, &chunk_id))
+                    {
+                        has_all = false;
+                        break;
+                    }
+                    stream_chunks = g_list_append(stream_chunks,
+                            entry_name_create(AUDIO_CONV_FOZ_TAG_AUDIODATA, &chunk_id));
+                }
+
+                for (list_iter = stream_chunks; list_iter; list_iter = list_iter->next)
+                {
+                    struct entry_name *entry = list_iter->data;
+                    if (has_all)
+                    {
+                        chunks_to_discard = g_list_append(chunks_to_discard,
+                                entry_name_create(entry->tag, &entry->hash));
+                        chunks_to_discard = g_list_append(chunks_to_discard,
+                                entry_name_create(AUDIO_CONV_FOZ_TAG_CODECINFO, &entry->hash));
+                    }
+                    else
+                    {
+                        chunks_to_keep = g_list_append(chunks_to_keep,
+                                entry_name_create(entry->tag, &entry->hash));
+                        chunks_to_keep = g_list_append(chunks_to_keep,
+                                entry_name_create(AUDIO_CONV_FOZ_TAG_CODECINFO, &entry->hash));
+                    }
+                }
+
+                if (has_all)
+                    chunks_to_discard = g_list_append(chunks_to_discard,
+                            entry_name_create(AUDIO_CONV_FOZ_TAG_STREAM, stream_id));
+
+                g_list_free_full(stream_chunks, free);
+            }
+            free(buffer);
+        }
+    }
+
+    for (list_iter = chunks_to_discard; list_iter; list_iter = list_iter->next)
+    {
+        struct entry_name *entry = list_iter->data;
+        if (!g_list_find_custom(chunks_to_keep, entry, entry_name_compare))
+            chunks = g_list_append(chunks, entry_name_create(entry->tag, &entry->hash));
+    }
+
+    if ((ret = fozdb_discard_entries(dump_fozdb.fozdb, chunks)) < 0)
+    {
+        GST_ERROR("Failed to discard entries, ret %d.", ret);
+        dump_fozdb_close(&dump_fozdb);
+    }
+
+    g_list_free_full(chunks, free);
+    g_list_free_full(chunks_to_keep, free);
+    g_list_free_full(chunks_to_discard, free);
+}
+
+static bool need_transcode_head_create_from_caps(GstCaps *caps, struct need_transcode_head **out)
+{
+    int wmaversion, bitrate, channels, rate, block_align, depth;
+    const GstStructure *structure = gst_caps_get_structure(caps, 0);
+    struct need_transcode_head *head;
+    const GValue *codec_data_value;
+    GstBuffer *codec_data_buffer;
+    gsize codec_data_size;
+
+    GST_DEBUG("caps %"GST_PTR_FORMAT", out %p.", caps, out);
+
+    if (!gst_structure_get_int(structure, "wmaversion", &wmaversion))
+    {
+        GST_ERROR("Caps have no wmaversion field.");
+        return false;
+    }
+    if (!gst_structure_get_int(structure, "bitrate", &bitrate))
+    {
+        GST_ERROR("Caps have no bitrate field.");
+        return false;
+    }
+    if (!gst_structure_get_int(structure, "channels", &channels))
+    {
+        GST_ERROR("Caps have no channels field.");
+        return false;
+    }
+    if (!gst_structure_get_int(structure, "rate", &rate))
+    {
+        GST_ERROR("Caps have no rate field.");
+        return false;
+    }
+    if (!gst_structure_get_int(structure, "block_align", &block_align))
+    {
+        GST_ERROR("Caps have no block_align field.");
+        return false;
+    }
+    if (!gst_structure_get_int(structure, "depth", &depth))
+    {
+        GST_ERROR("Caps have no depth field.");
+        return false;
+    }
+    if (!(codec_data_value = gst_structure_get_value(structure, "codec_data"))
+             || !(codec_data_buffer = gst_value_get_buffer(codec_data_value)))
+    {
+        GST_ERROR("Caps have no codec_data field.");
+        return false;
+    }
+
+    codec_data_size = gst_buffer_get_size(codec_data_buffer);
+    head = calloc(1, sizeof(*head) + codec_data_size);
+    head->codec_data_size = codec_data_size;
+    head->wmaversion = wmaversion;
+    head->bitrate = bitrate;
+    head->channels = channels;
+    head->rate = rate;
+    head->block_align = block_align;
+    head->depth = depth;
+    gst_buffer_extract(codec_data_buffer, 0, head + 1, codec_data_size);
+
+    *out = head;
+    return true;
+}
+
+static struct need_transcode_head *need_transcode_head_dup(struct need_transcode_head *head)
+{
+    size_t size = sizeof(*head) + head->codec_data_size;
+    struct need_transcode_head *dup;
+
+    dup = calloc(1, size);
+    memcpy(dup, head, size);
+
+    return dup;
+}
+
+
+static void need_transcode_head_serialize(struct need_transcode_head *head,
+        uint8_t *buffer, size_t buffer_size, size_t *out_size)
+{
+    *out_size = sizeof(*head) - sizeof(head->codec_data_size) + head->codec_data_size;
+
+    if (buffer_size < *out_size)
+    {
+        GST_ERROR("Buffer too small: buffer size %zu, out size %zu.", buffer_size, *out_size);
+        return;
+    }
+    memcpy(buffer, &head->wmaversion, *out_size);
+}
+
+static void stream_state_serializer_init(struct stream_state_serializer *serializer, struct stream_state *state)
+{
+    serializer->state = state;
+    serializer->index = 0;
+}
+
+static int stream_state_serializer_read(void *data_reader, uint8_t *buffer, size_t size, size_t *read_size)
+{
+    struct stream_state_serializer *serializer = data_reader;
+    struct buffer_entry *entry;
+
+    if (!size)
+    {
+        *read_size = 0;
+        return CONV_OK;
+    }
+
+    if (serializer->index >= g_list_length(serializer->state->buffers))
+        return CONV_ERROR_DATA_END;
+
+    entry = g_list_nth_data(serializer->state->buffers, serializer->index++);
+    memcpy(buffer, &entry->hash, sizeof(entry->hash));
+
+    *read_size = sizeof(entry->hash);
+    return CONV_OK;
+}
+
+static struct stream_state *stream_state_create(void)
+{
+    struct stream_state *state;
+    state = calloc(1, sizeof(*state));
+    murmur3_128_state_init(&state->hash_state, HASH_SEED);
+    return state;
+}
+
+static void stream_state_release(struct stream_state *state)
+{
+    g_list_free_full(state->buffers, buffer_entry_release);
+    g_list_free_full(state->loop_buffers, buffer_entry_release);
+    if (state->codec_info)
+        free(state->codec_info);
+    free(state);
+}
+
+static void stream_state_reset(struct stream_state *state)
+{
+    murmur3_128_state_reset(&state->hash_state);
+    memset(&state->current_hash, 0, sizeof(state->current_hash));
+    g_list_free_full(g_steal_pointer(&state->buffers), buffer_entry_release);
+    g_list_free_full(g_steal_pointer(&state->loop_buffers), buffer_entry_release);
+    free(state->codec_info);
+    state->codec_info = NULL;
+    state->needs_dump = false;
+}
+
+static loop_state stream_state_record_buffer(struct stream_state *state, struct payload_hash *buffer_hash,
+        struct payload_hash *loop_hash, GstBuffer *buffer, struct need_transcode_head *codec_info)
+{
+    if (!state->codec_info && codec_info)
+        state->codec_info = need_transcode_head_dup(codec_info);
+
+    if (g_list_length(state->loop_buffers) < g_list_length(state->buffers))
+    {
+        struct buffer_entry *entry = g_list_nth_data(state->buffers, g_list_length(state->loop_buffers));
+        if (!memcmp(&entry->hash, loop_hash, sizeof(*loop_hash)))
+        {
+            state->loop_buffers = g_list_append(state->loop_buffers,
+                    buffer_entry_create(buffer_hash /* Not loop_hash! */, buffer));
+            if (g_list_length(state->loop_buffers) == g_list_length(state->buffers))
+            {
+                /* Full loop, just drop them. */
+                g_list_free_full(g_steal_pointer(&state->loop_buffers), buffer_entry_release);
+                return LOOP_ENDED;
+            }
+
+            return LOOPING;
+        }
+    }
+
+    /* Partial loop, track them and then continue */
+    if (state->loop_buffers)
+        state->buffers = g_list_concat(state->buffers, g_steal_pointer(&state->loop_buffers));
+
+    state->buffers = g_list_append(state->buffers, buffer_entry_create(buffer_hash, buffer));
+
+    if (!hash_data((const uint8_t *)buffer_hash, sizeof(*buffer_hash), &state->hash_state, &state->current_hash))
+        return LOOP_ERROR;
+
+    return NO_LOOP;
+}
+
+static bool stream_state_is_stream_subset(struct stream_state *state, struct fozdb *db, struct payload_hash *stream_id)
+{
+    uint64_t offset = 0;
+    GList *list_iter;
+
+    for (list_iter = state->buffers; list_iter; list_iter = list_iter->next)
+    {
+        struct buffer_entry *entry = list_iter->data;
+        struct payload_hash buffer_id;
+        size_t read_size;
+
+        if ((fozdb_read_entry_data(db, AUDIO_CONV_FOZ_TAG_STREAM, stream_id,
+                offset, (uint8_t *)&buffer_id, sizeof(buffer_id), &read_size, true)) < 0
+                || read_size != sizeof(buffer_id))
+            return false;
+
+        if (memcmp(&buffer_id, &entry->hash, sizeof(buffer_id)) != 0)
+            return false;
+
+        offset += sizeof(buffer_id);
+    }
+
+    GST_LOG("Stream id %s is a subset of %s, so not recording stream.",
+            format_hash(&state->current_hash), format_hash(stream_id));
+
+    return true;
+}
+
+static int stream_state_write_to_foz(struct stream_state *state)
+{
+    struct stream_state_serializer serializer;
+    struct buffer_entry *entry;
+    struct bytes_reader reader;
+    uint8_t buffer[1024];
+    size_t header_size;
+    GList *list_iter;
+    bool found;
+    int ret;
+
+    GST_DEBUG("state %p, current hash %s.", state, format_hash(&state->current_hash));
+
+    if (!state->needs_dump || !state->buffers)
+        return CONV_OK;
+
+    pthread_mutex_lock(&dump_fozdb.mutex);
+
+    if ((ret = dump_fozdb_open_audio(true)) < 0)
+    {
+        GST_ERROR("Failed to open audio dump fozdb, ret %d.", ret);
+        pthread_mutex_unlock(&dump_fozdb.mutex);
+        return ret;
+    }
+
+    found = fozdb_has_entry(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_STREAM, &state->current_hash);
+    if (!found)
+    {
+        /* Are there any recorded streams of which this stream is a subset? */
+        struct payload_hash *stream_id;
+        GHashTableIter stream_ids;
+
+        fozdb_iter_tag(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_STREAM, &stream_ids);
+        while (g_hash_table_iter_next(&stream_ids, (void **)&stream_id, NULL))
+        {
+            if (stream_state_is_stream_subset(state, dump_fozdb.fozdb, stream_id))
+            {
+                found = true;
+                break;
+            }
+        }
+    }
+
+    if (!found)
+    {
+        if (dumping_disabled())
+        {
+            GST_LOG("Dumping disabled, so not recording stream id %s.", format_hash(&state->current_hash));
+        }
+        else
+        {
+            GST_LOG("Recording stream id %s.", format_hash(&state->current_hash));
+
+            need_transcode_head_serialize(state->codec_info, buffer, sizeof(buffer), &header_size);
+            bytes_reader_init(&reader, buffer, header_size);
+            entry = state->buffers->data;
+            if ((ret = fozdb_write_entry(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_CODECINFO, &entry->hash,
+                    &reader, bytes_reader_read, true)) < 0)
+            {
+                GST_ERROR("Unable to write stream header, ret %d.\n", ret);
+                pthread_mutex_unlock(&dump_fozdb.mutex);
+                return ret;
+            }
+
+            stream_state_serializer_init(&serializer, state);
+            if ((ret = fozdb_write_entry(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_STREAM, &state->current_hash,
+                    &serializer, stream_state_serializer_read, true)) < 0)
+            {
+                GST_ERROR("Unable to write stream, ret %d.\n", ret);
+                pthread_mutex_unlock(&dump_fozdb.mutex);
+                return ret;
+            }
+
+            for (list_iter = state->buffers; list_iter; list_iter = list_iter->next)
+            {
+                struct gst_buffer_reader buffer_reader;
+
+                entry = list_iter->data;
+                gst_buffer_reader_init(&buffer_reader, entry->buffer);
+                if ((ret = fozdb_write_entry(dump_fozdb.fozdb, AUDIO_CONV_FOZ_TAG_AUDIODATA, &entry->hash,
+                        &buffer_reader, gst_buffer_reader_read, true)) < 0)
+                {
+                    GST_ERROR("Unable to write audio data, ret %d.\n", ret);
+                    pthread_mutex_unlock(&dump_fozdb.mutex);
+                    return ret;
+                }
+            }
+        }
+    }
+
+    pthread_mutex_unlock(&dump_fozdb.mutex);
+    return CONV_OK;
+}
+
+static int audio_conv_state_create(struct audio_conv_state **out)
+{
+    struct audio_conv_state *state;
+    struct fozdb *fozdb = NULL;
+    char *read_fozdb_path;
+    int ret;
+
+    if (!(read_fozdb_path = getenv("MEDIACONV_AUDIO_TRANSCODED_FILE")))
+    {
+        GST_ERROR("Env MEDIACONV_AUDIO_TRANSCODED_FILE is not set!");
+        return CONV_ERROR_ENV_NOT_SET;
+    }
+
+    if ((ret = fozdb_create(read_fozdb_path, O_RDONLY, true /* Read-only? */, AUDIO_CONV_FOZ_NUM_TAGS, &fozdb)) < 0)
+        GST_ERROR("Failed to create fozdb from %s, ret %d.", read_fozdb_path, ret);
+
+    state = calloc(1, sizeof(*state));
+    murmur3_128_state_init(&state->hash_state, HASH_SEED);
+    murmur3_128_state_init(&state->loop_hash_state, HASH_SEED);
+    state->stream_state = stream_state_create();
+    state->read_fozdb = fozdb;
+
+    *out = state;
+    return CONV_OK;
+}
+
+static void audio_conv_state_release(struct audio_conv_state *state)
+{
+    free(state->codec_data);
+    stream_state_release(state->stream_state);
+    if (state->read_fozdb)
+        fozdb_release(state->read_fozdb);
+    free(state);
+}
+
+static void audio_conv_state_reset(struct audio_conv_state *state)
+{
+    if (stream_state_write_to_foz(state->stream_state) < 0)
+        GST_ERROR("Failed to write stream to dump fozdb.");
+
+    stream_state_reset(state->stream_state);
+    murmur3_128_state_reset(&state->hash_state);
+    murmur3_128_state_reset(&state->loop_hash_state);
+}
+
+/* Allocate a buffer on success, free it after usage. */
+static int audio_conv_state_open_transcode_file(struct audio_conv_state *state, GstBuffer *buffer,
+        uint8_t **out_data, size_t *out_size)
+{
+    struct payload_hash hash, loop_hash;
+    uint32_t transcoded_size;
+    const char *blank_audio;
+    bool try_loop, hash_ok;
+    GstMapInfo map_info;
+    uint64_t file_size;
+    loop_state loop;
+    uint8_t *data;
+    size_t size;
+    int fd;
+
+    /* Hash buffer. */
+    if (!gst_buffer_map(buffer, &map_info, GST_MAP_READ))
+        return CONV_ERROR;
+    hash_ok = hash_data(map_info.data, map_info.size, &state->hash_state, &hash)
+            && hash_data(map_info.data, map_info.size, &state->loop_hash_state, &loop_hash);
+    gst_buffer_unmap(buffer, &map_info);
+    if (!hash_ok)
+    {
+        GST_ERROR("Failed to hash buffer.");
+        return CONV_ERROR;
+    }
+
+    loop = stream_state_record_buffer(state->stream_state, &hash, &loop_hash, buffer, state->codec_data);
+    gst_buffer_unref(buffer); /* Buffer has been recorded, so unref it. */
+    switch (loop)
+    {
+    case NO_LOOP:
+        murmur3_128_state_reset(&state->loop_hash_state);
+        try_loop = false;
+        break;
+
+    case LOOP_ENDED:
+        murmur3_128_state_reset(&state->loop_hash_state);
+    case LOOPING:
+        try_loop = true;
+        break;
+
+    case LOOP_ERROR:
+    default:
+        return CONV_ERROR;
+    }
+
+    if (try_loop)
+        GST_INFO("Buffer hash: %s (Loop: %s).", format_hash(&hash), format_hash(&loop_hash));
+    else
+        GST_INFO("Buffer hash: %s.", format_hash(&hash));
+
+    /* Try to read transcoded data. */
+    if (state->read_fozdb)
+    {
+        if (fozdb_entry_size(state->read_fozdb,
+                AUDIO_CONV_FOZ_TAG_PTNADATA, &hash, &transcoded_size) == CONV_OK)
+        {
+            data = calloc(1, transcoded_size);
+            if (fozdb_read_entry_data(state->read_fozdb, AUDIO_CONV_FOZ_TAG_PTNADATA, &hash, 0,
+                    data, transcoded_size, &size, false) == CONV_OK)
+            {
+                *out_data = data;
+                *out_size = size;
+                return CONV_OK;
+            }
+            free(data);
+        }
+
+        if (try_loop && fozdb_entry_size(state->read_fozdb,
+                AUDIO_CONV_FOZ_TAG_PTNADATA, &loop_hash, &transcoded_size) == CONV_OK)
+        {
+            data = calloc(1, transcoded_size);
+            if (fozdb_read_entry_data(state->read_fozdb, AUDIO_CONV_FOZ_TAG_PTNADATA, &loop_hash, 0,
+                    data, transcoded_size, &size, false) == CONV_OK)
+            {
+                *out_data = data;
+                *out_size = size;
+                return CONV_OK;
+            }
+            free(data);
+        }
+    }
+
+    /* If we can't, return the blank file */
+    state->stream_state->needs_dump = true;
+    if (!(blank_audio = getenv("MEDIACONV_BLANK_AUDIO_FILE")))
+    {
+        GST_ERROR("Env MEDIACONV_BLANK_AUDIO_FILE not set.");
+        return CONV_ERROR_ENV_NOT_SET;
+    }
+    if (!open_file(blank_audio, O_RDONLY, &fd))
+        return CONV_ERROR_OPEN_FAILED;
+    if (!get_file_size(fd, &file_size))
+    {
+        close(fd);
+        return CONV_ERROR;
+    }
+    data = calloc(1, file_size);
+    if (!complete_read(fd, data, file_size))
+    {
+        free(data);
+        close(fd);
+        return CONV_ERROR_READ_FAILED;
+    }
+
+    create_placeholder_file("placeholder-audio-used");
+
+    *out_data = data;
+    *out_size = file_size;
+
+    return CONV_OK;
+}
+
+/* Call pthread_mutex_unlock() to unlock after usage. */
+static struct audio_conv_state *audio_conv_lock_state(AudioConv *conv)
+{
+    pthread_mutex_lock(&conv->state_mutex);
+    if (!conv->state)
+        pthread_mutex_unlock(&conv->state_mutex);
+    return conv->state;
+}
+
+static GstStateChangeReturn audio_conv_change_state(GstElement *element, GstStateChange transition)
+{
+    AudioConv *conv = AUDIO_CONV(element);
+    struct audio_conv_state *state;
+    int ret;
+
+    GST_DEBUG_OBJECT(element, "State transition %s.", gst_state_change_get_name(transition));
+
+    switch (transition)
+    {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+        /* Do runtime setup. */
+
+        /* Open fozdb here; this is the right place to fail
+        * and opening may be expensive. */
+        pthread_mutex_lock(&dump_fozdb.mutex);
+        dump_fozdb_discard_transcoded();
+        ret = dump_fozdb_open_audio(true);
+        pthread_mutex_unlock(&dump_fozdb.mutex);
+        if (ret < 0)
+        {
+            GST_ERROR("Failed to open dump fozdb, ret %d.", ret);
+            return GST_STATE_CHANGE_FAILURE;
+        }
+
+        /* Create audio conv state. */
+        if ((ret = audio_conv_state_create(&state)) < 0)
+        {
+            GST_ERROR("Failed to create audio conv state, ret %d.", ret);
+            return GST_STATE_CHANGE_FAILURE;
+        }
+        pthread_mutex_lock(&conv->state_mutex);
+        assert(!conv->state);
+        conv->state = state;
+        pthread_mutex_unlock(&conv->state_mutex);
+        break;
+
+    case GST_STATE_CHANGE_READY_TO_NULL:
+        /* Do runtime teardown. */
+        pthread_mutex_lock(&conv->state_mutex);
+        state = conv->state;
+        conv->state = NULL;
+        pthread_mutex_unlock(&conv->state_mutex);
+
+        if (state && (ret = stream_state_write_to_foz(state->stream_state)) < 0)
+            GST_WARNING("Error writing out stream data, ret %d.", ret);
+        audio_conv_state_release(state);
+        break;
+
+    default:
+        break;
+    }
+
+    return GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
+
+    /* XXX on ReadyToNull, sodium drops state _again_ here... why? */
+}
+
+static gboolean audio_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    AudioConv *conv = AUDIO_CONV(parent);
+    struct audio_conv_state *state;
+    GstCaps *caps;
+    bool ret;
+
+    GST_DEBUG_OBJECT(pad, "Got sink event %"GST_PTR_FORMAT".", event);
+
+    switch (event->type)
+    {
+    case GST_EVENT_CAPS:
+        if ((state = audio_conv_lock_state(conv)))
+        {
+            gst_event_parse_caps(event, &caps);
+            if (!need_transcode_head_create_from_caps(caps, &state->codec_data))
+            {
+                GST_ERROR("Invalid WMA caps!");
+                pthread_mutex_unlock(&conv->state_mutex);
+                return false;
+            }
+            pthread_mutex_unlock(&conv->state_mutex);
+        }
+
+        caps = gst_caps_from_string("audio/x-opus, channel-mapping-family=0");
+        ret = push_event(conv->src_pad, gst_event_new_caps(caps));
+        gst_caps_unref(caps);
+        return ret;
+
+    case GST_EVENT_FLUSH_STOP:
+        if ((state = audio_conv_lock_state(conv)))
+        {
+            audio_conv_state_reset(state);
+            pthread_mutex_unlock(&conv->state_mutex);
+        }
+        return gst_pad_event_default(pad, parent, event);
+
+    default:
+        return gst_pad_event_default(pad, parent, event);
+    }
+}
+
+static GstFlowReturn audio_conv_chain(GstPad *pad, GstObject *parent, GstBuffer *buffer)
+{
+    size_t ptna_data_size, offset, encoded_len;
+    GstFlowReturn flow_ret = GST_FLOW_ERROR;
+    AudioConv *conv = AUDIO_CONV(parent);
+    struct audio_conv_state *state;
+    uint8_t *ptna_data = NULL;
+    int ret;
+
+    GST_LOG_OBJECT(pad, "Handling buffer <%"GST_PTR_FORMAT">.", buffer);
+
+    if (!(state = audio_conv_lock_state(conv)))
+        return flow_ret;
+
+    if ((ret = audio_conv_state_open_transcode_file(state, buffer, &ptna_data, &ptna_data_size)) < 0)
+    {
+        GST_ERROR("Failed to read transcoded audio, ret %d. Things will go badly...", ret);
+        goto done;
+    }
+
+    for (offset = 0; offset < ptna_data_size; offset += encoded_len)
+    {
+        uint32_t packet_header, flags, padding_len;
+        GstBuffer *new_buffer;
+        bool packet_is_header;
+
+        if (offset + 4 >= ptna_data_size)
+        {
+            GST_WARNING( "Short read on ptna header?");
+            break;
+        }
+
+        packet_header = bytes_to_uint32(&ptna_data[offset]);
+        offset += 4;
+
+        flags = packet_header & AUDIO_CONV_FLAG_MASK,
+        padding_len = (packet_header & AUDIO_CONV_PADDING_LENGTH_MASK) >> AUDIO_CONV_PADDING_LENGTH_SHIFT;
+        encoded_len = packet_header & AUDIO_CONV_ENCODED_LENGTH_MASK;
+
+        if (offset + encoded_len > ptna_data_size)
+        {
+            GST_WARNING("Short read on ptna data?");
+            break;
+        }
+
+        packet_is_header = flags & AUDIO_CONV_FLAG_HEADER;
+        if (packet_is_header && state->sent_header)
+            continue; /* Only send one header. */
+
+        /* TODO: can we use a GstBuffer cache here? */
+        new_buffer = gst_buffer_new_and_alloc(encoded_len);
+        if (!packet_is_header && padding_len > 0)
+            gst_buffer_add_audio_clipping_meta(new_buffer, GST_FORMAT_DEFAULT, 0, padding_len);
+        gst_buffer_fill(new_buffer, 0, ptna_data + offset, encoded_len);
+
+        GST_LOG("Pushing one packet of len %zu.", encoded_len);
+        if ((flow_ret = gst_pad_push(conv->src_pad, new_buffer)) < 0)
+        {
+            GST_ERROR("Failed to push buffer <%"GST_PTR_FORMAT"> to src pad %"GST_PTR_FORMAT,
+                    new_buffer, conv->src_pad);
+            goto done;
+        }
+
+        if (packet_is_header)
+            state->sent_header = true;
+    }
+
+    flow_ret = GST_FLOW_OK;
+
+done:
+    if (ptna_data)
+        free(ptna_data);
+    pthread_mutex_unlock(&conv->state_mutex);
+    return flow_ret;
+}
+
+static gboolean audio_conv_src_query(GstPad *pad, GstObject *parent, GstQuery *query)
+{
+    AudioConv *conv = AUDIO_CONV(parent);
+    GstSchedulingFlags flags;
+    gint min, max, align;
+    GstQuery *peer_query;
+
+    GST_DEBUG_OBJECT(pad, "Got query %"GST_PTR_FORMAT".", query);
+
+    switch (query->type)
+    {
+    case GST_QUERY_SCHEDULING:
+        peer_query = gst_query_new_scheduling();
+        if (!gst_pad_peer_query(conv->sink_pad, peer_query))
+        {
+            gst_query_unref(peer_query);
+            return false;
+        }
+        gst_query_parse_scheduling(peer_query, &flags, &min, &max, &align);
+        gst_query_unref(peer_query);
+        gst_query_set_scheduling(query, flags, min, max, align);
+        return true;
+
+    default:
+        return gst_pad_query_default(pad, parent, query);
+    }
+
+}
+
+static gboolean audio_conv_active_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean active)
+{
+    AudioConv *conv = AUDIO_CONV(parent);
+    return gst_pad_activate_mode(conv->sink_pad, mode, active);
+}
+
+static void audio_conv_finalize(GObject *object)
+{
+    AudioConv *conv = AUDIO_CONV(object);
+
+    pthread_mutex_destroy(&conv->state_mutex);
+    if (conv->state)
+        audio_conv_state_release(conv->state);
+
+    G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static void audio_conv_class_init(AudioConvClass *klass)
+{
+    GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+    gst_element_class_set_metadata(element_class,
+            "Proton audio converter",
+            "Codec/Demuxer",
+            "Converts audio for Proton",
+            "Andrew Eikum <aeikum@codeweavers.com>, Ziqing Hui <zhui@codeweavers.com>");
+
+    element_class->change_state = audio_conv_change_state;
+    object_class->finalize = audio_conv_finalize;
+
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&audio_conv_sink_template));
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&audio_conv_src_template));
+}
+
+static void audio_conv_init(AudioConv *conv)
+{
+    GstElement *element = GST_ELEMENT(conv);
+
+    conv->sink_pad = gst_pad_new_from_static_template(&audio_conv_sink_template, "sink");
+    gst_pad_set_event_function(conv->sink_pad, GST_DEBUG_FUNCPTR(audio_conv_sink_event));
+    gst_pad_set_chain_function(conv->sink_pad, GST_DEBUG_FUNCPTR(audio_conv_chain));
+    gst_element_add_pad(element, conv->sink_pad);
+
+    conv->src_pad = gst_pad_new_from_static_template(&audio_conv_src_template, "src");
+    gst_pad_set_query_function(conv->src_pad, GST_DEBUG_FUNCPTR(audio_conv_src_query));
+    gst_pad_set_activatemode_function(conv->src_pad, GST_DEBUG_FUNCPTR(audio_conv_active_mode));
+    gst_element_add_pad(element, conv->src_pad);
+
+    pthread_mutex_init(&conv->state_mutex, NULL);
+    conv->state = NULL;
+}
diff --git a/dlls/winegstreamer/media-converter/audioconvbin.c b/dlls/winegstreamer/media-converter/audioconvbin.c
new file mode 100644
index 00000000000..9857a0ff507
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/audioconvbin.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+GST_DEBUG_CATEGORY_EXTERN(media_converter_debug);
+#undef GST_CAT_DEFAULT
+#define GST_CAT_DEFAULT media_converter_debug
+
+typedef struct
+{
+    GstBin bin;
+    GstElement *audio_conv, *opus_dec, *caps_setter;
+    GstPad *sink_pad, *src_pad; /* Ghost pads. */
+} AudioConvBin;
+
+typedef struct
+{
+    GstBinClass class;
+} AudioConvBinClass;
+
+G_DEFINE_TYPE(AudioConvBin, audio_conv_bin, GST_TYPE_BIN);
+#define AUDIO_CONV_BIN_TYPE (audio_conv_bin_get_type())
+#define AUDIO_CONV_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AUDIO_CONV_BIN_TYPE, AudioConvBin))
+GST_ELEMENT_REGISTER_DEFINE(protonaudioconverterbin, "protonaudioconverterbin",
+        GST_RANK_MARGINAL + 1, AUDIO_CONV_BIN_TYPE);
+
+static GstStaticPadTemplate audio_conv_bin_sink_template = GST_STATIC_PAD_TEMPLATE("sink",
+        GST_PAD_SINK, GST_PAD_ALWAYS,
+        GST_STATIC_CAPS("audio/x-wma;"));
+
+static GstStaticPadTemplate audio_conv_bin_src_template = GST_STATIC_PAD_TEMPLATE("src",
+        GST_PAD_SRC, GST_PAD_ALWAYS,
+        GST_STATIC_CAPS("audio/x-raw, format=S16LE;"));
+
+static void link_elements(GstElement *src_element, GstElement *sink_element)
+{
+    if (!gst_element_link(src_element, sink_element))
+        GST_ERROR("Failed to link src element %"GST_PTR_FORMAT" to sink element %"GST_PTR_FORMAT".",
+                src_element, sink_element);
+}
+
+static gboolean audio_conv_bin_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    AudioConvBin * bin = AUDIO_CONV_BIN(parent);
+    GstCaps *caps, *rate_caps;
+    GstStructure *structure;
+    GstPad *audio_conv_sink;
+    gint override_rate;
+    gboolean ret;
+
+    GST_DEBUG_OBJECT(pad, "Got sink event %"GST_PTR_FORMAT".", event);
+
+    switch (event->type)
+    {
+    case GST_EVENT_CAPS:
+        gst_event_parse_caps(event, &caps);
+        if ((structure = gst_caps_get_structure(caps, 0))
+                && gst_structure_get_int(structure, "rate", &override_rate))
+        {
+            rate_caps = gst_caps_new_simple("audio/x-raw", "rate", G_TYPE_INT, override_rate, NULL);
+            g_object_set(bin->caps_setter, "caps", rate_caps, NULL);
+        }
+        else
+        {
+            GST_WARNING("Event has no rate.");
+        }
+
+        /* Forward on to the real pad. */
+        audio_conv_sink = gst_element_get_static_pad(bin->audio_conv, "sink");
+        ret = gst_pad_send_event(audio_conv_sink, event);
+        gst_object_unref(audio_conv_sink);
+        return ret;
+
+    default:
+        return gst_pad_event_default(pad, parent, event);
+    }
+}
+
+static void audio_conv_bin_class_init(AudioConvBinClass * klass)
+{
+    GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+
+    gst_element_class_set_metadata(element_class,
+            "Proton audio converter with rate fixup",
+            "Codec/Decoder/Audio",
+            "Converts audio for Proton, fixing up samplerates",
+            "Andrew Eikum <aeikum@codeweavers.com>, Ziqing Hui <zhui@codeweavers.com>");
+
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&audio_conv_bin_sink_template));
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&audio_conv_bin_src_template));
+}
+
+static void audio_conv_bin_init(AudioConvBin *bin)
+{
+    GstElement *element = GST_ELEMENT(bin);
+    GstPad *sink, *src;
+
+    bin->sink_pad = gst_ghost_pad_new_no_target_from_template("sink",
+            gst_element_get_pad_template(element, "sink"));
+    bin->src_pad = gst_ghost_pad_new_no_target_from_template("src",
+           gst_element_get_pad_template(element, "src"));
+    gst_pad_set_event_function(bin->sink_pad, GST_DEBUG_FUNCPTR(audio_conv_bin_sink_event));
+
+    bin->audio_conv = create_element("protonaudioconverter", "protonmediaconverter");
+    bin->opus_dec = create_element("opusdec", "base");
+    bin->caps_setter = create_element("capssetter", "good");
+
+    gst_bin_add(GST_BIN(bin), bin->audio_conv);
+    gst_bin_add(GST_BIN(bin), bin->opus_dec);
+    gst_bin_add(GST_BIN(bin), bin->caps_setter);
+
+    link_elements(bin->audio_conv, bin->opus_dec);
+    link_elements(bin->opus_dec, bin->caps_setter);
+
+    sink = gst_element_get_static_pad(bin->audio_conv, "sink");
+    src = gst_element_get_static_pad(bin->caps_setter, "src");
+    gst_ghost_pad_set_target(GST_GHOST_PAD(bin->sink_pad), sink);
+    gst_ghost_pad_set_target(GST_GHOST_PAD(bin->src_pad), src);
+    gst_object_unref(src);
+    gst_object_unref(sink);
+
+    gst_element_add_pad(element, bin->sink_pad);
+    gst_element_add_pad(element, bin->src_pad);
+
+    GST_INFO("Initialized AudioConvBin %"GST_PTR_FORMAT": audio_conv %"GST_PTR_FORMAT", opus_dec %"GST_PTR_FORMAT", "
+            "caps_setter %"GST_PTR_FORMAT", sink_pad %"GST_PTR_FORMAT", src_pad %"GST_PTR_FORMAT".",
+            bin, bin->audio_conv, bin->opus_dec, bin->caps_setter, bin->sink_pad, bin->src_pad);
+}
diff --git a/dlls/winegstreamer/media-converter/fossilize.c b/dlls/winegstreamer/media-converter/fossilize.c
new file mode 100644
index 00000000000..057825ad5b5
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/fossilize.c
@@ -0,0 +1,722 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Based on "Fossilize," which is
+ * Copyright (c) 2018-2019 Hans-Kristian Arntzen
+ * https://github.com/ValveSoftware/Fossilize/
+ */
+
+/* This is a read/write implementation of the Fossilize database format.
+ *
+ * https://github.com/ValveSoftware/Fossilize/
+ *
+ * That C++ implementation is specific to Vulkan, while this one tries to be generic to store any
+ * type of data.
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+/* Fossilize StreamArchive database format version 6:
+ *
+ * The file consists of a header, followed by an unlimited series of "entries".
+ *
+ * All multi-byte entities are little-endian.
+ *
+ * The file header is as follows:
+ *
+ * Field           Type           Description
+ * -----           ----           -----------
+ * magic_number    uint8_t[12]    Constant value: "\x81""FOSSILIZEDB"
+ * version         uint32_t       StreamArchive version: 6
+ *
+ *
+ * Each entry follows this format:
+ *
+ * Field           Type                    Description
+ * -----           ----                    -----------
+ * name            unsigned char[40]       Application-defined entry identifier, stored in hexadecimal big-endian
+ *                                         ASCII. Usually N-char tag followed by (40 - N)-char hash.
+ * size            uint32_t                Size of the payload as stored in this file.
+ * flags           uint32_t                Flags for this entry (e.g. compression). See below.
+ * crc32           uint32_t                CRC32 of the payload as stored in this file.
+ * full_size       uint32_t                Size of this payload after decompression.
+ * payload         uint8_t[stored_size]    Entry data.
+ *
+ * The flags field may contain:
+ *     0x1: No compression.
+ *     0x2: Deflate compression.
+ */
+
+#define FOZDB_MIN_COMPAT_VERSION  5
+#define FOZDB_VERSION             6
+
+#define FOZDB_COMPRESSION_NONE    1
+#define FOZDB_COMPRESSION_DEFLATE 2
+
+#define ENTRY_NAME_SIZE  40
+
+#define BUFFER_COPY_BYTES (8 * 1024 * 1024) /* Tuneable. */
+
+static const uint8_t FOZDB_MAGIC[] = {0x81, 'F', 'O', 'S', 'S', 'I', 'L', 'I', 'Z', 'E', 'D', 'B'};
+
+struct file_header
+{
+    uint8_t magic[12];
+    uint8_t unused1;
+    uint8_t unused2;
+    uint8_t unused3;
+    uint8_t version;
+} __attribute__((packed));
+
+struct payload_header
+{
+    uint32_t size;
+    uint32_t compression;
+    uint32_t crc;
+    uint32_t full_size;
+} __attribute__((packed));
+
+struct payload_entry
+{
+    struct payload_hash hash;
+    struct payload_header header;
+    uint64_t offset;
+};
+
+static guint hash_func(gconstpointer key)
+{
+    const struct payload_hash *payload_hash = key;
+
+    return payload_hash->hash[0]
+            ^ payload_hash->hash[1]
+            ^ payload_hash->hash[2]
+            ^ payload_hash->hash[3];
+}
+
+static gboolean hash_equal(gconstpointer a, gconstpointer b)
+{
+    return memcmp(a, b, sizeof(struct payload_hash)) == 0;
+}
+
+static bool tag_from_ascii_bytes(uint32_t *tag, const uint8_t *ascii_bytes)
+{
+    char str[sizeof(*tag) * 2 + 1] = {};
+
+    memcpy(str, ascii_bytes, sizeof(*tag) * 2);
+
+    *tag = strtoul(str, NULL, 16);
+    if (errno != 0)
+    {
+        GST_ERROR("Failed to convert string \"%s\" to tag. %s.", str, strerror(errno));
+        return false;
+    }
+
+    return true;
+}
+
+static bool hash_from_ascii_bytes(struct payload_hash *hash, const uint8_t *ascii_bytes)
+{
+    unsigned int i;
+
+    for (i = 0; i < ARRAY_SIZE(hash->hash); ++i)
+    {
+        uint32_t *hash_part = &hash->hash[ARRAY_SIZE(hash->hash) - 1 - i];
+        char str[sizeof(hash_part) * 2 + 1] = {};
+
+        memcpy(str, ascii_bytes + sizeof(*hash_part) * 2 * i, sizeof(*hash_part) * 2);
+
+        *hash_part = strtoul(str, NULL, 16);
+
+        if (errno != 0)
+        {
+            GST_ERROR("Failed to convert string \"%s\" to hash part %u. %s.", str, 4 - i, strerror(errno));
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static void tag_to_ascii_bytes(uint32_t tag, uint8_t *ascii_bytes)
+{
+    char buffer[sizeof(tag) * 2 + 1];
+    sprintf(buffer, "%08x", tag);
+    memcpy(ascii_bytes, buffer, sizeof(tag) * 2);
+}
+
+static void hash_to_ascii_bytes(const struct payload_hash *hash, uint8_t *ascii_bytes)
+{
+    char buffer[sizeof(*hash) * 2 + 1];
+    sprintf(buffer, "%08x%08x%08x%08x", hash->hash[3], hash->hash[2], hash->hash[1], hash->hash[0]);
+    memcpy(ascii_bytes, buffer, sizeof(*hash) * 2);
+}
+
+static void payload_header_from_bytes(struct payload_header *header, const uint8_t *bytes)
+{
+    header->size        = bytes_to_uint32(bytes);
+    header->compression = bytes_to_uint32(bytes + 4);
+    header->crc         = bytes_to_uint32(bytes + 8);
+    header->full_size   = bytes_to_uint32(bytes + 12);
+}
+
+static int fozdb_read_file_header(struct fozdb *db)
+{
+    struct file_header header;
+
+    if (!complete_read(db->file, &header, sizeof(header)))
+    {
+        GST_ERROR("Failed to read file header.");
+        return CONV_ERROR_READ_FAILED;
+    }
+    if (memcmp(&header.magic, FOZDB_MAGIC, sizeof(FOZDB_MAGIC)) != 0)
+    {
+        GST_ERROR("Bad magic.");
+        return CONV_ERROR_CORRUPT_DATABASE;
+    }
+    if (header.version < FOZDB_MIN_COMPAT_VERSION || header.version > FOZDB_VERSION)
+    {
+        GST_ERROR("Incompatible version %u.", header.version);
+        return CONV_ERROR_CORRUPT_DATABASE;
+    }
+
+    return CONV_OK;
+}
+
+static int fozdb_read_entry_tag_hash_header(struct fozdb *db,
+        uint32_t *out_tag, struct payload_hash *out_hash, struct payload_header *out_header)
+{
+    uint8_t entry_name_and_header[ENTRY_NAME_SIZE + sizeof(struct payload_header)];
+    struct payload_hash hash;
+    uint32_t tag;
+
+    if (!complete_read(db->file, entry_name_and_header, sizeof(entry_name_and_header)))
+    {
+        GST_ERROR("Failed to read entry name and header.");
+        return CONV_ERROR_READ_FAILED;
+    }
+
+    if (!tag_from_ascii_bytes(&tag, entry_name_and_header)
+            || !hash_from_ascii_bytes(&hash, entry_name_and_header + sizeof(tag) * 2))
+        return CONV_ERROR_CORRUPT_DATABASE;
+
+    payload_header_from_bytes(out_header, entry_name_and_header + ENTRY_NAME_SIZE);
+
+    *out_tag = tag;
+    *out_hash = hash;
+    return CONV_OK;
+}
+
+static bool fozdb_seek_to_next_entry(struct fozdb *db, struct payload_header *header, bool *truncated)
+{
+    uint64_t file_size = 0, data_offset = lseek(db->file, 0, SEEK_CUR);
+
+    if (truncated)
+        *truncated = false;
+
+    get_file_size(db->file, &file_size);
+
+    if (lseek(db->file, header->size, SEEK_CUR) < 0)
+    {
+        GST_ERROR("Failed to seek to next entry. %s. "
+                "Entry data offset %#"PRIx64", size %#x, file size %#"PRIx64".",
+                strerror(errno), data_offset, header->size, file_size);
+        return false;
+    }
+
+    if (file_size && data_offset + header->size > file_size)
+    {
+        /* Truncated chunk is not fatal. */
+        GST_WARNING("Entry data larger than file, truncating database here. "
+            "Entry data offset %#"PRIx64", size %#x, file size %#"PRIx64".",
+                data_offset, header->size, file_size);
+        if (truncated)
+            *truncated = true;
+    }
+
+    return true;
+}
+
+static bool fozdb_write_entry_name(struct fozdb *db, uint32_t tag, struct payload_hash *hash)
+{
+    uint8_t entry_name[ENTRY_NAME_SIZE];
+
+    tag_to_ascii_bytes(tag, entry_name);
+    hash_to_ascii_bytes(hash, entry_name + sizeof(tag) * 2);
+
+    if (!complete_write(db->file, entry_name, sizeof(entry_name)))
+    {
+        GST_ERROR("Failed to write entry name.");
+        return false;
+    }
+
+    return true;
+}
+
+/* Copy an entry to write_pos. */
+static int fozdb_copy_entry(struct fozdb *db,
+        struct entry_name *name, struct payload_header *header, uint64_t entry_data_offset)
+{
+    uint64_t read_offset, entry_end = entry_data_offset + header->size;
+    ssize_t read_size;
+    uint8_t *buffer;
+
+    if (lseek(db->file, db->write_pos, SEEK_SET) < 0)
+    {
+        GST_ERROR("Failed to seek file to write_pos.");
+        return CONV_ERROR_SEEK_FAILED;
+    }
+
+    /* Write entry name. */
+    if (!fozdb_write_entry_name(db, name->tag, &name->hash))
+        return CONV_ERROR_WRITE_FAILED;
+    db->write_pos += ENTRY_NAME_SIZE;
+
+    /* Write entry header. */
+    if (!complete_write(db->file, header, sizeof(*header)))
+    {
+        GST_ERROR("Failed to write entry header.");
+        return CONV_ERROR_WRITE_FAILED;
+    }
+    db->write_pos += sizeof(*header);
+
+    /* Copy entry data. */
+    buffer = calloc(1, BUFFER_COPY_BYTES);
+    for (read_offset = entry_data_offset; read_offset < entry_end; read_offset += read_size)
+    {
+        size_t to_read = min(entry_end - read_offset, BUFFER_COPY_BYTES);
+
+        /* Read data from entry. */
+        if (lseek(db->file, read_offset, SEEK_SET) < 0)
+        {
+            GST_ERROR("Failed to seek to read offset. %s.", strerror(errno));
+            free(buffer);
+            return CONV_ERROR_SEEK_FAILED;
+        }
+        if ((read_size = read(db->file, buffer, to_read)) < 0)
+        {
+            GST_ERROR("Failed to read entry data. %s.", strerror(errno));
+            free(buffer);
+            return CONV_ERROR_READ_FAILED;
+        }
+        if (read_size == 0)
+            break;
+
+        /* Write data to write_pos. */
+        if (lseek(db->file, db->write_pos, SEEK_SET) < 0)
+        {
+            GST_ERROR("Failed to seek to write_pos. %s.", strerror(errno));
+            free(buffer);
+            return CONV_ERROR_SEEK_FAILED;
+        }
+        if (!complete_write(db->file, buffer, read_size))
+        {
+            GST_ERROR("Failed to write entry data to write_pos.");
+            free(buffer);
+            return CONV_ERROR_WRITE_FAILED;
+        }
+        db->write_pos += read_size;
+    }
+    free(buffer);
+
+    if (lseek(db->file, read_offset, SEEK_SET) < 0)
+    {
+        GST_ERROR("Failed to seek to read offset. %s.", strerror(errno));
+        return CONV_ERROR_SEEK_FAILED;
+    }
+
+    return CONV_OK;
+}
+
+int fozdb_create(const char *file_name, int open_flags, bool read_only, uint32_t num_tags, struct fozdb **out)
+{
+    struct fozdb *db;
+    size_t i;
+    int ret;
+
+    GST_DEBUG("file_name %s, open_flags %d, read_only %d, num_tags %u, out %p.",
+            file_name, open_flags, read_only, num_tags, out);
+
+    db = calloc(1, sizeof(*db));
+
+    if (!open_file(file_name, open_flags, &db->file))
+    {
+        free(db);
+        return CONV_ERROR_OPEN_FAILED;
+    }
+
+    db->file_name = file_name;
+    db->num_tags = num_tags;
+    db->read_only = read_only;
+
+    /* Create entry hash tables. */
+    db->seen_blobs = calloc(num_tags, sizeof(*db->seen_blobs));
+    for (i = 0; i < num_tags; ++i)
+        db->seen_blobs[i] = g_hash_table_new_full(hash_func, hash_equal, NULL, free);
+
+    /* Load entries. */
+    if ((ret = fozdb_prepare(db)) < 0)
+    {
+        GST_ERROR("Failed to prepare fozdb, ret %d.", ret);
+        fozdb_release(db);
+        return ret;
+    }
+
+    GST_INFO("Created fozdb %p from %s.", db, file_name);
+
+    *out = db;
+    return CONV_OK;
+}
+
+void fozdb_release(struct fozdb *db)
+{
+    int i;
+
+    GST_DEBUG("db %p.", db);
+
+    for (i = 0; i < db->num_tags; ++i)
+        g_hash_table_destroy(db->seen_blobs[i]);
+    free(db->seen_blobs);
+    close(db->file);
+    free(db);
+}
+
+int fozdb_prepare(struct fozdb *db)
+{
+    uint64_t file_size;
+    int ret;
+
+    GST_DEBUG("db %p, file_name %s, read_only %d, num_tags %u.",
+            db, db->file_name, db->read_only, db->num_tags);
+
+    db->write_pos = lseek(db->file, 0, SEEK_SET);
+    if (!get_file_size(db->file, &file_size))
+        return CONV_ERROR;
+
+    /* New file, write foz header. */
+    if (!file_size)
+    {
+        struct file_header file_header;
+
+        memcpy(file_header.magic, FOZDB_MAGIC, sizeof(FOZDB_MAGIC));
+        file_header.unused1 = 0;
+        file_header.unused2 = 0;
+        file_header.unused3 = 0;
+        file_header.version = FOZDB_VERSION;
+
+        if (!complete_write(db->file, &file_header, sizeof(file_header)))
+        {
+            GST_ERROR("Failed to write file header.");
+            return CONV_ERROR_WRITE_FAILED;
+        }
+        db->write_pos = sizeof(file_header);
+
+        return CONV_OK;
+    }
+
+    /* Read file header. */
+    if ((ret = fozdb_read_file_header(db)) < 0)
+        return ret;
+    db->write_pos = lseek(db->file, 0, SEEK_CUR);
+
+    /* Read entries to seen_blobs. */
+    while (db->write_pos < file_size)
+    {
+        struct payload_entry entry, *table_entry;
+        uint32_t tag;
+
+        /* Read an entry. */
+        if ((ret = fozdb_read_entry_tag_hash_header(db, &tag, &entry.hash, &entry.header) < 0))
+            return ret;
+        entry.offset = lseek(db->file, 0, SEEK_CUR);
+
+        if (!fozdb_seek_to_next_entry(db, &entry.header, NULL))
+            return CONV_ERROR_SEEK_FAILED;
+        db->write_pos = lseek(db->file, 0, SEEK_CUR);
+
+        GST_INFO("Got entry: tag %u, hash %s, offset %#"PRIx64", size %#x, crc %#x.",
+                tag, format_hash(&entry.hash), entry.offset, entry.header.size, entry.header.crc);
+
+        /* Insert entry to hash table. */
+        if (tag >= db->num_tags)
+        {
+            GST_WARNING("Invalid tag %u.", tag);
+
+            /* Ignore unknown tags for read-only DBs. */
+            if (db->read_only)
+                continue;
+            else
+                return CONV_ERROR_INVALID_TAG;
+        }
+        table_entry = calloc(1, sizeof(*table_entry));
+        *table_entry = entry;
+        g_hash_table_insert(db->seen_blobs[tag], &table_entry->hash, table_entry);
+    }
+
+    return CONV_OK;
+}
+
+bool fozdb_has_entry(struct fozdb *db, uint32_t tag, struct payload_hash *hash)
+{
+    if (tag >= db->num_tags)
+        return false;
+    return g_hash_table_contains(db->seen_blobs[tag], hash);
+}
+
+int fozdb_entry_size(struct fozdb *db, uint32_t tag, struct payload_hash *hash, uint32_t *size)
+{
+    struct payload_entry *entry;
+
+    if (tag >= db->num_tags)
+        return CONV_ERROR_INVALID_TAG;
+    if (!(entry = g_hash_table_lookup(db->seen_blobs[tag], hash)))
+        return CONV_ERROR_ENTRY_NOT_FOUND;
+
+    *size = entry->header.full_size;
+
+    return CONV_OK;
+}
+
+void fozdb_iter_tag(struct fozdb *db, uint32_t tag, GHashTableIter *iter)
+{
+    if (tag > db->num_tags)
+    {
+        GST_ERROR("Invalid tag %u.", tag);
+        return;
+    }
+    g_hash_table_iter_init(iter, db->seen_blobs[tag]);
+}
+
+int fozdb_read_entry_data(struct fozdb *db, uint32_t tag, struct payload_hash *hash,
+        uint64_t offset, uint8_t *buffer, size_t size, size_t *read_size, bool with_crc)
+{
+    struct payload_entry *entry;
+    size_t to_copy;
+
+    GST_DEBUG("db %p, file_name %s, tag %u, hash %s, offset %#"PRIx64", buffer %p, size %zu, read_size %p, with_crc %d.",
+            db, db->file_name, tag, format_hash(hash), offset, buffer, size, read_size, with_crc);
+
+    if (tag >= db->num_tags)
+        return CONV_ERROR_INVALID_TAG;
+    if (!(entry = g_hash_table_lookup(db->seen_blobs[tag], hash)))
+        return CONV_ERROR_ENTRY_NOT_FOUND;
+
+    if (entry->header.compression != FOZDB_COMPRESSION_NONE)
+        return CONV_ERROR_NOT_IMPLEMENTED;
+
+    if (offset >= entry->header.full_size)
+        return CONV_OK;
+
+    if (lseek(db->file, entry->offset + offset, SEEK_SET) < 0)
+        return CONV_ERROR_SEEK_FAILED;
+
+    to_copy = min(entry->header.full_size - offset, size);
+    if (!complete_read(db->file, buffer, to_copy))
+    {
+        GST_ERROR("Failed to read entry data.");
+        return CONV_ERROR_READ_FAILED;
+    }
+    *read_size = to_copy;
+
+    if (entry->header.crc != 0 && with_crc && entry->header.crc != crc32(0, buffer, to_copy))
+    {
+        GST_ERROR("Wrong check sum.");
+        return CONV_ERROR_WRONG_CHECKSUM;
+    }
+
+    return CONV_OK;
+}
+
+int fozdb_write_entry(struct fozdb *db, uint32_t tag, struct payload_hash *hash,
+        void *data_src, data_read_callback read_callback, bool with_crc)
+{
+    struct payload_header header;
+    struct payload_entry *entry;
+    off_t header_offset;
+    uint32_t size = 0;
+    size_t read_size;
+    uint8_t *buffer;
+    uint64_t offset;
+    int ret;
+
+    GST_DEBUG("db %p, file_name %s, tag %u, hash %s, data_src %p, read_callback %p, with_crc %d.",
+            db, db->file_name, tag, format_hash(hash), data_src, read_callback, with_crc);
+
+    if (tag >= db->num_tags)
+    {
+        GST_ERROR("Invalid tag %u.", tag);
+        return CONV_ERROR_INVALID_TAG;
+    }
+    if (fozdb_has_entry(db, tag, hash))
+        return CONV_OK;
+
+    if (lseek(db->file, db->write_pos, SEEK_SET) < 0)
+    {
+        GST_ERROR("Failed to seek file to write_pos %#"PRIx64".", db->write_pos);
+        return CONV_ERROR_SEEK_FAILED;
+    }
+
+    /* Write entry name. */
+    if (!fozdb_write_entry_name(db, tag, hash))
+        return CONV_ERROR_WRITE_FAILED;
+
+    /* Write payload header first. */
+    header_offset = lseek(db->file, 0, SEEK_CUR);
+    header.size = UINT32_MAX;      /* Will be filled later. */
+    header.compression = FOZDB_COMPRESSION_NONE;
+    header.crc = 0;                /* Will be filled later. */
+    header.full_size = UINT32_MAX; /* Will be filled later. */
+    if (!complete_write(db->file, &header, sizeof(header)))
+    {
+        GST_ERROR("Failed to write entry header.");
+        return CONV_ERROR_WRITE_FAILED;
+    }
+    offset = lseek(db->file, 0, SEEK_CUR);
+
+    /* Write data. */
+    buffer = calloc(1, BUFFER_COPY_BYTES);
+    while ((ret = read_callback(data_src, buffer, BUFFER_COPY_BYTES, &read_size)) == CONV_OK)
+    {
+        if (size + read_size > UINT32_MAX)
+        {
+            GST_ERROR("Data too large. Fossilize format only supports 4 GB entries.");
+            free(buffer);
+            return CONV_ERROR;
+        }
+
+        size += read_size;
+        if (!complete_write(db->file, buffer, read_size))
+        {
+            GST_ERROR("Failed to write entry data.");
+            free(buffer);
+            return CONV_ERROR_WRITE_FAILED;
+        }
+
+        if (with_crc)
+            header.crc = crc32(header.crc, buffer, read_size);
+    }
+    db->write_pos = lseek(db->file, 0, SEEK_CUR);
+    free(buffer);
+    if (ret != CONV_ERROR_DATA_END)
+    {
+        GST_ERROR("Failed to read data from data src, ret %d.", ret);
+        return ret;
+    }
+
+    /* Seek back and fill in the size to header. */
+    if (lseek(db->file, header_offset, SEEK_SET) < 0)
+    {
+        GST_ERROR("Failed to seek back to entry header. %s.", strerror(errno));
+        return CONV_ERROR_SEEK_FAILED;
+    }
+    header.size = size;
+    header.full_size = size;
+    if (!complete_write(db->file, &header, sizeof(header)))
+    {
+        GST_ERROR("Failed to write entry header.");
+        return CONV_ERROR_WRITE_FAILED;
+    }
+
+    /* Success. Record entry and exit. */
+    entry = calloc(1, sizeof(*entry));
+    entry->header = header;
+    entry->hash = *hash;
+    entry->offset = offset;
+    g_hash_table_insert(db->seen_blobs[tag], &entry->hash, entry);
+
+    GST_INFO("Wrote entry: tag %u, hash %s, offset %#"PRIx64", size %#x, crc %#x.",
+            tag, format_hash(&entry->hash), entry->offset, entry->header.size, entry->header.crc);
+
+    return CONV_OK;
+}
+
+/* Rewrites the database, discarding entries listed. */
+int fozdb_discard_entries(struct fozdb *db, GList *to_discard_names)
+{
+    uint8_t entry_name_and_header[ENTRY_NAME_SIZE + sizeof(struct payload_header)];
+    uint64_t file_size;
+    int i, ret;
+
+    GST_DEBUG("db %p, file_name %s, to_discard_entries %p.", db, db->file_name, to_discard_names);
+
+    /* Rewind the file and clear the entry tables. */
+    if (lseek(db->file, 0, SEEK_SET) < 0)
+    {
+        GST_ERROR("Failed to seek to file start. %s.", strerror(errno));
+        return CONV_ERROR_SEEK_FAILED;
+    }
+    for (i = 0; i < db->num_tags; ++i)
+        g_hash_table_remove_all(db->seen_blobs[i]);
+
+    /* Read file header. */
+    if ((ret = fozdb_read_file_header(db)) < 0)
+        return ret;
+    db->write_pos = lseek(db->file, 0, SEEK_CUR);
+
+    /* Read each entry and see if it should be discarded. */
+    if (!get_file_size(db->file, &file_size))
+        return CONV_ERROR;
+    while (lseek(db->file, 0, SEEK_CUR) < file_size)
+    {
+        struct payload_header header;
+        uint64_t entry_data_offset;
+        struct entry_name name;
+        bool truncated;
+
+        if ((ret = fozdb_read_entry_tag_hash_header(db, &name.tag, &name.hash, &header) < 0))
+            return CONV_ERROR_READ_FAILED;
+        entry_data_offset = lseek(db->file, 0, SEEK_CUR);
+
+        /* Check if entry should be discarded. */
+        if (g_list_find_custom(to_discard_names, &name, entry_name_compare))
+        {
+            if (!fozdb_seek_to_next_entry(db, &header, &truncated))
+                return CONV_ERROR_SEEK_FAILED;
+            if (truncated)
+                break;
+        }
+        else
+        {
+            if (db->write_pos == entry_data_offset - sizeof(entry_name_and_header))
+            {
+                /* If we haven't dropped any chunks, we can just skip it rather than rewrite it. */
+                if (!fozdb_seek_to_next_entry(db, &header, &truncated))
+                    return CONV_ERROR_SEEK_FAILED;
+                if (truncated)
+                    break;
+                db->write_pos = lseek(db->file, 0, SEEK_CUR);
+            }
+            else
+            {
+                /* We're offset, so we have to rewrite. */
+                if ((ret = fozdb_copy_entry(db, &name, &header, entry_data_offset)) < 0)
+                    return ret;
+            }
+        }
+    }
+
+    if (ftruncate(db->file, db->write_pos) < 0)
+    {
+        GST_ERROR("Failed to truncate file. %s.", strerror(errno));
+        return CONV_ERROR;
+    }
+
+    return fozdb_prepare(db);
+}
diff --git a/dlls/winegstreamer/media-converter/lib.c b/dlls/winegstreamer/media-converter/lib.c
new file mode 100644
index 00000000000..61d7fe8605e
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/lib.c
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+GST_ELEMENT_REGISTER_DECLARE(protonvideoconverter);
+GST_ELEMENT_REGISTER_DECLARE(protonaudioconverter);
+GST_ELEMENT_REGISTER_DECLARE(protonaudioconverterbin);
+
+GST_DEBUG_CATEGORY(media_converter_debug);
+
+static void get_dirname(const char *path, char *result)
+{
+    size_t i;
+
+    for (i = strlen(path) - 1; i > 0; --i)
+    {
+        if (path[i] == '\\' || path[i] == '/')
+            break;
+    }
+
+    memcpy(result, path, i);
+    result[i] = 0;
+}
+
+static void path_concat(char *result, const char *a, const char *b)
+{
+    size_t a_len, b_offset;
+
+    a_len = strlen(a);
+    b_offset = a_len;
+    memcpy(result, a, a_len);
+
+    if (result[a_len - 1] != '/')
+    {
+        result[a_len] = '/';
+        ++b_offset;
+    }
+
+    strcpy(result + b_offset, b);
+}
+
+static bool create_all_dir(const char *dir)
+{
+    char *ptr, buffer[4096] = {0};
+
+    strcpy(buffer, dir);
+    if (buffer[strlen(dir) - 1] != '/')
+        buffer[strlen(dir)] = '/';
+
+    ptr = strchr(buffer + 1, '/');
+    while (ptr)
+    {
+        *ptr = '\0';
+
+        if (mkdir(buffer, 0777) < 0)
+        {
+            if (errno != EEXIST)
+            {
+                GST_ERROR("Failed to make directory %s. %s.", buffer, strerror(errno));
+                return false;
+            }
+        }
+        *ptr = '/';
+
+        ptr = strchr(ptr + 1, '/');
+    }
+    return true;
+}
+
+static int create_file(const char *file_name)
+{
+    int fd, ret = CONV_OK;
+    char dir[4096];
+
+    get_dirname(file_name, dir);
+    if (access(dir, F_OK) < 0 && !create_all_dir(dir))
+        return CONV_ERROR_PATH_NOT_FOUND;
+
+    if ((fd = open(file_name, O_CREAT,  S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) < 0)
+    {
+        GST_WARNING("Failed to open file %s with O_CREAT. %s.", file_name, strerror(errno));
+        return CONV_ERROR_OPEN_FAILED;
+    }
+
+    if (futimens(fd, NULL) < 0)
+    {
+        GST_WARNING("Failed to set file %s timestamps. %s.", file_name, strerror(errno));
+        ret = CONV_ERROR;
+    }
+
+    close(fd);
+
+    return ret;
+}
+
+bool open_file(const char *file_name, int open_flags, int *out_fd)
+{
+    int fd;
+
+    if ((fd = open(file_name, open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) < 0)
+    {
+        GST_WARNING("Failed to open %s with flags %d. %s.", file_name, open_flags, strerror(errno));
+        return false;
+    }
+
+    *out_fd = fd;
+    return true;
+}
+
+bool get_file_size(int fd, uint64_t *file_size)
+{
+    struct stat file_info;
+
+    if (fstat(fd, &file_info) < 0)
+    {
+        GST_WARNING("Failed to fstat fd %d. %s.", fd, strerror(errno));
+        return false;
+    }
+
+    *file_size = file_info.st_size;
+    return true;
+}
+
+bool complete_read(int file, void *buffer, size_t size)
+{
+    size_t current_read = 0;
+    ssize_t read_size;
+    errno = 0;
+
+    while (current_read < size)
+    {
+        read_size = read(file, ((char *)buffer) + current_read, size - current_read);
+        if(read_size <= 0)
+        {
+            if(errno != EINTR && errno != EAGAIN)
+                return false;
+        }
+        else
+        {
+            current_read += read_size;
+        }
+    }
+
+    return current_read == size;
+}
+
+bool complete_write(int file, const void *buffer, size_t size)
+{
+    size_t current_write = 0;
+    ssize_t write_size;
+    errno = 0;
+
+    while (current_write < size)
+    {
+        write_size = write(file, (const char *)buffer + current_write, size - current_write);
+        if(write_size < 0)
+        {
+            if(errno != EINTR && errno != EAGAIN)
+                return false;
+        }
+        else
+        {
+            current_write += write_size;
+        }
+    }
+
+    return current_write == size;
+}
+
+uint32_t crc32(uint32_t crc, const uint8_t *ptr, size_t buf_len)
+{
+    static const uint32_t s_crc_table[256] =
+    {
+        0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535,
+        0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd,
+        0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
+        0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+        0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+        0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+        0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac,
+        0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+        0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
+        0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+        0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb,
+        0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+        0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
+        0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce,
+        0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+        0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+        0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409,
+        0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+        0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739,
+        0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+        0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268,
+        0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0,
+        0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
+        0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+        0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+        0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703,
+        0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
+        0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+        0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae,
+        0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+        0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6,
+        0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+        0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
+        0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5,
+        0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+        0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+        0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+    };
+    uint32_t crc32 = (uint32_t)crc ^ 0xffffffff;
+    const uint8_t *buffer = (const uint8_t *)ptr;
+
+    while (buf_len >= 4)
+    {
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ buffer[0]) & 0xff];
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ buffer[1]) & 0xff];
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ buffer[2]) & 0xff];
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ buffer[3]) & 0xff];
+        buffer += 4;
+        buf_len -= 4;
+    }
+
+    while (buf_len)
+    {
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ buffer[0]) & 0xff];
+        ++buffer;
+        --buf_len;
+    }
+
+    return ~crc32;
+}
+
+int create_placeholder_file(const char *file_name)
+{
+    const char *shader_path;
+    char path[1024];
+    int ret;
+
+    if ((shader_path = getenv("STEAM_COMPAT_SHADER_PATH")))
+    {
+        path_concat(path, shader_path, file_name);
+        if ((ret = create_file(path)) < 0)
+            GST_ERROR("Failed to create %s file, ret %d.", file_name, ret);
+    }
+    else
+    {
+        GST_ERROR("Env STEAM_COMPAT_SHADER_PATH not set.");
+        ret = CONV_ERROR_ENV_NOT_SET;
+    }
+
+    return ret;
+}
+
+int dump_fozdb_open(struct dump_fozdb *db, bool create, const char *file_path_env, int num_tags)
+{
+    char *dump_file_path;
+
+    if (db->fozdb)
+        return CONV_OK;
+
+    if (!(dump_file_path = getenv(file_path_env)))
+    {
+        GST_ERROR("Env %s not set.", file_path_env);
+        return CONV_ERROR_ENV_NOT_SET;
+    }
+
+    if (create)
+        create_file(dump_file_path);
+
+    return fozdb_create(dump_file_path, O_RDWR, false, num_tags, &db->fozdb);
+}
+
+void dump_fozdb_close(struct dump_fozdb *db)
+{
+    if (db->fozdb)
+    {
+        fozdb_release(db->fozdb);
+        db->fozdb = NULL;
+    }
+}
+
+bool media_converter_init(void)
+{
+    GST_DEBUG_CATEGORY_INIT(media_converter_debug,
+            "protonmediaconverter", GST_DEBUG_FG_YELLOW, "Proton media converter");
+
+    if (!GST_ELEMENT_REGISTER(protonvideoconverter, NULL))
+    {
+        GST_ERROR("Failed to register protonvideoconverter.");
+        return false;
+    }
+
+    if (!GST_ELEMENT_REGISTER(protonaudioconverter, NULL))
+    {
+        GST_ERROR("Failed to register protonaudioconverter.");
+        return false;
+    }
+
+    if (!GST_ELEMENT_REGISTER(protonaudioconverterbin, NULL))
+    {
+        GST_ERROR("Failed to register protonaudioconverterbin.");
+        return false;
+    }
+
+    return true;
+}
diff --git a/dlls/winegstreamer/media-converter/media-converter.h b/dlls/winegstreamer/media-converter/media-converter.h
new file mode 100644
index 00000000000..51b54147806
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/media-converter.h
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __MEDIA_CONVERTER_H__
+#define __MEDIA_CONVERTER_H__
+
+#define _FILE_OFFSET_BITS 64
+
+#include <string.h>
+#include <utime.h>
+#include <stdarg.h>
+#include <inttypes.h>
+
+#include "unix_private.h"
+
+GST_DEBUG_CATEGORY_EXTERN(media_converter_debug);
+#undef GST_CAT_DEFAULT
+#define GST_CAT_DEFAULT media_converter_debug
+
+typedef int (*data_read_callback)(void *data_reader, uint8_t *buffer, size_t size, size_t *read_size);
+
+/* Changing this will invalidate the cache. You MUST clear it. */
+#define HASH_SEED 0x4AA61F63
+
+enum conv_ret
+{
+    CONV_OK = 0,
+    CONV_ERROR = -1,
+    CONV_ERROR_NOT_IMPLEMENTED = -2,
+    CONV_ERROR_INVALID_ARGUMENT = -3,
+    CONV_ERROR_OPEN_FAILED = -4,
+    CONV_ERROR_READ_FAILED = -5,
+    CONV_ERROR_WRITE_FAILED = -6,
+    CONV_ERROR_SEEK_FAILED = -7,
+    CONV_ERROR_CORRUPT_DATABASE = -8,
+    CONV_ERROR_WRONG_CHECKSUM = -9,
+    CONV_ERROR_ENTRY_NOT_FOUND = -10,
+    CONV_ERROR_ENV_NOT_SET = -11,
+    CONV_ERROR_PATH_NOT_FOUND = -12,
+    CONV_ERROR_INVALID_TAG = -13,
+    CONV_ERROR_DATA_END = -14,
+};
+
+struct murmur3_x64_128_state
+{
+    uint32_t seed;
+    uint64_t h1;
+    uint64_t h2;
+    size_t processed;
+};
+
+struct murmur3_x86_128_state
+{
+    uint32_t seed;
+    uint32_t h1;
+    uint32_t h2;
+    uint32_t h3;
+    uint32_t h4;
+    size_t processed;
+};
+
+struct bytes_reader
+{
+    const uint8_t *data;
+    size_t size;
+    size_t offset;
+};
+
+struct gst_buffer_reader
+{
+    GstBuffer *buffer; /* No ref here, no need to unref. */
+    size_t offset;
+};
+
+struct payload_hash
+{
+    uint32_t hash[4];
+};
+
+struct entry_name
+{
+    uint32_t tag;
+    struct payload_hash hash;
+};
+
+struct dump_fozdb
+{
+    pthread_mutex_t mutex;
+    struct fozdb *fozdb;
+    bool already_cleaned;
+};
+
+struct fozdb
+{
+    const char *file_name;
+    int file;
+    bool read_only;
+    uint64_t write_pos;
+    GHashTable **seen_blobs;
+    uint32_t num_tags;
+};
+
+/* lib.c. */
+extern bool open_file(const char *file_name, int open_flags, int *out_fd);
+extern bool get_file_size(int fd, uint64_t *file_size);
+extern bool complete_read(int file, void *buffer, size_t size);
+extern bool complete_write(int file, const void *buffer, size_t size);
+extern uint32_t crc32(uint32_t crc, const uint8_t *ptr, size_t buf_len);
+extern int create_placeholder_file(const char *file_name);
+extern int dump_fozdb_open(struct dump_fozdb *db, bool create, const char *file_path_env, int num_tags);
+extern void dump_fozdb_close(struct dump_fozdb *db);
+
+/* murmur3.c. */
+extern void murmur3_x64_128_state_init(struct murmur3_x64_128_state *state, uint32_t seed);
+extern void murmur3_x64_128_state_reset(struct murmur3_x64_128_state *state);
+extern bool murmur3_x64_128_full(void *data_src, data_read_callback read_callback,
+        struct murmur3_x64_128_state* state, void *out);
+extern bool murmur3_x64_128(void *data_src, data_read_callback read_callback, uint32_t seed, void *out);
+extern void murmur3_x86_128_state_init(struct murmur3_x86_128_state *state, uint32_t seed);
+extern void murmur3_x86_128_state_reset(struct murmur3_x86_128_state *state);
+extern bool murmur3_x86_128_full(void *data_src, data_read_callback read_callback,
+        struct murmur3_x86_128_state* state, void *out);
+extern bool murmur3_x86_128(void *data_src, data_read_callback read_callback, uint32_t seed, void *out);
+#ifdef __x86_64__
+#define murmur3_128_state       murmur3_x64_128_state
+#define murmur3_128_state_init  murmur3_x64_128_state_init
+#define murmur3_128_state_reset murmur3_x64_128_state_reset
+#define murmur3_128_full        murmur3_x64_128_full
+#define murmur3_128             murmur3_x64_128
+#elif defined(__i386__)
+#define murmur3_128_state       murmur3_x86_128_state
+#define murmur3_128_state_init  murmur3_x86_128_state_init
+#define murmur3_128_state_reset murmur3_x86_128_state_reset
+#define murmur3_128_full        murmur3_x86_128_full
+#define murmur3_128             murmur3_x86_128
+#endif /* __x86_64__ */
+
+/* fossilize.c. */
+extern int fozdb_create(const char *file_name, int open_flags, bool read_only, uint32_t num_tags, struct fozdb **out);
+extern void fozdb_release(struct fozdb *db);
+extern int fozdb_prepare(struct fozdb *db);
+extern bool fozdb_has_entry(struct fozdb *db, uint32_t tag, struct payload_hash *hash);
+extern int fozdb_entry_size(struct fozdb *db, uint32_t tag, struct payload_hash *hash, uint32_t *size);
+extern void fozdb_iter_tag(struct fozdb *db, uint32_t tag, GHashTableIter *iter);
+extern int fozdb_read_entry_data(struct fozdb *db, uint32_t tag, struct payload_hash *hash,
+        uint64_t offset, uint8_t *buffer, size_t size, size_t *read_size, bool with_crc);
+extern int fozdb_write_entry(struct fozdb *db, uint32_t tag, struct payload_hash *hash,
+        void *data_src, data_read_callback read_callback, bool with_crc);
+extern int fozdb_discard_entries(struct fozdb *db, GList *to_discard_entries);
+
+static inline bool option_enabled(const char *env)
+{
+    const char *env_var;
+
+    if (!(env_var = getenv(env)))
+        return false;
+
+    return strcmp(env_var, "0") != 0;
+}
+
+static inline bool discarding_disabled(void)
+{
+    return option_enabled("MEDIACONV_DONT_DISCARD");
+}
+
+static inline const char *format_hash(struct payload_hash *hash)
+{
+    int hash_str_size = 2 + sizeof(*hash) * 2 + 1;
+    static char buffer[1024] = {};
+    static int offset = 0;
+    char *ret;
+
+    if (offset + hash_str_size > sizeof(buffer))
+        offset = 0;
+
+    ret = buffer + offset;
+    sprintf(ret, "0x%08x%08x%08x%08x", hash->hash[3], hash->hash[2], hash->hash[1], hash->hash[0]);
+    offset += hash_str_size;
+
+    return ret;
+}
+
+static inline void bytes_reader_init(struct bytes_reader *reader, const uint8_t *data, size_t size)
+{
+    reader->data = data;
+    reader->size = size;
+    reader->offset = 0;
+}
+
+static inline int bytes_reader_read(void *data_reader, uint8_t *buffer, size_t size, size_t *read_size)
+{
+    struct bytes_reader *reader = data_reader;
+    size_t data_size, to_copy;
+
+    if (!size)
+    {
+        *read_size = 0;
+        return CONV_OK;
+    }
+
+    if (!(data_size = reader->size - reader->offset))
+        return CONV_ERROR_DATA_END;
+
+    to_copy = min(data_size, size);
+    memcpy(buffer, reader->data + reader->offset, to_copy);
+    reader->offset += to_copy;
+
+    *read_size = to_copy;
+    return CONV_OK;
+}
+
+static inline void gst_buffer_reader_init(struct gst_buffer_reader *reader, GstBuffer *buffer)
+{
+    reader->buffer = buffer; /* No ref here, so no need to unref. */
+    reader->offset = 0;
+}
+
+static inline int gst_buffer_reader_read(void *data_reader, uint8_t *buffer, size_t size, size_t *read_size)
+{
+    struct gst_buffer_reader *reader = data_reader;
+
+    if (!size)
+    {
+        *read_size = 0;
+        return CONV_OK;
+    }
+
+    *read_size = gst_buffer_extract(reader->buffer, reader->offset, buffer, size);
+    reader->offset += *read_size;
+    if (!*read_size)
+        return CONV_ERROR_DATA_END;
+
+    return CONV_OK;
+}
+
+static inline bool file_exists(const char *file_path)
+{
+    if (!file_path)
+        return false;
+    return access(file_path, F_OK) == 0;
+}
+
+static inline struct entry_name *entry_name_create(uint32_t tag, struct payload_hash *hash)
+{
+    struct entry_name *entry = calloc(1, sizeof(*entry));
+    entry->tag = tag;
+    entry->hash = *hash;
+    return entry;
+}
+
+static inline gint entry_name_compare(const void *a, const void *b)
+{
+    return memcmp(a, b, sizeof(struct entry_name));
+}
+
+static inline uint32_t bytes_to_uint32(const uint8_t *bytes)
+{
+    return ((uint32_t)bytes[0] << 0)
+            | ((uint32_t)bytes[1] << 8)
+            | ((uint32_t)bytes[2] << 16)
+            | ((uint32_t)bytes[3] << 24);
+}
+
+static inline void payload_hash_from_bytes(struct payload_hash *hash, uint8_t *bytes)
+{
+    hash->hash[0] = bytes_to_uint32(bytes + 0);
+    hash->hash[1] = bytes_to_uint32(bytes + 4);
+    hash->hash[2] = bytes_to_uint32(bytes + 8);
+    hash->hash[3] = bytes_to_uint32(bytes + 12);
+}
+
+#endif /* __MEDIA_CONVERTER_H__ */
diff --git a/dlls/winegstreamer/media-converter/murmur3.c b/dlls/winegstreamer/media-converter/murmur3.c
new file mode 100644
index 00000000000..014345e61d5
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/murmur3.c
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+static uint64_t rotl64(uint64_t value, uint8_t shift)
+{
+    return (value << shift) | (value >> (64 - shift));
+}
+
+static uint32_t rotl32(uint32_t value, uint8_t shift)
+{
+    return (value << shift) | (value >> (32 - shift));
+}
+
+static uint64_t fmix64(uint64_t h)
+{
+    const uint64_t c1 = 0xff51afd7ed558ccd;
+    const uint64_t c2 = 0xc4ceb9fe1a85ec53;
+    const uint32_t r = 33;
+
+    h ^= h >> r;
+    h *= c1;
+    h ^= h >> r;
+    h *= c2;
+    h ^= h >> r;
+
+    return h;
+}
+
+static uint32_t fmix32 (uint32_t h)
+{
+    const uint32_t c1 = 0x85ebca6b;
+    const uint32_t c2 = 0xc2b2ae35;
+    const uint32_t r1 = 16;
+    const uint32_t r2 = 13;
+
+    h ^= h >> r1;
+    h *= c1;
+    h ^= h >> r2;
+    h *= c2;
+    h ^= h >> r1;
+
+    return h;
+}
+
+void murmur3_x64_128_state_init(struct murmur3_x64_128_state *state, uint32_t seed)
+{
+    state->seed = seed;
+    state->h1 = seed;
+    state->h2 = seed;
+    state->processed = 0;
+}
+
+void murmur3_x64_128_state_reset(struct murmur3_x64_128_state *state)
+{
+    state->h1 = state->seed;
+    state->h2 = state->seed;
+    state->processed = 0;
+}
+
+bool murmur3_x64_128_full(void *data_reader, data_read_callback read_callback,
+        struct murmur3_x64_128_state* state, void *out)
+{
+    const uint64_t c1 = 0x87c37b91114253d5, c2 = 0x4cf5ad432745937f, c3 = 0x52dce729, c4 = 0x38495ab5, m = 5;
+    size_t read_size, processed = state->processed;
+    const uint32_t r1 = 27, r2 = 31, r3 = 33;
+    uint64_t h1 = state->h1, h2 = state->h2;
+    uint8_t buffer[16] = {0};
+    uint64_t k1, k2;
+    int ret;
+
+    while ((ret = read_callback(data_reader, buffer, sizeof(buffer), &read_size)) == CONV_OK)
+    {
+        processed += read_size;
+
+        if (read_size == 16)
+        {
+            k1 = *(uint64_t *)&buffer[0];
+            k2 = *(uint64_t *)&buffer[8];
+
+            k1 *= c1;
+            k1 = rotl64(k1, r2);
+            k1 *= c2;
+            h1 ^= k1;
+            h1 = rotl64(h1, r1);
+            h1 += h2;
+            h1 = h1 * m + c3;
+
+            k2 *= c2;
+            k2 = rotl64(k2, r3);
+            k2 *= c1;
+            h2 ^= k2;
+            h2 = rotl64(h2, r2);
+            h2 += h1;
+            h2 = h2 * m + c4;
+        }
+        else
+        {
+            k1 = 0;
+            k2 = 0;
+
+            switch (read_size)
+            {
+            case 15:
+                k2 ^= ((uint64_t)buffer[14]) << 48;
+            case 14:
+                k2 ^= ((uint64_t)buffer[13]) << 40;
+            case 13:
+                k2 ^= ((uint64_t)buffer[12]) << 32;
+            case 12:
+                k2 ^= ((uint64_t)buffer[11]) << 24;
+            case 11:
+                k2 ^= ((uint64_t)buffer[10]) << 16;
+            case 10:
+                k2 ^= ((uint64_t)buffer[9]) << 8;
+            case 9:
+                k2 ^= ((uint64_t)buffer[8]) << 0;
+                k2 *= c2;
+                k2  = rotl64(k2, r3);
+                k2 *= c1;
+                h2 ^= k2;
+            case 8:
+                k1 ^= ((uint64_t)buffer[7]) << 56;
+            case 7:
+                k1 ^= ((uint64_t)buffer[6]) << 48;
+            case 6:
+                k1 ^= ((uint64_t)buffer[5]) << 40;
+            case 5:
+                k1 ^= ((uint64_t)buffer[4]) << 32;
+            case 4:
+                k1 ^= ((uint64_t)buffer[3]) << 24;
+            case 3:
+                k1 ^= ((uint64_t)buffer[2]) << 16;
+            case 2:
+                k1 ^= ((uint64_t)buffer[1]) << 8;
+            case 1:
+                k1 ^= ((uint64_t)buffer[0]) << 0;
+                k1 *= c1;
+                k1  = rotl64(k1, r2);
+                k1 *= c2;
+                h1 ^= k1;
+            }
+        }
+    }
+
+    if (ret != CONV_ERROR_DATA_END)
+        return false;
+
+    state->processed = processed;
+    state->h1 = h1;
+    state->h2 = h2;
+
+    h1 ^= (uint64_t)processed;
+    h2 ^= (uint64_t)processed;
+    h1 += h2;
+    h2 += h1;
+    h1 = fmix64(h1);
+    h2 = fmix64(h2);
+    h1 += h2;
+    h2 += h1;
+
+    ((uint64_t *)out)[0] = h1;
+    ((uint64_t *)out)[1] = h2;
+
+    return true;
+}
+
+bool murmur3_x64_128(void *data_src, data_read_callback read_callback, uint32_t seed, void *out)
+{
+    struct murmur3_x64_128_state state;
+    murmur3_x64_128_state_init(&state, seed);
+    return murmur3_x64_128_full(data_src, read_callback, &state, out);
+}
+
+void murmur3_x86_128_state_init(struct murmur3_x86_128_state *state, uint32_t seed)
+{
+    state->seed = seed;
+    state->h1 = seed;
+    state->h2 = seed;
+    state->h3 = seed;
+    state->h4 = seed;
+    state->processed = 0;
+}
+
+void murmur3_x86_128_state_reset(struct murmur3_x86_128_state *state)
+{
+    state->h1 = state->seed;
+    state->h2 = state->seed;
+    state->h3 = state->seed;
+    state->h4 = state->seed;
+    state->processed = 0;
+}
+
+bool murmur3_x86_128_full(void *data_reader, data_read_callback read_callback,
+        struct murmur3_x86_128_state *state, void *out)
+{
+    const uint32_t c1 = 0x239b961b, c2 = 0xab0e9789, c3 = 0x38b34ae5, c4 = 0xa1e38b93;
+    const uint32_t c5 = 0x561ccd1b, c6 = 0x0bcaa747, c7 = 0x96cd1c35, c8 = 0x32ac3b17;
+    uint32_t h1 = state->h1, h2 = state->h2, h3 = state->h3, h4 = state->h4;
+    size_t read_size, processed = state->processed;
+    unsigned char buffer[16] = {0};
+    uint64_t k1, k2, k3, k4;
+    const uint32_t m = 5;
+    int ret;
+
+    while ((ret = read_callback(data_reader, buffer, sizeof(buffer), &read_size)) == CONV_OK)
+    {
+        processed += read_size;
+
+        if (read_size == 16)
+        {
+            k1 = *(uint32_t*)&buffer[0];
+            k2 = *(uint32_t*)&buffer[4];
+            k3 = *(uint32_t*)&buffer[8];
+            k4 = *(uint32_t*)&buffer[12];
+
+            k1 *= c1;
+            k1 = rotl32(k1, 15);
+            k1 *= c2;
+            h1 ^= k1;
+            h1 = rotl32(h1, 19);
+            h1 += h2;
+            h1 = h1 * m + c5;
+
+            k2 *= c2;
+            k2 = rotl32(k2, 16);
+            k2 *= c3;
+            h2 ^= k2;
+            h2 = rotl32(h2, 17);
+            h2 += h3;
+            h2 = h2 * m + c6;
+
+            k3 *= c3;
+            k3 = rotl32(k3, 17);
+            k3 *= c4;
+            h3 ^= k3;
+            h3 = rotl32(h3, 15);
+            h3 += h4;
+            h3 = h3 * m + c7;
+
+            k4 *= c4;
+            k4 = rotl32(k4, 18);
+            k4 *= c1;
+            h4 ^= k4;
+            h4 = rotl32(h4, 13);
+            h4 += h1;
+            h4 = h4 * m + c8;
+        }
+        else
+        {
+            k1 = 0;
+            k2 = 0;
+            k3 = 0;
+            k4 = 0;
+
+            switch (read_size)
+            {
+            case 15:
+                k4 ^= buffer[14] << 16;
+            case 14:
+                k4 ^= buffer[13] << 8;
+            case 13:
+                k4 ^= buffer[12] << 0;
+                k4 *= c4;
+                k4 = rotl32(k4,18);
+                k4 *= c1;
+                h4 ^= k4;
+            case 12:
+                k3 ^= buffer[11] << 24;
+            case 11:
+                k3 ^= buffer[10] << 16;
+            case 10:
+                k3 ^= buffer[9] << 8;
+            case 9:
+                k3 ^= buffer[8] << 0;
+                k3 *= c3;
+                k3 = rotl32(k3, 17);
+                k3 *= c4;
+                h3 ^= k3;
+            case 8:
+                k2 ^= buffer[7] << 24;
+            case 7:
+                k2 ^= buffer[6] << 16;
+            case 6:
+                k2 ^= buffer[5] << 8;
+            case 5:
+                k2 ^= buffer[4] << 0;
+                k2 *= c2;
+                k2 = rotl32(k2, 16);
+                k2 *= c3;
+                h2 ^= k2;
+            case 4:
+                k1 ^= buffer[3] << 24;
+            case 3:
+                k1 ^= buffer[2] << 16;
+            case 2:
+                k1 ^= buffer[1] << 8;
+            case 1:
+                k1 ^= buffer[0] << 0;
+                k1 *= c1;
+                k1 = rotl32(k1, 15);
+                k1 *= c2;
+                h1 ^= k1;
+            }
+        }
+    }
+
+    if (ret != CONV_ERROR_DATA_END)
+        return false;
+
+    state->processed = processed;
+    state->h1 = h1;
+    state->h2 = h2;
+    state->h3 = h3;
+    state->h4 = h4;
+
+    h1 ^= processed;
+    h2 ^= processed;
+    h3 ^= processed;
+    h4 ^= processed;
+    h1 += h2;
+    h1 += h3;
+    h1 += h4;
+    h2 += h1;
+    h3 += h1;
+    h4 += h1;
+    h1 = fmix32(h1);
+    h2 = fmix32(h2);
+    h3 = fmix32(h3);
+    h4 = fmix32(h4);
+    h1 += h2;
+    h1 += h3;
+    h1 += h4;
+    h2 += h1;
+    h3 += h1;
+    h4 += h1;
+
+    ((uint32_t*)out)[0] = h1;
+    ((uint32_t*)out)[1] = h2;
+    ((uint32_t*)out)[2] = h3;
+    ((uint32_t*)out)[3] = h4;
+
+    return true;
+}
+
+bool murmur3_x86_128(void *data_src, data_read_callback read_callback, uint32_t seed, void *out)
+{
+    struct murmur3_x86_128_state state;
+    murmur3_x86_128_state_init(&state, seed);
+    return murmur3_x86_128_full(data_src, read_callback, &state, out);
+}
diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
new file mode 100644
index 00000000000..b91aa96f1bf
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -0,0 +1,938 @@
+/*
+ * Copyright 2024 Ziqing Hui for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* Algorithm
+ * ---------
+ *
+ * Nicely, both Quartz and Media Foundation allow us random access to the entire data stream. So we
+ * can easily hash the entire incoming stream and substitute it with our Ogg Theora video. If there
+ * is a cache miss, then we dump the entire incoming stream. In case of a cache hit, we dump
+ * nothing.
+ *
+ * Incoming video data is stored in the video.foz Fossilize database.
+ *
+ * Transcoded video data is stored in the transcoded_video.foz Fossilize database.
+ *
+ *
+ * Hashing algorithm
+ * -----------------
+ *
+ * We use murmur3 hash with the seed given below. We use the x32 variant for 32-bit programs, and
+ * the x64 variant for 64-bit programs.
+ *
+ * For speed when hashing, we specify a stride which will skip over chunks of the input. However,
+ * we will always hash the first "stride" number of bytes, to try to avoid collisions on smaller
+ * files with size between chunk and stride.
+ *
+ * For example, the 'H's below are hashed, the 'x's are skipped:
+ *
+ * int chunk = 4;
+ * int stride = chunk * 3;
+ * H = hashed, x = skipped
+ * [HHHH HHHH HHHH HHHH xxxx xxxx HHHH xxxx xxxx HHHH xxxx] < data stream
+ *  ^^^^ ^^^^ ^^^^ stride prefix, hashed
+ *                 ^^^^ chunk
+ *                 ^^^^ ^^^^ ^^^^ stride
+ *                                ^^^^ chunk
+ *                                ^^^^ ^^^^ ^^^^ stride
+ *                                               ^^^^ chunk
+ *                                               ^^^^ ^^^^ stride
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+#include <assert.h>
+
+#define HASH_CHUNK_SIZE (8 * 1024 * 1024) /* 8 MB. */
+#define HASH_STRIDE     (HASH_CHUNK_SIZE * 6)
+
+#define VIDEO_CONV_FOZ_TAG_VIDEODATA 0
+#define VIDEO_CONV_FOZ_TAG_OGVDATA   1
+#define VIDEO_CONV_FOZ_TAG_STREAM    2
+#define VIDEO_CONV_FOZ_TAG_MKVDATA   3
+#define VIDEO_CONV_FOZ_NUM_TAGS      4
+
+#define DURATION_NONE (UINT64_MAX)
+
+struct pad_reader
+{
+    GstPad *pad;
+    size_t offset;
+    uint8_t *chunk;
+    size_t chunk_offset;
+    size_t chunk_end;
+    size_t stride; /* Set to SIZE_MAX to skip no bytes. */
+};
+
+struct hashes_reader
+{
+    GList *current_hash;
+};
+
+struct video_conv_state
+{
+    struct payload_hash transcode_hash;
+    struct fozdb *read_fozdb;
+    uint64_t upstream_duration;
+    uint64_t our_duration;
+    uint32_t transcoded_tag;
+    bool has_transcoded, need_stream_start;
+};
+
+typedef struct
+{
+    GstElement element;
+    GstPad *sink_pad, *src_pad;
+    pthread_mutex_t state_mutex;
+    struct video_conv_state *state;
+} VideoConv;
+
+typedef struct
+{
+    GstElementClass class;
+} VideoConvClass;
+
+G_DEFINE_TYPE(VideoConv, video_conv, GST_TYPE_ELEMENT);
+#define VIDEO_CONV_TYPE (video_conv_get_type())
+#define VIDEO_CONV(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIDEO_CONV_TYPE, VideoConv))
+#define parent_class    (video_conv_parent_class)
+GST_ELEMENT_REGISTER_DEFINE(protonvideoconverter, "protonvideoconverter",
+        GST_RANK_MARGINAL, VIDEO_CONV_TYPE);
+
+static GstStaticPadTemplate video_conv_sink_template = GST_STATIC_PAD_TEMPLATE("sink",
+        GST_PAD_SINK, GST_PAD_ALWAYS,
+        GST_STATIC_CAPS("video/x-ms-asf; video/x-msvideo; video/mpeg; video/quicktime;"));
+
+static GstStaticPadTemplate video_conv_src_template = GST_STATIC_PAD_TEMPLATE("src",
+        GST_PAD_SRC, GST_PAD_ALWAYS,
+        GST_STATIC_CAPS("video/x-matroska; application/ogg;"));
+
+static struct dump_fozdb dump_fozdb = {PTHREAD_MUTEX_INITIALIZER, NULL, false};
+
+void hashes_reader_init(struct hashes_reader *reader, GList *hashes)
+{
+    reader->current_hash = hashes;
+}
+
+static int hashes_reader_read(void *reader, uint8_t *buffer, size_t size, size_t *read_size)
+{
+    struct payload_hash *hash = (struct payload_hash *)buffer;
+    struct hashes_reader *hashes_reader = reader;
+
+    if (!size)
+    {
+        *read_size = 0;
+        return CONV_OK;
+    }
+
+    if (!hashes_reader->current_hash)
+        return CONV_ERROR_DATA_END;
+
+    *hash = *(struct payload_hash *)(hashes_reader->current_hash->data);
+    hashes_reader->current_hash = hashes_reader->current_hash->next;
+
+    *read_size = sizeof(*hash);
+    return CONV_OK;
+}
+
+static int dump_fozdb_open_video(bool create)
+{
+    return dump_fozdb_open(&dump_fozdb, create, "MEDIACONV_VIDEO_DUMP_FILE", VIDEO_CONV_FOZ_NUM_TAGS);
+}
+
+static void dump_fozdb_discard_transcoded(void)
+{
+    GList *to_discard_chunks = NULL;
+    struct payload_hash *stream_id;
+    struct fozdb *read_fozdb;
+    char *read_fozdb_path;
+    GHashTableIter iter;
+    int ret;
+
+    if (dump_fozdb.already_cleaned)
+        return;
+    dump_fozdb.already_cleaned = true;
+
+    if (discarding_disabled())
+        return;
+    if (!file_exists(getenv("MEDIACONV_VIDEO_DUMP_FILE")))
+        return;
+
+    if (dump_fozdb_open_video(false) < 0)
+        return;
+
+    if (!(read_fozdb_path = getenv("MEDIACONV_VIDEO_TRANSCODED_FILE")))
+    {
+        GST_ERROR("Env MEDIACONV_VIDEO_TRANSCODED_FILE not set.");
+        return;
+    }
+
+    if ((ret = fozdb_create(read_fozdb_path, O_RDONLY, true /* Read-only?  */, VIDEO_CONV_FOZ_NUM_TAGS, &read_fozdb)) < 0)
+    {
+        GST_ERROR("Failed to create read fozdb, ret %d.", ret);
+        return;
+    }
+
+    fozdb_iter_tag(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_STREAM, &iter);
+    while (g_hash_table_iter_next(&iter, (void **)&stream_id, NULL))
+    {
+        struct payload_hash chunk_id;
+        uint32_t chunks_size, i;
+        size_t read_size;
+
+        if (fozdb_has_entry(read_fozdb, VIDEO_CONV_FOZ_TAG_OGVDATA, stream_id))
+        {
+            if (fozdb_entry_size(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_STREAM, stream_id, &chunks_size) == CONV_OK)
+            {
+                uint8_t *buffer = calloc(1, chunks_size);
+                if (fozdb_read_entry_data(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_STREAM, stream_id,
+                        0, buffer, chunks_size, &read_size, true) == CONV_OK)
+                {
+                    for (i = 0; i < read_size / sizeof(chunk_id); ++i)
+                    {
+                        payload_hash_from_bytes(&chunk_id, buffer + i * sizeof(chunk_id));
+                        to_discard_chunks = g_list_append(to_discard_chunks,
+                                entry_name_create(VIDEO_CONV_FOZ_TAG_VIDEODATA, &chunk_id));
+                    }
+                }
+                free(buffer);
+            }
+
+            to_discard_chunks = g_list_append(to_discard_chunks,
+                    entry_name_create(VIDEO_CONV_FOZ_TAG_STREAM, stream_id));
+        }
+    }
+
+    if ((ret = fozdb_discard_entries(dump_fozdb.fozdb, to_discard_chunks)) < 0)
+    {
+        GST_ERROR("Failed to discard entries, ret %d.", ret);
+        dump_fozdb_close(&dump_fozdb);
+    }
+
+    g_list_free_full(to_discard_chunks, free);
+}
+
+struct pad_reader *pad_reader_create_with_stride(GstPad *pad, size_t stride)
+{
+    struct pad_reader *pad_reader;
+
+    pad_reader = calloc(1, sizeof(*pad_reader));
+    pad_reader->chunk = calloc(HASH_CHUNK_SIZE, sizeof(*pad_reader->chunk));
+    pad_reader->stride = stride;
+    gst_object_ref((pad_reader->pad = pad));
+
+    return pad_reader;
+}
+
+struct pad_reader *pad_reader_create(GstPad *pad)
+{
+    return pad_reader_create_with_stride(pad, SIZE_MAX);
+}
+
+void pad_reader_release(struct pad_reader *reader)
+{
+    gst_object_unref(reader->pad);
+    free(reader->chunk);
+    free(reader);
+}
+
+int pad_reader_read(void *data_src, uint8_t *buffer, size_t size, size_t *read_size)
+{
+    struct pad_reader *reader = data_src;
+    GstBuffer *gst_buffer = NULL;
+    GstFlowReturn gst_ret;
+    size_t to_copy;
+
+    if (!size)
+    {
+        *read_size = 0;
+        return CONV_OK;
+    }
+
+    if (reader->chunk_offset >= reader->chunk_end)
+    {
+        reader->chunk_offset = 0;
+        reader->chunk_end = 0;
+
+        if ((gst_ret = gst_pad_pull_range(reader->pad,
+                reader->offset, HASH_CHUNK_SIZE, &gst_buffer)) == GST_FLOW_OK)
+        {
+            gsize buffer_size = gst_buffer_get_size(gst_buffer);
+
+            if (reader->offset + buffer_size < reader->stride)
+            {
+                to_copy = buffer_size;
+                reader->offset += to_copy;
+            }
+            else if (reader->offset < reader->stride)
+            {
+                to_copy = reader->stride - reader->offset;
+                reader->offset = reader->stride;
+            }
+            else
+            {
+                to_copy = buffer_size;
+                reader->offset += reader->stride;
+            }
+
+            if (size >= to_copy) /* Copy directly into out buffer and return. */
+            {
+                *read_size = gst_buffer_extract(gst_buffer, 0, buffer, to_copy);
+                gst_buffer_unref(gst_buffer);
+                return CONV_OK;
+            }
+            else
+            {
+                reader->chunk_end = gst_buffer_extract(gst_buffer, 0, reader->chunk, to_copy);
+                gst_buffer_unref(gst_buffer);
+            }
+        }
+        else if (gst_ret == GST_FLOW_EOS)
+        {
+            return CONV_ERROR_DATA_END;
+        }
+        else
+        {
+            GST_WARNING("Failed to pull data from %"GST_PTR_FORMAT", reason %s.",
+                    reader->pad, gst_flow_get_name(gst_ret));
+            return CONV_ERROR;
+        }
+    }
+
+    /* Copy chunk data to output buffer. */
+    to_copy = min(reader->chunk_end - reader->chunk_offset, size);
+    memcpy(buffer, reader->chunk + reader->chunk_offset, to_copy);
+    reader->chunk_offset += to_copy;
+
+    *read_size = to_copy;
+    return CONV_OK;
+}
+
+static int video_conv_state_create(struct video_conv_state **out)
+{
+    struct video_conv_state *state;
+    struct fozdb *fozdb = NULL;
+    char *read_fozdb_path;
+    int ret;
+
+    if (!(read_fozdb_path = getenv("MEDIACONV_VIDEO_TRANSCODED_FILE")))
+    {
+        GST_ERROR("MEDIACONV_VIDEO_TRANSCODED_FILE is not set.");
+        return CONV_ERROR_ENV_NOT_SET;
+    }
+
+    if ((ret = fozdb_create(read_fozdb_path, O_RDONLY, true /* Read-only? */, VIDEO_CONV_FOZ_NUM_TAGS, &fozdb)) < 0)
+        GST_ERROR("Failed to create read fozdb from %s, ret %d.", read_fozdb_path, ret);
+
+    state = calloc(1, sizeof(*state));
+    state->read_fozdb = fozdb;
+    state->upstream_duration = DURATION_NONE;
+    state->our_duration = DURATION_NONE;
+    state->transcoded_tag = VIDEO_CONV_FOZ_TAG_MKVDATA;
+    state->need_stream_start = true;
+
+    *out = state;
+    return CONV_OK;
+}
+
+static void video_conv_state_release(struct video_conv_state *state)
+{
+    if (state->read_fozdb)
+        fozdb_release(state->read_fozdb);
+    free(state);
+}
+
+/* Return true if the file is transcoded, false if not. */
+bool video_conv_state_begin_transcode(struct video_conv_state *state, struct payload_hash *hash)
+{
+    const char *blank_video;
+    uint64_t file_size = 0;
+    int fd;
+
+    GST_DEBUG("state %p, hash %s.", state, format_hash(hash));
+
+    if (state->read_fozdb)
+    {
+        uint32_t entry_size;
+
+        if (fozdb_entry_size(state->read_fozdb, VIDEO_CONV_FOZ_TAG_MKVDATA, hash, &entry_size) == CONV_OK)
+        {
+            GST_DEBUG("Found an MKV video for hash %s.", format_hash(hash));
+            state->transcode_hash = *hash;
+            state->our_duration = entry_size;
+            state->transcoded_tag = VIDEO_CONV_FOZ_TAG_MKVDATA;
+            state->has_transcoded = true;
+            return true;
+        }
+
+        if (fozdb_entry_size(state->read_fozdb, VIDEO_CONV_FOZ_TAG_OGVDATA, hash, &entry_size) == CONV_OK)
+        {
+            GST_DEBUG("Found an OGV video for hash %s.", format_hash(hash));
+            state->transcode_hash = *hash;
+            state->our_duration = entry_size;
+            state->transcoded_tag = VIDEO_CONV_FOZ_TAG_OGVDATA;
+            state->has_transcoded = true;
+            return true;
+        }
+    }
+
+    GST_INFO("No transcoded video for %s. Substituting a blank video.", format_hash(hash));
+
+    if (!(blank_video = getenv("MEDIACONV_BLANK_VIDEO_FILE")))
+    {
+        GST_ERROR("Env MEDIACONV_BLANK_VIDEO_FILE not set.");
+        return false;
+    }
+    if (open_file(blank_video, O_RDONLY, &fd))
+    {
+        get_file_size(fd, &file_size);
+        close(fd);
+    }
+    state->our_duration = file_size;
+    state->has_transcoded = false;
+
+    create_placeholder_file("placeholder-video-used");
+
+    return false;
+}
+
+int video_conv_state_fill_buffer(struct video_conv_state *state, uint64_t offset,
+        uint8_t *buffer, size_t size, size_t *fill_size)
+{
+    const char *blank_video;
+    uint64_t file_size;
+    size_t to_copy;
+    bool read_ok;
+    int fd, ret;
+
+    if (state->has_transcoded)
+    {
+        if ((ret = fozdb_read_entry_data(state->read_fozdb, state->transcoded_tag, &state->transcode_hash,
+                offset, buffer, size, fill_size, false)) < 0)
+            GST_ERROR("Failed to read entry data, ret %d.", ret);
+        return ret;
+    }
+    else /* Fill blank video data to buffer. */
+    {
+        if (!(blank_video = getenv("MEDIACONV_BLANK_VIDEO_FILE")))
+        {
+            GST_ERROR("Env MEDIACONV_BLANK_VIDEO_FILE not set.");
+            return CONV_ERROR_ENV_NOT_SET;
+        }
+        if (!open_file(blank_video, O_RDONLY, &fd))
+            return CONV_ERROR_OPEN_FAILED;
+        if (!get_file_size(fd, &file_size))
+        {
+            close(fd);
+            return CONV_ERROR;
+        }
+
+        /* Get copy size. */
+        if (offset >= file_size)
+        {
+            close(fd);
+            return CONV_OK;
+        }
+        to_copy = min(file_size - offset, size);
+
+        /* Copy data. */
+        if (lseek(fd, offset, SEEK_SET) < 0)
+        {
+            GST_ERROR("Failed to seek %s to %#"PRIx64". %s.", blank_video, offset, strerror(errno));
+            close(fd);
+            return CONV_ERROR;
+        }
+        read_ok = complete_read(fd, buffer, to_copy);
+        close(fd);
+
+        if (!read_ok)
+        {
+            GST_ERROR("Failed to read blank video data.");
+            return CONV_ERROR_READ_FAILED;
+        }
+        *fill_size = to_copy;
+        return CONV_OK;
+    }
+}
+
+/* Call pthread_mutex_unlock() to unlock after usage. */
+static struct video_conv_state *video_conv_lock_state(VideoConv *conv)
+{
+    pthread_mutex_lock(&conv->state_mutex);
+    if (!conv->state)
+        pthread_mutex_unlock(&conv->state_mutex);
+    return conv->state;
+}
+
+static GstStateChangeReturn video_conv_change_state(GstElement *element, GstStateChange transition)
+{
+    VideoConv *conv = VIDEO_CONV(element);
+    struct video_conv_state *state;
+    int ret;
+
+    GST_INFO_OBJECT(element, "State transition: %s.", gst_state_change_get_name(transition));
+
+    switch (transition)
+    {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+        /* Do runtime setup. */
+        if ((ret = video_conv_state_create(&state)) < 0)
+        {
+            GST_ERROR("Failed to create video conv state, ret %d.", ret);
+            return GST_STATE_CHANGE_FAILURE;
+        }
+        pthread_mutex_lock(&conv->state_mutex);
+        assert(!conv->state);
+        conv->state = state;
+        pthread_mutex_unlock(&conv->state_mutex);
+        break;
+
+    case GST_STATE_CHANGE_READY_TO_NULL:
+        /* Do runtime teardown. */
+        pthread_mutex_lock(&conv->state_mutex);
+        video_conv_state_release(conv->state);
+        conv->state = NULL;
+        pthread_mutex_unlock(&conv->state_mutex);
+        break;
+
+    default:
+        break;
+    }
+
+    return GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
+
+    /* XXX on ReadyToNull, sodium drops state _again_ here... why? */
+}
+
+static uint64_t video_conv_duration_ours_to_upstream(VideoConv *conv, uint64_t pos)
+{
+    struct video_conv_state *state = conv->state;
+
+    if (state->upstream_duration != DURATION_NONE && state->our_duration != DURATION_NONE)
+        return pos * state->upstream_duration / state->our_duration;
+    else
+        return DURATION_NONE;
+}
+
+static void video_conv_query_upstream_duration(VideoConv *conv)
+{
+    gint64 duration;
+
+    if (gst_pad_peer_query_duration(conv->sink_pad, GST_FORMAT_BYTES, &duration))
+        conv->state->upstream_duration = duration;
+    else
+        GST_ERROR_OBJECT(conv, "Failed to query upstream duration.");
+}
+
+static bool video_conv_get_upstream_range(VideoConv *conv, uint64_t offset, uint32_t requested_size,
+        uint64_t *upstream_offset, uint64_t *upstream_requested_size)
+{
+    struct video_conv_state *state;
+
+    if (!(state = video_conv_lock_state(conv)))
+        return false;
+
+    if (state->upstream_duration == DURATION_NONE)
+        video_conv_query_upstream_duration(conv);
+
+    *upstream_offset = video_conv_duration_ours_to_upstream(conv, offset);
+    *upstream_requested_size = video_conv_duration_ours_to_upstream(conv, requested_size);
+
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    return true;
+}
+
+static bool video_conv_hash_upstream_data(VideoConv *conv, struct payload_hash *hash)
+{
+    struct pad_reader *reader;
+    bool ret;
+
+    memset(hash, 0, sizeof(*hash));
+
+    reader = pad_reader_create_with_stride(conv->sink_pad, HASH_STRIDE);
+    ret = murmur3_128(reader, pad_reader_read, HASH_SEED, hash);
+    pad_reader_release(reader);
+
+    return ret;
+}
+
+static int video_conv_dump_upstream_data(VideoConv *conv, struct payload_hash *hash)
+{
+    struct hashes_reader chunk_hashes_reader;
+    struct pad_reader *pad_reader = NULL;
+    GList *chunk_hashes = NULL;
+    uint8_t *buffer = NULL;
+    size_t read_size;
+    int ret;
+
+    GST_DEBUG("Dumping upstream data, hash %s.", format_hash(hash));
+
+    if ((ret = dump_fozdb_open_video(true)) < 0)
+    {
+        GST_ERROR("Failed to open video dump fozdb, ret %d.", ret);
+        goto done;
+    }
+
+    buffer = calloc(1, HASH_CHUNK_SIZE);
+    pad_reader = pad_reader_create(conv->sink_pad);
+    while ((ret = pad_reader_read(pad_reader, buffer, HASH_CHUNK_SIZE, &read_size)) == CONV_OK)
+    {
+        struct bytes_reader bytes_reader;
+        struct payload_hash *chunk_hash;
+
+        bytes_reader_init(&bytes_reader, buffer, read_size);
+        chunk_hash = calloc(1, sizeof(*chunk_hash));
+        murmur3_128(&bytes_reader, bytes_reader_read, HASH_SEED, chunk_hash);
+        chunk_hashes = g_list_append(chunk_hashes, chunk_hash);
+
+        bytes_reader_init(&bytes_reader, buffer, read_size);
+        if ((ret = fozdb_write_entry(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_VIDEODATA, chunk_hash,
+                &bytes_reader, bytes_reader_read, true)) < 0)
+        {
+            GST_ERROR("Error writing video data to fozdb, ret %d.", ret);
+            goto done;
+        }
+    }
+
+    if (ret != CONV_ERROR_DATA_END)
+    {
+        GST_ERROR("Failed to read data from pad reader, ret %d.", ret);
+        goto done;
+    }
+
+    hashes_reader_init(&chunk_hashes_reader, chunk_hashes);
+    if ((ret = fozdb_write_entry(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_STREAM, hash,
+            &chunk_hashes_reader, hashes_reader_read, true)) < 0)
+        GST_ERROR("Error writing stream data to fozdb, ret %d.", ret);
+
+done:
+    if (chunk_hashes)
+        g_list_free_full(chunk_hashes, free);
+    if (pad_reader)
+        pad_reader_release(pad_reader);
+    if (buffer)
+        free(buffer);
+    return ret;
+}
+
+static void video_conv_init_transcode(VideoConv *conv)
+{
+    struct video_conv_state *state = conv->state;
+    struct payload_hash hash;
+    int ret;
+
+    if (state->has_transcoded)
+        return;
+
+    pthread_mutex_lock(&dump_fozdb.mutex);
+
+    dump_fozdb_discard_transcoded();
+
+    if (video_conv_hash_upstream_data(conv, &hash))
+    {
+        GST_INFO("Got upstream data hash: %s.", format_hash(&hash));
+        if (!video_conv_state_begin_transcode(state, &hash)
+                && (ret = video_conv_dump_upstream_data(conv, &hash)) < 0)
+            GST_ERROR("Failed to dump upstream data, ret %d.", ret);
+    }
+    else
+    {
+        GST_WARNING("Failed to hash upstream data.");
+    }
+
+    pthread_mutex_unlock(&dump_fozdb.mutex);
+}
+
+static gboolean video_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    VideoConv *conv = VIDEO_CONV(parent);
+    bool ret;
+
+    GST_DEBUG_OBJECT(pad, "Got event %"GST_PTR_FORMAT".", event);
+
+    if (event->type == GST_EVENT_CAPS)
+    {
+        struct video_conv_state *state;
+        uint32_t transcode_tag;
+        GstCaps *caps;
+
+        /* push_event, below, can also grab state and cause a deadlock, so make sure it's
+         * unlocked before calling */
+        if (!(state = video_conv_lock_state(conv)))
+        {
+            GST_ERROR("VideoConv not yet in READY state?");
+            return false;
+        }
+
+        if (!gst_pad_activate_mode(conv->sink_pad, GST_PAD_MODE_PULL, true))
+        {
+            GST_ERROR("Failed to activate sink pad in pull mode.");
+            pthread_mutex_unlock(&conv->state_mutex);
+            return false;
+        }
+
+        video_conv_init_transcode(conv);
+        transcode_tag = state->transcoded_tag;
+
+        pthread_mutex_unlock(&conv->state_mutex);
+
+        if (transcode_tag == VIDEO_CONV_FOZ_TAG_MKVDATA)
+            caps = gst_caps_from_string("video/x-matroska");
+        else if (transcode_tag == VIDEO_CONV_FOZ_TAG_OGVDATA)
+            caps = gst_caps_from_string("application/ogg");
+        else
+            return false;
+
+        ret = push_event(conv->src_pad, gst_event_new_caps(caps));
+        gst_caps_unref(caps);
+        return ret;
+    }
+
+    return gst_pad_event_default(pad, parent, event);
+}
+
+static GstFlowReturn video_conv_src_get_range(GstPad *pad, GstObject *parent,
+        guint64 offset, guint request_size, GstBuffer **buffer)
+{
+    GstBuffer *my_buffer, *upstream_buffer = NULL, *new_buffer = NULL;
+    uint64_t upstream_offset, upstream_request_size;
+    GstFlowReturn flow_ret = GST_FLOW_ERROR;
+    VideoConv *conv = VIDEO_CONV(parent);
+    struct video_conv_state *state;
+    size_t fill_size;
+    GstMapInfo map;
+    int ret;
+
+    if (!video_conv_get_upstream_range(conv, offset, request_size, &upstream_offset, &upstream_request_size))
+        return flow_ret;
+
+    if (!(state = video_conv_lock_state(conv)))
+        return flow_ret;
+
+    /* Read and ignore upstream bytes. */
+    if ((flow_ret = gst_pad_pull_range(conv->sink_pad, upstream_offset, upstream_request_size, &upstream_buffer)) < 0)
+    {
+        GST_ERROR("Failed to pull upstream data from %"GST_PTR_FORMAT", offset %#"PRIx64", size %#"PRIx64", reason %s.",
+                conv->sink_pad, upstream_offset, upstream_request_size, gst_flow_get_name(flow_ret));
+        goto done;
+    }
+    gst_buffer_unref(upstream_buffer);
+
+    /* Allocate and map buffer. */
+    my_buffer = *buffer;
+    if (!my_buffer)
+    {
+        /* XXX: can we use a buffer cache here? */
+        if (!(new_buffer = gst_buffer_new_and_alloc(request_size)))
+        {
+            GST_ERROR("Failed to allocate buffer of %u bytes.", request_size);
+            goto done;
+        }
+        my_buffer = new_buffer;
+    }
+    if (!gst_buffer_map(my_buffer, &map, GST_MAP_READWRITE))
+    {
+        GST_ERROR("Failed to map buffer <%"GST_PTR_FORMAT">.", my_buffer);
+        goto done;
+    }
+
+    /* Fill buffer. */
+    ret = video_conv_state_fill_buffer(state, offset, map.data, map.size, &fill_size);
+    gst_buffer_unmap(my_buffer, &map);
+    if (ret < 0)
+    {
+        GST_ERROR("Failed to fill buffer, ret %d.", ret);
+        goto done;
+    }
+
+    if (fill_size > 0 || !gst_buffer_get_size(my_buffer))
+    {
+        gst_buffer_set_size(my_buffer, fill_size);
+        *buffer = my_buffer;
+        flow_ret = GST_FLOW_OK;
+    }
+    else
+    {
+        flow_ret = GST_FLOW_EOS;
+    }
+
+done:
+    if (flow_ret < 0 && new_buffer)
+        gst_buffer_unref(new_buffer);
+    pthread_mutex_unlock(&conv->state_mutex);
+    return flow_ret;
+}
+
+static gboolean video_conv_src_query(GstPad *pad, GstObject *parent, GstQuery *query)
+{
+    VideoConv *conv = VIDEO_CONV(parent);
+    struct video_conv_state *state;
+    GstSchedulingFlags flags;
+    gint min, max, align;
+    GstQuery *peer_query;
+    uint64_t duration;
+    GstFormat format;
+
+    GST_DEBUG_OBJECT(pad, "Got query %"GST_PTR_FORMAT".", query);
+
+    switch (query->type)
+    {
+    case GST_QUERY_SCHEDULING:
+        peer_query = gst_query_new_scheduling();
+        if (!gst_pad_peer_query(conv->sink_pad, peer_query))
+        {
+            GST_ERROR_OBJECT(conv->sink_pad, "Failed to query scheduling from peer.");
+            gst_query_unref(peer_query);
+            return false;
+        }
+        gst_query_parse_scheduling(peer_query, &flags, &min, &max, &align);
+        gst_query_unref(peer_query);
+
+        gst_query_set_scheduling(query, flags, min, max, align);
+        gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL);
+
+        return true;
+
+    case GST_QUERY_DURATION:
+        gst_query_parse_duration(query, &format, NULL);
+        if (format != GST_FORMAT_BYTES)
+        {
+            GST_WARNING("Duration query format is not GST_FORMAT_BYTES.");
+            return false;
+        }
+
+        if (!(state = video_conv_lock_state(conv)))
+            return false;
+        if (state->upstream_duration == DURATION_NONE)
+            video_conv_query_upstream_duration(conv);
+        duration = state->our_duration;
+        pthread_mutex_unlock(&conv->state_mutex);
+
+        if (duration == DURATION_NONE)
+            return false;
+        gst_query_set_duration(query, GST_FORMAT_BYTES, duration);
+        return true;
+
+    default:
+        return gst_pad_query_default(pad, parent, query);
+    }
+}
+
+static gboolean video_conv_src_active_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean active)
+{
+    VideoConv *conv = VIDEO_CONV(parent);
+    struct video_conv_state *state;
+    struct payload_hash hash;
+    bool need_stream_start;
+    bool has_transcoded;
+
+    GST_DEBUG_OBJECT(pad, "mode %s, active %d.", gst_pad_mode_get_name(mode), active);
+
+    if (!gst_pad_activate_mode(conv->sink_pad, mode, active))
+    {
+        GST_ERROR_OBJECT(conv->sink_pad, "Failed to active sink pad: mode %s, active %d.",
+                gst_pad_mode_get_name(mode), active);
+        return false;
+    }
+
+    if (mode != GST_PAD_MODE_PULL)
+        return true;
+
+    if (!(state = video_conv_lock_state(conv)))
+    {
+        GST_ERROR("VideoConv not yet in READY state?");
+        return false;
+    }
+
+    video_conv_init_transcode(conv);
+    hash = state->transcode_hash;
+    need_stream_start = state->need_stream_start;
+    has_transcoded = state->has_transcoded;
+
+    /* push_event, below, can also grab state and cause a deadlock, so make sure it's
+     * unlocked before calling */
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    if (need_stream_start && active && has_transcoded)
+    {
+        push_event(conv->src_pad, gst_event_new_stream_start(format_hash(&hash)));
+
+        if (!(state = video_conv_lock_state(conv)))
+        {
+            GST_ERROR("VideoConv not yet in READY state?");
+            return false;
+        }
+        state->need_stream_start = false;
+        pthread_mutex_unlock(&conv->state_mutex);
+    }
+
+    return true;
+}
+
+
+static void video_conv_finalize(GObject *object)
+{
+    VideoConv *conv = VIDEO_CONV(object);
+
+    pthread_mutex_destroy(&conv->state_mutex);
+    if (conv->state)
+        video_conv_state_release(conv->state);
+
+    G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static void video_conv_class_init(VideoConvClass * klass)
+{
+    GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+    gst_element_class_set_metadata(element_class,
+            "Proton video converter",
+            "Codec/Demuxer",
+            "Converts video for Proton",
+            "Andrew Eikum <aeikum@codeweavers.com>, Ziqing Hui <zhui@codeweavers.com>");
+
+    element_class->change_state = video_conv_change_state;
+    object_class->finalize = video_conv_finalize;
+
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&video_conv_sink_template));
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&video_conv_src_template));
+}
+
+static void video_conv_init(VideoConv *conv)
+{
+    GstElement *element = GST_ELEMENT(conv);
+
+    conv->sink_pad = gst_pad_new_from_static_template(&video_conv_sink_template, "sink");
+    gst_pad_set_event_function(conv->sink_pad, GST_DEBUG_FUNCPTR(video_conv_sink_event));
+    gst_element_add_pad(element, conv->sink_pad);
+
+    conv->src_pad = gst_pad_new_from_static_template(&video_conv_src_template, "src");
+    gst_pad_set_getrange_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_get_range));
+    gst_pad_set_query_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_query));
+    gst_pad_set_activatemode_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_active_mode));
+    gst_element_add_pad(element, conv->src_pad);
+
+    pthread_mutex_init(&conv->state_mutex, NULL);
+    conv->state = NULL;
+}
diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c
index 3c51c83b348..881566339eb 100644
--- a/dlls/winegstreamer/unixlib.c
+++ b/dlls/winegstreamer/unixlib.c
@@ -46,6 +46,8 @@
 
 GST_DEBUG_CATEGORY(wine);
 
+extern bool media_converter_init(void);
+
 GstGLDisplay *gl_display;
 
 GstStreamType stream_type_from_caps(GstCaps *caps)
@@ -323,5 +325,12 @@ NTSTATUS wg_init_gstreamer(void *arg)
         }
     }
 
+    if (!media_converter_init())
+    {
+        GST_ERROR("Failed to init media converter.");
+        gst_object_unref(gl_display);
+        return STATUS_UNSUCCESSFUL;
+    }
+
     return STATUS_SUCCESS;
 }

From d5b29cf9769e5bfa200958d2118ec3490b230cf5 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:08 +0800
Subject: [PATCH 328/389] Revert "mfmediaengine/tests: Test
 IMFMediaEngineEx::SetCurrentTime/Ex()."

This reverts commit e9b0c55ec27c464482847d057cc22721121d30e9.
---
 dlls/mfmediaengine/tests/mfmediaengine.c | 201 -----------------------
 1 file changed, 201 deletions(-)

diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index c7fabbe218f..f9489f3dcb5 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -2183,11 +2183,6 @@ struct test_seek_notify
 {
     IMFMediaEngineNotify IMFMediaEngineNotify_iface;
     HANDLE playing_event;
-    HANDLE seeking_event;
-    HANDLE seeked_event;
-    HANDLE time_update_event;
-    BOOL seeking_event_received;
-    BOOL time_update_event_received;
     HRESULT expected_error;
     HRESULT error;
     LONG refcount;
@@ -2227,9 +2222,6 @@ static ULONG WINAPI test_seek_notify_Release(IMFMediaEngineNotify *iface)
     if (!refcount)
     {
         CloseHandle(notify->playing_event);
-        CloseHandle(notify->seeking_event);
-        CloseHandle(notify->seeked_event);
-        CloseHandle(notify->time_update_event);
         free(notify);
     }
 
@@ -2246,17 +2238,6 @@ static HRESULT WINAPI test_seek_notify_EventNotify(IMFMediaEngineNotify *iface,
     case MF_MEDIA_ENGINE_EVENT_PLAYING:
         SetEvent(notify->playing_event);
         break;
-    case MF_MEDIA_ENGINE_EVENT_SEEKING:
-        notify->seeking_event_received = TRUE;
-        SetEvent(notify->seeking_event);
-        break;
-    case MF_MEDIA_ENGINE_EVENT_SEEKED:
-        SetEvent(notify->seeked_event);
-        break;
-    case MF_MEDIA_ENGINE_EVENT_TIMEUPDATE:
-        notify->time_update_event_received = TRUE;
-        SetEvent(notify->time_update_event);
-        break;
     case MF_MEDIA_ENGINE_EVENT_ERROR:
         ok(param2 == notify->expected_error, "Unexpected error %#lx\n", param2);
         notify->error = param2;
@@ -2281,13 +2262,7 @@ static struct test_seek_notify *create_seek_notify(void)
     object = calloc(1, sizeof(*object));
     object->IMFMediaEngineNotify_iface.lpVtbl = &test_seek_notify_vtbl;
     object->playing_event = CreateEventW(NULL, FALSE, FALSE, NULL);
-    object->seeking_event = CreateEventW(NULL, FALSE, FALSE, NULL);
-    object->seeked_event = CreateEventW(NULL, FALSE, FALSE, NULL);
-    object->time_update_event = CreateEventW(NULL, FALSE, FALSE, NULL);
     ok(!!object->playing_event, "Failed to create an event, error %lu.\n", GetLastError());
-    ok(!!object->seeking_event, "Failed to create an event, error %lu.\n", GetLastError());
-    ok(!!object->seeked_event, "Failed to create an event, error %lu.\n", GetLastError());
-    ok(!!object->time_update_event, "Failed to create an event, error %lu.\n", GetLastError());
     object->refcount = 1;
     return object;
 }
@@ -2529,181 +2504,6 @@ static void test_media_extension(void)
     IMFMediaEngineExtension_Release(&extension->IMFMediaEngineExtension_iface);
 }
 
-#define test_seek_result(a, b, c) _test_seek_result(__LINE__, a, b, c)
-static void _test_seek_result(int line, IMFMediaEngineEx *media_engine,
-        struct test_seek_notify *notify, double expected_time)
-{
-    static const double allowed_error = 0.05;
-    static const int timeout = 1000;
-    double time;
-    DWORD res;
-
-    ok(notify->seeking_event_received, "Seeking event not received.\n");
-    notify->seeking_event_received = FALSE;
-    res = WaitForSingleObject(notify->seeking_event, timeout);
-    ok_(__FILE__, line)(!res, "Waiting for seeking event returned %#lx.\n", res);
-    res = WaitForSingleObject(notify->seeked_event, timeout);
-    ok_(__FILE__, line)(!res, "Waiting for seeked event returned %#lx.\n", res);
-    res = WaitForSingleObject(notify->time_update_event, timeout);
-    ok_(__FILE__, line)(!res, "Waiting for ready event returned %#lx.\n", res);
-    time = IMFMediaEngineEx_GetCurrentTime(media_engine);
-    ok_(__FILE__, line)(compare_double(time, expected_time, allowed_error), "Unexpected time %lf.\n", time);
-}
-
-static void test_SetCurrentTime(void)
-{
-    static const double allowed_error = 0.05;
-    static const int timeout = 1000;
-    IMFByteStream *stream, *unseekable_stream = NULL;
-    double time, duration, start, end;
-    struct test_seek_notify *notify;
-    IMFMediaEngineEx *media_engine;
-    ULONG refcount;
-    HRESULT hr;
-    DWORD res;
-    BOOL ret;
-    BSTR url;
-
-    notify = create_seek_notify();
-    hr = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_B8G8R8X8_UNORM,
-            &IID_IMFMediaEngineEx, (void **)&media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);
-
-    stream = load_resource(L"i420-64x64.avi", L"video/avi");
-    url = SysAllocString(L"i420-64x64.avi");
-    hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, stream, url);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IMFMediaEngineEx_Play(media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    res = WaitForSingleObject(notify->playing_event, 5000);
-    ok(!res, "Unexpected res %#lx.\n", res);
-
-    duration = IMFMediaEngineEx_GetDuration(media_engine);
-    ok(duration > 0, "Got invalid duration.\n");
-    start = 0;
-    end = duration;
-
-    /* Test playing state */
-    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, end);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-        test_seek_result(media_engine, notify, end);
-
-    /* Test seeking with a negative position */
-    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, -1);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-        test_seek_result(media_engine, notify, 0);
-
-    /* Test seeking beyond duration */
-    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, end + 1);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-        test_seek_result(media_engine, notify, end);
-
-    hr = IMFMediaEngineEx_SetCurrentTimeEx(media_engine, start, MF_MEDIA_ENGINE_SEEK_MODE_NORMAL);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-        test_seek_result(media_engine, notify, start);
-
-    hr = IMFMediaEngineEx_SetCurrentTimeEx(media_engine, end, MF_MEDIA_ENGINE_SEEK_MODE_APPROXIMATE);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-        test_seek_result(media_engine, notify, end);
-
-    /* Test paused state */
-    hr = IMFMediaEngineEx_Pause(media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, start);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-    {
-        ok(notify->seeking_event_received, "Seeking event not received.\n");
-        notify->seeking_event_received = FALSE;
-        ok(notify->time_update_event_received, "Time update event not received.\n");
-        notify->time_update_event_received = FALSE;
-        res = WaitForSingleObject(notify->seeking_event, timeout);
-        ok(!res, "Unexpected res %#lx.\n", res);
-        res = WaitForSingleObject(notify->seeked_event, timeout);
-        ok(res == WAIT_TIMEOUT || res == 0, /* No timeout sometimes on Win10+ */
-                "Unexpected res %#lx.\n", res);
-        res = WaitForSingleObject(notify->time_update_event, timeout);
-        ok(!res, "Unexpected res %#lx.\n", res);
-        time = IMFMediaEngineEx_GetCurrentTime(media_engine);
-        ok(compare_double(time, start, allowed_error), "Unexpected time %lf.\n", time);
-    }
-
-    Sleep(end * 1000);
-
-    ret = IMFMediaEngineEx_IsPaused(media_engine);
-    ok(ret, "Unexpected ret %d.\n", ret);
-    time = IMFMediaEngineEx_GetCurrentTime(media_engine);
-    ok(compare_double(time, start, allowed_error)
-            || broken(time >= end) /* Windows 11 21H2 AMD GPU TestBot */, "Unexpected time %lf.\n", time);
-
-    hr = IMFMediaEngineEx_Play(media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    res = WaitForSingleObject(notify->seeked_event, timeout);
-    ok(res == WAIT_TIMEOUT, "Unexpected res %#lx.\n", res);
-
-    /* Media engine is shut down */
-    hr = IMFMediaEngineEx_Shutdown(media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, start);
-    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaEngineEx_SetCurrentTimeEx(media_engine, start, MF_MEDIA_ENGINE_SEEK_MODE_NORMAL);
-    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
-
-    refcount = IMFMediaEngineEx_Release(media_engine);
-    todo_wine
-    ok(!refcount, "Got unexpected refcount %lu.\n", refcount);
-
-    /* Unseekable bytestreams */
-    notify = create_seek_notify();
-    hr = create_media_engine(&notify->IMFMediaEngineNotify_iface, NULL, DXGI_FORMAT_B8G8R8X8_UNORM,
-            &IID_IMFMediaEngineEx, (void **)&media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);
-    unseekable_stream = create_unseekable_stream(stream);
-    hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, unseekable_stream, url);
-    todo_wine
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (FAILED(hr))
-        goto done;
-
-    hr = IMFMediaEngineEx_Play(media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    notify->expected_error = MF_E_INVALIDREQUEST;
-    res = WaitForSingleObject(notify->playing_event, 5000);
-    ok(res == S_OK, "Unexpected res %#lx.\n", res);
-
-    hr = IMFMediaEngineEx_SetCurrentTime(media_engine, end);
-    ok(hr == S_OK || broken(hr == MF_INVALID_STATE_ERR) /* Win8 */, "Unexpected hr %#lx.\n", hr);
-    if (hr == S_OK)
-    {
-        ok(!notify->seeking_event_received, "Seeking event received.\n");
-        res = WaitForSingleObject(notify->seeking_event, timeout);
-        ok(res == WAIT_TIMEOUT, "Unexpected res %#lx.\n", res);
-        res = WaitForSingleObject(notify->seeked_event, timeout);
-        ok(res == WAIT_TIMEOUT, "Unexpected res %#lx.\n", res);
-        res = WaitForSingleObject(notify->time_update_event, timeout);
-        ok(!res, "Unexpected res %#lx.\n", res);
-    }
-
-done:
-    hr = IMFMediaEngineEx_Shutdown(media_engine);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    refcount = IMFMediaEngineEx_Release(media_engine);
-    ok(!refcount || broken(refcount == 1) /* Win8.1 */, "Got unexpected refcount %lu.\n", refcount);
-    IMFByteStream_Release(unseekable_stream);
-    SysFreeString(url);
-    IMFByteStream_Release(stream);
-}
-
 START_TEST(mfmediaengine)
 {
     HRESULT hr;
@@ -2739,7 +2539,6 @@ START_TEST(mfmediaengine)
     test_GetDuration();
     test_GetSeekable();
     test_media_extension();
-    test_SetCurrentTime();
 
     IMFMediaEngineClassFactory_Release(factory);
 

From 52ccf6492da32cd6803becd0d0ad6db49cb0c8f2 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:09 +0800
Subject: [PATCH 329/389] Revert "mfmediaengine: Implement
 IMFMediaEngineEx::SetCurrentTimeEx()."

This reverts commit cab32f60ad8cbed6613656f7b89fa97b49f7046a.
---
 dlls/mfmediaengine/main.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index f6ea0cf3e59..c6f82ec055b 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -3027,24 +3027,9 @@ static HRESULT WINAPI media_engine_SetRealTimeMode(IMFMediaEngineEx *iface, BOOL
 
 static HRESULT WINAPI media_engine_SetCurrentTimeEx(IMFMediaEngineEx *iface, double seektime, MF_MEDIA_ENGINE_SEEK_MODE mode)
 {
-    struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
-    HRESULT hr;
-
-    TRACE("%p, %f, %#x.\n", iface, seektime, mode);
-
-    if (mode)
-        FIXME("mode %#x is ignored.\n", mode);
-
-    EnterCriticalSection(&engine->cs);
-
-    if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)
-        hr = MF_E_SHUTDOWN;
-    else
-        hr = media_engine_set_current_time(engine, seektime);
+    FIXME("%p, %f, %#x stub.\n", iface, seektime, mode);
 
-    LeaveCriticalSection(&engine->cs);
-
-    return hr;
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI media_engine_EnableTimeUpdateTimer(IMFMediaEngineEx *iface, BOOL enable)

From b2f499fe8f895283ca9e2f23194681d1d4e838d3 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:10 +0800
Subject: [PATCH 330/389] Revert "mfmediaengine: Implement
 IMFMediaEngineEx::SetCurrentTime()."

This reverts commit 283cde7ab8a1d3551cfae38f333c3de1ab779103.
---
 dlls/mfmediaengine/main.c | 59 +++++----------------------------------
 1 file changed, 7 insertions(+), 52 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index c6f82ec055b..3e05626f238 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -94,7 +94,6 @@ enum media_engine_flags
     FLAGS_ENGINE_NEW_FRAME = 0x8000,
     FLAGS_ENGINE_SOURCE_PENDING = 0x10000,
     FLAGS_ENGINE_PLAY_PENDING = 0x20000,
-    FLAGS_ENGINE_SEEKING = 0x40000,
 };
 
 struct vec3
@@ -165,7 +164,6 @@ struct media_engine
     {
         IMFMediaSource *source;
         IMFPresentationDescriptor *pd;
-        PROPVARIANT start_position;
     } presentation;
     struct effects video_effects;
     struct effects audio_effects;
@@ -980,14 +978,7 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
             break;
         }
         case MESessionStarted:
-            EnterCriticalSection(&engine->cs);
-            if (engine->flags & FLAGS_ENGINE_SEEKING)
-            {
-                media_engine_set_flag(engine, FLAGS_ENGINE_SEEKING | FLAGS_ENGINE_IS_ENDED, FALSE);
-                IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKED, 0, 0);
-                IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);
-            }
-            LeaveCriticalSection(&engine->cs);
+
             IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAYING, 0, 0);
             break;
         case MESessionEnded:
@@ -1348,9 +1339,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
 
 static void media_engine_start_playback(struct media_engine *engine)
 {
-    IMFMediaSession_Start(engine->session, &GUID_NULL, &engine->presentation.start_position);
-    /* Reset the playback position to the current position */
-    engine->presentation.start_position.vt = VT_EMPTY;
+    PROPVARIANT var;
+
+    var.vt = VT_EMPTY;
+    IMFMediaSession_Start(engine->session, &GUID_NULL, &var);
 }
 
 static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
@@ -1778,10 +1770,6 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface)
     {
         ret = engine->duration;
     }
-    else if (engine->flags & FLAGS_ENGINE_PAUSED && engine->presentation.start_position.vt == VT_I8)
-    {
-        ret = (double)engine->presentation.start_position.hVal.QuadPart / 10000000;
-    }
     else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime)))
     {
         ret = mftime_to_seconds(clocktime);
@@ -1791,50 +1779,17 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface)
     return ret;
 }
 
-static HRESULT media_engine_set_current_time(struct media_engine *engine, double seektime)
-{
-    PROPVARIANT position;
-    DWORD caps;
-    HRESULT hr;
-
-    hr = IMFMediaSession_GetSessionCapabilities(engine->session, &caps);
-    if (FAILED(hr) || !(caps & MFSESSIONCAP_SEEK))
-        return hr;
-
-    position.vt = VT_I8;
-    position.hVal.QuadPart = min(max(0, seektime), engine->duration) * 10000000;
-
-    if (IMFMediaEngineEx_IsPaused(&engine->IMFMediaEngineEx_iface))
-    {
-        engine->presentation.start_position = position;
-        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKING, 0, 0);
-        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKED, 0, 0);
-        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);
-        return S_OK;
-    }
-
-    if (SUCCEEDED(hr = IMFMediaSession_Start(engine->session, &GUID_NULL, &position)))
-    {
-        media_engine_set_flag(engine, FLAGS_ENGINE_SEEKING, TRUE);
-        IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_SEEKING, 0, 0);
-    }
-
-    return hr;
-}
-
 static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngineEx *iface, double time)
 {
     struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
-    HRESULT hr;
+    HRESULT hr = E_NOTIMPL;
 
-    TRACE("%p, %f.\n", iface, time);
+    FIXME("(%p, %f): stub.\n", iface, time);
 
     EnterCriticalSection(&engine->cs);
 
     if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)
         hr = MF_E_SHUTDOWN;
-    else
-        hr = media_engine_set_current_time(engine, time);
 
     LeaveCriticalSection(&engine->cs);
 

From 80ef443af8a439b7c6b1e705498f4733f52239a4 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:11 +0800
Subject: [PATCH 331/389] Revert "mf/tests: Test IMFMediaSession::Start()."

This reverts commit dfce0a5d5df21bc0e7cc60c16e820c1a7537589f.
---
 dlls/mf/tests/mf.c | 960 +--------------------------------------------
 1 file changed, 8 insertions(+), 952 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index e6ae0a922d1..35d22839032 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -2075,7 +2075,6 @@ static IMFMediaSource *create_media_source(const WCHAR *name, const WCHAR *mime)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL,
             &obj_type, (IUnknown **)&source);
-    todo_wine_if(hr == MF_E_UNEXPECTED) /* Gitlab CI Debian runner */
     ok(hr == S_OK || broken(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE), "Unexpected hr %#lx.\n", hr);
     IMFSourceResolver_Release(resolver);
     IMFByteStream_Release(stream);
@@ -2087,626 +2086,6 @@ static IMFMediaSource *create_media_source(const WCHAR *name, const WCHAR *mime)
     return source;
 }
 
-enum object_state
-{
-    SOURCE_START,
-    SOURCE_PAUSE,
-    SOURCE_STOP,
-    SOURCE_SHUTDOWN,
-    SINK_ON_CLOCK_START,
-    SINK_ON_CLOCK_PAUSE,
-    SINK_ON_CLOCK_STOP,
-    SINK_ON_CLOCK_RESTART,
-    SINK_ON_CLOCK_SETRATE,
-};
-
-#define MAX_OBJECT_STATE 1024
-
-struct object_state_record
-{
-    enum object_state states[MAX_OBJECT_STATE];
-    unsigned int state_count;
-};
-static struct object_state_record actual_object_state_record;
-
-#define add_object_state(a, b) _add_object_state(__LINE__, a, b)
-static void _add_object_state(int line, struct object_state_record *record, enum object_state state)
-{
-    ok_(__FILE__, line)(record->state_count < MAX_OBJECT_STATE, "exceeded state_count maximum %d.\n", MAX_OBJECT_STATE);
-    if (record->state_count < MAX_OBJECT_STATE)
-        record->states[record->state_count++] = state;
-}
-
-#define compare_object_states(a, b) _compare_object_states(__LINE__, a, b)
-static void _compare_object_states(int line, const struct object_state_record *r1,
-        const struct object_state_record *r2)
-{
-    ok_(__FILE__, line)(r1->state_count == r2->state_count, "State count not equal.\n");
-    if (r1->state_count == r2->state_count)
-        ok_(__FILE__, line)(!memcmp(r1->states, r2->states, sizeof(enum object_state) * r1->state_count), "Got different states.\n");
-}
-
-enum source_state
-{
-    SOURCE_STOPPED,
-    SOURCE_RUNNING,
-    SOURCE_PAUSED,
-};
-
-struct test_media_stream
-{
-    IMFMediaStream IMFMediaStream_iface;
-    IMFMediaEventQueue *event_queue;
-    IMFStreamDescriptor *sd;
-    IMFMediaSource *source;
-    LONGLONG sample_duration;
-    LONGLONG sample_time;
-    BOOL is_new;
-    LONG refcount;
-};
-
-static struct test_media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface)
-{
-    return CONTAINING_RECORD(iface, struct test_media_stream, IMFMediaStream_iface);
-}
-
-static HRESULT WINAPI test_media_stream_QueryInterface(IMFMediaStream *iface, REFIID riid, void **out)
-{
-    if (IsEqualIID(riid, &IID_IMFMediaStream)
-            || IsEqualIID(riid, &IID_IMFMediaEventGenerator)
-            || IsEqualIID(riid, &IID_IUnknown))
-    {
-        *out = iface;
-    }
-    else
-    {
-        *out = NULL;
-        return E_NOINTERFACE;
-    }
-
-    IMFMediaStream_AddRef(iface);
-    return S_OK;
-}
-
-static ULONG WINAPI test_media_stream_AddRef(IMFMediaStream *iface)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    return InterlockedIncrement(&stream->refcount);
-}
-
-static ULONG WINAPI test_media_stream_Release(IMFMediaStream *iface)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    ULONG refcount = InterlockedDecrement(&stream->refcount);
-
-    if (!refcount)
-    {
-        IMFMediaEventQueue_Release(stream->event_queue);
-        free(stream);
-    }
-
-    return refcount;
-}
-
-static HRESULT WINAPI test_media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, IMFMediaEvent **event)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event);
-}
-
-static HRESULT WINAPI test_media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsyncCallback *callback, IUnknown *state)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state);
-}
-
-static HRESULT WINAPI test_media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncResult *result, IMFMediaEvent **event)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event);
-}
-
-static HRESULT WINAPI test_media_stream_QueueEvent(IMFMediaStream *iface, MediaEventType event_type, REFGUID ext_type,
-        HRESULT hr, const PROPVARIANT *value)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value);
-}
-
-static HRESULT WINAPI test_media_stream_GetMediaSource(IMFMediaStream *iface, IMFMediaSource **source)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-
-    *source = stream->source;
-    IMFMediaSource_AddRef(*source);
-
-    return S_OK;
-}
-
-static HRESULT WINAPI test_media_stream_GetStreamDescriptor(IMFMediaStream *iface, IMFStreamDescriptor **sd)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-
-    *sd = stream->sd;
-    IMFStreamDescriptor_AddRef(*sd);
-
-    return S_OK;
-}
-
-static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token)
-{
-    struct test_media_stream *stream = impl_from_IMFMediaStream(iface);
-    IMFMediaBuffer *buffer;
-    IMFSample *sample;
-    HRESULT hr;
-
-    hr = MFCreateSample(&sample);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    if (stream->sample_duration)
-    {
-        hr = IMFSample_SetSampleDuration(sample, stream->sample_duration);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-        hr = IMFSample_SetSampleTime(sample, stream->sample_time);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-        stream->sample_time += stream->sample_duration;
-    }
-    else
-    {
-        hr = IMFSample_SetSampleTime(sample, 123);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-        hr = IMFSample_SetSampleDuration(sample, 1);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    }
-
-    if (token)
-        IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token);
-
-    /* Reader expects buffers, empty samples are considered an error. */
-    hr = MFCreateMemoryBuffer(8, &buffer);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFSample_AddBuffer(sample, buffer);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFMediaBuffer_Release(buffer);
-
-    hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample, &GUID_NULL, S_OK,
-            (IUnknown *)sample);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFSample_Release(sample);
-
-    return S_OK;
-}
-
-static const IMFMediaStreamVtbl test_media_stream_vtbl =
-{
-    test_media_stream_QueryInterface,
-    test_media_stream_AddRef,
-    test_media_stream_Release,
-    test_media_stream_GetEvent,
-    test_media_stream_BeginGetEvent,
-    test_media_stream_EndGetEvent,
-    test_media_stream_QueueEvent,
-    test_media_stream_GetMediaSource,
-    test_media_stream_GetStreamDescriptor,
-    test_media_stream_RequestSample,
-};
-
-#define TEST_SOURCE_NUM_STREAMS 3
-
-struct test_seek_source
-{
-    IMFMediaSource IMFMediaSource_iface;
-    IMFMediaEventQueue *event_queue;
-    IMFPresentationDescriptor *pd;
-    struct test_media_stream *streams[TEST_SOURCE_NUM_STREAMS];
-    enum source_state state;
-    unsigned stream_count;
-    CRITICAL_SECTION cs;
-    BOOL seekable;
-    LONG refcount;
-};
-
-static struct test_seek_source *impl_test_seek_source_from_IMFMediaSource(IMFMediaSource *iface)
-{
-    return CONTAINING_RECORD(iface, struct test_seek_source, IMFMediaSource_iface);
-}
-
-static HRESULT WINAPI test_seek_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out)
-{
-    if (IsEqualIID(riid, &IID_IMFMediaSource)
-            || IsEqualIID(riid, &IID_IMFMediaEventGenerator)
-            || IsEqualIID(riid, &IID_IUnknown))
-    {
-        *out = iface;
-    }
-    else
-    {
-        *out = NULL;
-        return E_NOINTERFACE;
-    }
-
-    IMFMediaSource_AddRef(iface);
-    return S_OK;
-}
-
-static ULONG WINAPI test_seek_source_AddRef(IMFMediaSource *iface)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    return InterlockedIncrement(&source->refcount);
-}
-
-static ULONG WINAPI test_seek_source_Release(IMFMediaSource *iface)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    ULONG refcount = InterlockedDecrement(&source->refcount);
-
-    if (!refcount)
-    {
-        IMFMediaEventQueue_Release(source->event_queue);
-        free(source);
-    }
-
-    return refcount;
-}
-
-static HRESULT WINAPI test_seek_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event);
-}
-
-static HRESULT WINAPI test_seek_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state);
-}
-
-static HRESULT WINAPI test_seek_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event);
-}
-
-static HRESULT WINAPI test_seek_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type,
-        HRESULT hr, const PROPVARIANT *value)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value);
-}
-
-static HRESULT WINAPI test_seek_source_GetCharacteristics(IMFMediaSource *iface, DWORD *flags)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-
-    if (source->seekable)
-        *flags = MFMEDIASOURCE_CAN_PAUSE | MFMEDIASOURCE_CAN_SEEK;
-    else
-        *flags = MFMEDIASOURCE_CAN_PAUSE;
-    return S_OK;
-}
-
-static HRESULT WINAPI test_seek_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **pd)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    IMFStreamDescriptor *sds[ARRAY_SIZE(source->streams)];
-    IMFMediaType *media_type;
-    HRESULT hr = S_OK;
-    int i;
-
-    EnterCriticalSection(&source->cs);
-
-    if (source->pd)
-    {
-        *pd = source->pd;
-        IMFPresentationDescriptor_AddRef(*pd);
-    }
-    else
-    {
-        for (i = 0; i < source->stream_count; ++i)
-        {
-            hr = MFCreateMediaType(&media_type);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-            hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-            hr = MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-            IMFMediaType_Release(media_type);
-        }
-
-        hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFPresentationDescriptor_SetUINT64(source->pd, &MF_PD_DURATION, 10 * 10000000);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFPresentationDescriptor_SelectStream(source->pd, 0);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        for (i = 0; i < source->stream_count; ++i)
-            IMFStreamDescriptor_Release(sds[i]);
-
-        *pd = source->pd;
-        IMFPresentationDescriptor_AddRef(*pd);
-    }
-
-    LeaveCriticalSection(&source->cs);
-
-    return hr;
-}
-
-static BOOL is_stream_selected(IMFPresentationDescriptor *pd, DWORD index)
-{
-    IMFStreamDescriptor *sd;
-    BOOL selected = FALSE;
-
-    if (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, index, &selected, &sd)))
-        IMFStreamDescriptor_Release(sd);
-
-    return selected;
-}
-
-static HRESULT WINAPI test_seek_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *pd, const GUID *time_format,
-        const PROPVARIANT *start_position)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    MediaEventType event_type;
-    PROPVARIANT var;
-    HRESULT hr;
-    int i;
-
-    add_object_state(&actual_object_state_record, SOURCE_START);
-
-    ok(time_format && IsEqualGUID(time_format, &GUID_NULL), "Unexpected time format %s.\n",
-            wine_dbgstr_guid(time_format));
-    ok(start_position && (start_position->vt == VT_I8 || start_position->vt == VT_EMPTY),
-            "Unexpected position type.\n");
-
-    /* This is what makes IMFMediaSession::Start() seeking fail, not the lacking of MFMEDIASOURCE_CAN_SEEK.
-     * Without this, IMFMediaSession::Start() seeking succeeds even with the missing MFMEDIASOURCE_CAN_SEEK.
-     * If this is check is not here, the first IMFMediaSession::Start() call to a non-zero position
-     * succeeds somehow on Windows 10, then all following seeks fails and no MESessionStarted events */
-    if (!source->seekable && start_position && start_position->vt == VT_I8 && start_position->hVal.QuadPart)
-        return E_FAIL;
-
-    EnterCriticalSection(&source->cs);
-
-    event_type = source->state != SOURCE_STOPPED ? MESourceSeeked : MESourceStarted;
-    hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    for (i = 0; i < source->stream_count; ++i)
-    {
-        if (!is_stream_selected(pd, i))
-            continue;
-
-        var.vt = VT_UNKNOWN;
-        var.punkVal = (IUnknown *)&source->streams[i]->IMFMediaStream_iface;
-        event_type = source->streams[i]->is_new ? MENewStream : MEUpdatedStream;
-        source->streams[i]->is_new = FALSE;
-        hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, &var);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-        event_type = source->state != SOURCE_STOPPED ? MEStreamSeeked : MEStreamStarted;
-        hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL,
-                S_OK, NULL);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    }
-
-    source->state = SOURCE_RUNNING;
-
-    LeaveCriticalSection(&source->cs);
-
-    return S_OK;
-}
-
-static HRESULT WINAPI test_seek_source_Stop(IMFMediaSource *iface)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    MediaEventType event_type;
-    HRESULT hr;
-    int i;
-
-    add_object_state(&actual_object_state_record, SOURCE_STOP);
-
-    EnterCriticalSection(&source->cs);
-
-    event_type = MESourceStopped;
-    hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    for (i = 0; i < source->stream_count; ++i)
-    {
-        if (!is_stream_selected(source->pd, i))
-            continue;
-
-        event_type = MEStreamStopped;
-        hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL,
-                S_OK, NULL);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    }
-
-    source->state = SOURCE_STOPPED;
-
-    LeaveCriticalSection(&source->cs);
-
-    return S_OK;
-}
-
-static HRESULT WINAPI test_seek_source_Pause(IMFMediaSource *iface)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    MediaEventType event_type;
-    HRESULT hr;
-    int i;
-
-    add_object_state(&actual_object_state_record, SOURCE_PAUSE);
-
-    EnterCriticalSection(&source->cs);
-
-    event_type = MESourcePaused;
-    hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    for (i = 0; i < source->stream_count; ++i)
-    {
-        if (!is_stream_selected(source->pd, i))
-            continue;
-
-        event_type = MEStreamPaused;
-        hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL,
-                S_OK, NULL);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    }
-
-    source->state = SOURCE_PAUSED;
-    LeaveCriticalSection(&source->cs);
-
-    return S_OK;
-}
-
-static HRESULT WINAPI test_seek_source_Shutdown(IMFMediaSource *iface)
-{
-    struct test_seek_source *source = impl_test_seek_source_from_IMFMediaSource(iface);
-    HRESULT hr;
-
-    add_object_state(&actual_object_state_record, SOURCE_SHUTDOWN);
-
-    hr = IMFMediaEventQueue_Shutdown(source->event_queue);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    return S_OK;
-}
-
-static const IMFMediaSourceVtbl test_seek_source_vtbl =
-{
-    test_seek_source_QueryInterface,
-    test_seek_source_AddRef,
-    test_seek_source_Release,
-    test_seek_source_GetEvent,
-    test_seek_source_BeginGetEvent,
-    test_seek_source_EndGetEvent,
-    test_seek_source_QueueEvent,
-    test_seek_source_GetCharacteristics,
-    test_seek_source_CreatePresentationDescriptor,
-    test_seek_source_Start,
-    test_seek_source_Stop,
-    test_seek_source_Pause,
-    test_seek_source_Shutdown,
-};
-
-static HRESULT WINAPI test_seek_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj)
-{
-    if (IsEqualIID(riid, &IID_IMFClockStateSink) ||
-        IsEqualIID(riid, &IID_IUnknown))
-    {
-        *obj = iface;
-        IMFClockStateSink_AddRef(iface);
-        return S_OK;
-    }
-
-    *obj = NULL;
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI test_seek_clock_sink_AddRef(IMFClockStateSink *iface)
-{
-   return 2;
-}
-
-static ULONG WINAPI test_seek_clock_sink_Release(IMFClockStateSink *iface)
-{
-   return 1;
-}
-
-static HRESULT WINAPI test_seek_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME system_time, LONGLONG offset)
-{
-   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_START);
-   return S_OK;
-}
-
-static HRESULT WINAPI test_seek_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME system_time)
-{
-   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_STOP);
-   return S_OK;
-}
-
-static HRESULT WINAPI test_seek_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME system_time)
-{
-   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_PAUSE);
-   return S_OK;
-}
-
-static HRESULT WINAPI test_seek_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME system_time)
-{
-   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_RESTART);
-   return S_OK;
-}
-
-static HRESULT WINAPI test_seek_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME system_time, float rate)
-{
-   add_object_state(&actual_object_state_record, SINK_ON_CLOCK_SETRATE);
-   return S_OK;
-}
-
-static const IMFClockStateSinkVtbl test_seek_clock_sink_vtbl =
-{
-   test_seek_clock_sink_QueryInterface,
-   test_seek_clock_sink_AddRef,
-   test_seek_clock_sink_Release,
-   test_seek_clock_sink_OnClockStart,
-   test_seek_clock_sink_OnClockStop,
-   test_seek_clock_sink_OnClockPause,
-   test_seek_clock_sink_OnClockRestart,
-   test_seek_clock_sink_OnClockSetRate,
-};
-
-static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMediaSource *source)
-{
-    struct test_media_stream *stream;
-    IMFPresentationDescriptor *pd;
-    BOOL selected;
-    HRESULT hr;
-
-    stream = calloc(1, sizeof(*stream));
-    stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl;
-    stream->refcount = 1;
-    hr = MFCreateEventQueue(&stream->event_queue);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    stream->source = source;
-    IMFMediaSource_AddRef(stream->source);
-    stream->is_new = TRUE;
-
-    IMFMediaSource_CreatePresentationDescriptor(source, &pd);
-    IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, stream_index, &selected, &stream->sd);
-    IMFPresentationDescriptor_Release(pd);
-
-    return stream;
-}
-
-static IMFMediaSource *create_test_seek_source(BOOL seekable)
-{
-    struct test_seek_source *source;
-    int i;
-
-    source = calloc(1, sizeof(*source));
-    source->IMFMediaSource_iface.lpVtbl = &test_seek_source_vtbl;
-    source->refcount = 1;
-    source->stream_count = 1;
-    source->seekable = seekable;
-    MFCreateEventQueue(&source->event_queue);
-    InitializeCriticalSection(&source->cs);
-    for (i = 0; i < source->stream_count; ++i)
-        source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface);
-
-    return &source->IMFMediaSource_iface;
-}
-
 static void test_media_session_events(void)
 {
     static const media_type_desc audio_float_44100 =
@@ -3508,27 +2887,27 @@ static ULONG WINAPI test_grabber_callback_Release(IMFSampleGrabberSinkCallback *
 
 static HRESULT WINAPI test_grabber_callback_OnClockStart(IMFSampleGrabberSinkCallback *iface, MFTIME time, LONGLONG offset)
 {
-    return S_OK;
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockStop(IMFSampleGrabberSinkCallback *iface, MFTIME time)
 {
-    return S_OK;
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockPause(IMFSampleGrabberSinkCallback *iface, MFTIME time)
 {
-    return S_OK;
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockRestart(IMFSampleGrabberSinkCallback *iface, MFTIME time)
 {
-    return S_OK;
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnClockSetRate(IMFSampleGrabberSinkCallback *iface, MFTIME time, float rate)
 {
-    return S_OK;
+    return E_NOTIMPL;
 }
 
 static HRESULT WINAPI test_grabber_callback_OnSetPresentationClock(IMFSampleGrabberSinkCallback *iface,
@@ -5616,8 +4995,8 @@ static void test_sample_grabber_is_mediatype_supported(void)
     IMFSampleGrabberSinkCallback_Release(grabber_callback);
 }
 
-/* create a test topology with the specified source and sink, and return duration if required */
-static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate, UINT64 *duration)
+/* create a test topology with the specified source and sink */
+static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate)
 {
     IMFTopologyNode *src_node, *sink_node;
     IMFPresentationDescriptor *pd;
@@ -5643,11 +5022,6 @@ static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *si
     hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(selected, "got selected %u.\n", !!selected);
-    if (duration)
-    {
-        hr = IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, duration);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    }
     init_source_node(source, -1, src_node, pd, sd);
     hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate);
     ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
@@ -5709,7 +5083,7 @@ static void test_sample_grabber_orientation(GUID subtype)
     ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
     IMFMediaType_Release(output_type);
 
-    topology = create_test_topology(source, sink_activate, NULL);
+    topology = create_test_topology(source, sink_activate);
     hr = IMFMediaSession_SetTopology(session, 0, topology);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IMFTopology_Release(topology);
@@ -7908,323 +7282,6 @@ static void test_MFCreateSequencerSegmentOffset(void)
     PropVariantClear(&propvar);
 }
 
-static void test_media_session_Start(void)
-{
-    static const struct object_state_record expected_object_state_records[] =
-    {
-        {{SOURCE_START, SINK_ON_CLOCK_START}, 2},
-        {{SOURCE_STOP, SOURCE_START, SINK_ON_CLOCK_START}, 3},
-        {{SOURCE_STOP, SOURCE_START, SINK_ON_CLOCK_START}, 3},
-    };
-    media_type_desc video_rgb32_desc =
-    {
-        ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
-        ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
-    };
-    static const MFTIME allowed_error = 5000000;
-    IMFClockStateSink test_seek_clock_sink = {&test_seek_clock_sink_vtbl};
-    struct test_grabber_callback *grabber_callback;
-    IMFPresentationClock *presentation_clock;
-    enum source_state initial_state;
-    IMFActivate *sink_activate;
-    IMFAsyncCallback *callback;
-    IMFMediaType *output_type;
-    IMFMediaSession *session;
-    IMFMediaSource *source;
-    IMFTopology *topology;
-    MFTIME time, old_time;
-    PROPVARIANT propvar;
-    IMFClock *clock;
-    UINT64 duration;
-    DWORD caps;
-    HRESULT hr;
-
-    hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
-    ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr);
-
-    if (!(source = create_media_source(L"test.mp4", L"video/mp4")))
-    {
-        todo_wine /* Gitlab CI Debian runner */
-        win_skip("MP4 media source is not supported, skipping tests.\n");
-        MFShutdown();
-        return;
-    }
-
-    grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
-    hr = MFCreateMediaType(&output_type);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    init_media_type(output_type, video_rgb32_desc, -1);
-    hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
-    ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
-    IMFMediaType_Release(output_type);
-
-    hr = MFCreateMediaSession(NULL, &session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    topology = create_test_topology(source, sink_activate, &duration);
-    hr = IMFMediaSession_SetTopology(session, 0, topology);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFTopology_Release(topology);
-
-    hr = IMFMediaSession_GetClock(session, &clock);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFClock_Release(clock);
-
-    propvar.vt = VT_EMPTY;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    callback = create_test_callback(TRUE);
-    hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    /* Seek to 1s */
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = 10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(llabs(time - 10000000) <= allowed_error, "Unexpected time %I64d.\n", time);
-
-    /* Seek to beyond duration */
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = duration + 10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == MF_E_INVALID_POSITION, "Unexpected hr %#lx.\n", hr);
-
-    /* Seek to negative position */
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = -10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(llabs(time - (-10000000)) <= allowed_error, "Unexpected time %I64d.\n", time);
-
-    /* Seek backwards to 0s */
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = 0;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(llabs(time) <= allowed_error, "Unexpected time %I64d.\n", time);
-
-    /* Seek to 1s while in paused state */
-    hr = IMFMediaSession_Pause(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionPaused, 1000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = 10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(llabs(time - 10000000) <= allowed_error, "Unexpected time %I64d.\n", time);
-    old_time = time;
-
-    /* Expected the presentation clock is running */
-    Sleep(100);
-    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(time > old_time, "Unexpected time %I64d.\n", time);
-
-    hr = IMFMediaSession_Stop(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaSession_Close(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    /* Media session is shut down */
-    hr = IMFMediaSource_Shutdown(source);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaSession_Shutdown(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = 10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, NULL);
-    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
-
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = 10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
-
-    propvar.vt = VT_EMPTY;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);
-
-    IMFPresentationClock_Release(presentation_clock);
-    IMFMediaSource_Release(source);
-    IMFAsyncCallback_Release(callback);
-    /* sometimes briefly leaking */
-    IMFMediaSession_Release(session);
-    IMFActivate_ShutdownObject(sink_activate);
-    IMFActivate_Release(sink_activate);
-    IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface);
-
-    /* Unseekable media source */
-    source = create_test_seek_source(FALSE);
-    hr = IMFMediaSource_GetCharacteristics(source, &caps);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok((caps & MFMEDIASOURCE_CAN_SEEK) == 0, "Got unexpected caps %#lx.\n", caps);
-    grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
-    hr = MFCreateMediaType(&output_type);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    init_media_type(output_type, video_rgb32_desc, -1);
-    hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
-    ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
-    IMFMediaType_Release(output_type);
-
-    hr = MFCreateMediaSession(NULL, &session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    topology = create_test_topology(source, sink_activate, &duration);
-    hr = IMFMediaSession_SetTopology(session, 0, topology);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFTopology_Release(topology);
-
-    hr = IMFMediaSession_GetClock(session, &clock);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IMFClock_Release(clock);
-
-    propvar.vt = VT_EMPTY;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    callback = create_test_callback(TRUE);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IMFMediaSession_GetSessionCapabilities(session, &caps);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok((caps & MFSESSIONCAP_SEEK) == 0, "Got unexpected caps %#lx\n", caps);
-
-    /* Seek to 1s */
-    propvar.vt = VT_I8;
-    propvar.hVal.QuadPart = 10000000;
-    hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = wait_media_event(session, callback, MESessionStarted, 1000, &propvar);
-    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
-    hr = IMFPresentationClock_GetTime(presentation_clock, &time);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(llabs(time) <= allowed_error, "Unexpected time %I64d.\n", time);
-
-    hr = IMFMediaSession_Stop(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaSession_Close(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaSession_Shutdown(session);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaSource_Shutdown(source);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    IMFPresentationClock_Release(presentation_clock);
-    IMFAsyncCallback_Release(callback);
-    IMFMediaSession_Release(session);
-    IMFMediaSource_Release(source);
-    IMFActivate_ShutdownObject(sink_activate);
-    IMFActivate_Release(sink_activate);
-    IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface);
-
-    /* Test object state transitions */
-    for (initial_state = SOURCE_STOPPED; initial_state <= SOURCE_PAUSED; initial_state++)
-    {
-        winetest_push_context("Test %d", initial_state);
-
-        source = create_test_seek_source(TRUE);
-        callback = create_test_callback(TRUE);
-
-        grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
-        hr = MFCreateMediaType(&output_type);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        init_media_type(output_type, video_rgb32_desc, -1);
-        hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate);
-        ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
-        IMFMediaType_Release(output_type);
-
-        hr = MFCreateMediaSession(NULL, &session);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        topology = create_test_topology(source, sink_activate, &duration);
-        hr = IMFMediaSession_SetTopology(session, 0, topology);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        IMFTopology_Release(topology);
-
-        hr = IMFMediaSession_GetClock(session, &clock);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFPresentationClock_AddClockStateSink(presentation_clock, &test_seek_clock_sink);
-        ok(hr == S_OK, "Failed to add a sink, hr %#lx.\n", hr);
-        IMFClock_Release(clock);
-
-        if (initial_state == SOURCE_RUNNING || initial_state == SOURCE_PAUSED)
-        {
-            propvar.vt = VT_EMPTY;
-            hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        }
-        if (initial_state == SOURCE_PAUSED)
-        {
-            hr = IMFMediaSession_Pause(session);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            hr = wait_media_event(session, callback, MESessionPaused, 5000, &propvar);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        }
-
-        /* Seek to 1s */
-        memset(&actual_object_state_record, 0, sizeof(actual_object_state_record));
-
-        propvar.vt = VT_I8;
-        propvar.hVal.QuadPart = 10000000;
-        hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        todo_wine_if(initial_state == SOURCE_PAUSED)
-        compare_object_states(&actual_object_state_record, &expected_object_state_records[initial_state]);
-
-        hr = IMFMediaSession_Stop(session);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFMediaSession_Close(session);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFMediaSession_Shutdown(session);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFMediaSource_Shutdown(source);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-        IMFPresentationClock_RemoveClockStateSink(presentation_clock, &test_seek_clock_sink);
-        IMFPresentationClock_Release(presentation_clock);
-        IMFAsyncCallback_Release(callback);
-        IMFMediaSession_Release(session);
-        IMFMediaSource_Release(source);
-        IMFActivate_ShutdownObject(sink_activate);
-        IMFActivate_Release(sink_activate);
-        IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface);
-        winetest_pop_context();
-    }
-
-    hr = MFShutdown();
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-}
-
 START_TEST(mf)
 {
     init_functions();
@@ -8261,5 +7318,4 @@ START_TEST(mf)
     test_MFRequireProtectedEnvironment();
     test_mpeg4_media_sink();
     test_MFCreateSequencerSegmentOffset();
-    test_media_session_Start();
 }

From c1f7b96d0fcda581e13f0716d206b549425827b0 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:11 +0800
Subject: [PATCH 332/389] Revert "mf: Support seeking while a session is
 started."

This reverts commit ba94fc6d74cb1ba10b5d9cc57cb6edd7a58753d6.
---
 dlls/mf/session.c | 63 ++---------------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 6590f001a00..d38e7cc0f6b 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -93,7 +93,6 @@ enum session_state
     SESSION_STATE_STARTING_SOURCES,
     SESSION_STATE_PREROLLING_SINKS,
     SESSION_STATE_STARTING_SINKS,
-    SESSION_STATE_RESTARTING_SOURCES,
     SESSION_STATE_STARTED,
     SESSION_STATE_PAUSING_SINKS,
     SESSION_STATE_PAUSING_SOURCES,
@@ -930,7 +929,6 @@ static void session_start(struct media_session *session, const GUID *time_format
 {
     struct media_source *source;
     struct topo_node *topo_node;
-    MFTIME duration;
     HRESULT hr;
     UINT i;
 
@@ -983,36 +981,8 @@ static void session_start(struct media_session *session, const GUID *time_format
             session->state = SESSION_STATE_STARTING_SOURCES;
             break;
         case SESSION_STATE_STARTED:
-            /* Check for invalid positions */
-            LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
-            {
-                hr = IMFPresentationDescriptor_GetUINT64(source->pd, &MF_PD_DURATION, (UINT64 *)&duration);
-                if (SUCCEEDED(hr) && IsEqualGUID(time_format, &GUID_NULL)
-                        && start_position->vt == VT_I8 && start_position->hVal.QuadPart > duration)
-                {
-                    WARN("Start position %s out of range, hr %#lx.\n", wine_dbgstr_longlong(start_position->hVal.QuadPart), hr);
-                    session_command_complete_with_event(session, MESessionStarted, MF_E_INVALID_POSITION, NULL);
-                    return;
-                }
-            }
-
-            /* Stop sources */
-            LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
-            {
-                if (FAILED(hr = IMFMediaSource_Stop(source->source)))
-                {
-                    WARN("Failed to stop media source %p, hr %#lx.\n", source->source, hr);
-                    session_command_complete_with_event(session, MESessionStarted, hr, NULL);
-                    return;
-                }
-            }
-
-            session->presentation.time_format = *time_format;
-            session->presentation.start_position.vt = VT_EMPTY;
-            PropVariantCopy(&session->presentation.start_position, start_position);
-
-            /* SESSION_STATE_STARTED -> SESSION_STATE_RESTARTING_SOURCES -> SESSION_STATE_STARTED */
-            session->state = SESSION_STATE_RESTARTING_SOURCES;
+            FIXME("Seeking is not implemented.\n");
+            session_command_complete(session);
             break;
         default:
             session_command_complete_with_event(session, MESessionStarted, MF_E_INVALIDREQUEST, NULL);
@@ -2931,7 +2901,6 @@ static BOOL session_set_node_object_state(struct media_session *session, IUnknow
 static void session_set_source_object_state(struct media_session *session, IUnknown *object,
         MediaEventType event_type)
 {
-    struct media_source *source;
     IMFStreamSink *stream_sink;
     struct media_source *src;
     struct media_sink *sink;
@@ -2983,15 +2952,6 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
 
             session_set_presentation_clock(session);
 
-            /* If sinks are already started, start session immediately. This can happen when doing a
-             * seek from SESSION_STATE_STARTED */
-            if (session_is_output_nodes_state(session, OBJ_STATE_STARTED)
-                    && SUCCEEDED(session_start_clock(session)))
-            {
-                session_set_started(session);
-                return;
-            }
-
             if ((session->presentation.flags & SESSION_FLAG_NEEDS_PREROLL) && session_is_output_nodes_state(session, OBJ_STATE_STOPPED))
             {
                 MFTIME preroll_time = 0;
@@ -3029,25 +2989,6 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
             else if (SUCCEEDED(session_start_clock(session)))
                 session->state = SESSION_STATE_STARTING_SINKS;
 
-            break;
-        case SESSION_STATE_RESTARTING_SOURCES:
-            if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED))
-                break;
-
-            session_flush_nodes(session);
-
-            /* Start sources */
-            LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
-            {
-                if (FAILED(hr = IMFMediaSource_Start(source->source, source->pd,
-                        &session->presentation.time_format, &session->presentation.start_position)))
-                {
-                    WARN("Failed to start media source %p, hr %#lx.\n", source->source, hr);
-                    session_command_complete_with_event(session, MESessionStarted, hr, NULL);
-                    return;
-                }
-            }
-            session->state = SESSION_STATE_STARTING_SOURCES;
             break;
         case SESSION_STATE_PAUSING_SOURCES:
             if (!session_is_source_nodes_state(session, OBJ_STATE_PAUSED))

From fde26f8197130a3ba4aacba94c33daad826056bb Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:12 +0800
Subject: [PATCH 333/389] Revert "mf/tests: Add a create_test_topology()
 helper."

This reverts commit 69e83049c9cf5e239a2fca60cac86a16368b30b7.
---
 dlls/mf/tests/mf.c | 80 +++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 35d22839032..0a34329bd75 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4995,48 +4995,6 @@ static void test_sample_grabber_is_mediatype_supported(void)
     IMFSampleGrabberSinkCallback_Release(grabber_callback);
 }
 
-/* create a test topology with the specified source and sink */
-static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate)
-{
-    IMFTopologyNode *src_node, *sink_node;
-    IMFPresentationDescriptor *pd;
-    IMFTopology *topology = NULL;
-    IMFStreamDescriptor *sd;
-    BOOL selected;
-    HRESULT hr;
-
-    hr = MFCreateTopology(&topology);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFTopology_AddNode(topology, sink_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFTopology_AddNode(topology, src_node);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(selected, "got selected %u.\n", !!selected);
-    init_source_node(source, -1, src_node, pd, sd);
-    hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate);
-    ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
-    hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER);
-    ok(hr == S_OK, "Failed to set connect method, hr %#lx.\n", hr);
-    hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    IMFStreamDescriptor_Release(sd);
-    IMFPresentationDescriptor_Release(pd);
-    IMFTopologyNode_Release(src_node);
-    IMFTopologyNode_Release(sink_node);
-    return topology;
-}
-
 static void test_sample_grabber_orientation(GUID subtype)
 {
     media_type_desc video_rgb32_desc =
@@ -5046,13 +5004,17 @@ static void test_sample_grabber_orientation(GUID subtype)
     };
 
     struct test_grabber_callback *grabber_callback;
+    IMFTopologyNode *src_node, *sink_node;
+    IMFPresentationDescriptor *pd;
     IMFAsyncCallback *callback;
     IMFActivate *sink_activate;
     IMFMediaType *output_type;
     IMFMediaSession *session;
+    IMFStreamDescriptor *sd;
     IMFMediaSource *source;
     IMFTopology *topology;
     PROPVARIANT propvar;
+    BOOL selected;
     HRESULT hr;
     DWORD res;
 
@@ -5076,6 +5038,30 @@ static void test_sample_grabber_orientation(GUID subtype)
     hr = MFCreateMediaSession(NULL, &session);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
+    hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = MFCreateTopology(&topology);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFTopology_AddNode(topology, sink_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFTopology_AddNode(topology, src_node);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd);
+    ok(selected, "got selected %u.\n", !!selected);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    init_source_node(source, -1, src_node, pd, sd);
+    IMFTopologyNode_Release(src_node);
+    IMFPresentationDescriptor_Release(pd);
+    IMFStreamDescriptor_Release(sd);
+
     hr = MFCreateMediaType(&output_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     init_media_type(output_type, video_rgb32_desc, -1);
@@ -5083,7 +5069,15 @@ static void test_sample_grabber_orientation(GUID subtype)
     ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr);
     IMFMediaType_Release(output_type);
 
-    topology = create_test_topology(source, sink_activate);
+    hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate);
+    ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr);
+    hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER);
+    ok(hr == S_OK, "Failed to set connect method, hr %#lx.\n", hr);
+    IMFTopologyNode_Release(sink_node);
+
+    hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
     hr = IMFMediaSession_SetTopology(session, 0, topology);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IMFTopology_Release(topology);

From c3870845ac4bca22aeffd6d26a9b7741b0a09e72 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 17:07:13 +0800
Subject: [PATCH 334/389] Revert "mf: Add a session_flush_nodes() helper."

This reverts commit a46a5ee7b214cc10184dd8921d69c30991deda6d.
---
 dlls/mf/session.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index d38e7cc0f6b..ef707dea4de 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -912,19 +912,6 @@ static HRESULT session_subscribe_sources(struct media_session *session)
     return hr;
 }
 
-static void session_flush_nodes(struct media_session *session)
-{
-    struct topo_node *node;
-
-    LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry)
-    {
-        if (node->type == MF_TOPOLOGY_OUTPUT_NODE)
-            IMFStreamSink_Flush(node->object.sink_stream);
-        else if (node->type == MF_TOPOLOGY_TRANSFORM_NODE)
-            IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0);
-    }
-}
-
 static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position)
 {
     struct media_source *source;
@@ -2905,6 +2892,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
     struct media_source *src;
     struct media_sink *sink;
     enum object_state state;
+    struct topo_node *node;
     BOOL changed = FALSE;
     DWORD i, count;
     HRESULT hr;
@@ -3000,7 +2988,21 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
             if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED))
                 break;
 
-            session_flush_nodes(session);
+            LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry)
+            {
+                switch (node->type)
+                {
+                    case MF_TOPOLOGY_OUTPUT_NODE:
+                        IMFStreamSink_Flush(node->object.sink_stream);
+                        break;
+                    case MF_TOPOLOGY_TRANSFORM_NODE:
+                        IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0);
+                        break;
+                    default:
+                        ;
+                }
+            }
+
             session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE);
 
             if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS)

From 71a0e7cb914a56431353dcc41dc0d0d631393536 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Sat, 25 Feb 2023 13:15:16 -0600
Subject: [PATCH 335/389] explorer: Add an environment variable setting to
 start Xalia.

---
 programs/explorer/desktop.c | 42 +++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 3571368b8f3..fe50586184f 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -1041,6 +1041,46 @@ static HANDLE start_tabtip_process(void)
     return pi.hProcess;
 }
 
+static void start_xalia_process(void)
+{
+    PROCESS_INFORMATION pi;
+    STARTUPINFOW si = { sizeof(si) };
+    WCHAR use_envvar[2];
+    LPWSTR path;
+    LPCWSTR path_suffix = L"/../xalia/xalia.exe";
+    DWORD ret, buffersize;
+
+    /* check if xalia is enabled */
+    ret = GetEnvironmentVariableW(L"PROTON_USE_XALIA", use_envvar, ARRAY_SIZE(use_envvar));
+    if (!ret || (ret <= ARRAY_SIZE(use_envvar) && lstrcmpW(use_envvar, L"0") == 0))
+        return;
+
+    /* locate xalia.exe */
+    ret = GetEnvironmentVariableW(L"WINEDATADIR", NULL, 0);
+    if (ret == 0)
+        return;
+
+    buffersize = ret + lstrlenW(path_suffix);
+    path = HeapAlloc(GetProcessHeap(), 0, buffersize * sizeof(*path));
+
+    GetEnvironmentVariableW(L"WINEDATADIR", path, ret);
+    if (!memcmp(path, L"\\??\\", 8))  path[1] = '\\';  /* change \??\ into \\?\ */
+    lstrcatW(path, path_suffix);
+
+    /* setup environment */
+    SetEnvironmentVariableW(L"XALIA_WINE_SYSTEM_PROCESS", L"1");
+
+    if (!CreateProcessW(path, NULL,
+                        NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &si, &pi))
+    {
+        WINE_ERR("Couldn't start xalia.exe: error %lu\n", GetLastError());
+        return;
+    }
+    CloseHandle(pi.hThread);
+    CloseHandle(pi.hProcess);
+    return;
+}
+
 /* main desktop management function */
 void manage_desktop( WCHAR *arg )
 {
@@ -1169,6 +1209,8 @@ void manage_desktop( WCHAR *arg )
         /* FIXME: hack, run tabtip.exe on startup. */
         tabtip = start_tabtip_process();
 
+        start_xalia_process();
+
         TRACE( "desktop message loop starting on hwnd %p\n", hwnd );
         while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg );
         TRACE( "desktop message loop exiting for hwnd %p\n", hwnd );

From d70dce6ecedc66b599be40a179974a690fa49fa1 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Wed, 8 Mar 2023 15:19:51 -0600
Subject: [PATCH 336/389] winex11.drv: Mark Xalia overlay window as a gamescope
 overlay.

---
 dlls/winex11.drv/window.c      | 25 +++++++++++++++++++++++++
 dlls/winex11.drv/x11drv.h      |  1 +
 dlls/winex11.drv/x11drv_main.c |  1 +
 3 files changed, 27 insertions(+)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index db51152e1dc..29773e871b0 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2077,6 +2077,29 @@ void set_hwnd_style_props( Display *display, Window window, HWND hwnd )
 }
 
 
+void set_gamescope_overlay_prop( Display *display, Window window, HWND hwnd )
+{
+    static const WCHAR class_name[] = {'X','a','l','i','a','O','v','e','r','l','a','y','B','o','x',0};
+    WCHAR class_name_buf[16];
+    UNICODE_STRING class_name_str;
+    INT ret;
+
+    class_name_str.Buffer = class_name_buf;
+    class_name_str.MaximumLength = sizeof(class_name_buf);
+
+    ret = NtUserGetClassName( hwnd, FALSE, &class_name_str );
+
+    if (ret && !wcscmp( class_name_buf, class_name )) {
+        DWORD one = 1;
+
+        TRACE( "setting GAMESCOPE_XALIA_OVERLAY on window %lx, hwnd %p\n", window, hwnd );
+
+        XChangeProperty( display, window, x11drv_atom(GAMESCOPE_XALIA_OVERLAY), XA_CARDINAL, 32,
+                         PropModeReplace, (unsigned char *)&one, sizeof(one) / 4 );
+    }
+}
+
+
 /**********************************************************************
  *		create_whole_window
  *
@@ -2147,6 +2170,8 @@ static void create_whole_window( struct x11drv_win_data *data )
 
     set_hwnd_style_props( data->display, data->whole_window, data->hwnd );
 
+    set_gamescope_overlay_prop( data->display, data->whole_window, data->hwnd );
+
     /* set the window text */
     if (!NtUserInternalGetWindowText( data->hwnd, text, ARRAY_SIZE( text ))) text[0] = 0;
     sync_window_text( data->display, data->whole_window, text );
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 4032ab85e9a..d60432a68e8 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -567,6 +567,7 @@ enum x11drv_atoms
     XATOM_text_uri_list,
     XATOM_GAMESCOPE_FOCUSED_APP,
     XATOM_GAMESCOPE_DISPLAY_EDID_PATH,
+    XATOM_GAMESCOPE_XALIA_OVERLAY,
     NB_XATOMS
 };
 
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index a5eb1416c99..b286e6cfde8 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -234,6 +234,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
     "text/uri-list",
     "GAMESCOPE_FOCUSED_APP",
     "GAMESCOPE_DISPLAY_EDID_PATH",
+    "GAMESCOPE_XALIA_OVERLAY",
 };
 
 /***********************************************************************

From f1a9c2dc8e5be3aeaa20d1f3c35ba3f161e45534 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Tue, 5 Mar 2024 20:55:18 +0000
Subject: [PATCH 337/389] winex11.drv: Do not shape layered windows in
 Gamescope.

The use of xshape doesn't work and actively breaks rendering in
Gamescope.
---
 dlls/winex11.drv/bitblt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index e6890495a51..5d2392fe450 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -1642,6 +1642,8 @@ static void update_surface_region( struct x11drv_window_surface *surface )
 
     if (!shape_layered_windows) return;
 
+    if (wm_is_steamcompmgr(gdi_display)) return;
+
     if (!surface->is_argb && surface->color_key == CLR_INVALID)
     {
         XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet );

From 0aca54d625b122fdc7af7063b4bc96756bb8f196 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Tue, 12 Mar 2024 20:39:00 +0000
Subject: [PATCH 338/389] win32u: Implement EVENT_OBJECT_STATECHANGE.

---
 dlls/win32u/window.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index d3ce35ebb86..400500f34dc 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -873,6 +873,7 @@ BOOL enable_window( HWND hwnd, BOOL enable )
             send_message( hwnd, WM_ENABLE, FALSE, 0 );
         }
     }
+    NtUserNotifyWinEvent( EVENT_OBJECT_STATECHANGE, hwnd, OBJID_CLIENT, 0 );
     return ret;
 }
 

From a5883000119c2d6d225ce88758caf9d133c1b33c Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Wed, 13 Mar 2024 19:21:23 +0000
Subject: [PATCH 339/389] win32u: Implement EVENT_OBJECT_LOCATIONCHANGE.

---
 dlls/win32u/window.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 400500f34dc..967b47f7ca0 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -3545,6 +3545,10 @@ BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y )
         winpos->cy = new_window_rect.bottom - new_window_rect.top;
         send_message( winpos->hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)winpos );
     }
+
+    if ((winpos->flags & (SWP_NOMOVE|SWP_NOSIZE)) != (SWP_NOMOVE|SWP_NOSIZE))
+        NtUserNotifyWinEvent( EVENT_OBJECT_LOCATIONCHANGE, winpos->hwnd, OBJID_WINDOW, 0 );
+
     ret = TRUE;
 done:
     SetThreadDpiAwarenessContext( context );

From 50300bf47f94da2ab2d314dd8edf5831aa45ee4f Mon Sep 17 00:00:00 2001
From: Connor McAdams <cmcadams@codeweavers.com>
Date: Thu, 16 Feb 2023 11:52:42 -0500
Subject: [PATCH 340/389] win32u: Add support for raising EVENT_OBJECT_DESTROY
 events on windows.

---
 dlls/win32u/window.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 967b47f7ca0..2dcc3e20d3e 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -4693,6 +4693,7 @@ static void send_destroy_message( HWND hwnd )
     if (hwnd == NtUserGetClipboardOwner()) release_clipboard_owner( hwnd );
 
     send_message( hwnd, WM_DESTROY, 0, 0);
+    NtUserNotifyWinEvent( EVENT_OBJECT_DESTROY, hwnd, OBJID_WINDOW, 0 );
 
     /*
      * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow

From 111ffe4378609d203a82c9ae8e3846c18d73a3c4 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Sat, 19 Aug 2023 14:35:34 -0500
Subject: [PATCH 341/389] win32u: Implement cross-process GetScrollBarInfo.

---
 dlls/win32u/message.c        | 11 +++++++++++
 dlls/win32u/scroll.c         |  5 ++++-
 dlls/win32u/win32u_private.h |  1 +
 include/ntuser.h             |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index 7308a4d8196..b9470be3070 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -729,6 +729,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
         if (!get_buffer_space( buffer, sizeof(SCROLLINFO), buffer_size )) return FALSE;
         break;
     case SBM_GETSCROLLBARINFO:
+    case WM_WINE_GETSCROLLBARINFO:
         if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), buffer_size )) return FALSE;
         break;
     case EM_GETSEL:
@@ -1127,6 +1128,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
         push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) );
         return sizeof(SCROLLINFO);
     case SBM_GETSCROLLBARINFO:
+    case WM_WINE_GETSCROLLBARINFO:
     {
         const SCROLLBARINFO *info = (const SCROLLBARINFO *)lparam;
         size_t size = min( info->cbSize, sizeof(SCROLLBARINFO) );
@@ -1363,6 +1365,10 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
     case SBM_GETSCROLLINFO:
         push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) );
         break;
+    case SBM_GETSCROLLBARINFO:
+    case WM_WINE_GETSCROLLBARINFO:
+        push_data( data, (SCROLLBARINFO *)lparam, sizeof(SCROLLBARINFO) );
+        break;
     case EM_GETRECT:
     case LB_GETITEMRECT:
     case CB_GETDROPPEDCONTROLRECT:
@@ -1504,6 +1510,7 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
         memcpy( (SCROLLINFO *)lparam, buffer, min( sizeof(SCROLLINFO), size ));
         break;
     case SBM_GETSCROLLBARINFO:
+    case WM_WINE_GETSCROLLBARINFO:
         memcpy( (SCROLLBARINFO *)lparam, buffer, min( sizeof(SCROLLBARINFO), size ));
         break;
     case EM_GETRECT:
@@ -1708,6 +1715,7 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
         size = sizeof(SCROLLINFO);
         break;
     case SBM_GETSCROLLBARINFO:
+    case WM_WINE_GETSCROLLBARINFO:
         size = sizeof(SCROLLBARINFO);
         break;
     case EM_GETSEL:
@@ -1950,6 +1958,7 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me
         copy_size = sizeof(SCROLLINFO);
         break;
     case SBM_GETSCROLLBARINFO:
+    case WM_WINE_GETSCROLLBARINFO:
         copy_size = sizeof(SCROLLBARINFO);
         break;
     case EM_GETSEL:
@@ -2121,6 +2130,8 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
     case WM_WINE_UPDATEWINDOWSTATE:
         update_window_state( hwnd );
         return 0;
+    case WM_WINE_GETSCROLLBARINFO:
+        return get_scroll_bar_info( hwnd, (LONG)wparam, (SCROLLBARINFO *)lparam );
     default:
         if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG)
             return user_driver->pWindowMessage( hwnd, msg, wparam, lparam );
diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c
index 19a9a1379f4..65491f25c5b 100644
--- a/dlls/win32u/scroll.c
+++ b/dlls/win32u/scroll.c
@@ -1048,7 +1048,7 @@ static int set_scroll_info( HWND hwnd, int bar, const SCROLLINFO *info, BOOL red
     return ret; /* Return current position */
 }
 
-static BOOL get_scroll_bar_info( HWND hwnd, LONG id, SCROLLBARINFO *info )
+BOOL get_scroll_bar_info( HWND hwnd, LONG id, SCROLLBARINFO *info )
 {
     struct scroll_info *scroll;
     int bar, dummy;
@@ -1067,6 +1067,9 @@ static BOOL get_scroll_bar_info( HWND hwnd, LONG id, SCROLLBARINFO *info )
     /* handle invalid data structure */
     if (info->cbSize != sizeof(*info)) return FALSE;
 
+    if (bar != SB_CTL && !is_current_thread_window( hwnd ))
+        return send_message( hwnd, WM_WINE_GETSCROLLBARINFO, (WPARAM)id, (LPARAM)info );
+
     get_scroll_bar_rect( hwnd, bar, &info->rcScrollBar, &dummy,
                          &info->dxyLineButton, &info->xyThumbTop );
     /* rcScrollBar needs to be in screen coordinates */
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index a5d2a196932..dc65ca858cb 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -153,6 +153,7 @@ extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHOR
 
 /* scroll.c */
 extern void draw_nc_scrollbar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical );
+extern BOOL get_scroll_bar_info( HWND hwnd, LONG id, SCROLLBARINFO *info );
 extern BOOL get_scroll_info( HWND hwnd, INT bar, SCROLLINFO *info );
 extern void handle_scroll_event( HWND hwnd, INT bar, UINT msg, POINT pt );
 extern LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
diff --git a/include/ntuser.h b/include/ntuser.h
index 738fe055ff7..fc7cd98813c 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -489,6 +489,7 @@ enum wine_internal_message
     WM_WINE_KEYBOARD_LL_HOOK,
     WM_WINE_MOUSE_LL_HOOK,
     WM_WINE_UPDATEWINDOWSTATE,
+    WM_WINE_GETSCROLLBARINFO,
     WM_WINE_FIRST_DRIVER_MSG = 0x80001000,  /* range of messages reserved for the USER driver */
     WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */
     WM_WINE_SETCURSOR,

From 3475b1aa02246ae43a8df746e9e714ddf4747093 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Sat, 19 Aug 2023 15:06:50 -0500
Subject: [PATCH 342/389] win32u: Implement cross-process GetScrollInfo.

---
 dlls/win32u/message.c | 8 ++++++++
 dlls/win32u/scroll.c  | 8 +++++++-
 include/ntuser.h      | 1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index b9470be3070..c0b009d8eb4 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -726,6 +726,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
         minsize = sizeof(SCROLLINFO);
         break;
     case SBM_GETSCROLLINFO:
+    case WM_WINE_GETSCROLLINFO:
         if (!get_buffer_space( buffer, sizeof(SCROLLINFO), buffer_size )) return FALSE;
         break;
     case SBM_GETSCROLLBARINFO:
@@ -1125,6 +1126,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
         push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) );
         return 0;
     case SBM_GETSCROLLINFO:
+    case WM_WINE_GETSCROLLINFO:
         push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) );
         return sizeof(SCROLLINFO);
     case SBM_GETSCROLLBARINFO:
@@ -1363,6 +1365,7 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
         break;
     }
     case SBM_GETSCROLLINFO:
+    case WM_WINE_GETSCROLLINFO:
         push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) );
         break;
     case SBM_GETSCROLLBARINFO:
@@ -1507,6 +1510,7 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
         }
         break;
     case SBM_GETSCROLLINFO:
+    case WM_WINE_GETSCROLLINFO:
         memcpy( (SCROLLINFO *)lparam, buffer, min( sizeof(SCROLLINFO), size ));
         break;
     case SBM_GETSCROLLBARINFO:
@@ -1712,6 +1716,7 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
         break;
     case SBM_SETSCROLLINFO:
     case SBM_GETSCROLLINFO:
+    case WM_WINE_GETSCROLLINFO:
         size = sizeof(SCROLLINFO);
         break;
     case SBM_GETSCROLLBARINFO:
@@ -1955,6 +1960,7 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me
         break;
     case SBM_SETSCROLLINFO:
     case SBM_GETSCROLLINFO:
+    case WM_WINE_GETSCROLLINFO:
         copy_size = sizeof(SCROLLINFO);
         break;
     case SBM_GETSCROLLBARINFO:
@@ -2132,6 +2138,8 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
         return 0;
     case WM_WINE_GETSCROLLBARINFO:
         return get_scroll_bar_info( hwnd, (LONG)wparam, (SCROLLBARINFO *)lparam );
+    case WM_WINE_GETSCROLLINFO:
+        return get_scroll_info( hwnd, (int)wparam, (SCROLLINFO *)lparam );
     default:
         if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG)
             return user_driver->pWindowMessage( hwnd, msg, wparam, lparam );
diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c
index 65491f25c5b..e3ed1350b09 100644
--- a/dlls/win32u/scroll.c
+++ b/dlls/win32u/scroll.c
@@ -892,7 +892,13 @@ BOOL get_scroll_info( HWND hwnd, int bar, SCROLLINFO *info )
     struct scroll_info *scroll;
 
     /* handle invalid data structure */
-    if (!validate_scroll_info( info ) || !(scroll = get_scroll_info_ptr( hwnd, bar, FALSE )))
+    if (!validate_scroll_info( info ))
+        return FALSE;
+
+    if (bar != SB_CTL && !is_current_thread_window( hwnd ))
+        return send_message( hwnd, WM_WINE_GETSCROLLINFO, (WPARAM)bar, (LPARAM)info );
+
+    if (!(scroll = get_scroll_info_ptr( hwnd, bar, FALSE )))
         return FALSE;
 
     /* fill in the desired scroll info structure */
diff --git a/include/ntuser.h b/include/ntuser.h
index fc7cd98813c..0677f114aea 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -490,6 +490,7 @@ enum wine_internal_message
     WM_WINE_MOUSE_LL_HOOK,
     WM_WINE_UPDATEWINDOWSTATE,
     WM_WINE_GETSCROLLBARINFO,
+    WM_WINE_GETSCROLLINFO,
     WM_WINE_FIRST_DRIVER_MSG = 0x80001000,  /* range of messages reserved for the USER driver */
     WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */
     WM_WINE_SETCURSOR,

From 25357691c44cf18c9abd806725edeb581c6e770c Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 15 Mar 2024 16:30:57 +0000
Subject: [PATCH 343/389] win32u: Implement winevents for scrollbars.

---
 dlls/win32u/scroll.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c
index e3ed1350b09..40a9b1a6605 100644
--- a/dlls/win32u/scroll.c
+++ b/dlls/win32u/scroll.c
@@ -165,6 +165,16 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert
         /* frame has been changed, let the window redraw itself */
         NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0,
                             SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
+
+        if ((set_bits & WS_HSCROLL) && !(old_style & WS_HSCROLL))
+            NtUserNotifyWinEvent( EVENT_OBJECT_SHOW, hwnd, OBJID_HSCROLL, 0 );
+        if ((set_bits & WS_VSCROLL) && !(old_style & WS_VSCROLL))
+            NtUserNotifyWinEvent( EVENT_OBJECT_SHOW, hwnd, OBJID_VSCROLL, 0 );
+        if ((clear_bits & WS_HSCROLL) && (old_style & WS_HSCROLL))
+            NtUserNotifyWinEvent( EVENT_OBJECT_HIDE, hwnd, OBJID_HSCROLL, 0 );
+        if ((clear_bits & WS_VSCROLL) && (old_style & WS_VSCROLL))
+            NtUserNotifyWinEvent( EVENT_OBJECT_HIDE, hwnd, OBJID_VSCROLL, 0 );
+
         return TRUE;
     }
     return FALSE; /* no frame changes */
@@ -1049,6 +1059,19 @@ static int set_scroll_info( HWND hwnd, int bar, const SCROLLINFO *info, BOOL red
             refresh_scroll_bar( hwnd, bar, TRUE, TRUE );
         else if (action & SA_SSI_REPAINT_ARROWS)
             refresh_scroll_bar( hwnd, bar, TRUE, FALSE );
+
+        switch (bar)
+        {
+            case SB_CTL:
+                NtUserNotifyWinEvent( EVENT_OBJECT_VALUECHANGE, hwnd, OBJID_CLIENT, 0 );
+                break;
+            case SB_HORZ:
+                NtUserNotifyWinEvent( EVENT_OBJECT_VALUECHANGE, hwnd, OBJID_HSCROLL, 0 );
+                break;
+            case SB_VERT:
+                NtUserNotifyWinEvent( EVENT_OBJECT_VALUECHANGE, hwnd, OBJID_VSCROLL, 0 );
+                break;
+        }
     }
 
     return ret; /* Return current position */

From 05e023ab753ffc913be3f0bae1159b494fffd92c Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 1 Apr 2024 21:15:03 -0600
Subject: [PATCH 344/389] kernelbase: HACK: Force in-process-gpu for Summer
 Islands.

CW-Bug-Id: #23635
---
 dlls/kernelbase/process.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index 838d139210b..6b90a0d8ba3 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -594,6 +594,7 @@ static const WCHAR *hack_append_command_line( const WCHAR *cmd )
     }
     options[] =
     {
+        {L"SummerIslands.exe", L" --in-process-gpu"},
         {L"UplayWebCore.exe", L" --use-angle=vulkan"},
         {L"Paradox Launcher.exe", L" --use-angle=gl"},
         {L"Montaro\\nw.exe", L" --use-gl=swiftshader"},

From 2ea89e6985ebbc25c7774bb87b6857a7e2c6006f Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 2 Apr 2024 18:05:11 -0600
Subject: [PATCH 345/389] kernelbase: HACK: Force in-process-gpu for Total War:
 WARHAMMER II.

CW-Bug-Id: #23579
---
 dlls/kernelbase/process.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index 6b90a0d8ba3..dfce336d2c0 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -594,6 +594,7 @@ static const WCHAR *hack_append_command_line( const WCHAR *cmd )
     }
     options[] =
     {
+        {L"Warhammer2.exe", L" --in-process-gpu"},
         {L"SummerIslands.exe", L" --in-process-gpu"},
         {L"UplayWebCore.exe", L" --use-angle=vulkan"},
         {L"Paradox Launcher.exe", L" --use-angle=gl"},

From c63b374a6a54de090ed7706e38f413bdd021c308 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 29 Mar 2024 11:46:14 +0800
Subject: [PATCH 346/389] gdiplus/tests: Add tests for
 GdipPrivateAddMemoryFont().

CW-Bug-Id: #23597
---
 dlls/gdiplus/tests/font.c               |  64 +++++++-
 dlls/gdiplus/tests/resource.rc          |   8 +
 dlls/gdiplus/tests/wine_mac_win.ttf     | Bin 0 -> 1140 bytes
 dlls/gdiplus/tests/wine_mac_win.ttx     | 203 ++++++++++++++++++++++++
 dlls/gdiplus/tests/wine_unicode_mac.ttf | Bin 0 -> 1168 bytes
 dlls/gdiplus/tests/wine_unicode_mac.ttx | 203 ++++++++++++++++++++++++
 6 files changed, 471 insertions(+), 7 deletions(-)
 create mode 100644 dlls/gdiplus/tests/wine_mac_win.ttf
 create mode 100644 dlls/gdiplus/tests/wine_mac_win.ttx
 create mode 100644 dlls/gdiplus/tests/wine_unicode_mac.ttf
 create mode 100644 dlls/gdiplus/tests/wine_unicode_mac.ttx

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 8f0bbce0eb4..6a21ea30361 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -43,11 +43,21 @@ static void set_rect_empty(RectF *rc)
     rc->Height = 0.0;
 }
 
+#define load_resource(a, b, c) _load_resource(__LINE__, a, b, c)
+static void _load_resource(int line, const WCHAR *filename, BYTE **data, DWORD *size)
+{
+    HRSRC resource = FindResourceW(NULL, filename, (const WCHAR *)RT_RCDATA);
+    ok_(__FILE__, line)(!!resource, "FindResourceW failed, error %lu\n", GetLastError());
+    *data = LockResource(LoadResource(GetModuleHandleW(NULL), resource));
+    ok_(__FILE__, line)(!!*data, "LockResource failed, error %lu\n", GetLastError());
+    *size = SizeofResource(GetModuleHandleW(NULL), resource);
+    ok_(__FILE__, line)(*size > 0, "SizeofResource failed, error %lu\n", GetLastError());
+}
+
 static void create_testfontfile(const WCHAR *filename, int resource, WCHAR pathW[MAX_PATH])
 {
-    DWORD written;
+    DWORD written, length;
     HANDLE file;
-    HRSRC res;
     void *ptr;
 
     GetTempPathW(MAX_PATH, pathW);
@@ -56,11 +66,9 @@ static void create_testfontfile(const WCHAR *filename, int resource, WCHAR pathW
     file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
     ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %ld\n", wine_dbgstr_w(pathW), GetLastError());
 
-    res = FindResourceA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(resource), (LPCSTR)RT_RCDATA);
-    ok(res != 0, "couldn't find resource\n");
-    ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res));
-    WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), &written, NULL);
-    ok(written == SizeofResource(GetModuleHandleA(NULL), res), "couldn't write resource\n");
+    load_resource(MAKEINTRESOURCEW(resource), (BYTE **)&ptr, &length);
+    WriteFile(file, ptr, length, &written, NULL);
+    ok(written == length, "couldn't write resource\n");
     CloseHandle(file);
 }
 
@@ -1524,6 +1532,47 @@ static void test_CloneFont(void)
     GdipDeleteFontFamily(family);
 }
 
+static void test_GdipPrivateAddMemoryFont(void)
+{
+    static const WORD resource_ids[] =
+    {
+        3, /* A font that has an invalid full name on Mac platform and a valid full name on Microsoft platform */
+        4, /* A font that has an invalid full name on Unicode platform and a valid full name on Mac platform */
+    };
+    GpFontCollection *fonts;
+    GpStatus stat;
+    int count, i;
+    void *buffer;
+    DWORD size;
+
+    for (i = 0; i < ARRAY_SIZE(resource_ids); i++)
+    {
+        winetest_push_context("test %d", i);
+
+        stat = GdipNewPrivateFontCollection(&fonts);
+        ok(stat == Ok, "GdipNewPrivateFontCollection failed, error %d\n", stat);
+
+        load_resource(MAKEINTRESOURCEW(resource_ids[i]), (BYTE **)&buffer, &size);
+        stat = GdipPrivateAddMemoryFont(fonts, buffer, size);
+        if (stat == Ok)
+        {
+            stat = GdipGetFontCollectionFamilyCount(fonts, &count);
+            ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed, error %d\n", stat);
+            todo_wine
+            ok(count == 1, "Expected count 1, got %d\n", count);
+        }
+        else if (i == 1 && stat == FileNotFound)
+            win_skip("Fonts without Microsoft platform names are unsupported on win7.\n");
+        else
+            ok(0, "GdipPrivateAddMemoryFont failed, error %d\n", stat);
+
+        stat = GdipDeletePrivateFontCollection(&fonts);
+        ok(stat == Ok, "GdipDeletePrivateFontCollection failed, error %d\n", stat);
+
+        winetest_pop_context();
+    }
+}
+
 START_TEST(font)
 {
     struct GdiplusStartupInput gdiplusStartupInput;
@@ -1558,6 +1607,7 @@ START_TEST(font)
     test_heightgivendpi();
     test_GdipGetFontCollectionFamilyList();
     test_GdipGetFontCollectionFamilyCount();
+    test_GdipPrivateAddMemoryFont();
 
     GdiplusShutdown(gdiplusToken);
 }
diff --git a/dlls/gdiplus/tests/resource.rc b/dlls/gdiplus/tests/resource.rc
index 2db8d6359ea..4af61fef65d 100644
--- a/dlls/gdiplus/tests/resource.rc
+++ b/dlls/gdiplus/tests/resource.rc
@@ -23,3 +23,11 @@
 
 /* @makedep: wine_testfont0.ttf */
 2 RCDATA wine_testfont0.ttf
+
+/* Generated with: fonttools ttx wine_mac_win.ttx */
+/* @makedep: wine_mac_win.ttf */
+3 RCDATA wine_mac_win.ttf
+
+/* Generated with: fonttools ttx wine_unicode_mac.ttx */
+/* @makedep: wine_unicode_mac.ttf */
+4 RCDATA wine_unicode_mac.ttf
diff --git a/dlls/gdiplus/tests/wine_mac_win.ttf b/dlls/gdiplus/tests/wine_mac_win.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0a0493134deea4cf31e17182df526d9ececd96d2
GIT binary patch
literal 1140
zcmds0O=}ZT6g@MOOjB#4%|Z$WnT28tQj=J^kb>1z7j6m>8d{X`F_|xzk1$Qr1O)Rp
z6n8EKaak8GM3*j91aT$0bgkmbcwS~~$G_km?!D)ockZ1x?<P<H%wh};C%0~0Y|Kaf
zn}D)N_O2C*F6Ol-T#xD3++gI8r>Sok6wel&7v0Jh@gw@0M?(KH^NRQb{j3-EhR1fW
zN$HU5QV?5$nWnyGD1~C!#dXw)f6<Ldgm(Gox6|Bz%bLfKXQN-aQTb$^SpR{!5((hm
zxo2aUzh0=mmpQW%)C{pkKR<bigH%secFLPFWwb*|R;JtrR;H|4g7O{3`;+3O;sb7;
zNwfA5j#}Xfp&wQM)4lCSHa27r-TCd{KzEdfT;w$d6rOBT-H|HZeCpLqvra~;t0=%=
zF7TOFPbOS}F+C}<q8~L@<Tw1i0V$N0e{0J8|FMjxhu<w{ncjhd<D6`YRm|XWhP51D
zzyhvjd=YbKWmunTIF-UI``yMJIU!;Ni+G-46=l53u$JQsIb6gke9knw<ePDKl=!aK
zGnTAnqfu+D8oQo9@)<?s8cv)T&A4N?Z85Nuy?y?&%urY+LCbdgfk^ylAOgQ*I{hFp
z<^N}!IzNt#`brH=#OPv#1U_7N=)u4eEG#oOP@}IB?Q+Mb%FnPsM705j)d{og(t(XO
nU0}eNU=RD$N5m#VvKDj7w8**WBOse#J5&4Y5wTaDBdFmI%UpkJ

literal 0
HcmV?d00001

diff --git a/dlls/gdiplus/tests/wine_mac_win.ttx b/dlls/gdiplus/tests/wine_mac_win.ttx
new file mode 100644
index 00000000000..c85a8abd50b
--- /dev/null
+++ b/dlls/gdiplus/tests/wine_mac_win.ttx
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A font that has an invalid full name on Mac platform and a valid full name on Microsoft platform -->
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.38">
+
+  <GlyphOrder>
+    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="uni0000"/>
+    <GlyphID id="2" name="glyph00002"/>
+  </GlyphOrder>
+
+  <head>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0xc8ad052c"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00001011"/>
+    <unitsPerEm value="2048"/>
+    <created value="Thu Jan  1 00:00:00 1970"/>
+    <modified value="Thu Jan  1 00:00:00 1970"/>
+    <xMin value="68"/>
+    <yMin value="-63"/>
+    <xMax value="1405"/>
+    <yMax value="1575"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="8"/>
+    <fontDirectionHint value="2"/>
+    <indexToLocFormat value="0"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="0x00010000"/>
+    <ascent value="1575"/>
+    <descent value="-63"/>
+    <lineGap value="184"/>
+    <advanceWidthMax value="2048"/>
+    <minLeftSideBearing value="0"/>
+    <minRightSideBearing value="0"/>
+    <xMaxExtent value="1405"/>
+    <caretSlopeRise value="1"/>
+    <caretSlopeRun value="0"/>
+    <caretOffset value="0"/>
+    <reserved0 value="0"/>
+    <reserved1 value="0"/>
+    <reserved2 value="0"/>
+    <reserved3 value="0"/>
+    <metricDataFormat value="0"/>
+    <numberOfHMetrics value="3"/>
+  </hhea>
+
+  <maxp>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="0x10000"/>
+    <numGlyphs value="3"/>
+    <maxPoints value="8"/>
+    <maxContours value="2"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
+    <maxZones value="2"/>
+    <maxTwilightPoints value="0"/>
+    <maxStorage value="1"/>
+    <maxFunctionDefs value="1"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="64"/>
+    <maxSizeOfInstructions value="46"/>
+    <maxComponentElements value="0"/>
+    <maxComponentDepth value="0"/>
+  </maxp>
+
+  <OS_2>
+    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
+         will be recalculated by the compiler -->
+    <version value="2"/>
+    <xAvgCharWidth value="2048"/>
+    <usWeightClass value="500"/>
+    <usWidthClass value="5"/>
+    <fsType value="01111111 11111111"/>
+    <ySubscriptXSize value="1331"/>
+    <ySubscriptYSize value="1433"/>
+    <ySubscriptXOffset value="0"/>
+    <ySubscriptYOffset value="286"/>
+    <ySuperscriptXSize value="1331"/>
+    <ySuperscriptYSize value="1433"/>
+    <ySuperscriptXOffset value="0"/>
+    <ySuperscriptYOffset value="983"/>
+    <yStrikeoutSize value="102"/>
+    <yStrikeoutPosition value="530"/>
+    <sFamilyClass value="0"/>
+    <panose>
+      <bFamilyType value="2"/>
+      <bSerifStyle value="0"/>
+      <bWeight value="6"/>
+      <bProportion value="3"/>
+      <bContrast value="0"/>
+      <bStrokeVariation value="0"/>
+      <bArmStyle value="0"/>
+      <bLetterForm value="0"/>
+      <bMidline value="0"/>
+      <bXHeight value="0"/>
+    </panose>
+    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
+    <achVendID value="Wine"/>
+    <fsSelection value="00000000 01000000"/>
+    <usFirstCharIndex value="0"/>
+    <usLastCharIndex value="0"/>
+    <sTypoAscender value="1638"/>
+    <sTypoDescender value="-410"/>
+    <sTypoLineGap value="184"/>
+    <usWinAscent value="1638"/>
+    <usWinDescent value="410"/>
+    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
+    <sxHeight value="0"/>
+    <sCapHeight value="0"/>
+    <usDefaultChar value="0"/>
+    <usBreakChar value="32"/>
+    <usMaxContext value="1"/>
+  </OS_2>
+
+  <hmtx>
+    <mtx name=".notdef" width="2048" lsb="68"/>
+    <mtx name="glyph00002" width="2048" lsb="0"/>
+    <mtx name="uni0000" width="2048" lsb="601"/>
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="0" platEncID="3" language="0">
+      <map code="0x0" name="uni0000"/><!-- ???? -->
+    </cmap_format_4>
+    <cmap_format_0 platformID="1" platEncID="0" language="0">
+      <map code="0x0" name="uni0000"/>
+      <map code="0x8" name="uni0000"/>
+      <map code="0x9" name="glyph00002"/>
+      <map code="0xd" name="glyph00002"/>
+      <map code="0x1d" name="uni0000"/>
+    </cmap_format_0>
+    <cmap_format_4 platformID="3" platEncID="1" language="0">
+      <map code="0x0" name="uni0000"/><!-- ???? -->
+    </cmap_format_4>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef"/><!-- contains no outline data -->
+    <TTGlyph name="glyph00002"/><!-- contains no outline data -->
+    <TTGlyph name="uni0000"/><!-- contains no outline data -->
+  </glyf>
+
+  <name>
+    <namerecord nameID="0" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Copyright (c) 2024 Zhiyi Zhang for CodeWeavers
+    </namerecord>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_mac_win
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="3" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_mac_win
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      invalid_full_name
+    </namerecord>
+    <namerecord nameID="5" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Version 1.0
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_mac_win
+    </namerecord>
+    <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
+      Copyright (c) 2024 Zhiyi Zhang for CodeWeavers
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      wine_mac_win
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="3" platformID="3" platEncID="1" langID="0x409">
+      wine_mac_win
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      wine_mac_win
+    </namerecord>
+    <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
+      Version 1.0
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      wine_mac_win
+    </namerecord>
+  </name>
+
+</ttFont>
diff --git a/dlls/gdiplus/tests/wine_unicode_mac.ttf b/dlls/gdiplus/tests/wine_unicode_mac.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4c0af94ade4dd5f9a89246cf5f63ae9320d659c8
GIT binary patch
literal 1168
zcmds0O=}ZT6g_W}OroW=bRjN+45HYgq)9BUx+tb@+z1gGT7>a2nU4pVnJ`V-1PW&D
zKTyO!poq(E#LuM*7lIo>^cT2LaAiC%GfCrL@P_;Dx#ymH-<wAs1b|Z*A&2GLch>8R
zQU4Yo&XK+6gtCjp+*9Tw`VGG`^vKhU4_rjx%J$3d%3b2e^y>i$^IP#9@hAGlAnXlJ
z?_!(M0rOHPb|fRsc+aI2%0U-5Q6v6Mw;~z3_LW!cH$JlGHT2o&Prmp~`^@GqER;w9
zN0(lVbo_p`{8h)yN-#3S9`o|}4USViSv_gq#DvMsDBYQITc}J}qXh92h5O^ewZcOd
z&!;i>8J@Ai6T&>{{%3kiMJ~4V4AcAL;n?)VBPR123xX%xHg>g&H=lYr(`=H_>N4`M
z81wv1y2oQ?;F_M4SePe+h5m-=4QQdZ`CU`y|6iBzeD;z0znPlgT~0FtOE}8-+#H|B
z1w6?30?y)DhRum)dY2Wv&F)oT89y>?ph!Wg;ai&V`8iy`f+%JhbHX<eql+ODDEJ7_
z<4&t^u*O(NmA*l=$BLp#WmqDj+JeXKgi%jv!$pfOalkdfJ`Smmh;8&46{n^u8zEH=
znymS(b(rb>BX&w=inDCa)|C!XL^h;$C!4D{C*rO(zLaVs?hX^>2R&=mS+nZZ`i8X^
vsG;I2Bj57k#A?KCx8=$MH`zbr+pznQa!A>sbegW;@5p3_B^5_jty299<J*K;

literal 0
HcmV?d00001

diff --git a/dlls/gdiplus/tests/wine_unicode_mac.ttx b/dlls/gdiplus/tests/wine_unicode_mac.ttx
new file mode 100644
index 00000000000..377b4b3d4ed
--- /dev/null
+++ b/dlls/gdiplus/tests/wine_unicode_mac.ttx
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A font that has an invalid full name on Unicode platform and a valid full name on Mac platform -->
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.38">
+
+  <GlyphOrder>
+    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="uni0000"/>
+    <GlyphID id="2" name="glyph00002"/>
+  </GlyphOrder>
+
+  <head>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0xc8ad052c"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00001011"/>
+    <unitsPerEm value="2048"/>
+    <created value="Thu Jan  1 00:00:00 1970"/>
+    <modified value="Thu Jan  1 00:00:00 1970"/>
+    <xMin value="68"/>
+    <yMin value="-63"/>
+    <xMax value="1405"/>
+    <yMax value="1575"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="8"/>
+    <fontDirectionHint value="2"/>
+    <indexToLocFormat value="0"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="0x00010000"/>
+    <ascent value="1575"/>
+    <descent value="-63"/>
+    <lineGap value="184"/>
+    <advanceWidthMax value="2048"/>
+    <minLeftSideBearing value="0"/>
+    <minRightSideBearing value="0"/>
+    <xMaxExtent value="1405"/>
+    <caretSlopeRise value="1"/>
+    <caretSlopeRun value="0"/>
+    <caretOffset value="0"/>
+    <reserved0 value="0"/>
+    <reserved1 value="0"/>
+    <reserved2 value="0"/>
+    <reserved3 value="0"/>
+    <metricDataFormat value="0"/>
+    <numberOfHMetrics value="3"/>
+  </hhea>
+
+  <maxp>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="0x10000"/>
+    <numGlyphs value="3"/>
+    <maxPoints value="8"/>
+    <maxContours value="2"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
+    <maxZones value="2"/>
+    <maxTwilightPoints value="0"/>
+    <maxStorage value="1"/>
+    <maxFunctionDefs value="1"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="64"/>
+    <maxSizeOfInstructions value="46"/>
+    <maxComponentElements value="0"/>
+    <maxComponentDepth value="0"/>
+  </maxp>
+
+  <OS_2>
+    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
+         will be recalculated by the compiler -->
+    <version value="2"/>
+    <xAvgCharWidth value="2048"/>
+    <usWeightClass value="500"/>
+    <usWidthClass value="5"/>
+    <fsType value="01111111 11111111"/>
+    <ySubscriptXSize value="1331"/>
+    <ySubscriptYSize value="1433"/>
+    <ySubscriptXOffset value="0"/>
+    <ySubscriptYOffset value="286"/>
+    <ySuperscriptXSize value="1331"/>
+    <ySuperscriptYSize value="1433"/>
+    <ySuperscriptXOffset value="0"/>
+    <ySuperscriptYOffset value="983"/>
+    <yStrikeoutSize value="102"/>
+    <yStrikeoutPosition value="530"/>
+    <sFamilyClass value="0"/>
+    <panose>
+      <bFamilyType value="2"/>
+      <bSerifStyle value="0"/>
+      <bWeight value="6"/>
+      <bProportion value="3"/>
+      <bContrast value="0"/>
+      <bStrokeVariation value="0"/>
+      <bArmStyle value="0"/>
+      <bLetterForm value="0"/>
+      <bMidline value="0"/>
+      <bXHeight value="0"/>
+    </panose>
+    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
+    <achVendID value="Wine"/>
+    <fsSelection value="00000000 01000000"/>
+    <usFirstCharIndex value="0"/>
+    <usLastCharIndex value="0"/>
+    <sTypoAscender value="1638"/>
+    <sTypoDescender value="-410"/>
+    <sTypoLineGap value="184"/>
+    <usWinAscent value="1638"/>
+    <usWinDescent value="410"/>
+    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
+    <sxHeight value="0"/>
+    <sCapHeight value="0"/>
+    <usDefaultChar value="0"/>
+    <usBreakChar value="32"/>
+    <usMaxContext value="1"/>
+  </OS_2>
+
+  <hmtx>
+    <mtx name=".notdef" width="2048" lsb="68"/>
+    <mtx name="glyph00002" width="2048" lsb="0"/>
+    <mtx name="uni0000" width="2048" lsb="601"/>
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="0" platEncID="3" language="0">
+      <map code="0x0" name="uni0000"/><!-- ???? -->
+    </cmap_format_4>
+    <cmap_format_0 platformID="1" platEncID="0" language="0">
+      <map code="0x0" name="uni0000"/>
+      <map code="0x8" name="uni0000"/>
+      <map code="0x9" name="glyph00002"/>
+      <map code="0xd" name="glyph00002"/>
+      <map code="0x1d" name="uni0000"/>
+    </cmap_format_0>
+    <cmap_format_4 platformID="3" platEncID="1" language="0">
+      <map code="0x0" name="uni0000"/><!-- ???? -->
+    </cmap_format_4>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef"/><!-- contains no outline data -->
+    <TTGlyph name="glyph00002"/><!-- contains no outline data -->
+    <TTGlyph name="uni0000"/><!-- contains no outline data -->
+  </glyf>
+
+  <name>
+    <namerecord nameID="0" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      Copyright (c) 2024 Zhiyi Zhang for CodeWeavers
+    </namerecord>
+    <namerecord nameID="1" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+    <namerecord nameID="2" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="3" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+    <namerecord nameID="4" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      invalid_full_name
+    </namerecord>
+    <namerecord nameID="5" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      Version 1.0
+    </namerecord>
+    <namerecord nameID="6" platformID="0" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+    <namerecord nameID="0" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Copyright (c) 2024 Zhiyi Zhang for CodeWeavers
+    </namerecord>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="3" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+    <namerecord nameID="5" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Version 1.0
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      wine_unicode_mac
+    </namerecord>
+  </name>
+
+</ttFont>

From 8ff4cd260fd400850dc7d314405060b68f4fc0c4 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Thu, 28 Mar 2024 17:00:39 +0800
Subject: [PATCH 347/389] gdiplus: Search microsoft platform names first in
 load_ttf_name_id().

Search names in fonts in the order of Microsoft, Mac and finally Unicode platform. This is also the
order win32u uses to load font names.

Fix Granado Espada Japan (1219160) launcher crashes at start in Japanese locale. The game ships a
font with a broken name record of Mac platform and encoding ID 0 (Roman) but the name string is in
code page 10001 (Japanese). This broken name record is placed before the name records for the
Microsoft platform so it gets selected first. Then name value in the name record doesn't get
converted correctly to Unicode because of the wrong code page. Thus the EnumFontFamiliesExW()
in GdipPrivateAddMemoryFont() fails to find the font.

CW-Bug-Id: #23597
---
 dlls/gdiplus/font.c       | 38 +++++++++++++++++++++++---------------
 dlls/gdiplus/tests/font.c |  1 -
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index da37279fbef..67d75ed97f6 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -1385,12 +1385,13 @@ static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *da
 
 static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id )
 {
+    static const WORD platform_id_table[] = {TT_PLATFORM_MICROSOFT, TT_PLATFORM_MACINTOSH, TT_PLATFORM_APPLE_UNICODE};
     LANGID lang = GetSystemDefaultLangID();
     const tt_header *header;
     const tt_name_table *name_table;
-    const tt_name_record *name_record;
+    const tt_name_record *name_record_table, *name_record;
     DWORD pos, ofs = 0, count;
-    int i, res, best_lang = 0, best_index = -1;
+    int i, j, res, best_lang = 0, best_index = -1;
 
     if (sizeof(tt_header) > size)
         return NULL;
@@ -1421,26 +1422,33 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id )
     if (pos > size)
         return NULL;
     name_table = (const tt_name_table*)&mem[ofs];
+    name_record_table = (const tt_name_record *)&mem[pos];
     count =  GET_BE_WORD(name_table->count);
     if (GET_BE_WORD(name_table->string_offset) >= size - ofs) return NULL;
     ofs += GET_BE_WORD(name_table->string_offset);
-    for (i=0; i<count; i++)
+    for (i = 0; i < ARRAY_SIZE(platform_id_table); i++)
     {
-        name_record = (const tt_name_record*)&mem[pos];
-        pos += sizeof(*name_record);
-        if (pos > size)
-            return NULL;
+        for (j = 0; j < count; j++)
+        {
+            name_record = name_record_table + j;
+            if ((const BYTE *)name_record - mem > size)
+                return NULL;
 
-        if (GET_BE_WORD(name_record->name_id) != id) continue;
-        if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL;
-        if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL;
+            if (GET_BE_WORD(name_record->platform_id) != platform_id_table[i]) continue;
+            if (GET_BE_WORD(name_record->name_id) != id) continue;
+            if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL;
+            if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL;
 
-        res = match_name_table_language( name_record, lang );
-        if (res > best_lang)
-        {
-            best_lang = res;
-            best_index = i;
+            res = match_name_table_language(name_record, lang);
+            if (res > best_lang)
+            {
+                best_lang = res;
+                best_index = j;
+            }
         }
+
+        if (best_index != -1)
+            break;
     }
 
     if (best_lang)
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 6a21ea30361..1bbb18f4c6d 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -1558,7 +1558,6 @@ static void test_GdipPrivateAddMemoryFont(void)
         {
             stat = GdipGetFontCollectionFamilyCount(fonts, &count);
             ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed, error %d\n", stat);
-            todo_wine
             ok(count == 1, "Expected count 1, got %d\n", count);
         }
         else if (i == 1 && stat == FileNotFound)

From 6cc0d8b2f00a8c5f467a63bdbc459c064242ba3b Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 2 Apr 2024 20:16:29 -0600
Subject: [PATCH 348/389] mmdevapi: Implement
 SAC_IsAudioObjectFormatSupported().

CW-Bug-Id: #23641
---
 dlls/mmdevapi/spatialaudio.c       | 67 ++++++++++++++++++++----------
 dlls/mmdevapi/tests/spatialaudio.c | 21 ++++++++++
 2 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c
index 23f3de31428..bc1b085f3cd 100644
--- a/dlls/mmdevapi/spatialaudio.c
+++ b/dlls/mmdevapi/spatialaudio.c
@@ -49,6 +49,36 @@ static UINT32 AudioObjectType_to_index(AudioObjectType type)
     return o - 2;
 }
 
+static const char *debugstr_fmtex(const WAVEFORMATEX *fmt)
+{
+    static char buf[2048];
+
+    if (!fmt)
+    {
+        strcpy(buf, "(null)");
+    }
+    else if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+    {
+        const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt;
+        snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%lx), rate: %lu, depth: %u",
+                fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat),
+                fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec,
+                fmt->wBitsPerSample);
+    }
+    else
+    {
+        snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %lu, depth: %u",
+                fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec,
+                fmt->wBitsPerSample);
+    }
+    return buf;
+}
+
+static BOOL formats_equal(const WAVEFORMATEX *fmt1, const WAVEFORMATEX *fmt2)
+{
+    return !memcmp(fmt1, fmt2, sizeof(*fmt1) + fmt1->cbSize);
+}
+
 typedef struct SpatialAudioImpl SpatialAudioImpl;
 typedef struct SpatialAudioStreamImpl SpatialAudioStreamImpl;
 typedef struct SpatialAudioObjectImpl SpatialAudioObjectImpl;
@@ -610,9 +640,20 @@ static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface,
 static HRESULT WINAPI SAC_IsAudioObjectFormatSupported(ISpatialAudioClient *iface,
         const WAVEFORMATEX *format)
 {
-    SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface);
-    FIXME("(%p)->(%p)\n", This, format);
-    return E_NOTIMPL;
+    SpatialAudioImpl *sac = impl_from_ISpatialAudioClient(iface);
+
+    TRACE("sac %p, format %s.\n", sac, debugstr_fmtex(format));
+
+    if (!format)
+        return E_POINTER;
+
+    if (!formats_equal(&sac->object_fmtex.Format, format))
+    {
+        FIXME("Reporting format %s as unsupported.\n", debugstr_fmtex(format));
+        return E_INVALIDARG;
+    }
+
+    return S_OK;
 }
 
 static HRESULT WINAPI SAC_IsSpatialAudioStreamAvailable(ISpatialAudioClient *iface,
@@ -630,23 +671,6 @@ static WAVEFORMATEX *clone_fmtex(const WAVEFORMATEX *src)
     return r;
 }
 
-static const char *debugstr_fmtex(const WAVEFORMATEX *fmt)
-{
-    static char buf[2048];
-    if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
-        const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt;
-        snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%lx), rate: %lu, depth: %u",
-                fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat),
-                fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec,
-                fmt->wBitsPerSample);
-    }else{
-        snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %lu, depth: %u",
-                fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec,
-                fmt->wBitsPerSample);
-    }
-    return buf;
-}
-
 static void static_mask_to_channels(AudioObjectType static_mask, WORD *count, DWORD *mask, UINT32 *map)
 {
     UINT32 out_chan = 0, map_idx = 0;
@@ -776,8 +800,7 @@ static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface,
             return E_INVALIDARG;
         }
 
-        if(!params->ObjectFormat ||
-                memcmp(params->ObjectFormat, &This->object_fmtex.Format, sizeof(*params->ObjectFormat) + params->ObjectFormat->cbSize)){
+        if(!(params->ObjectFormat && formats_equal(params->ObjectFormat, &This->object_fmtex.Format))) {
             *stream = NULL;
             return AUDCLNT_E_UNSUPPORTED_FORMAT;
         }
diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c
index a382b57e7a2..4d8073d49ce 100644
--- a/dlls/mmdevapi/tests/spatialaudio.c
+++ b/dlls/mmdevapi/tests/spatialaudio.c
@@ -64,6 +64,27 @@ static void test_formats(void)
     ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %lu\n", fmt->nAvgBytesPerSec);
     ok(fmt->cbSize == 0, "Wrong cbSize for simple format, expected 0, got %hu\n", fmt->cbSize);
 
+    hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, NULL);
+    ok(hr == E_POINTER, "Got %#lx.\n", hr);
+
+    memcpy(&format, fmt, sizeof(format));
+    hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format);
+    ok(hr == S_OK, "Got %#lx.\n", hr);
+
+    format.nBlockAlign *= 2;
+    hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format);
+    todo_wine ok(hr == S_OK, "Got %#lx.\n", hr);
+
+    memcpy(&format, fmt, sizeof(format));
+    format.wBitsPerSample *= 2;
+    hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format);
+    ok(hr == E_INVALIDARG, "Got %#lx.\n", hr);
+
+    memcpy(&format, fmt, sizeof(format));
+    format.nChannels = 2;
+    hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format);
+    ok(hr == E_INVALIDARG, "Got %#lx.\n", hr);
+
     memcpy(&format, fmt, sizeof(format));
 
     IAudioFormatEnumerator_Release(afe);

From a4503a70d1de9530686780b324884821fe28f66a Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Wed, 3 Apr 2024 10:35:29 +0800
Subject: [PATCH 349/389] HACK: ntdll: Enable WINE_SIMULATE_WRITECOPY for
 Hentai Maid Memories.

CW-Bug-Id: #23637
---
 dlls/ntdll/unix/loader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index b7d1f677203..4f8a84c6080 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -2112,7 +2112,8 @@ static void hacks_init(void)
                                        || !strcmp(sgi, "2053940") /* Idol Hands 2 */
                                        || !strcmp(sgi, "391150") /* Red Tie Runner */
                                        || !strcmp(sgi, "2152990") /* Dinogen Online */
-                                       || !strcmp(sgi, "2176450"); /* Mr. Hopp's Playhouse 3 */
+                                       || !strcmp(sgi, "2176450") /* Mr. Hopp's Playhouse 3 */
+                                       || !strcmp(sgi, "2361360"); /* Hentai Maid Memories */
 
     if (sgi) wine_allocs_2g_limit = !strcmp(sgi, "359870");
     if (wine_allocs_2g_limit) ERR("Allocation 2g limit enabled.\n");

From 3f99f09c7680f0b68242bd1e12db3fe45f3b852e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 3 Apr 2024 15:02:49 -0600
Subject: [PATCH 350/389] winegstreamer: Try to handle broken IStream_Stat
 implementation in WM reader OpenStream().

CW-Bug-Id: #23643
---
 dlls/winegstreamer/wm_reader.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 8014691def3..a172f1cfbb3 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -2250,18 +2250,36 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename)
 
 static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream)
 {
+    static const ULONG64 canary_size = 0xdeadbeeffeedcafe;
     struct wm_reader *reader = impl_from_IWMSyncReader2(iface);
     STATSTG stat;
     HRESULT hr;
 
     TRACE("reader %p, stream %p.\n", reader, stream);
 
+    stat.cbSize.QuadPart = canary_size;
     if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME)))
     {
         ERR("Failed to stat stream, hr %#lx.\n", hr);
         return hr;
     }
 
+    if (stat.cbSize.QuadPart == canary_size)
+    {
+        /* Call of Juarez: Gunslinger implements IStream_Stat as an empty function returning S_OK, leaving
+         * the output stat unchanged. Windows doesn't call IStream_Seek(_SEEK_END) and probably validates
+         * the size against WMV file headers so the bigger cbSize doesn't change anything.
+         * Such streams work as soon as the uninitialized cbSize is big enough which is usually the case
+         * (if that is not the case Windows will favour shorter cbSize). */
+        static const LARGE_INTEGER zero = { 0 };
+        ULARGE_INTEGER pos = { .QuadPart = canary_size };
+
+        if (SUCCEEDED(hr = IStream_Seek(stream, zero, STREAM_SEEK_END, &pos)))
+            IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
+        stat.cbSize.QuadPart = pos.QuadPart == canary_size ? 0 : pos.QuadPart;
+        ERR("IStream_Stat did not fill the stream size, size from _Seek %I64u.\n", stat.cbSize.QuadPart);
+    }
+
     EnterCriticalSection(&reader->cs);
 
     if (reader->wg_parser)

From 107c8d5edbcbb80b95062f23e35fe5f75c41b4cf Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Fri, 22 Mar 2024 17:08:32 -0300
Subject: [PATCH 351/389] crypt32: Fix CryptBinaryToString not adding a
 separator.

(cherry picked from commit 624e87a7252abd1f03598c68edc56e6815af1ef2)
---
 dlls/crypt32/base64.c       | 16 +++++++++-------
 dlls/crypt32/tests/base64.c |  8 ++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c
index b61ed7ff8cc..298756ca541 100644
--- a/dlls/crypt32/base64.c
+++ b/dlls/crypt32/base64.c
@@ -111,8 +111,6 @@ static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
     i = 0;
     while (div > 0 && ptr < end)
     {
-        if (i && i % 64 == 0)
-            ptr += stradd(ptr, end, sep, strlen(sep));
         /* first char is the first 6 bits of the first byte*/
         chunk[0] = b64[ ( d[0] >> 2) & 0x3f ];
         /* second char is the last 2 bits of the first byte and the first 4
@@ -127,6 +125,9 @@ static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
         i += 4;
         d += 3;
         div--;
+
+        if (i && i % 64 == 0)
+            ptr += stradd(ptr, end, sep, strlen(sep));
     }
 
     switch(pad_bytes)
@@ -393,11 +394,6 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
     i = 0;
     while (div > 0)
     {
-        if (i && i % 64 == 0)
-        {
-            lstrcpyW(ptr, sep);
-            ptr += lstrlenW(sep);
-        }
         /* first char is the first 6 bits of the first byte*/
         *ptr++ = b64[ ( d[0] >> 2) & 0x3f ];
         /* second char is the last 2 bits of the first byte and the first 4
@@ -411,6 +407,12 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
         i += 4;
         d += 3;
         div--;
+
+        if (i && i % 64 == 0)
+        {
+            lstrcpyW(ptr, sep);
+            ptr += lstrlenW(sep);
+        }
     }
 
     switch(pad_bytes)
diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c
index e81a57c576d..2263b236fa8 100644
--- a/dlls/crypt32/tests/base64.c
+++ b/dlls/crypt32/tests/base64.c
@@ -57,6 +57,8 @@ static const BYTE toEncode4[] =
 static const BYTE toEncode5[] =
  "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHI";
 
+static const BYTE toEncode6[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+
 static const struct BinTests tests[] = {
  { toEncode1, sizeof(toEncode1), "AA==\r\n", },
  { toEncode2, sizeof(toEncode2), "AQI=\r\n", },
@@ -69,6 +71,9 @@ static const struct BinTests tests[] = {
    "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\r\n" },
  { toEncode5, sizeof(toEncode5),
    "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISQA=\r\n" },
+ { toEncode6, sizeof(toEncode6),
+   "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\r\n"
+   "YQA=\r\n" },
 };
 
 static const struct BinTests testsNoCR[] = {
@@ -83,6 +88,9 @@ static const struct BinTests testsNoCR[] = {
    "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\n" },
  { toEncode5, sizeof(toEncode5),
    "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISQA=\n" },
+ { toEncode6, sizeof(toEncode6),
+   "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\n"
+   "YQA=\n" },
 };
 
 static WCHAR *strdupAtoW(const char *str)

From c4888745f0e93f0b17619bb3289061055f1aaae2 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 4 Apr 2024 17:53:09 -0600
Subject: [PATCH 352/389] kernelbase: HACK: Force CEF swiftshader for
 Insanity's Blade.

CW-Bug-Id: #23650
---
 dlls/kernelbase/process.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index dfce336d2c0..725e9e252ce 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -594,6 +594,7 @@ static const WCHAR *hack_append_command_line( const WCHAR *cmd )
     }
     options[] =
     {
+        {L"Insanitys Blade\\nw.exe", L" --use-gl=swiftshader"},
         {L"Warhammer2.exe", L" --in-process-gpu"},
         {L"SummerIslands.exe", L" --in-process-gpu"},
         {L"UplayWebCore.exe", L" --use-angle=vulkan"},

From 27448768d98b9a47ff6fc4f62ce61421175e7008 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Thu, 4 Apr 2024 17:51:39 -0600
Subject: [PATCH 353/389] kernelbase: HACK: Force disable direct composition
 for Bloody Walls.

CW-Bug-Id: #23651
---
 dlls/kernelbase/process.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index 725e9e252ce..4267a8c57e6 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -594,6 +594,7 @@ static const WCHAR *hack_append_command_line( const WCHAR *cmd )
     }
     options[] =
     {
+        {L"Bloody Walls\\game.exe", L" --disable_direct_composition=1"},
         {L"Insanitys Blade\\nw.exe", L" --use-gl=swiftshader"},
         {L"Warhammer2.exe", L" --in-process-gpu"},
         {L"SummerIslands.exe", L" --in-process-gpu"},

From f5c2fd9cb7dc27c8c7ea2925a8b45bf4e929988f Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Fri, 5 Apr 2024 12:05:04 +0300
Subject: [PATCH 354/389] fixup! opengl32: HACK: Fixup shaders for Joe Danger
 2: The Movie.

Fix possibility of strcmp dereferencing NULL when env variable
SteamGameId is not set.

Link: https://github.com/ValveSoftware/wine/issues/228
---
 dlls/opengl32/wgl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 251e177ad9c..2a308152735 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1343,6 +1343,8 @@ static char *fixup_shader( GLsizei count, const GLchar *const*string, const GLin
         const char *sgi = getenv("SteamGameId");
         unsigned int i;
 
+        if (!sgi) return NULL;
+
         for (i = 0; i < ARRAY_SIZE(replace); ++i)
             if (!strcmp( sgi, replace[i].gameid )) break;
 

From 06f9ea4e09590a6580fdaa1387925eb527ca8bfd Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 5 Apr 2024 12:11:51 -0600
Subject: [PATCH 355/389] ntdll: Return STATUS_NO_YIELD_PERFORMED from
 NtYieldExecution() on Linux if no yield was performed.

CW-Bug-Id: #23654
---
 dlls/ntdll/unix/sync.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index dd08632e21c..23f17e72e08 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -43,6 +43,9 @@
 #ifdef HAVE_SCHED_H
 # include <sched.h>
 #endif
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -1626,7 +1629,17 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait,
 NTSTATUS WINAPI NtYieldExecution(void)
 {
 #ifdef HAVE_SCHED_YIELD
+#ifdef RUSAGE_THREAD
+    struct rusage u1, u2;
+    int ret;
+
+    ret = getrusage( RUSAGE_THREAD, &u1 );
+#endif
     sched_yield();
+#ifdef RUSAGE_THREAD
+    if (!ret) ret = getrusage( RUSAGE_THREAD, &u2 );
+    if (!ret && u1.ru_nvcsw == u2.ru_nvcsw && u1.ru_nivcsw == u2.ru_nivcsw) return STATUS_NO_YIELD_PERFORMED;
+#endif
     return STATUS_SUCCESS;
 #else
     return STATUS_NO_YIELD_PERFORMED;

From c231dbe07818d3557947f97ff25ea60113b0abe9 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 8 Apr 2024 20:21:09 -0600
Subject: [PATCH 356/389] winhttp: Set actual default receive response timeout
 to 21sec.

CW-Bug-Id: #23656
---
 dlls/winhttp/request.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index c75d6fd513f..ee7315170c6 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
 
 #define DEFAULT_KEEP_ALIVE_TIMEOUT 30000
 
+#define ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT 21000
+
+static int request_receive_response_timeout( struct request *req )
+{
+    if (req->receive_response_timeout == -1) return ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT;
+    return req->receive_response_timeout;
+}
+
 static const WCHAR *attribute_table[] =
 {
     L"Mime-Version",                /* WINHTTP_QUERY_MIME_VERSION               = 0  */
@@ -1658,7 +1666,7 @@ static DWORD open_connection( struct request *request )
             return ret;
         }
         netconn_set_timeout( netconn, TRUE, request->send_timeout );
-        netconn_set_timeout( netconn, FALSE, request->receive_response_timeout );
+        netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request ));
 
         request->netconn = netconn;
 
@@ -1696,7 +1704,7 @@ static DWORD open_connection( struct request *request )
         TRACE("using connection %p\n", netconn);
 
         netconn_set_timeout( netconn, TRUE, request->send_timeout );
-        netconn_set_timeout( netconn, FALSE, request->receive_response_timeout );
+        netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request ));
         request->netconn = netconn;
     }
 
@@ -2329,7 +2337,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD
 
     if (!chunked && content_length <= optional_len)
     {
-        netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout );
+        netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request ));
         request->read_reply_status = read_reply( request );
         if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED)
             request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED;
@@ -2932,7 +2940,7 @@ static DWORD receive_response( struct request *request )
         }
         /* fallthrough */
     case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT:
-        netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout );
+        netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request ));
         request->read_reply_status = read_reply( request );
         request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED;
         break;

From 6c0704129ae5a7bf326c3741cd6a5bb8d5fb2b1a Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 8 Apr 2024 22:35:05 -0600
Subject: [PATCH 357/389] winhttp/tests: Add some tests for actual connection
 caching.

CW-Bug-Id: #23656
---
 dlls/winhttp/tests/winhttp.c | 114 +++++++++++++++++++++++++++++++----
 1 file changed, 102 insertions(+), 12 deletions(-)

diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 09abc4c5854..8aa03596732 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -2197,6 +2197,12 @@ static const char okmsg[] =
 "Server: winetest\r\n"
 "\r\n";
 
+static const char okmsg_length0[] =
+"HTTP/1.1 200 OK\r\n"
+"Server: winetest\r\n"
+"Content-length: 0\r\n"
+"\r\n";
+
 static const char notokmsg[] =
 "HTTP/1.1 400 Bad Request\r\n"
 "\r\n";
@@ -2318,6 +2324,24 @@ static void create_websocket_accept(const char *key, char *buf, unsigned int buf
     CryptBinaryToStringA( (BYTE *)sha1, sizeof(sha1), CRYPT_STRING_BASE64, buf, &len);
 }
 
+static int server_receive_request(int c, char *buffer, size_t buffer_size)
+{
+    int i, r;
+
+    memset(buffer, 0, buffer_size);
+    for(i = 0; i < buffer_size - 1; i++)
+    {
+        r = recv(c, &buffer[i], 1, 0);
+        if (r != 1)
+            break;
+        if (i < 4) continue;
+        if (buffer[i - 2] == '\n' && buffer[i] == '\n' &&
+            buffer[i - 3] == '\r' && buffer[i - 1] == '\r')
+            break;
+    }
+    return r;
+}
+
 static DWORD CALLBACK server_thread(LPVOID param)
 {
     struct server_info *si = param;
@@ -2351,18 +2375,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
     do
     {
         if (c == -1) c = accept(s, NULL, NULL);
-
-        memset(buffer, 0, sizeof buffer);
-        for(i = 0; i < sizeof buffer - 1; i++)
-        {
-            r = recv(c, &buffer[i], 1, 0);
-            if (r != 1)
-                break;
-            if (i < 4) continue;
-            if (buffer[i - 2] == '\n' && buffer[i] == '\n' &&
-                buffer[i - 3] == '\r' && buffer[i - 1] == '\r')
-                break;
-        }
+        server_receive_request(c, buffer, sizeof(buffer));
         if (strstr(buffer, "GET /basic"))
         {
             send(c, okmsg, sizeof okmsg - 1, 0);
@@ -2558,6 +2571,23 @@ static DWORD CALLBACK server_thread(LPVOID param)
             }
             send(c, okmsg, sizeof(okmsg) - 1, 0);
         }
+
+        if (strstr(buffer, "GET /cached"))
+        {
+            send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0);
+            r = server_receive_request(c, buffer, sizeof(buffer));
+            ok(r > 0, "got %d.\n", r);
+            ok(!!strstr(buffer, "GET /cached"), "request not found.\n");
+            send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0);
+            r = server_receive_request(c, buffer, sizeof(buffer));
+            todo_wine ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]);
+        }
+        if (strstr(buffer, "GET /notcached"))
+        {
+            send(c, okmsg, sizeof okmsg - 1, 0);
+            r = server_receive_request(c, buffer, sizeof(buffer));
+            ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0] );
+        }
         shutdown(c, 2);
         closesocket(c);
         c = -1;
@@ -5822,6 +5852,65 @@ static void test_client_cert_authentication(void)
     WinHttpCloseHandle( ses );
 }
 
+static void test_connection_cache(int port)
+{
+    HINTERNET ses, con, req;
+    DWORD status, size;
+    char buffer[256];
+    BOOL ret;
+
+    ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0);
+    ok(ses != NULL, "failed to open session %lu\n", GetLastError());
+
+    con = WinHttpConnect(ses, L"localhost", port, 0);
+    ok(con != NULL, "failed to open a connection %lu\n", GetLastError());
+
+    req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0);
+    ok(req != NULL, "failed to open a request %lu\n", GetLastError());
+    ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0);
+    ok(ret, "failed to send request %lu\n", GetLastError());
+    ret = WinHttpReceiveResponse(req, NULL);
+    ok(ret, "failed to receive response %lu\n", GetLastError());
+    size = sizeof(status);
+    ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL);
+    ok(ret, "failed to query status code %lu\n", GetLastError());
+    ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status);
+    ret = WinHttpReadData(req, buffer, sizeof buffer, &size);
+    ok(ret, "failed to read data %lu\n", GetLastError());
+    ok(!size, "got size %lu.\n", size);
+    WinHttpCloseHandle(req);
+
+    req = WinHttpOpenRequest(con, L"GET", L"/cached", NULL, NULL, NULL, 0);
+    ok(req != NULL, "failed to open a request %lu\n", GetLastError());
+    ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0);
+    ok(ret, "failed to send request %lu\n", GetLastError());
+    ret = WinHttpReceiveResponse(req, NULL);
+    ok(ret, "failed to receive response %lu\n", GetLastError());
+    size = sizeof(status);
+    ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL);
+    ok(ret, "failed to query status code %lu\n", GetLastError());
+    ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status);
+    ret = WinHttpReadData(req, buffer, sizeof buffer, &size);
+    ok(ret, "failed to read data %lu\n", GetLastError());
+    ok(!size, "got size %lu.\n", size);
+    WinHttpCloseHandle(req);
+
+    req = WinHttpOpenRequest(con, L"GET", L"/notcached", NULL, NULL, NULL, 0);
+    ok(req != NULL, "failed to open a request %lu\n", GetLastError());
+    ret = WinHttpSendRequest(req, L"Connection: close", ~0ul, NULL, 0, 0, 0);
+    ok(ret, "failed to send request %lu\n", GetLastError());
+    ret = WinHttpReceiveResponse(req, NULL);
+    ok(ret, "failed to receive response %lu\n", GetLastError());
+    size = sizeof(status);
+    ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL);
+    ok(ret, "failed to query status code %lu\n", GetLastError());
+    ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status);
+    WinHttpCloseHandle(req);
+
+    WinHttpCloseHandle(con);
+    WinHttpCloseHandle(ses);
+}
+
 START_TEST (winhttp)
 {
     struct server_info si;
@@ -5889,6 +5978,7 @@ START_TEST (winhttp)
     test_passport_auth(si.port);
     test_websocket(si.port);
     test_redirect(si.port);
+    test_connection_cache(si.port);
 
     /* send the basic request again to shutdown the server thread */
     test_basic_request(si.port, NULL, L"/quit");

From 26c7c69fe79c0eb25ca70f6f244dd42680f5563a Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 8 Apr 2024 22:45:08 -0600
Subject: [PATCH 358/389] winhttp: Do not cache connection if suggested by
 request headers.

CW-Bug-Id: #23656
---
 dlls/winhttp/request.c       | 20 +++++++++-----------
 dlls/winhttp/tests/winhttp.c |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index ee7315170c6..17621af8647 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -1922,7 +1922,7 @@ static DWORD refill_buffer( struct request *request, BOOL notify )
 
 static void finished_reading( struct request *request )
 {
-    BOOL close = FALSE, notify;
+    BOOL close = FALSE, close_request_headers;
     WCHAR connection[20];
     DWORD size = sizeof(connection);
 
@@ -1937,18 +1937,16 @@ static void finished_reading( struct request *request )
     }
     else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE;
 
-    if (close)
+    size = sizeof(connection);
+    close_request_headers =
+            (!query_headers( request, WINHTTP_QUERY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, NULL, connection, &size, NULL )
+             || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, NULL, connection, &size, NULL ))
+             && !wcsicmp( connection, L"close" );
+    if (close || close_request_headers)
     {
-        size = sizeof(connection);
-        notify = (!query_headers( request, WINHTTP_QUERY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS,
-                                  NULL, connection, &size, NULL )
-                  || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION | WINHTTP_QUERY_FLAG_REQUEST_HEADERS,
-                                     NULL, connection, &size, NULL ))
-                 && !wcsicmp( connection, L"close" );
-
-        if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 );
+        if (close_request_headers) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 0 );
         netconn_release( request->netconn );
-        if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 );
+        if (close_request_headers) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 );
     }
     else
         cache_connection( request->netconn );
diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 8aa03596732..2c3f1791898 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -2580,7 +2580,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
             ok(!!strstr(buffer, "GET /cached"), "request not found.\n");
             send(c, okmsg_length0, sizeof okmsg_length0 - 1, 0);
             r = server_receive_request(c, buffer, sizeof(buffer));
-            todo_wine ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]);
+            ok(!r, "got %d, buffer[0] %d.\n", r, buffer[0]);
         }
         if (strstr(buffer, "GET /notcached"))
         {

From 4699da416b798a50de718df614ae9af9a19ce0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 10:55:06 +0100
Subject: [PATCH 359/389] winegstreamer/media-converter: Split videoconv caps
 event handler to a separate helper.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 71 ++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index b91aa96f1bf..f92c3300604 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -663,50 +663,55 @@ static void video_conv_init_transcode(VideoConv *conv)
     pthread_mutex_unlock(&dump_fozdb.mutex);
 }
 
-static gboolean video_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+static gboolean video_conv_sink_event_caps(VideoConv *conv, GstEvent *event)
 {
-    VideoConv *conv = VIDEO_CONV(parent);
+    struct video_conv_state *state;
+    uint32_t transcode_tag;
+    GstCaps *caps;
     bool ret;
 
-    GST_DEBUG_OBJECT(pad, "Got event %"GST_PTR_FORMAT".", event);
+    gst_event_unref(event);
 
-    if (event->type == GST_EVENT_CAPS)
+    /* push_event, below, can also grab state and cause a deadlock, so make sure it's
+     * unlocked before calling */
+    if (!(state = video_conv_lock_state(conv)))
     {
-        struct video_conv_state *state;
-        uint32_t transcode_tag;
-        GstCaps *caps;
+        GST_ERROR("VideoConv not yet in READY state?");
+        return false;
+    }
 
-        /* push_event, below, can also grab state and cause a deadlock, so make sure it's
-         * unlocked before calling */
-        if (!(state = video_conv_lock_state(conv)))
-        {
-            GST_ERROR("VideoConv not yet in READY state?");
-            return false;
-        }
+    if (!gst_pad_activate_mode(conv->sink_pad, GST_PAD_MODE_PULL, true))
+    {
+        GST_ERROR("Failed to activate sink pad in pull mode.");
+        pthread_mutex_unlock(&conv->state_mutex);
+        return false;
+    }
 
-        if (!gst_pad_activate_mode(conv->sink_pad, GST_PAD_MODE_PULL, true))
-        {
-            GST_ERROR("Failed to activate sink pad in pull mode.");
-            pthread_mutex_unlock(&conv->state_mutex);
-            return false;
-        }
+    video_conv_init_transcode(conv);
+    transcode_tag = state->transcoded_tag;
 
-        video_conv_init_transcode(conv);
-        transcode_tag = state->transcoded_tag;
+    pthread_mutex_unlock(&conv->state_mutex);
 
-        pthread_mutex_unlock(&conv->state_mutex);
+    if (transcode_tag == VIDEO_CONV_FOZ_TAG_MKVDATA)
+        caps = gst_caps_from_string("video/x-matroska");
+    else if (transcode_tag == VIDEO_CONV_FOZ_TAG_OGVDATA)
+        caps = gst_caps_from_string("application/ogg");
+    else
+        return false;
 
-        if (transcode_tag == VIDEO_CONV_FOZ_TAG_MKVDATA)
-            caps = gst_caps_from_string("video/x-matroska");
-        else if (transcode_tag == VIDEO_CONV_FOZ_TAG_OGVDATA)
-            caps = gst_caps_from_string("application/ogg");
-        else
-            return false;
+    ret = push_event(conv->src_pad, gst_event_new_caps(caps));
+    gst_caps_unref(caps);
+    return ret;
+}
 
-        ret = push_event(conv->src_pad, gst_event_new_caps(caps));
-        gst_caps_unref(caps);
-        return ret;
-    }
+static gboolean video_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    VideoConv *conv = VIDEO_CONV(parent);
+
+    GST_DEBUG_OBJECT(pad, "Got event %"GST_PTR_FORMAT".", event);
+
+    if (event->type == GST_EVENT_CAPS)
+        return video_conv_sink_event_caps(conv, event);
 
     return gst_pad_event_default(pad, parent, event);
 }

From 8287b52f8ee4d17183084b03d37ec48ee1dd1bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 11:04:31 +0100
Subject: [PATCH 360/389] winegstreamer/media-converter: Split videoconv
 upstream chunk dump to a separate helper.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index f92c3300604..9597d686abb 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -576,6 +576,22 @@ static bool video_conv_hash_upstream_data(VideoConv *conv, struct payload_hash *
     return ret;
 }
 
+static int video_conv_dump_upstream_chunk(VideoConv *conv, void *buffer, size_t read_size,
+        GList **chunk_hashes)
+{
+    struct bytes_reader bytes_reader;
+    struct payload_hash *chunk_hash;
+
+    bytes_reader_init(&bytes_reader, buffer, read_size);
+    chunk_hash = calloc(1, sizeof(*chunk_hash));
+    murmur3_128(&bytes_reader, bytes_reader_read, HASH_SEED, chunk_hash);
+    *chunk_hashes = g_list_append(*chunk_hashes, chunk_hash);
+
+    bytes_reader_init(&bytes_reader, buffer, read_size);
+    return fozdb_write_entry(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_VIDEODATA, chunk_hash,
+            &bytes_reader, bytes_reader_read, true);
+}
+
 static int video_conv_dump_upstream_data(VideoConv *conv, struct payload_hash *hash)
 {
     struct hashes_reader chunk_hashes_reader;
@@ -597,17 +613,7 @@ static int video_conv_dump_upstream_data(VideoConv *conv, struct payload_hash *h
     pad_reader = pad_reader_create(conv->sink_pad);
     while ((ret = pad_reader_read(pad_reader, buffer, HASH_CHUNK_SIZE, &read_size)) == CONV_OK)
     {
-        struct bytes_reader bytes_reader;
-        struct payload_hash *chunk_hash;
-
-        bytes_reader_init(&bytes_reader, buffer, read_size);
-        chunk_hash = calloc(1, sizeof(*chunk_hash));
-        murmur3_128(&bytes_reader, bytes_reader_read, HASH_SEED, chunk_hash);
-        chunk_hashes = g_list_append(chunk_hashes, chunk_hash);
-
-        bytes_reader_init(&bytes_reader, buffer, read_size);
-        if ((ret = fozdb_write_entry(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_VIDEODATA, chunk_hash,
-                &bytes_reader, bytes_reader_read, true)) < 0)
+        if ((ret = video_conv_dump_upstream_chunk(conv, buffer, read_size, &chunk_hashes)) < 0)
         {
             GST_ERROR("Error writing video data to fozdb, ret %d.", ret);
             goto done;

From b7de5e8424233f668107cbc883c15800861034c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 11:52:12 +0100
Subject: [PATCH 361/389] winegstreamer/media-converter: Split videoconv
 stream-start event push to a separate helper.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index 9597d686abb..28b391b2d68 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -669,6 +669,23 @@ static void video_conv_init_transcode(VideoConv *conv)
     pthread_mutex_unlock(&dump_fozdb.mutex);
 }
 
+static gboolean video_conv_push_stream_start(VideoConv *conv, struct payload_hash *hash)
+{
+    struct video_conv_state *state;
+
+    push_event(conv->src_pad, gst_event_new_stream_start(format_hash(hash)));
+
+    if (!(state = video_conv_lock_state(conv)))
+    {
+        GST_ERROR("VideoConv not yet in READY state?");
+        return false;
+    }
+    state->need_stream_start = false;
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    return true;
+}
+
 static gboolean video_conv_sink_event_caps(VideoConv *conv, GstEvent *event)
 {
     struct video_conv_state *state;
@@ -885,18 +902,7 @@ static gboolean video_conv_src_active_mode(GstPad *pad, GstObject *parent, GstPa
     pthread_mutex_unlock(&conv->state_mutex);
 
     if (need_stream_start && active && has_transcoded)
-    {
-        push_event(conv->src_pad, gst_event_new_stream_start(format_hash(&hash)));
-
-        if (!(state = video_conv_lock_state(conv)))
-        {
-            GST_ERROR("VideoConv not yet in READY state?");
-            return false;
-        }
-        state->need_stream_start = false;
-        pthread_mutex_unlock(&conv->state_mutex);
-    }
-
+        return video_conv_push_stream_start(conv, &hash);
     return true;
 }
 

From 1d22a0dac47870925b1fe05b3b97a5f0b679c80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 17:10:58 +0100
Subject: [PATCH 362/389] winegstreamer/media-converter: Split videoconv event
 caps push to a separate helper.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index 28b391b2d68..4a58a989fdf 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -686,12 +686,27 @@ static gboolean video_conv_push_stream_start(VideoConv *conv, struct payload_has
     return true;
 }
 
+static gboolean video_conv_push_caps(VideoConv *conv, uint32_t transcode_tag)
+{
+    GstCaps *caps;
+    gboolean ret;
+
+    if (transcode_tag == VIDEO_CONV_FOZ_TAG_MKVDATA)
+        caps = gst_caps_from_string("video/x-matroska");
+    else if (transcode_tag == VIDEO_CONV_FOZ_TAG_OGVDATA)
+        caps = gst_caps_from_string("application/ogg");
+    else
+        return false;
+
+    ret = push_event(conv->src_pad, gst_event_new_caps(caps));
+    gst_caps_unref(caps);
+    return ret;
+}
+
 static gboolean video_conv_sink_event_caps(VideoConv *conv, GstEvent *event)
 {
     struct video_conv_state *state;
     uint32_t transcode_tag;
-    GstCaps *caps;
-    bool ret;
 
     gst_event_unref(event);
 
@@ -715,16 +730,7 @@ static gboolean video_conv_sink_event_caps(VideoConv *conv, GstEvent *event)
 
     pthread_mutex_unlock(&conv->state_mutex);
 
-    if (transcode_tag == VIDEO_CONV_FOZ_TAG_MKVDATA)
-        caps = gst_caps_from_string("video/x-matroska");
-    else if (transcode_tag == VIDEO_CONV_FOZ_TAG_OGVDATA)
-        caps = gst_caps_from_string("application/ogg");
-    else
-        return false;
-
-    ret = push_event(conv->src_pad, gst_event_new_caps(caps));
-    gst_caps_unref(caps);
-    return ret;
+    return video_conv_push_caps(conv, transcode_tag);
 }
 
 static gboolean video_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)

From 0246157701b61d7062707831195e31fa9cf87050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 10:54:28 +0100
Subject: [PATCH 363/389] winegstreamer/media-converter: Open the blank file on
 videoconv state creation.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 73 +++++++------------
 1 file changed, 26 insertions(+), 47 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index 4a58a989fdf..bf2c4c6b168 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -92,6 +92,7 @@ struct video_conv_state
 {
     struct payload_hash transcode_hash;
     struct fozdb *read_fozdb;
+    int blank_file;
     uint64_t upstream_duration;
     uint64_t our_duration;
     uint32_t transcoded_tag;
@@ -331,22 +332,37 @@ static int video_conv_state_create(struct video_conv_state **out)
 {
     struct video_conv_state *state;
     struct fozdb *fozdb = NULL;
-    char *read_fozdb_path;
-    int ret;
+    char *read_fozdb_path, *blank_video;
+    uint64_t blank_file_size;
+    int ret, fd;
 
     if (!(read_fozdb_path = getenv("MEDIACONV_VIDEO_TRANSCODED_FILE")))
     {
         GST_ERROR("MEDIACONV_VIDEO_TRANSCODED_FILE is not set.");
         return CONV_ERROR_ENV_NOT_SET;
     }
+    if (!(blank_video = getenv("MEDIACONV_BLANK_VIDEO_FILE")))
+    {
+        GST_ERROR("Env MEDIACONV_BLANK_VIDEO_FILE not set.");
+        return CONV_ERROR_ENV_NOT_SET;
+    }
+
+    if (!open_file(blank_video, O_RDONLY, &fd))
+        return CONV_ERROR_OPEN_FAILED;
+    if (!get_file_size(fd, &blank_file_size))
+    {
+        close(fd);
+        return CONV_ERROR_OPEN_FAILED;
+    }
 
     if ((ret = fozdb_create(read_fozdb_path, O_RDONLY, true /* Read-only? */, VIDEO_CONV_FOZ_NUM_TAGS, &fozdb)) < 0)
         GST_ERROR("Failed to create read fozdb from %s, ret %d.", read_fozdb_path, ret);
 
     state = calloc(1, sizeof(*state));
     state->read_fozdb = fozdb;
+    state->blank_file = fd;
     state->upstream_duration = DURATION_NONE;
-    state->our_duration = DURATION_NONE;
+    state->our_duration = blank_file_size;
     state->transcoded_tag = VIDEO_CONV_FOZ_TAG_MKVDATA;
     state->need_stream_start = true;
 
@@ -358,16 +374,13 @@ static void video_conv_state_release(struct video_conv_state *state)
 {
     if (state->read_fozdb)
         fozdb_release(state->read_fozdb);
+    close(state->blank_file);
     free(state);
 }
 
 /* Return true if the file is transcoded, false if not. */
 bool video_conv_state_begin_transcode(struct video_conv_state *state, struct payload_hash *hash)
 {
-    const char *blank_video;
-    uint64_t file_size = 0;
-    int fd;
-
     GST_DEBUG("state %p, hash %s.", state, format_hash(hash));
 
     if (state->read_fozdb)
@@ -396,18 +409,6 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
     }
 
     GST_INFO("No transcoded video for %s. Substituting a blank video.", format_hash(hash));
-
-    if (!(blank_video = getenv("MEDIACONV_BLANK_VIDEO_FILE")))
-    {
-        GST_ERROR("Env MEDIACONV_BLANK_VIDEO_FILE not set.");
-        return false;
-    }
-    if (open_file(blank_video, O_RDONLY, &fd))
-    {
-        get_file_size(fd, &file_size);
-        close(fd);
-    }
-    state->our_duration = file_size;
     state->has_transcoded = false;
 
     create_placeholder_file("placeholder-video-used");
@@ -418,11 +419,9 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
 int video_conv_state_fill_buffer(struct video_conv_state *state, uint64_t offset,
         uint8_t *buffer, size_t size, size_t *fill_size)
 {
-    const char *blank_video;
-    uint64_t file_size;
     size_t to_copy;
     bool read_ok;
-    int fd, ret;
+    int ret;
 
     if (state->has_transcoded)
     {
@@ -433,38 +432,18 @@ int video_conv_state_fill_buffer(struct video_conv_state *state, uint64_t offset
     }
     else /* Fill blank video data to buffer. */
     {
-        if (!(blank_video = getenv("MEDIACONV_BLANK_VIDEO_FILE")))
-        {
-            GST_ERROR("Env MEDIACONV_BLANK_VIDEO_FILE not set.");
-            return CONV_ERROR_ENV_NOT_SET;
-        }
-        if (!open_file(blank_video, O_RDONLY, &fd))
-            return CONV_ERROR_OPEN_FAILED;
-        if (!get_file_size(fd, &file_size))
-        {
-            close(fd);
-            return CONV_ERROR;
-        }
-
         /* Get copy size. */
-        if (offset >= file_size)
-        {
-            close(fd);
+        if (offset >= state->our_duration)
             return CONV_OK;
-        }
-        to_copy = min(file_size - offset, size);
+        to_copy = min(state->our_duration - offset, size);
 
         /* Copy data. */
-        if (lseek(fd, offset, SEEK_SET) < 0)
+        if (lseek(state->blank_file, offset, SEEK_SET) < 0)
         {
-            GST_ERROR("Failed to seek %s to %#"PRIx64". %s.", blank_video, offset, strerror(errno));
-            close(fd);
+            GST_ERROR("Failed to seek to %#"PRIx64". %s.", offset, strerror(errno));
             return CONV_ERROR;
         }
-        read_ok = complete_read(fd, buffer, to_copy);
-        close(fd);
-
-        if (!read_ok)
+        if (!(read_ok = complete_read(state->blank_file, buffer, to_copy)))
         {
             GST_ERROR("Failed to read blank video data.");
             return CONV_ERROR_READ_FAILED;

From 5e24cabfaa0345bed0cb16ecb48619879d91a3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 10:54:28 +0100
Subject: [PATCH 364/389] winegstreamer/media-converter: Use an enum for video
 conv state flags.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index bf2c4c6b168..cf3f99fe7a2 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -88,6 +88,12 @@ struct hashes_reader
     GList *current_hash;
 };
 
+enum video_conv_state_flags
+{
+    VIDEO_CONV_STREAM_STARTED = 1,
+    VIDEO_CONV_HAS_TRANSCODED = 2,
+};
+
 struct video_conv_state
 {
     struct payload_hash transcode_hash;
@@ -96,7 +102,7 @@ struct video_conv_state
     uint64_t upstream_duration;
     uint64_t our_duration;
     uint32_t transcoded_tag;
-    bool has_transcoded, need_stream_start;
+    uint32_t state_flags;
 };
 
 typedef struct
@@ -364,7 +370,6 @@ static int video_conv_state_create(struct video_conv_state **out)
     state->upstream_duration = DURATION_NONE;
     state->our_duration = blank_file_size;
     state->transcoded_tag = VIDEO_CONV_FOZ_TAG_MKVDATA;
-    state->need_stream_start = true;
 
     *out = state;
     return CONV_OK;
@@ -393,7 +398,7 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
             state->transcode_hash = *hash;
             state->our_duration = entry_size;
             state->transcoded_tag = VIDEO_CONV_FOZ_TAG_MKVDATA;
-            state->has_transcoded = true;
+            state->state_flags |= VIDEO_CONV_HAS_TRANSCODED;
             return true;
         }
 
@@ -403,13 +408,13 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
             state->transcode_hash = *hash;
             state->our_duration = entry_size;
             state->transcoded_tag = VIDEO_CONV_FOZ_TAG_OGVDATA;
-            state->has_transcoded = true;
+            state->state_flags |= VIDEO_CONV_HAS_TRANSCODED;
             return true;
         }
     }
 
     GST_INFO("No transcoded video for %s. Substituting a blank video.", format_hash(hash));
-    state->has_transcoded = false;
+    state->state_flags &= ~VIDEO_CONV_HAS_TRANSCODED;
 
     create_placeholder_file("placeholder-video-used");
 
@@ -423,7 +428,7 @@ int video_conv_state_fill_buffer(struct video_conv_state *state, uint64_t offset
     bool read_ok;
     int ret;
 
-    if (state->has_transcoded)
+    if (state->state_flags & VIDEO_CONV_HAS_TRANSCODED)
     {
         if ((ret = fozdb_read_entry_data(state->read_fozdb, state->transcoded_tag, &state->transcode_hash,
                 offset, buffer, size, fill_size, false)) < 0)
@@ -626,7 +631,7 @@ static void video_conv_init_transcode(VideoConv *conv)
     struct payload_hash hash;
     int ret;
 
-    if (state->has_transcoded)
+    if (state->state_flags & VIDEO_CONV_HAS_TRANSCODED)
         return;
 
     pthread_mutex_lock(&dump_fozdb.mutex);
@@ -659,7 +664,7 @@ static gboolean video_conv_push_stream_start(VideoConv *conv, struct payload_has
         GST_ERROR("VideoConv not yet in READY state?");
         return false;
     }
-    state->need_stream_start = false;
+    state->state_flags |= VIDEO_CONV_STREAM_STARTED;
     pthread_mutex_unlock(&conv->state_mutex);
 
     return true;
@@ -856,8 +861,7 @@ static gboolean video_conv_src_active_mode(GstPad *pad, GstObject *parent, GstPa
     VideoConv *conv = VIDEO_CONV(parent);
     struct video_conv_state *state;
     struct payload_hash hash;
-    bool need_stream_start;
-    bool has_transcoded;
+    uint32_t state_flags;
 
     GST_DEBUG_OBJECT(pad, "mode %s, active %d.", gst_pad_mode_get_name(mode), active);
 
@@ -879,14 +883,13 @@ static gboolean video_conv_src_active_mode(GstPad *pad, GstObject *parent, GstPa
 
     video_conv_init_transcode(conv);
     hash = state->transcode_hash;
-    need_stream_start = state->need_stream_start;
-    has_transcoded = state->has_transcoded;
+    state_flags = state->state_flags;
 
     /* push_event, below, can also grab state and cause a deadlock, so make sure it's
      * unlocked before calling */
     pthread_mutex_unlock(&conv->state_mutex);
 
-    if (need_stream_start && active && has_transcoded)
+    if (active && !(state_flags & VIDEO_CONV_STREAM_STARTED) && (state_flags & VIDEO_CONV_HAS_TRANSCODED))
         return video_conv_push_stream_start(conv, &hash);
     return true;
 }

From 512bb1577b0a2327ff2d501d42dc44ca703e7659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 29 Mar 2024 15:17:07 +0100
Subject: [PATCH 365/389] winegstreamer/media-converter: Wrap around the blank
 video if shorter than upstream data.

CW-Bug-Id: #22319
---
 dlls/winegstreamer/media-converter/videoconv.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index cf3f99fe7a2..3e2e17018f4 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -437,9 +437,7 @@ int video_conv_state_fill_buffer(struct video_conv_state *state, uint64_t offset
     }
     else /* Fill blank video data to buffer. */
     {
-        /* Get copy size. */
-        if (offset >= state->our_duration)
-            return CONV_OK;
+        offset = offset % state->our_duration;
         to_copy = min(state->our_duration - offset, size);
 
         /* Copy data. */

From b35f9cd3ae3ed0109463f94de84ffb07b868ea6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 29 Mar 2024 15:17:07 +0100
Subject: [PATCH 366/389] winegstreamer/media-converter: Use
 gst_util_uint64_scale_round to round upstream position.

CW-Bug-Id: #22319
---
 dlls/winegstreamer/media-converter/videoconv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index 3e2e17018f4..32a097e2583 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -510,7 +510,7 @@ static uint64_t video_conv_duration_ours_to_upstream(VideoConv *conv, uint64_t p
     struct video_conv_state *state = conv->state;
 
     if (state->upstream_duration != DURATION_NONE && state->our_duration != DURATION_NONE)
-        return pos * state->upstream_duration / state->our_duration;
+        return gst_util_uint64_scale_round(pos, state->upstream_duration, state->our_duration);
     else
         return DURATION_NONE;
 }

From 49dda8b7d462d5f702d71dc50a5f9bff8f01a424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 29 Mar 2024 15:17:07 +0100
Subject: [PATCH 367/389] winegstreamer/media-converter: Implement support for
 push mode in videoconv.

CW-Bug-Id: #22319
---
 .../winegstreamer/media-converter/videoconv.c | 334 +++++++++++++++++-
 1 file changed, 319 insertions(+), 15 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index 32a097e2583..99c451c4a17 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -59,6 +59,7 @@
 #endif
 
 #include "media-converter.h"
+#include <gst/base/gstadapter.h>
 
 #include <assert.h>
 
@@ -92,6 +93,7 @@ enum video_conv_state_flags
 {
     VIDEO_CONV_STREAM_STARTED = 1,
     VIDEO_CONV_HAS_TRANSCODED = 2,
+    VIDEO_CONV_IS_DUMPING = 4,
 };
 
 struct video_conv_state
@@ -103,6 +105,8 @@ struct video_conv_state
     uint64_t our_duration;
     uint32_t transcoded_tag;
     uint32_t state_flags;
+    uint64_t read_offset;
+    GList *chunk_hashes;
 };
 
 typedef struct
@@ -111,6 +115,8 @@ typedef struct
     GstPad *sink_pad, *src_pad;
     pthread_mutex_t state_mutex;
     struct video_conv_state *state;
+    GstPadMode active_mode;
+    GstAdapter *adapter;
 } VideoConv;
 
 typedef struct
@@ -388,6 +394,8 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
 {
     GST_DEBUG("state %p, hash %s.", state, format_hash(hash));
 
+    state->transcode_hash = *hash;
+
     if (state->read_fozdb)
     {
         uint32_t entry_size;
@@ -395,7 +403,6 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
         if (fozdb_entry_size(state->read_fozdb, VIDEO_CONV_FOZ_TAG_MKVDATA, hash, &entry_size) == CONV_OK)
         {
             GST_DEBUG("Found an MKV video for hash %s.", format_hash(hash));
-            state->transcode_hash = *hash;
             state->our_duration = entry_size;
             state->transcoded_tag = VIDEO_CONV_FOZ_TAG_MKVDATA;
             state->state_flags |= VIDEO_CONV_HAS_TRANSCODED;
@@ -405,7 +412,6 @@ bool video_conv_state_begin_transcode(struct video_conv_state *state, struct pay
         if (fozdb_entry_size(state->read_fozdb, VIDEO_CONV_FOZ_TAG_OGVDATA, hash, &entry_size) == CONV_OK)
         {
             GST_DEBUG("Found an OGV video for hash %s.", format_hash(hash));
-            state->transcode_hash = *hash;
             state->our_duration = entry_size;
             state->transcoded_tag = VIDEO_CONV_FOZ_TAG_OGVDATA;
             state->state_flags |= VIDEO_CONV_HAS_TRANSCODED;
@@ -544,21 +550,63 @@ static bool video_conv_get_upstream_range(VideoConv *conv, uint64_t offset, uint
     return true;
 }
 
+static uint64_t video_conv_duration_ours_to_downstream(VideoConv *conv, uint64_t pos)
+{
+    struct video_conv_state *state = conv->state;
+
+    if (state->upstream_duration != DURATION_NONE && state->our_duration != DURATION_NONE)
+        return gst_util_uint64_scale_round(pos, state->our_duration, state->upstream_duration);
+    else
+        return DURATION_NONE;
+}
+
+static bool video_conv_get_downstream_range(VideoConv *conv, uint64_t offset, uint32_t end,
+        uint64_t *downstream_offset, uint64_t *downstream_end)
+{
+    struct video_conv_state *state;
+
+    if (!(state = video_conv_lock_state(conv)))
+        return false;
+
+    if (state->upstream_duration == DURATION_NONE)
+        video_conv_query_upstream_duration(conv);
+
+    *downstream_offset = video_conv_duration_ours_to_downstream(conv, offset);
+    *downstream_end = video_conv_duration_ours_to_downstream(conv, end);
+
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    return true;
+}
+
 static bool video_conv_hash_upstream_data(VideoConv *conv, struct payload_hash *hash)
 {
-    struct pad_reader *reader;
-    bool ret;
+    bool ret = false;
 
     memset(hash, 0, sizeof(*hash));
 
-    reader = pad_reader_create_with_stride(conv->sink_pad, HASH_STRIDE);
-    ret = murmur3_128(reader, pad_reader_read, HASH_SEED, hash);
-    pad_reader_release(reader);
+    if (conv->active_mode == GST_PAD_MODE_PUSH && gst_adapter_available(conv->adapter) > 0)
+    {
+        struct bytes_reader bytes_reader;
+        gsize read_size = gst_adapter_available(conv->adapter);
+        const void *buffer = gst_adapter_map(conv->adapter, read_size);
+        bytes_reader_init(&bytes_reader, buffer, read_size);
+        ret = murmur3_128(&bytes_reader, bytes_reader_read, HASH_SEED, hash);
+        gst_adapter_unmap(conv->adapter);
+        gst_adapter_clear(conv->adapter);
+    }
+    else if (gst_pad_activate_mode(conv->sink_pad, GST_PAD_MODE_PULL, true))
+    {
+        struct pad_reader *reader = pad_reader_create_with_stride(conv->sink_pad, HASH_STRIDE);
+        ret = murmur3_128(reader, pad_reader_read, HASH_SEED, hash);
+        pad_reader_release(reader);
+        conv->active_mode = GST_PAD_MODE_PULL;
+    }
 
     return ret;
 }
 
-static int video_conv_dump_upstream_chunk(VideoConv *conv, void *buffer, size_t read_size,
+static int video_conv_dump_upstream_chunk(VideoConv *conv, const void *buffer, size_t read_size,
         GList **chunk_hashes)
 {
     struct bytes_reader bytes_reader;
@@ -591,6 +639,12 @@ static int video_conv_dump_upstream_data(VideoConv *conv, struct payload_hash *h
         goto done;
     }
 
+    if (conv->active_mode == GST_PAD_MODE_PUSH)
+    {
+        conv->state->state_flags |= VIDEO_CONV_IS_DUMPING;
+        return 0;
+    }
+
     buffer = calloc(1, HASH_CHUNK_SIZE);
     pad_reader = pad_reader_create(conv->sink_pad);
     while ((ret = pad_reader_read(pad_reader, buffer, HASH_CHUNK_SIZE, &read_size)) == CONV_OK)
@@ -648,7 +702,24 @@ static void video_conv_init_transcode(VideoConv *conv)
         GST_WARNING("Failed to hash upstream data.");
     }
 
-    pthread_mutex_unlock(&dump_fozdb.mutex);
+    if (!(state->state_flags & VIDEO_CONV_IS_DUMPING))
+        pthread_mutex_unlock(&dump_fozdb.mutex);
+}
+
+static uint32_t video_conv_get_state_flags(VideoConv *conv)
+{
+    struct video_conv_state *state;
+    uint32_t state_flags;
+
+    if (!(state = video_conv_lock_state(conv)))
+    {
+        GST_ERROR("VideoConv not yet in READY state?");
+        return 0;
+    }
+    state_flags = state->state_flags;
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    return state_flags;
 }
 
 static gboolean video_conv_push_stream_start(VideoConv *conv, struct payload_hash *hash)
@@ -700,19 +771,81 @@ static gboolean video_conv_sink_event_caps(VideoConv *conv, GstEvent *event)
         return false;
     }
 
-    if (!gst_pad_activate_mode(conv->sink_pad, GST_PAD_MODE_PULL, true))
+    video_conv_init_transcode(conv);
+    transcode_tag = state->transcoded_tag;
+
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    return video_conv_push_caps(conv, transcode_tag);
+}
+
+static gboolean video_conv_sink_event_eos(VideoConv *conv, GstEvent *event)
+{
+    struct video_conv_state *state;
+    struct payload_hash hash;
+    uint32_t transcode_tag;
+    uint32_t state_flags;
+    int ret;
+
+    gst_event_unref(event);
+
+    if (!(state = video_conv_lock_state(conv)))
+        return false;
+
+    if (state->state_flags & VIDEO_CONV_IS_DUMPING)
     {
-        GST_ERROR("Failed to activate sink pad in pull mode.");
+        struct hashes_reader chunk_hashes_reader;
+        gsize read_bytes;
+
+        if ((read_bytes = gst_adapter_available(conv->adapter)))
+        {
+            const void *buffer = gst_adapter_map(conv->adapter, read_bytes);
+
+            if ((ret = video_conv_dump_upstream_chunk(conv, buffer, read_bytes, &state->chunk_hashes)) < 0)
+                GST_ERROR("Error writing stream data to fozdb, ret %d.", ret);
+
+            gst_adapter_unmap(conv->adapter);
+            gst_adapter_clear(conv->adapter);
+        }
+
+        hashes_reader_init(&chunk_hashes_reader, state->chunk_hashes);
+        if ((ret = fozdb_write_entry(dump_fozdb.fozdb, VIDEO_CONV_FOZ_TAG_STREAM, &state->transcode_hash,
+                &chunk_hashes_reader, hashes_reader_read, true)) < 0)
+            GST_ERROR("Error writing stream data to fozdb, ret %d.", ret);
+
+        if (state->chunk_hashes)
+            g_list_free_full(state->chunk_hashes, free);
+
+        pthread_mutex_unlock(&dump_fozdb.mutex);
+        state->state_flags &= ~VIDEO_CONV_IS_DUMPING;
         pthread_mutex_unlock(&conv->state_mutex);
-        return false;
+
+        return gst_pad_push_event(conv->src_pad, gst_event_new_eos());
     }
 
     video_conv_init_transcode(conv);
+    hash = state->transcode_hash;
+    state_flags = state->state_flags;
     transcode_tag = state->transcoded_tag;
 
     pthread_mutex_unlock(&conv->state_mutex);
 
-    return video_conv_push_caps(conv, transcode_tag);
+    if (!(state_flags & VIDEO_CONV_STREAM_STARTED))
+    {
+        /* rewind and start a new stream for dumping or playback */
+        if (!push_event(conv->sink_pad, gst_event_new_seek(1.0, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH,
+                GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, -1)))
+            return false;
+        if (!video_conv_push_stream_start(conv, &hash))
+            return false;
+        if (!video_conv_push_caps(conv, transcode_tag))
+            return false;
+
+        /* return false to cancel upstream pads EOS event handling and avoid setting EOS flag */
+        return false;
+    }
+
+    return gst_pad_push_event(conv->src_pad, gst_event_new_eos());
 }
 
 static gboolean video_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
@@ -723,8 +856,167 @@ static gboolean video_conv_sink_event(GstPad *pad, GstObject *parent, GstEvent *
 
     if (event->type == GST_EVENT_CAPS)
         return video_conv_sink_event_caps(conv, event);
+    if (event->type == GST_EVENT_EOS)
+        return video_conv_sink_event_eos(conv, event);
+
+    if (video_conv_get_state_flags(conv) & VIDEO_CONV_STREAM_STARTED)
+        return gst_pad_event_default(pad, parent, event);
+
+    gst_event_unref(event);
+    return true;
+}
+
+static gboolean video_conv_src_event_seek(VideoConv *conv, GstEvent *event)
+{
+    guint seqnum = gst_event_get_seqnum(event);
+    guint64 upstream_offset, upstream_size;
+    GstSeekType offset_type, stop_type;
+    struct video_conv_state *state;
+    gint64 offset, stop;
+    GstSeekFlags flags;
+    GstFormat format;
+    gdouble rate;
+
+    gst_event_parse_seek(event, &rate, &format, &flags, &offset_type, &offset, &stop_type, &stop);
+    gst_event_unref(event);
+    if (format != GST_FORMAT_BYTES)
+        return false;
+
+    GST_TRACE("conv %p, rate %f, format %s, flags %#x, offset_type %u, cur %#" G_GINT64_MODIFIER "x, "
+            "stop_type %u, stop %#" G_GINT64_MODIFIER "x.", conv, rate, gst_format_get_name(format),
+            flags, offset_type, offset, stop_type, stop);
+
+    if (!(state = video_conv_lock_state(conv)))
+        return GST_FLOW_ERROR;
+    if (state->state_flags & VIDEO_CONV_IS_DUMPING)
+    {
+        pthread_mutex_unlock(&conv->state_mutex);
+        return true;
+    }
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    if (!video_conv_get_upstream_range(conv, offset, HASH_CHUNK_SIZE, &upstream_offset, &upstream_size))
+        return false;
+
+    if ((event = gst_event_new_seek(1.0, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH,
+            GST_SEEK_TYPE_SET, upstream_offset, GST_SEEK_TYPE_NONE, -1)))
+        gst_event_set_seqnum(event, seqnum);
+    return push_event(conv->sink_pad, event);
+}
+
+static gboolean video_conv_src_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    VideoConv *conv = VIDEO_CONV(parent);
+
+    GST_DEBUG_OBJECT(pad, "Got event %"GST_PTR_FORMAT".", event);
+
+    if (event->type == GST_EVENT_SEEK)
+        return video_conv_src_event_seek(conv, event);
+
+    if (video_conv_get_state_flags(conv) & VIDEO_CONV_STREAM_STARTED)
+        return gst_pad_event_default(pad, parent, event);
+
+    gst_event_unref(event);
+    return true;
+}
+
+static void video_conv_dump_buffered_chunks(VideoConv *conv, gsize bytes_available)
+{
+    struct video_conv_state *state = conv->state;
+    int ret;
+
+    while (bytes_available >= HASH_CHUNK_SIZE)
+    {
+        const void *buffer = gst_adapter_map(conv->adapter, HASH_CHUNK_SIZE);
+        if ((ret = video_conv_dump_upstream_chunk(conv, buffer, HASH_CHUNK_SIZE, &state->chunk_hashes)) < 0)
+        {
+            pthread_mutex_unlock(&dump_fozdb.mutex);
+            state->state_flags &= ~VIDEO_CONV_IS_DUMPING;
+            break;
+        }
+
+        gst_adapter_unmap(conv->adapter);
+        gst_adapter_flush(conv->adapter, HASH_CHUNK_SIZE);
+        bytes_available -= HASH_CHUNK_SIZE;
+    }
+}
+
+static GstFlowReturn video_conv_sink_chain(GstPad *pad, GstObject *parent, GstBuffer *buffer)
+{
+    gsize buffer_size = gst_buffer_get_size(buffer), buffer_offset = GST_BUFFER_OFFSET(buffer);
+    uint64_t downstream_offset, downstream_end, seek_offset = -1;
+    VideoConv *conv = VIDEO_CONV(parent);
+    struct video_conv_state *state;
+    GstBuffer *transcoded = NULL;
+    uint32_t state_flags;
+    int ret = 0;
+
+    GST_DEBUG_OBJECT(pad, "Got buffer %"GST_PTR_FORMAT".", buffer);
+
+    if (!(state = video_conv_lock_state(conv)))
+        return GST_FLOW_ERROR;
+    state_flags = state->state_flags;
+
+    if ((state_flags & VIDEO_CONV_IS_DUMPING) || !(state_flags & VIDEO_CONV_STREAM_STARTED))
+    {
+        gsize bytes_available = gst_adapter_available(conv->adapter) + buffer_size;
+        gst_adapter_push(conv->adapter, buffer);
+
+        if (state_flags & VIDEO_CONV_IS_DUMPING)
+            video_conv_dump_buffered_chunks(conv, bytes_available);
+        else if (!(bytes_available % HASH_CHUNK_SIZE) && bytes_available >= HASH_STRIDE)
+        {
+            state->read_offset += HASH_STRIDE;
+            seek_offset = state->read_offset;
+        }
+    }
+
+    pthread_mutex_unlock(&conv->state_mutex);
+
+    if (ret < 0)
+    {
+        GST_ERROR("Failed to dump or read transcoded buffer, error %d.", ret);
+        if (transcoded)
+            gst_buffer_unref(transcoded);
+        return GST_FLOW_ERROR;
+    }
+
+    if (seek_offset != -1 && !push_event(pad, gst_event_new_seek(1.0, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH,
+            GST_SEEK_TYPE_SET, seek_offset, GST_SEEK_TYPE_NONE, -1)))
+        return GST_FLOW_ERROR;
+    if (!(state_flags & VIDEO_CONV_STREAM_STARTED))
+        return GST_FLOW_OK;
 
-    return gst_pad_event_default(pad, parent, event);
+    if (!video_conv_get_downstream_range(conv, buffer_offset, buffer_offset + buffer_size,
+            &downstream_offset, &downstream_end))
+        return GST_FLOW_ERROR;
+
+    if (downstream_end == downstream_offset)
+        return GST_FLOW_OK;
+    if (!(transcoded = gst_buffer_new_and_alloc(downstream_end - downstream_offset)))
+        return GST_FLOW_ERROR;
+    else
+    {
+        GstBufferMapInfo map;
+        size_t fill_size = 0;
+
+        if (gst_buffer_map(transcoded, &map, GST_MAP_READWRITE))
+        {
+            ret = video_conv_state_fill_buffer(state, downstream_offset, map.data, map.size, &fill_size);
+            gst_buffer_unmap(transcoded, &map);
+            gst_buffer_set_size(transcoded, fill_size);
+        }
+
+        if (gst_buffer_get_size(transcoded))
+        {
+            GST_BUFFER_OFFSET(transcoded) = downstream_offset;
+            return gst_pad_push(conv->src_pad, transcoded);
+        }
+
+        gst_buffer_unref(transcoded);
+    }
+
+    return GST_FLOW_OK;
 }
 
 static GstFlowReturn video_conv_src_get_range(GstPad *pad, GstObject *parent,
@@ -825,7 +1117,13 @@ static gboolean video_conv_src_query(GstPad *pad, GstObject *parent, GstQuery *q
         gst_query_unref(peer_query);
 
         gst_query_set_scheduling(query, flags, min, max, align);
-        gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL);
+        if (conv->active_mode != GST_PAD_MODE_NONE)
+            gst_query_add_scheduling_mode(query, conv->active_mode);
+        else
+        {
+            gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL);
+            gst_query_add_scheduling_mode(query, GST_PAD_MODE_PUSH);
+        }
 
         return true;
 
@@ -870,6 +1168,7 @@ static gboolean video_conv_src_active_mode(GstPad *pad, GstObject *parent, GstPa
         return false;
     }
 
+    conv->active_mode = mode;
     if (mode != GST_PAD_MODE_PULL)
         return true;
 
@@ -897,6 +1196,7 @@ static void video_conv_finalize(GObject *object)
 {
     VideoConv *conv = VIDEO_CONV(object);
 
+    gst_object_unref(conv->adapter);
     pthread_mutex_destroy(&conv->state_mutex);
     if (conv->state)
         video_conv_state_release(conv->state);
@@ -928,9 +1228,11 @@ static void video_conv_init(VideoConv *conv)
 
     conv->sink_pad = gst_pad_new_from_static_template(&video_conv_sink_template, "sink");
     gst_pad_set_event_function(conv->sink_pad, GST_DEBUG_FUNCPTR(video_conv_sink_event));
+    gst_pad_set_chain_function(conv->sink_pad, GST_DEBUG_FUNCPTR(video_conv_sink_chain));
     gst_element_add_pad(element, conv->sink_pad);
 
     conv->src_pad = gst_pad_new_from_static_template(&video_conv_src_template, "src");
+    gst_pad_set_event_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_event));
     gst_pad_set_getrange_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_get_range));
     gst_pad_set_query_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_query));
     gst_pad_set_activatemode_function(conv->src_pad, GST_DEBUG_FUNCPTR(video_conv_src_active_mode));
@@ -938,4 +1240,6 @@ static void video_conv_init(VideoConv *conv)
 
     pthread_mutex_init(&conv->state_mutex, NULL);
     conv->state = NULL;
+    conv->adapter = gst_adapter_new();
+    conv->active_mode = GST_PAD_MODE_NONE;
 }

From d7cbbc14773b2396df0dc499cca30d01a20a3c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 10:54:28 +0100
Subject: [PATCH 368/389] winegstreamer/media-converter: Wrap videoconv and a
 demuxer in a new protondemuxer bin.

CW-Bug-Id: #22319
---
 dlls/winegstreamer/Makefile.in                |   1 +
 dlls/winegstreamer/media-converter/lib.c      |   7 +
 .../media-converter/protondemuxer.c           | 223 ++++++++++++++++++
 .../winegstreamer/media-converter/videoconv.c |   2 +-
 4 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 dlls/winegstreamer/media-converter/protondemuxer.c

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index ac38a1b8964..f76a7fb35f2 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -38,4 +38,5 @@ SOURCES = \
 	media-converter/fossilize.c \
 	media-converter/lib.c \
 	media-converter/murmur3.c \
+	media-converter/protondemuxer.c \
 	media-converter/videoconv.c
diff --git a/dlls/winegstreamer/media-converter/lib.c b/dlls/winegstreamer/media-converter/lib.c
index 61d7fe8605e..4f7884c1178 100644
--- a/dlls/winegstreamer/media-converter/lib.c
+++ b/dlls/winegstreamer/media-converter/lib.c
@@ -26,6 +26,7 @@
 GST_ELEMENT_REGISTER_DECLARE(protonvideoconverter);
 GST_ELEMENT_REGISTER_DECLARE(protonaudioconverter);
 GST_ELEMENT_REGISTER_DECLARE(protonaudioconverterbin);
+GST_ELEMENT_REGISTER_DECLARE(protondemuxer);
 
 GST_DEBUG_CATEGORY(media_converter_debug);
 
@@ -325,5 +326,11 @@ bool media_converter_init(void)
         return false;
     }
 
+    if (!GST_ELEMENT_REGISTER(protondemuxer, NULL))
+    {
+        GST_ERROR("Failed to register protondemuxer.");
+        return false;
+    }
+
     return true;
 }
diff --git a/dlls/winegstreamer/media-converter/protondemuxer.c b/dlls/winegstreamer/media-converter/protondemuxer.c
new file mode 100644
index 00000000000..9ab4be5ae3c
--- /dev/null
+++ b/dlls/winegstreamer/media-converter/protondemuxer.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2024 Remi Bernon for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include "media-converter.h"
+
+GST_DEBUG_CATEGORY_EXTERN(media_converter_debug);
+#undef GST_CAT_DEFAULT
+#define GST_CAT_DEFAULT media_converter_debug
+
+typedef struct
+{
+    GstBin bin;
+    GstElement *video_conv, *demuxer;
+    GstPad *sink_pad; /* Ghost pad. */
+    GstPad *inner_sink, *inner_src;
+} ProtonDemuxer;
+
+typedef struct
+{
+    GstBinClass class;
+} ProtonDemuxerClass;
+
+G_DEFINE_TYPE(ProtonDemuxer, proton_demuxer, GST_TYPE_BIN);
+#define PROTON_DEMUXER_TYPE (proton_demuxer_get_type())
+#define PROTON_DEMUXER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PROTON_DEMUXER_TYPE, ProtonDemuxer))
+GST_ELEMENT_REGISTER_DEFINE(protondemuxer, "protondemuxer", GST_RANK_MARGINAL, PROTON_DEMUXER_TYPE);
+
+static GstStaticPadTemplate proton_demuxer_sink_template = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK,
+        GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-ms-asf; video/x-msvideo; video/mpeg; video/quicktime;"));
+static GstStaticPadTemplate proton_demuxer_src_template = GST_STATIC_PAD_TEMPLATE("src", GST_PAD_SRC,
+        GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY);
+
+static gboolean proton_demuxer_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    GST_DEBUG_OBJECT(pad, "Got sink event %"GST_PTR_FORMAT".", event);
+    return gst_pad_event_default(pad, parent, event);
+}
+
+static void proton_demuxer_pad_added(GstElement *element, GstPad *pad, gpointer user)
+{
+    ProtonDemuxer *bin = PROTON_DEMUXER(user);
+    GstPad *ghost_src;
+    GstEvent *event;
+
+    GST_DEBUG_OBJECT(element, "Got inner pad added %"GST_PTR_FORMAT".", pad);
+
+    ghost_src = gst_ghost_pad_new(GST_PAD_NAME(pad), pad);
+    gst_pad_set_active(ghost_src, true);
+
+    if ((event = gst_pad_get_sticky_event(pad, GST_EVENT_STREAM_START, 0)))
+    {
+        gst_pad_store_sticky_event(ghost_src, event);
+        gst_event_unref(event);
+    }
+
+    gst_element_add_pad(GST_ELEMENT(&bin->bin), ghost_src);
+}
+
+static void proton_demuxer_no_more_pads(GstElement *element, gpointer user)
+{
+    ProtonDemuxer *bin = PROTON_DEMUXER(user);
+    GST_DEBUG_OBJECT(element, "Got inner no-more-pads.");
+    gst_element_no_more_pads(GST_ELEMENT(&bin->bin));
+}
+
+static GstFlowReturn proton_demuxer_inner_sink_chain(GstPad *pad, GstObject *parent, GstBuffer *buffer)
+{
+    ProtonDemuxer *bin = PROTON_DEMUXER(gst_pad_get_element_private(pad));
+    GST_DEBUG_OBJECT(pad, "Got inner sink buffer %"GST_PTR_FORMAT".", buffer);
+    return gst_pad_push(bin->inner_src, buffer);
+}
+
+static gboolean proton_demuxer_inner_sink_event_caps(ProtonDemuxer *bin, GstEvent *event)
+{
+    GstCaps *src_caps, *any_caps;
+    GstEvent *stream_start;
+    GstPad *src;
+
+    gst_event_parse_caps(event, &src_caps);
+
+    if (!bin->demuxer)
+    {
+        if (!(any_caps = gst_caps_new_any()))
+            return false;
+        if (!(bin->demuxer = find_element(GST_ELEMENT_FACTORY_TYPE_DECODABLE, src_caps, any_caps)))
+        {
+            gst_caps_unref(any_caps);
+            return false;
+        }
+        gst_caps_unref(any_caps);
+        g_signal_connect(bin->demuxer, "pad-added", G_CALLBACK(proton_demuxer_pad_added), bin);
+        g_signal_connect(bin->demuxer, "no-more-pads", G_CALLBACK(proton_demuxer_no_more_pads), bin);
+
+        if ((src = gst_element_get_static_pad(bin->demuxer, "src")))
+        {
+            GstPad *ghost_src = gst_ghost_pad_new_no_target_from_template(GST_PAD_NAME(src),
+               gst_element_get_pad_template(GST_ELEMENT(&bin->bin), "src"));
+            gst_ghost_pad_set_target(GST_GHOST_PAD(ghost_src), src);
+            gst_element_add_pad(GST_ELEMENT(&bin->bin), ghost_src);
+            gst_object_unref(src);
+
+            gst_element_no_more_pads(GST_ELEMENT(&bin->bin));
+        }
+
+        gst_bin_add(GST_BIN(bin), bin->demuxer);
+        link_src_to_element(bin->inner_src, bin->demuxer);
+        gst_pad_set_active(bin->inner_src, true);
+
+        if ((stream_start = gst_pad_get_sticky_event(bin->inner_sink, GST_EVENT_STREAM_START, 0)))
+            push_event(bin->inner_src, stream_start);
+
+        gst_element_sync_state_with_parent(bin->demuxer);
+    }
+
+    return gst_pad_push_event(bin->inner_src, event);
+}
+
+static gboolean proton_demuxer_inner_sink_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    ProtonDemuxer *bin = PROTON_DEMUXER(gst_pad_get_element_private(pad));
+
+    GST_DEBUG_OBJECT(pad, "Got inner sink event %"GST_PTR_FORMAT".", event);
+
+    if (event->type == GST_EVENT_CAPS)
+        return proton_demuxer_inner_sink_event_caps(bin, event);
+    if (!bin->demuxer)
+        return gst_pad_event_default(pad, parent, event);
+    if (event->type == GST_EVENT_STREAM_START)
+    {
+        GstEvent *stream_start;
+        if ((stream_start = gst_pad_get_sticky_event(bin->inner_src, GST_EVENT_STREAM_START, 0)))
+            push_event(bin->inner_src, stream_start);
+        return gst_pad_event_default(pad, parent, event);
+    }
+
+    return gst_pad_push_event(bin->inner_src, event);
+}
+
+static gboolean proton_demuxer_inner_src_query(GstPad *pad, GstObject *parent, GstQuery *query)
+{
+    ProtonDemuxer *bin = PROTON_DEMUXER(gst_pad_get_element_private(pad));
+
+    GST_DEBUG_OBJECT(pad, "Got inner src query %"GST_PTR_FORMAT".", query);
+
+    if (!bin->demuxer)
+        return gst_pad_query_default(pad, parent, query);
+    return gst_pad_peer_query(bin->inner_sink, query);
+}
+
+static gboolean proton_demuxer_inner_src_event(GstPad *pad, GstObject *parent, GstEvent *event)
+{
+    ProtonDemuxer *bin = PROTON_DEMUXER(gst_pad_get_element_private(pad));
+    GST_DEBUG_OBJECT(pad, "Got inner src event %"GST_PTR_FORMAT".", event);
+    return gst_pad_push_event(bin->inner_sink, event);
+}
+
+static void proton_demuxer_class_init(ProtonDemuxerClass * klass)
+{
+    GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+
+    /* wg_parser autoplugging ordering relies on the element "Proton video converter" name */
+    gst_element_class_set_metadata(element_class, "Proton video converter", "Codec/Demuxer", "Demuxes video for Proton",
+            "Andrew Eikum <aeikum@codeweavers.com>, Ziqing Hui <zhui@codeweavers.com>");
+
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&proton_demuxer_sink_template));
+    gst_element_class_add_pad_template(element_class, gst_static_pad_template_get(&proton_demuxer_src_template));
+}
+
+static void proton_demuxer_init(ProtonDemuxer *bin)
+{
+    GstStaticPadTemplate inner_sink_template = GST_STATIC_PAD_TEMPLATE("inner-sink",
+            GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY);
+    GstStaticPadTemplate inner_src_template = GST_STATIC_PAD_TEMPLATE("inner-src",
+            GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY);
+    GstElement *element = GST_ELEMENT(bin);
+    GstPad *sink;
+
+    bin->sink_pad = gst_ghost_pad_new_no_target_from_template("sink", gst_element_get_pad_template(element, "sink"));
+    gst_pad_set_event_function(bin->sink_pad, GST_DEBUG_FUNCPTR(proton_demuxer_sink_event));
+
+    bin->inner_sink = gst_pad_new_from_static_template(&inner_sink_template, "inner-sink");
+    gst_pad_set_chain_function(bin->inner_sink, GST_DEBUG_FUNCPTR(proton_demuxer_inner_sink_chain));
+    gst_pad_set_event_function(bin->inner_sink, GST_DEBUG_FUNCPTR(proton_demuxer_inner_sink_event));
+    gst_pad_set_element_private(bin->inner_sink, bin);
+
+    bin->inner_src = gst_pad_new_from_static_template(&inner_src_template, "inner-src");
+    gst_pad_set_query_function(bin->inner_src, GST_DEBUG_FUNCPTR(proton_demuxer_inner_src_query));
+    gst_pad_set_event_function(bin->inner_src, GST_DEBUG_FUNCPTR(proton_demuxer_inner_src_event));
+    gst_pad_set_element_private(bin->inner_src, bin);
+
+    bin->video_conv = create_element("protonvideoconverter", "protonmediaconverter");
+    gst_bin_add(GST_BIN(bin), bin->video_conv);
+    link_element_to_sink(bin->video_conv, bin->inner_sink);
+    gst_pad_set_active(bin->inner_sink, true);
+
+    sink = gst_element_get_static_pad(bin->video_conv, "sink");
+    gst_ghost_pad_set_target(GST_GHOST_PAD(bin->sink_pad), sink);
+    gst_object_unref(sink);
+
+    gst_element_add_pad(element, bin->sink_pad);
+
+    GST_INFO("Initialized ProtonDemuxer %"GST_PTR_FORMAT": video_conv %"GST_PTR_FORMAT", demuxer %"GST_PTR_FORMAT", "
+            "sink_pad %"GST_PTR_FORMAT".", bin, bin->video_conv, bin->demuxer, bin->sink_pad);
+}
diff --git a/dlls/winegstreamer/media-converter/videoconv.c b/dlls/winegstreamer/media-converter/videoconv.c
index 99c451c4a17..0f916b86f66 100644
--- a/dlls/winegstreamer/media-converter/videoconv.c
+++ b/dlls/winegstreamer/media-converter/videoconv.c
@@ -129,7 +129,7 @@ G_DEFINE_TYPE(VideoConv, video_conv, GST_TYPE_ELEMENT);
 #define VIDEO_CONV(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIDEO_CONV_TYPE, VideoConv))
 #define parent_class    (video_conv_parent_class)
 GST_ELEMENT_REGISTER_DEFINE(protonvideoconverter, "protonvideoconverter",
-        GST_RANK_MARGINAL, VIDEO_CONV_TYPE);
+        GST_RANK_MARGINAL + 1, VIDEO_CONV_TYPE);
 
 static GstStaticPadTemplate video_conv_sink_template = GST_STATIC_PAD_TEMPLATE("sink",
         GST_PAD_SINK, GST_PAD_ALWAYS,

From 89965249df21413ab6efde5bb2b060f70d623d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 5 Mar 2024 22:23:44 +0100
Subject: [PATCH 369/389] winegstreamer/media-converter: Automatically add an
 audio decoder to protondemuxer.

CW-Bug-Id: #22319
---
 .../media-converter/protondemuxer.c           | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/dlls/winegstreamer/media-converter/protondemuxer.c b/dlls/winegstreamer/media-converter/protondemuxer.c
index 9ab4be5ae3c..124d105ca46 100644
--- a/dlls/winegstreamer/media-converter/protondemuxer.c
+++ b/dlls/winegstreamer/media-converter/protondemuxer.c
@@ -58,13 +58,39 @@ static gboolean proton_demuxer_sink_event(GstPad *pad, GstObject *parent, GstEve
 static void proton_demuxer_pad_added(GstElement *element, GstPad *pad, gpointer user)
 {
     ProtonDemuxer *bin = PROTON_DEMUXER(user);
-    GstPad *ghost_src;
+    GstPad *ghost_src, *src_pad;
+    GstElement *decoder = NULL;
     GstEvent *event;
+    GstCaps *caps;
 
     GST_DEBUG_OBJECT(element, "Got inner pad added %"GST_PTR_FORMAT".", pad);
 
-    ghost_src = gst_ghost_pad_new(GST_PAD_NAME(pad), pad);
-    gst_pad_set_active(ghost_src, true);
+    if ((caps = gst_pad_get_current_caps(pad)))
+    {
+        const char *mime_type = gst_structure_get_name(gst_caps_get_structure(caps, 0));
+        GST_DEBUG_OBJECT(element, "Got inner pad caps %"GST_PTR_FORMAT".", caps);
+
+        if (!strcmp(mime_type, "audio/x-vorbis"))
+            decoder = create_element("vorbisdec", "base");
+        else if (!strcmp(mime_type, "audio/x-opus"))
+            decoder = create_element("opusdec", "base");
+
+        gst_caps_unref(caps);
+    }
+
+    if (!decoder)
+        ghost_src = gst_ghost_pad_new(GST_PAD_NAME(pad), pad);
+    else
+    {
+        gst_bin_add(GST_BIN(bin), decoder);
+        link_src_to_element(pad, decoder);
+
+        src_pad = gst_element_get_static_pad(decoder, "src");
+        ghost_src = gst_ghost_pad_new(GST_PAD_NAME(src_pad), src_pad);
+        gst_object_unref(src_pad);
+
+        gst_element_sync_state_with_parent(decoder);
+    }
 
     if ((event = gst_pad_get_sticky_event(pad, GST_EVENT_STREAM_START, 0)))
     {
@@ -72,6 +98,7 @@ static void proton_demuxer_pad_added(GstElement *element, GstPad *pad, gpointer
         gst_event_unref(event);
     }
 
+    gst_pad_set_active(ghost_src, true);
     gst_element_add_pad(GST_ELEMENT(&bin->bin), ghost_src);
 }
 

From de8a5440be5d328f69475ffc6894972cf23693d9 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Tue, 9 Apr 2024 11:56:54 +0300
Subject: [PATCH 370/389] HACK: winebuild: Include target arch in the hash used
 for timestamp.

So that 32 and 64 bit PEs produce different values even if they have the
same name.
---
 tools/winebuild/spec32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 6e3a0941310..26cb6878391 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -62,7 +62,7 @@ static unsigned int hash_filename( const char *name )
     /* FNV-1 hash */
     unsigned int ret = 2166136261u;
     while (*name) ret = (ret * 16777619) ^ *name++;
-    return ret;
+    return ret + target.cpu;
 }
 
 /* check if entry point needs a relay thunk */

From e0aaae1f1f8aec6c936715274e8907a8166903bb Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 5 Apr 2024 17:09:27 -0600
Subject: [PATCH 371/389] ntdll/tests: Add tests for CONTEXT_EXCEPTION_REQUEST.

CW-Bug-Id: #23654
---
 dlls/ntdll/tests/exception.c  | 321 ++++++++++++++++++++++++++++++++--
 dlls/ntdll/tests/ntdll_test.h |   2 +
 dlls/ntdll/tests/wow64.c      |  14 +-
 include/winnt.h               |   5 +
 4 files changed, 322 insertions(+), 20 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 3a15c1ac7ab..710bf19bd21 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -18,20 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "ntdll_test.h"
+
 #include <stdio.h>
 
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winnt.h"
-#include "winreg.h"
 #include "winuser.h"
-#include "winternl.h"
 #include "ddk/wdm.h"
 #include "excpt.h"
-#include "wine/test.h"
 #include "intrin.h"
 
 static void *code_mem;
@@ -284,6 +277,19 @@ static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, enum debugger_stag
     status = pNtSetContextThread(thread, xctx);
     ok(!status, "NtSetContextThread failed with 0x%lx\n", status);
 }
+
+#define check_context_exception_request( a, b ) check_context_exception_request_( a, b, __LINE__ )
+static void check_context_exception_request_( DWORD flags, BOOL hardware_exception, unsigned int line )
+{
+    static const DWORD exception_reporting_flags = CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING
+                                                   | CONTEXT_EXCEPTION_ACTIVE | CONTEXT_SERVICE_ACTIVE;
+    DWORD expected_flags = CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING;
+
+    if (!(flags & CONTEXT_EXCEPTION_REPORTING)) return;
+    expected_flags |= hardware_exception ? CONTEXT_EXCEPTION_ACTIVE : CONTEXT_SERVICE_ACTIVE;
+    ok_(__FILE__, line)( (flags & exception_reporting_flags) == expected_flags, "got %#lx, expected %#lx.\n",
+                         flags, expected_flags );
+}
 #endif
 
 #ifdef __i386__
@@ -1154,13 +1160,16 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                                           sizeof(stage), &size_read);
             ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
 
-            ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS;
+            ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS | CONTEXT_EXCEPTION_REQUEST;
             status = pNtGetContextThread(pi.hThread, &ctx);
             ok(!status, "NtGetContextThread failed with 0x%lx\n", status);
+            todo_wine ok(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING
+                    || broken( !(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING) ) /* Win7 WoW64 */,
+                    "got %#lx.\n", ctx.ContextFlags);
 
-            trace("exception 0x%lx at %p firstchance=%ld Eip=0x%lx, Eax=0x%lx\n",
+            trace("exception 0x%lx at %p firstchance=%ld Eip=0x%lx, Eax=0x%lx ctx.ContextFlags %#lx\n",
                   de.u.Exception.ExceptionRecord.ExceptionCode,
-                  de.u.Exception.ExceptionRecord.ExceptionAddress, de.u.Exception.dwFirstChance, ctx.Eip, ctx.Eax);
+                  de.u.Exception.ExceptionRecord.ExceptionAddress, de.u.Exception.dwFirstChance, ctx.Eip, ctx.Eax, ctx.ContextFlags);
 
             if (counter > 100)
             {
@@ -1177,6 +1186,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     (char *)ctx.Eip < (char *)ntdll + nt->OptionalHeader.SizeOfImage,
                     "wrong eip %p ntdll %p-%p\n", (void *)ctx.Eip, ntdll,
                     (char *)ntdll + nt->OptionalHeader.SizeOfImage );
+                check_context_exception_request( ctx.ContextFlags, TRUE );
             }
             else
             {
@@ -1190,6 +1200,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     ctx.Eax = 0xf00f00f1;
                     /* let the debuggee handle the exception */
                     continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, !is_wow64 );
                 }
                 else if (stage == STAGE_RTLRAISE_HANDLE_LAST_CHANCE)
                 {
@@ -1226,6 +1237,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                                ctx.Eip, (char *)code_mem_address + 0xb);
                         /* here we handle exception */
                     }
+                    check_context_exception_request( ctx.ContextFlags, !is_wow64 );
                 }
                 else if (stage == STAGE_SERVICE_CONTINUE || stage == STAGE_SERVICE_NOT_HANDLED)
                 {
@@ -1235,6 +1247,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                        "expected Eip = %p, got 0x%lx\n", (char *)code_mem_address + 0x1d, ctx.Eip);
 
                     if (stage == STAGE_SERVICE_NOT_HANDLED) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                 }
                 else if (stage == STAGE_BREAKPOINT_CONTINUE || stage == STAGE_BREAKPOINT_NOT_HANDLED)
                 {
@@ -1244,6 +1257,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                        "expected Eip = %p, got 0x%lx\n", (char *)code_mem_address + 2, ctx.Eip);
 
                     if (stage == STAGE_BREAKPOINT_NOT_HANDLED) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                 }
                 else if (stage == STAGE_EXCEPTION_INVHANDLE_CONTINUE || stage == STAGE_EXCEPTION_INVHANDLE_NOT_HANDLED)
                 {
@@ -1254,14 +1268,17 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                        "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
 
                     if (stage == STAGE_EXCEPTION_INVHANDLE_NOT_HANDLED) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, !is_wow64 );
                 }
                 else if (stage == STAGE_NO_EXCEPTION_INVHANDLE_NOT_HANDLED)
                 {
                     ok(FALSE || broken(TRUE) /* < Win10 */, "should not throw exception\n");
                     continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, !is_wow64 );
                 }
                 else if (stage == STAGE_XSTATE || stage == STAGE_XSTATE_LEGACY_SSE)
                 {
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                     test_debugger_xstate(pi.hThread, &ctx, stage);
                 }
                 else if (stage == STAGE_SEGMENTS)
@@ -1282,6 +1299,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                         ok( !ctx.SegEs, "wrong es %04lx / %04lx\n", ctx.SegEs, ctx.SegSs );
                         ok( !ctx.SegGs, "wrong gs %04lx / %04lx\n", ctx.SegGs, ctx.SegSs );
                     }
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                 }
                 else
                     ok(FALSE, "unexpected stage %u\n", stage);
@@ -4052,9 +4070,10 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                                           sizeof(stage), &size_read);
             ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
 
-            ctx.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS;
+            ctx.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_EXCEPTION_REQUEST;
             status = pNtGetContextThread(pi.hThread, &ctx);
             ok(!status, "NtGetContextThread failed with 0x%lx\n", status);
+            todo_wine ok(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING, "got %#lx.\n", ctx.ContextFlags);
 
             trace("exception 0x%lx at %p firstchance=%ld Rip=%p, Rax=%p\n",
                   de.u.Exception.ExceptionRecord.ExceptionCode,
@@ -4076,6 +4095,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     (char *)ctx.Rip < (char *)ntdll + nt->OptionalHeader.SizeOfImage,
                     "wrong rip %p ntdll %p-%p\n", (void *)ctx.Rip, ntdll,
                     (char *)ntdll + nt->OptionalHeader.SizeOfImage );
+                check_context_exception_request( ctx.ContextFlags, TRUE );
             }
             else
             {
@@ -4089,6 +4109,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     ctx.Rax = 0xf00f00f1;
                     /* let the debuggee handle the exception */
                     continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, FALSE );
                 }
                 else if (stage == STAGE_RTLRAISE_HANDLE_LAST_CHANCE)
                 {
@@ -4117,6 +4138,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                                 ctx.Rip, (char *)code_mem_address + 0x10);
                         /* here we handle exception */
                     }
+                    check_context_exception_request( ctx.ContextFlags, FALSE );
                 }
                 else if (stage == STAGE_SERVICE_CONTINUE || stage == STAGE_SERVICE_NOT_HANDLED)
                 {
@@ -4125,6 +4147,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     ok((char *)ctx.Rip == (char *)code_mem_address + 0x30,
                        "expected Rip = %p, got %p\n", (char *)code_mem_address + 0x30, (char *)ctx.Rip);
                     if (stage == STAGE_SERVICE_NOT_HANDLED) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                 }
                 else if (stage == STAGE_BREAKPOINT_CONTINUE || stage == STAGE_BREAKPOINT_NOT_HANDLED)
                 {
@@ -4133,6 +4156,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     ok((char *)ctx.Rip == (char *)code_mem_address + 2,
                        "expected Rip = %p, got %p\n", (char *)code_mem_address + 2, (char *)ctx.Rip);
                     if (stage == STAGE_BREAKPOINT_NOT_HANDLED) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                 }
                 else if (stage == STAGE_EXCEPTION_INVHANDLE_CONTINUE || stage == STAGE_EXCEPTION_INVHANDLE_NOT_HANDLED)
                 {
@@ -4143,14 +4167,17 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                        "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
 
                     if (stage == STAGE_EXCEPTION_INVHANDLE_NOT_HANDLED) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, FALSE );
                 }
                 else if (stage == STAGE_NO_EXCEPTION_INVHANDLE_NOT_HANDLED)
                 {
                     ok(FALSE || broken(TRUE) /* < Win10 */, "should not throw exception\n");
                     continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    check_context_exception_request( ctx.ContextFlags, FALSE );
                 }
                 else if (stage == STAGE_XSTATE || stage == STAGE_XSTATE_LEGACY_SSE)
                 {
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                     test_debugger_xstate(pi.hThread, &ctx, stage);
                 }
                 else if (stage == STAGE_SEGMENTS)
@@ -4175,6 +4202,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
                     ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs );
                     todo_wine ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs );
                     ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs );
+                    check_context_exception_request( ctx.ContextFlags, TRUE );
                 }
                 else
                     ok(FALSE, "unexpected stage %u\n", stage);
@@ -4596,9 +4624,21 @@ static void test_wow64_context(void)
         ret = pRtlWow64GetThreadContext( pi.hThread, &ctx );
         ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
         ok( ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx.ContextFlags );
+
+        ctx.ContextFlags = WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST;
+        ret = pRtlWow64GetThreadContext( pi.hThread, &ctx );
+        ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+        todo_wine ok( (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING) || broken( ctx.ContextFlags == WOW64_CONTEXT_ALL ) /*Win 7*/,
+            "got context flags %#lx\n", ctx.ContextFlags );
+
         if (context.SegCs == cs32)
         {
             trace( "in 32-bit mode %04x\n", context.SegCs );
+            if (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING)
+                ok( ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING)
+                    || ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING
+                       | CONTEXT_EXCEPTION_ACTIVE),
+                    "got %#lx.\n", ctx.ContextFlags );
             ok( ctx.Eip == context.Rip, "cs32: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip );
             ok( ctx.Ebp == context.Rbp, "cs32: ebp %08lx / %p\n", ctx.Ebp, (void *)context.Rbp );
             ok( ctx.Esp == context.Rsp, "cs32: esp %08lx / %p\n", ctx.Esp, (void *)context.Rsp );
@@ -4673,6 +4713,12 @@ static void test_wow64_context(void)
         else
         {
             trace( "in 64-bit mode %04x\n", context.SegCs );
+            if (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING)
+                ok( ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
+                    | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE)
+                    || ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
+                    | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE),
+                    "got %#lx.\n", ctx.ContextFlags );
             ok( ctx.Eip != context.Rip, "cs64: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip);
             ok( ctx.SegCs == cs32, "cs64: wrong cs %04lx / %04x\n", ctx.SegCs, cs32 );
             ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs );
@@ -12341,6 +12387,254 @@ static void test_set_live_context(void)
 }
 #endif
 
+struct context_exception_request_thread_param
+{
+    LONG volatile sync;
+    HANDLE event;
+};
+static volatile int *p_context_exception_request_value;
+struct context_exception_request_thread_param *context_exception_request_param;
+
+static LONG CALLBACK test_context_exception_request_handler( EXCEPTION_POINTERS *info )
+{
+    PEXCEPTION_RECORD rec = info->ExceptionRecord;
+    CONTEXT *c = info->ContextRecord;
+    DWORD old_prot;
+
+    ok( !(c->ContextFlags & (CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
+                             | CONTEXT_EXCEPTION_ACTIVE)), "got %#lx.\n", c->ContextFlags );
+
+    ok( rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION, "got %#lx.\n", rec->ExceptionCode );
+    VirtualProtect( (void *)p_context_exception_request_value, sizeof(*p_context_exception_request_value),
+                    PAGE_READWRITE, &old_prot );
+
+    WriteRelease( &context_exception_request_param->sync, 5 );
+    while (ReadAcquire( &context_exception_request_param->sync ) != 6)
+        ;
+
+    return EXCEPTION_CONTINUE_EXECUTION;
+}
+
+static DWORD WINAPI test_context_exception_request_thread( void *arg )
+{
+#ifndef _WIN64
+    static BYTE wait_sync_x64_code[] =
+    {
+        0x89, 0x11,       /* mov %edx,(%rcx) */
+        0x83, 0xc2, 0x01, /* add $0x1,%edx */
+        0x0f, 0x1f, 0x00, /* 1: nopl   (%rax) */
+        0x8b, 0x01,       /* mov (%rcx),%eax */
+        0x39, 0xd0,       /* cmp %edx,%eax */
+        0x75, 0xfa,       /* jne 1b */
+        0xc3,             /* ret */
+    };
+    ULONG64 args[2];
+#endif
+    struct context_exception_request_thread_param *p = arg;
+    void *vectored_handler;
+
+    context_exception_request_param = p;
+    vectored_handler = pRtlAddVectoredExceptionHandler( TRUE, test_context_exception_request_handler );
+    ok( !!vectored_handler, "failed.\n" );
+
+    WriteRelease( &p->sync, 1 );
+    while (ReadAcquire( &p->sync ) != 2)
+        ;
+
+    WaitForSingleObject( p->event, INFINITE );
+
+#ifndef _WIN64
+    memcpy( (char *)code_mem + 1024, wait_sync_x64_code, sizeof(wait_sync_x64_code) );
+    args[0] = (ULONG_PTR)&p->sync;
+    args[1] = 3;
+    if (is_wow64 && !old_wow64) call_func64( (ULONG64)(ULONG_PTR)code_mem + 1024, ARRAY_SIZE(args), args, code_mem );
+#endif
+
+    p_context_exception_request_value = VirtualAlloc( NULL, sizeof(*p_context_exception_request_value),
+                                                      MEM_RESERVE | MEM_COMMIT, PAGE_READONLY );
+    ok( !!p_context_exception_request_value, "got NULL.\n" );
+    *p_context_exception_request_value = 1;
+    ok( *p_context_exception_request_value == 1, "got %d.\n", *p_context_exception_request_value );
+    VirtualFree( (void *)p_context_exception_request_value, 0, MEM_RELEASE );
+    pRtlRemoveVectoredExceptionHandler( vectored_handler );
+
+#ifndef _WIN64
+    args[1] = 7;
+    if (is_wow64 && !old_wow64) call_func64( (ULONG64)(ULONG_PTR)code_mem + 1024, ARRAY_SIZE(args), args, code_mem );
+#endif
+
+    return 0;
+}
+
+static void test_context_exception_request(void)
+{
+    struct context_exception_request_thread_param p;
+    DWORD expected_flags;
+    HANDLE thread;
+    CONTEXT c;
+    BOOL ret;
+
+    if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler)
+    {
+        skip( "RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler not found.\n" );
+        return;
+    }
+
+    c.ContextFlags = CONTEXT_CONTROL;
+    ret = GetThreadContext( GetCurrentThread(), &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    ok( c.ContextFlags == CONTEXT_CONTROL, "got %#lx.\n", c.ContextFlags );
+
+    expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE;
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+    ret = GetThreadContext( GetCurrentThread(), &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags || broken( c.ContextFlags == 0x10001 ) /* Win7 WoW64 */,
+                  "got %#lx.\n", c.ContextFlags );
+    if (c.ContextFlags == 0x10001)
+    {
+        win_skip( "Old WoW64 behaviour, skipping tests.\n" );
+        return;
+    }
+
+    ret = DuplicateHandle( GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &thread, 0, TRUE, DUPLICATE_SAME_ACCESS );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    c.ContextFlags = expected_flags | CONTEXT_EXCEPTION_REQUEST;
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    CloseHandle( thread );
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
+                     | CONTEXT_EXCEPTION_ACTIVE;
+    ret = GetThreadContext( GetCurrentThread(), &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    p.event = CreateEventW( NULL, FALSE, FALSE, NULL );
+    thread = CreateThread( NULL, 0, test_context_exception_request_thread, &p, CREATE_SUSPENDED, NULL );
+    ok( !!thread, "got error %lu.\n", GetLastError() );
+
+    expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags || broken( c.ContextFlags == (CONTEXT_CONTROL
+                  | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING)) /* Win7 64 */, "got %#lx.\n", c.ContextFlags );
+
+    p.sync = 0;
+    ResumeThread(thread);
+
+    while (ReadAcquire( &p.sync ) != 1)
+        SwitchToThread();
+    /* thread is in user code. */
+    SuspendThread( thread );
+
+    c.ContextFlags = CONTEXT_CONTROL;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    ok( c.ContextFlags == CONTEXT_CONTROL, "got %#lx.\n", c.ContextFlags );
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE;
+    ret = SetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+
+    expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING;
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
+                     | CONTEXT_EXCEPTION_ACTIVE;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    ResumeThread(thread);
+    WriteRelease( &p.sync, 2 );
+    /* Try to make sure the thread entered WaitForSingleObject(). */
+    Sleep(30);
+
+    expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE;
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    c.ContextFlags = CONTEXT_CONTROL;
+    ret = SetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
+                     | CONTEXT_EXCEPTION_ACTIVE;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    SetEvent( p.event );
+
+    if (is_wow64 && !old_wow64)
+    {
+        while (ReadAcquire( &p.sync ) != 3)
+            SwitchToThread();
+        /* thread is in x64 code. */
+
+        expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
+
+        c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+        ret = GetThreadContext( thread, &c );
+        ok( ret, "got error %lu.\n", GetLastError() );
+        todo_wine ok( c.ContextFlags == expected_flags, "got %#lx, expected %#lx.\n", c.ContextFlags, expected_flags );
+
+        WriteRelease( &p.sync, 4 );
+    }
+
+    while (ReadAcquire( &p.sync ) != 5)
+        SwitchToThread();
+
+    expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING;
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
+                     | CONTEXT_EXCEPTION_ACTIVE;
+    ret = GetThreadContext( thread, &c );
+    ok( ret, "got error %lu.\n", GetLastError() );
+    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+
+    WriteRelease( &p.sync, 6 );
+
+    if (is_wow64 && !old_wow64)
+    {
+        while (ReadAcquire( &p.sync ) != 7)
+            SwitchToThread();
+        /* thread is in x64 code. */
+
+        expected_flags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
+
+        c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
+        ret = GetThreadContext( thread, &c );
+        ok( ret, "got error %lu.\n", GetLastError() );
+        todo_wine ok( c.ContextFlags == expected_flags, "got %#lx, expected %#lx.\n", c.ContextFlags, expected_flags );
+
+        WriteRelease( &p.sync, 8 );
+    }
+
+    WaitForSingleObject( thread, INFINITE );
+    CloseHandle( thread );
+    CloseHandle( p.event );
+}
+
 START_TEST(exception)
 {
     HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -12617,5 +12911,6 @@ START_TEST(exception)
     test_suspend_thread();
     test_suspend_process();
     test_unload_trace();
+    test_context_exception_request();
     VirtualFree(code_mem, 0, MEM_RELEASE);
 }
diff --git a/dlls/ntdll/tests/ntdll_test.h b/dlls/ntdll/tests/ntdll_test.h
index 67278358b29..ed824583870 100644
--- a/dlls/ntdll/tests/ntdll_test.h
+++ b/dlls/ntdll/tests/ntdll_test.h
@@ -30,3 +30,5 @@
 
 #include "wine/test.h"
 #include "wine/heap.h"
+
+extern NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args, void *code_mem );
diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c
index 01cd0cad035..1d48918165e 100644
--- a/dlls/ntdll/tests/wow64.c
+++ b/dlls/ntdll/tests/wow64.c
@@ -1440,7 +1440,7 @@ static const BYTE call_func64_code[] =
     0xcb,                               /* lret */
 };
 
-static NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args )
+NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args, void *code_mem )
 {
     NTSTATUS (WINAPI *func)( ULONG64 func64, int nb_args, ULONG64 *args ) = code_mem;
 
@@ -1940,7 +1940,7 @@ static void test_iosb(void)
     iosb64.Information = 0xdeadbeef;
 
     args[0] = (LONG_PTR)server;
-    status = call_func64( func, ARRAY_SIZE(args), args );
+    status = call_func64( func, ARRAY_SIZE(args), args, code_mem );
     ok( status == STATUS_PENDING, "NtFsControlFile returned %lx\n", status );
     ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status );
     ok( iosb64.Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", iosb64.Status );
@@ -1965,7 +1965,7 @@ static void test_iosb(void)
     args[8] = (ULONG_PTR)&id;
     args[9] = sizeof(id);
 
-    status = call_func64( func, ARRAY_SIZE(args), args );
+    status = call_func64( func, ARRAY_SIZE(args), args, code_mem );
     ok( status == STATUS_PENDING || status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status );
     todo_wine
     {
@@ -1995,7 +1995,7 @@ static void test_iosb(void)
     id = 0xdeadbeef;
 
     args[0] = (LONG_PTR)server;
-    status = call_func64( func, ARRAY_SIZE(args), args );
+    status = call_func64( func, ARRAY_SIZE(args), args, code_mem );
     ok( status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status );
     ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status );
     ok( iosb32.Information == 0x55555555, "info changed to %Ix\n", iosb32.Information );
@@ -2018,7 +2018,7 @@ static NTSTATUS invoke_syscall( const char *name, ULONG args32[] )
     else
         win_skip( "syscall thunk %s not recognized\n", name );
 
-    return call_func64( func, ARRAY_SIZE(args64), args64 );
+    return call_func64( func, ARRAY_SIZE(args64), args64, code_mem );
 }
 
 static void test_syscalls(void)
@@ -2124,14 +2124,14 @@ static void test_cpu_area(void)
         ULONG64 context, context_ex;
         ULONG64 args[] = { (ULONG_PTR)&machine, (ULONG_PTR)&context, (ULONG_PTR)&context_ex };
 
-        status = call_func64( ptr, ARRAY_SIZE(args), args );
+        status = call_func64( ptr, ARRAY_SIZE(args), args, code_mem );
         ok( !status, "RtlWow64GetCpuAreaInfo failed %lx\n", status );
         ok( machine == IMAGE_FILE_MACHINE_I386, "wrong machine %x\n", machine );
         ok( context == teb64->TlsSlots[WOW64_TLS_CPURESERVED] + 4, "wrong context %s / %s\n",
             wine_dbgstr_longlong(context), wine_dbgstr_longlong(teb64->TlsSlots[WOW64_TLS_CPURESERVED]) );
         ok( !context_ex, "got context_ex %s\n", wine_dbgstr_longlong(context_ex) );
         args[0] = args[1] = args[2] = 0;
-        status = call_func64( ptr, ARRAY_SIZE(args), args );
+        status = call_func64( ptr, ARRAY_SIZE(args), args, code_mem );
         ok( !status, "RtlWow64GetCpuAreaInfo failed %lx\n", status );
     }
     else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" );
diff --git a/include/winnt.h b/include/winnt.h
index 0f7c9430bfd..7f2a5f7b18b 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1523,6 +1523,11 @@ typedef struct _CONTEXT_EX
 #endif
 } CONTEXT_EX, *PCONTEXT_EX;
 
+#define CONTEXT_EXCEPTION_ACTIVE    0x08000000
+#define CONTEXT_SERVICE_ACTIVE      0x10000000
+#define CONTEXT_EXCEPTION_REQUEST   0x40000000
+#define CONTEXT_EXCEPTION_REPORTING 0x80000000
+
 #define CONTEXT_ARM    0x0200000
 #define CONTEXT_ARM_CONTROL         (CONTEXT_ARM | 0x00000001)
 #define CONTEXT_ARM_INTEGER         (CONTEXT_ARM | 0x00000002)

From bca6c4d6d4f84ffef60b59b4b7800abb0ede1a8e Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 9 Apr 2024 17:26:10 -0600
Subject: [PATCH 372/389] ntdll: Set exception reporting flags in
 NtGetContextThread().

CW-Bug-Id: #23654
---
 dlls/ntdll/tests/exception.c    |  8 ++++----
 dlls/ntdll/unix/signal_arm.c    |  1 +
 dlls/ntdll/unix/signal_arm64.c  |  3 +++
 dlls/ntdll/unix/signal_i386.c   |  1 +
 dlls/ntdll/unix/signal_x86_64.c |  2 ++
 dlls/ntdll/unix/unix_private.h  | 11 +++++++++++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 710bf19bd21..d11850fd841 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -12490,8 +12490,8 @@ static void test_context_exception_request(void)
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
     ret = GetThreadContext( GetCurrentThread(), &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags || broken( c.ContextFlags == 0x10001 ) /* Win7 WoW64 */,
-                  "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags || broken( c.ContextFlags == 0x10001 ) /* Win7 WoW64 */,
+        "got %#lx.\n", c.ContextFlags );
     if (c.ContextFlags == 0x10001)
     {
         win_skip( "Old WoW64 behaviour, skipping tests.\n" );
@@ -12505,14 +12505,14 @@ static void test_context_exception_request(void)
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
     CloseHandle( thread );
 
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
                      | CONTEXT_EXCEPTION_ACTIVE;
     ret = GetThreadContext( GetCurrentThread(), &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     p.event = CreateEventW( NULL, FALSE, FALSE, NULL );
     thread = CreateThread( NULL, 0, test_context_exception_request_thread, &p, CREATE_SUSPENDED, NULL );
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index afa3e71c5e2..56a897fcdd0 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -1033,6 +1033,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         memcpy( context->D, frame->d, sizeof(frame->d) );
         context->ContextFlags |= CONTEXT_FLOATING_POINT;
     }
+    set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
     return STATUS_SUCCESS;
 }
 
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 389f16f89d9..6785d56d7f2 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -710,6 +710,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
         context->ContextFlags |= CONTEXT_FLOATING_POINT;
     }
     if (needed_flags & CONTEXT_DEBUG_REGISTERS) FIXME( "debug registers not supported\n" );
+    set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
     return STATUS_SUCCESS;
 }
 
@@ -917,6 +918,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
             context->Dr7 = wow_frame->Dr7;
         }
         /* FIXME: CONTEXT_I386_XSTATE */
+        set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
         break;
     }
 
@@ -956,6 +958,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
             memcpy( context->D, wow_frame->D, sizeof(wow_frame->D) );
             context->ContextFlags |= CONTEXT_FLOATING_POINT;
         }
+        set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
         break;
     }
 
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index b87fc077602..876a683617f 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1168,6 +1168,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
                 x86_thread_data()->dr7 = context->Dr7;
             }
         }
+        set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
     }
 
     if (context->ContextFlags & (CONTEXT_INTEGER & ~CONTEXT_i386))
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 453be6ca1b3..847ede602fc 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1213,6 +1213,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
             amd64_thread_data()->dr7 = context->Dr7;
         }
     }
+    set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
     return STATUS_SUCCESS;
 }
 
@@ -1415,6 +1416,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size )
             frame->restore_flags |= CONTEXT_XSTATE;
         }
     }
+    set_context_exception_reporting_flags( &context->ContextFlags, CONTEXT_SERVICE_ACTIVE );
     return STATUS_SUCCESS;
 }
 
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 967422d9288..97546ca1797 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -228,6 +228,17 @@ extern int server_pipe( int fd[2] );
 extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux );
 extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu );
 
+static inline void set_context_exception_reporting_flags( DWORD *context_flags, DWORD reporting_flag )
+{
+    if (!(*context_flags & CONTEXT_EXCEPTION_REQUEST))
+    {
+        *context_flags &= ~(CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE | CONTEXT_EXCEPTION_ACTIVE);
+        return;
+    }
+    *context_flags = (*context_flags & ~(CONTEXT_SERVICE_ACTIVE | CONTEXT_EXCEPTION_ACTIVE))
+                     | CONTEXT_EXCEPTION_REPORTING | reporting_flag;
+}
+
 extern BOOL xstate_compaction_enabled;
 extern UINT64 xstate_supported_features_mask;
 extern UINT64 xstate_features_size;

From c989fa268c153486cad4b696ad49e8da93a0b0c0 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 9 Apr 2024 17:35:56 -0600
Subject: [PATCH 373/389] ntdll: Store exception reporting flags in server
 context.

CW-Bug-Id: #23654
---
 dlls/ntdll/tests/exception.c | 18 ++++++-------
 dlls/ntdll/unix/server.c     |  4 +++
 dlls/ntdll/unix/thread.c     | 50 +++++++++++++++++++++++++++++++++---
 server/protocol.def          | 13 ++++++++++
 server/thread.c              |  5 ++--
 server/trace.c               | 13 ++++++++++
 tools/make_requests          |  2 +-
 7 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index d11850fd841..c7ba65795de 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -287,7 +287,7 @@ static void check_context_exception_request_( DWORD flags, BOOL hardware_excepti
 
     if (!(flags & CONTEXT_EXCEPTION_REPORTING)) return;
     expected_flags |= hardware_exception ? CONTEXT_EXCEPTION_ACTIVE : CONTEXT_SERVICE_ACTIVE;
-    ok_(__FILE__, line)( (flags & exception_reporting_flags) == expected_flags, "got %#lx, expected %#lx.\n",
+    todo_wine ok_(__FILE__, line)( (flags & exception_reporting_flags) == expected_flags, "got %#lx, expected %#lx.\n",
                          flags, expected_flags );
 }
 #endif
@@ -1163,7 +1163,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
             ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS | CONTEXT_EXCEPTION_REQUEST;
             status = pNtGetContextThread(pi.hThread, &ctx);
             ok(!status, "NtGetContextThread failed with 0x%lx\n", status);
-            todo_wine ok(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING
+            ok(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING
                     || broken( !(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING) ) /* Win7 WoW64 */,
                     "got %#lx.\n", ctx.ContextFlags);
 
@@ -4073,7 +4073,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
             ctx.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_EXCEPTION_REQUEST;
             status = pNtGetContextThread(pi.hThread, &ctx);
             ok(!status, "NtGetContextThread failed with 0x%lx\n", status);
-            todo_wine ok(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING, "got %#lx.\n", ctx.ContextFlags);
+            ok(ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING, "got %#lx.\n", ctx.ContextFlags);
 
             trace("exception 0x%lx at %p firstchance=%ld Rip=%p, Rax=%p\n",
                   de.u.Exception.ExceptionRecord.ExceptionCode,
@@ -4628,7 +4628,7 @@ static void test_wow64_context(void)
         ctx.ContextFlags = WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST;
         ret = pRtlWow64GetThreadContext( pi.hThread, &ctx );
         ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
-        todo_wine ok( (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING) || broken( ctx.ContextFlags == WOW64_CONTEXT_ALL ) /*Win 7*/,
+        ok( (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING) || broken( ctx.ContextFlags == WOW64_CONTEXT_ALL ) /*Win 7*/,
             "got context flags %#lx\n", ctx.ContextFlags );
 
         if (context.SegCs == cs32)
@@ -4714,7 +4714,7 @@ static void test_wow64_context(void)
         {
             trace( "in 64-bit mode %04x\n", context.SegCs );
             if (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING)
-                ok( ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
+                todo_wine ok( ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
                     | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE)
                     || ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
                     | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE),
@@ -12548,13 +12548,13 @@ static void test_context_exception_request(void)
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
                      | CONTEXT_EXCEPTION_ACTIVE;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     ResumeThread(thread);
     WriteRelease( &p.sync, 2 );
@@ -12604,13 +12604,13 @@ static void test_context_exception_request(void)
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE
                      | CONTEXT_EXCEPTION_ACTIVE;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     WriteRelease( &p.sync, 6 );
 
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 6148cfddce2..992e5cfdc3d 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -762,7 +762,11 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT
 
     if (ret == STATUS_USER_APC) *user_apc = reply_data.call.user;
     if (reply_size > sizeof(reply_data.call))
+    {
         memcpy( context, reply_data.context, reply_size - sizeof(reply_data.call) );
+        context[0].flags &= ~SERVER_CTX_EXEC_SPACE;
+        context[1].flags &= ~SERVER_CTX_EXEC_SPACE;
+    }
     return ret;
 }
 
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 812302bf346..65fa0aa9894 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -184,7 +184,7 @@ BOOL validate_context_xstate( CONTEXT *context )
  */
 static unsigned int get_server_context_flags( const void *context, USHORT machine )
 {
-    unsigned int flags, ret = 0;
+    unsigned int flags = 0, ret = 0;
 
     switch (machine)
     {
@@ -222,6 +222,7 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin
         if (flags & CONTEXT_ARM64_DEBUG_REGISTERS) ret |= SERVER_CTX_DEBUG_REGISTERS;
         break;
     }
+    if (flags & CONTEXT_EXCEPTION_REQUEST) ret |= SERVER_CTX_EXEC_SPACE;
     return ret;
 }
 
@@ -236,11 +237,11 @@ static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_
     switch (MAKELONG( native_machine, wow_machine ))
     {
     case MAKELONG( IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386 ):
-        return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS;
+        return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS | SERVER_CTX_EXEC_SPACE;
     case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_ARMNT ):
-        return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT;
+        return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_EXEC_SPACE;
     default:
-        return 0;
+        return SERVER_CTX_EXEC_SPACE;
     }
 }
 
@@ -260,6 +261,21 @@ static void xstate_to_server( context_t *to, const CONTEXT_EX *xctx )
 }
 
 
+/***********************************************************************
+ *           exception_request_flags_to_server
+ *
+ * Copy exception reporting flags to the server format.
+ */
+static void exception_request_flags_to_server( context_t *to, DWORD context_flags )
+{
+    if (!(context_flags & CONTEXT_EXCEPTION_REPORTING)) return;
+    to->flags |= SERVER_CTX_EXEC_SPACE;
+    if (context_flags & CONTEXT_SERVICE_ACTIVE)        to->exec_space.space.space = EXEC_SPACE_SYSCALL;
+    else if (context_flags & CONTEXT_EXCEPTION_ACTIVE) to->exec_space.space.space = EXEC_SPACE_EXCEPTION;
+    else                                               to->exec_space.space.space = EXEC_SPACE_USERMODE;
+}
+
+
 /***********************************************************************
  *           context_to_server
  *
@@ -337,6 +353,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
         }
         if (flags & CONTEXT_I386_XSTATE)
             xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
+        exception_request_flags_to_server( to, flags );
         return STATUS_SUCCESS;
     }
 
@@ -395,6 +412,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
         }
         if (flags & CONTEXT_I386_XSTATE)
             xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
+        exception_request_flags_to_server( to, flags );
         return STATUS_SUCCESS;
     }
 
@@ -456,6 +474,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
         }
         if (flags & CONTEXT_AMD64_XSTATE)
             xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
+        exception_request_flags_to_server( to, flags );
         return STATUS_SUCCESS;
     }
 
@@ -521,6 +540,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
         }
         if (flags & CONTEXT_AMD64_XSTATE)
             xstate_to_server( to, (const CONTEXT_EX *)(from + 1) );
+        exception_request_flags_to_server( to, flags );
         return STATUS_SUCCESS;
     }
 
@@ -568,6 +588,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
             for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->debug.arm_regs.wvr[i] = from->Wvr[i];
             for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->debug.arm_regs.wcr[i] = from->Wcr[i];
         }
+        exception_request_flags_to_server( to, flags );
         return STATUS_SUCCESS;
     }
 
@@ -609,6 +630,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void
             for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->debug.arm64_regs.wcr[i] = from->Wcr[i];
             for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->debug.arm64_regs.wvr[i] = from->Wvr[i];
         }
+        exception_request_flags_to_server( to, flags );
         return STATUS_SUCCESS;
     }
 
@@ -650,6 +672,20 @@ static void xstate_from_server( CONTEXT_EX *xctx, const context_t *from )
 }
 
 
+/***********************************************************************
+ *           exception_request_flags_from_server
+ *
+ * Copy exception reporting flags from the server format.
+ */
+static void exception_request_flags_from_server( DWORD *context_flags, const context_t *from )
+{
+    if (!(*context_flags & CONTEXT_EXCEPTION_REQUEST) || !(from->flags & SERVER_CTX_EXEC_SPACE)) return;
+    *context_flags = (*context_flags & ~(CONTEXT_SERVICE_ACTIVE | CONTEXT_EXCEPTION_ACTIVE)) | CONTEXT_EXCEPTION_REPORTING;
+    if (from->exec_space.space.space == EXEC_SPACE_SYSCALL)        *context_flags |= CONTEXT_SERVICE_ACTIVE;
+    else if (from->exec_space.space.space == EXEC_SPACE_EXCEPTION) *context_flags |= CONTEXT_EXCEPTION_ACTIVE;
+}
+
+
 /***********************************************************************
  *           context_from_server
  *
@@ -724,6 +760,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_I386_XSTATE))
             xstate_from_server( (CONTEXT_EX *)(to + 1), from );
+        exception_request_flags_from_server( &to->ContextFlags, from );
         return STATUS_SUCCESS;
     }
 
@@ -785,6 +822,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_I386_XSTATE))
             xstate_from_server( (CONTEXT_EX *)(to + 1), from );
+        exception_request_flags_from_server( &to->ContextFlags, from );
         return STATUS_SUCCESS;
     }
 
@@ -847,6 +885,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_AMD64_XSTATE))
             xstate_from_server( (CONTEXT_EX *)(to + 1), from );
+        exception_request_flags_from_server( &to->ContextFlags, from );
         return STATUS_SUCCESS;
     }
 
@@ -916,6 +955,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
         }
         if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_AMD64_XSTATE))
             xstate_from_server( (CONTEXT_EX *)(to + 1), from );
+        exception_request_flags_from_server( &to->ContextFlags, from );
         return STATUS_SUCCESS;
     }
 
@@ -963,6 +1003,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->Wvr[i] = from->debug.arm_regs.wvr[i];
             for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->Wcr[i] = from->debug.arm_regs.wcr[i];
         }
+        exception_request_flags_from_server( &to->ContextFlags, from );
         return STATUS_SUCCESS;
     }
 
@@ -1004,6 +1045,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma
             for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->Wcr[i] = from->debug.arm64_regs.wcr[i];
             for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->Wvr[i] = from->debug.arm64_regs.wvr[i];
         }
+        exception_request_flags_from_server( &to->ContextFlags, from );
         return STATUS_SUCCESS;
     }
 
diff --git a/server/protocol.def b/server/protocol.def
index ac14467f330..99396170aef 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -125,6 +125,14 @@ typedef union
     } unload_dll;
 } debug_event_t;
 
+
+enum context_exec_space
+{
+    EXEC_SPACE_USERMODE,
+    EXEC_SPACE_SYSCALL,
+    EXEC_SPACE_EXCEPTION,
+};
+
 /* context data */
 typedef struct
 {
@@ -171,6 +179,10 @@ typedef struct
         unsigned char i386_regs[512];
     } ext;                       /* selected by SERVER_CTX_EXTENDED_REGISTERS */
     union
+    {
+        struct { enum context_exec_space space; int __pad; } space;
+    } exec_space;                /* selected by SERVER_CTX_EXEC_SPACE */
+    union
     {
         struct { struct { unsigned __int64 low, high; } ymm_high[16]; } regs;
     } ymm;                       /* selected by SERVER_CTX_YMM_REGISTERS */
@@ -183,6 +195,7 @@ typedef struct
 #define SERVER_CTX_DEBUG_REGISTERS    0x10
 #define SERVER_CTX_EXTENDED_REGISTERS 0x20
 #define SERVER_CTX_YMM_REGISTERS      0x40
+#define SERVER_CTX_EXEC_SPACE         0x80
 
 /* structure used in sending an fd from client to server */
 struct send_fd
diff --git a/server/thread.c b/server/thread.c
index e54e83c178a..0620686399d 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1564,6 +1564,7 @@ static void copy_context( context_t *to, const context_t *from, unsigned int fla
     if (flags & SERVER_CTX_DEBUG_REGISTERS) to->debug = from->debug;
     if (flags & SERVER_CTX_EXTENDED_REGISTERS) to->ext = from->ext;
     if (flags & SERVER_CTX_YMM_REGISTERS) to->ymm = from->ymm;
+    if (flags & SERVER_CTX_EXEC_SPACE) to->exec_space = from->exec_space;
 }
 
 /* gets the current impersonation token */
@@ -2224,14 +2225,14 @@ DECL_HANDLER(set_thread_context)
             /* If context is in a pending state, we don't know if we will use WoW or native
              * context, so store both and discard irrevelant one in select request. */
             const int is_pending = thread->context->status == STATUS_PENDING;
-            unsigned int native_flags = contexts[CTX_NATIVE].flags;
+            unsigned int native_flags = contexts[CTX_NATIVE].flags & ~SERVER_CTX_EXEC_SPACE;
 
             if (ctx_count == 2 && (is_pending || thread->context->regs[CTX_WOW].machine))
             {
                 context_t *ctx = &thread->context->regs[CTX_WOW];
 
                 /* some regs are always set from the native context */
-                flags = contexts[CTX_WOW].flags & ~req->native_flags;
+                flags = contexts[CTX_WOW].flags & ~(req->native_flags | SERVER_CTX_EXEC_SPACE);
                 if (is_pending) ctx->machine = contexts[CTX_WOW].machine;
                 else native_flags &= req->native_flags;
 
diff --git a/server/trace.c b/server/trace.c
index 313a4541a1a..a44836e6543 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -840,6 +840,19 @@ static void dump_varargs_context( const char *prefix, data_size_t size )
         fprintf( stderr, "%s{machine=%04x", prefix, ctx.machine );
         break;
     }
+    if (ctx.flags & SERVER_CTX_EXEC_SPACE)
+    {
+        const char *space;
+
+        switch (ctx.exec_space.space.space)
+        {
+        case EXEC_SPACE_USERMODE:  space = "user"; break;
+        case EXEC_SPACE_SYSCALL:   space = "syscall"; break;
+        case EXEC_SPACE_EXCEPTION: space = "exception"; break;
+        default:                   space = "invalid"; break;
+        }
+        fprintf( stderr, ",exec_space=%s", space );
+    }
     fputc( '}', stderr );
     remove_data( size );
 }
diff --git a/tools/make_requests b/tools/make_requests
index 77b5ab331f4..b450e22c2b8 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -54,7 +54,7 @@ my %formats =
     "hw_input_t"    => [  40,  8,  "&dump_hw_input" ],
     # varargs-only structures
     "apc_call_t"               => [  64,  8 ],
-    "context_t"                => [  1720,  8 ],
+    "context_t"                => [  1728,  8 ],
     "cursor_pos_t"             => [  24,  8 ],
     "debug_event_t"            => [  160,  8 ],
     "message_data_t"           => [  56,  8 ],

From 00eb20380a50d5ec2616b2b96f2ccf2c32e1412c Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 9 Apr 2024 18:00:11 -0600
Subject: [PATCH 374/389] ntdll: Store exception reporting flags on suspend.

CW-Bug-Id: #23654
---
 dlls/ntdll/tests/exception.c    | 10 +++++-----
 dlls/ntdll/unix/signal_arm.c    |  9 +++++++--
 dlls/ntdll/unix/signal_arm64.c  |  9 +++++++--
 dlls/ntdll/unix/signal_i386.c   |  4 +++-
 dlls/ntdll/unix/signal_x86_64.c |  6 ++++--
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index c7ba65795de..5b0d0662fbb 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -4714,7 +4714,7 @@ static void test_wow64_context(void)
         {
             trace( "in 64-bit mode %04x\n", context.SegCs );
             if (ctx.ContextFlags & CONTEXT_EXCEPTION_REPORTING)
-                todo_wine ok( ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
+                ok( ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
                     | CONTEXT_EXCEPTION_REPORTING | CONTEXT_SERVICE_ACTIVE)
                     || ctx.ContextFlags == (WOW64_CONTEXT_ALL | CONTEXT_EXCEPTION_REQUEST
                     | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE),
@@ -12523,8 +12523,8 @@ static void test_context_exception_request(void)
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags || broken( c.ContextFlags == (CONTEXT_CONTROL
-                  | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING)) /* Win7 64 */, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags || broken( c.ContextFlags == (CONTEXT_CONTROL
+        | CONTEXT_EXCEPTION_REQUEST | CONTEXT_EXCEPTION_REPORTING)) /* Win7 64 */, "got %#lx.\n", c.ContextFlags );
 
     p.sync = 0;
     ResumeThread(thread);
@@ -12566,7 +12566,7 @@ static void test_context_exception_request(void)
     c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     c.ContextFlags = CONTEXT_CONTROL;
     ret = SetThreadContext( thread, &c );
@@ -12576,7 +12576,7 @@ static void test_context_exception_request(void)
                      | CONTEXT_EXCEPTION_ACTIVE;
     ret = GetThreadContext( thread, &c );
     ok( ret, "got error %lu.\n", GetLastError() );
-    todo_wine ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
+    ok( c.ContextFlags == expected_flags, "got %#lx.\n", c.ContextFlags );
 
     SetEvent( p.event );
 
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index 56a897fcdd0..0484e57eb8c 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -1525,7 +1525,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 
     if (is_inside_syscall( sigcontext ))
     {
-        context.ContextFlags = CONTEXT_FULL;
+        context.ContextFlags = CONTEXT_FULL | CONTEXT_EXCEPTION_REQUEST;
         NtGetContextThread( GetCurrentThread(), &context );
         wait_suspend( &context );
         NtSetContextThread( GetCurrentThread(), &context );
@@ -1533,6 +1533,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
     else
     {
         save_context( &context, sigcontext );
+        context.ContextFlags |= CONTEXT_EXCEPTION_REPORTING;
         wait_suspend( &context );
         restore_context( &context, sigcontext );
     }
@@ -1639,7 +1640,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
     if (context.Pc & 1) context.Cpsr |= 0x20; /* thumb mode */
     if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) *ctx = context;
 
-    if (suspend) wait_suspend( &context );
+    if (suspend)
+    {
+        context.ContextFlags |= CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
+        wait_suspend( &context );
+    }
 
     ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1;
     *ctx = context;
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 6785d56d7f2..5afc2cc2b91 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -1494,7 +1494,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
 
     if (is_inside_syscall( sigcontext ))
     {
-        context.ContextFlags = CONTEXT_FULL;
+        context.ContextFlags = CONTEXT_FULL | CONTEXT_EXCEPTION_REQUEST;
         NtGetContextThread( GetCurrentThread(), &context );
         wait_suspend( &context );
         NtSetContextThread( GetCurrentThread(), &context );
@@ -1502,6 +1502,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
     else
     {
         save_context( &context, sigcontext );
+        context.ContextFlags |= CONTEXT_EXCEPTION_REPORTING;
         wait_suspend( &context );
         restore_context( &context, sigcontext );
     }
@@ -1687,7 +1688,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
         if (arm_context->Pc & 1) arm_context->Cpsr |= 0x20; /* thumb mode */
     }
 
-    if (suspend) wait_suspend( &context );
+    if (suspend)
+    {
+        context.ContextFlags |= CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
+        wait_suspend( &context );
+    }
 
     ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1;
     *ctx = context;
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 876a683617f..61df990ce61 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -2159,7 +2159,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
             ERR_(seh)( "kernel stack overflow.\n" );
             return;
         }
-        context->c.ContextFlags = CONTEXT_FULL;
+        context->c.ContextFlags = CONTEXT_FULL | CONTEXT_EXCEPTION_REQUEST;
         NtGetContextThread( GetCurrentThread(), &context->c );
         if (xstate_extended_features())
         {
@@ -2182,6 +2182,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
         struct xcontext context;
 
         save_context( &context, ucontext );
+        context.c.ContextFlags |= CONTEXT_EXCEPTION_REPORTING;
         wait_suspend( &context.c );
         restore_context( &context, ucontext );
     }
@@ -2551,6 +2552,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
 
     if (suspend)
     {
+        context.ContextFlags |= CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
         wait_suspend( &context );
         if (context.ContextFlags & CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)
         {
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 847ede602fc..c4790a00b47 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2516,7 +2516,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
             ERR_(seh)( "kernel stack overflow.\n" );
             return;
         }
-        context->c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS;
+        context->c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_EXCEPTION_REQUEST;
         NtGetContextThread( GetCurrentThread(), &context->c );
         if (xstate_extended_features())
         {
@@ -2539,6 +2539,8 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
         struct xcontext context;
 
         save_context( &context, ucontext );
+        context.c.ContextFlags |= CONTEXT_EXCEPTION_REPORTING;
+        if (is_wow64() && context.c.SegCs == cs64_sel) context.c.ContextFlags |= CONTEXT_EXCEPTION_ACTIVE;
         wait_suspend( &context.c );
         restore_context( &context, ucontext );
     }
@@ -2885,7 +2887,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
 # error Please define setting %gs for your architecture
 #endif
 
-    context.ContextFlags = CONTEXT_ALL;
+    context.ContextFlags = CONTEXT_ALL | CONTEXT_EXCEPTION_REPORTING | CONTEXT_EXCEPTION_ACTIVE;
     context.Rcx    = (ULONG_PTR)entry;
     context.Rdx    = (ULONG_PTR)arg;
     context.Rsp    = (ULONG_PTR)teb->Tib.StackBase - 0x28;

From 1875b212f0ad43379006e14e462469ee3d492234 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 8 Apr 2024 10:47:02 -0600
Subject: [PATCH 375/389] ntdll: Store exception reporting flags for debug
 events.

CW-Bug-Id: #23654
---
 dlls/ntdll/tests/exception.c    | 6 +++---
 dlls/ntdll/unix/signal_arm.c    | 2 +-
 dlls/ntdll/unix/signal_arm64.c  | 2 +-
 dlls/ntdll/unix/signal_i386.c   | 2 +-
 dlls/ntdll/unix/signal_x86_64.c | 2 +-
 dlls/ntdll/unix/thread.c        | 6 ++++--
 dlls/ntdll/unix/unix_private.h  | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 5b0d0662fbb..1d1c9697713 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -287,7 +287,7 @@ static void check_context_exception_request_( DWORD flags, BOOL hardware_excepti
 
     if (!(flags & CONTEXT_EXCEPTION_REPORTING)) return;
     expected_flags |= hardware_exception ? CONTEXT_EXCEPTION_ACTIVE : CONTEXT_SERVICE_ACTIVE;
-    todo_wine ok_(__FILE__, line)( (flags & exception_reporting_flags) == expected_flags, "got %#lx, expected %#lx.\n",
+    ok_(__FILE__, line)( (flags & exception_reporting_flags) == expected_flags, "got %#lx, expected %#lx.\n",
                          flags, expected_flags );
 }
 #endif
@@ -12591,7 +12591,7 @@ static void test_context_exception_request(void)
         c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
         ret = GetThreadContext( thread, &c );
         ok( ret, "got error %lu.\n", GetLastError() );
-        todo_wine ok( c.ContextFlags == expected_flags, "got %#lx, expected %#lx.\n", c.ContextFlags, expected_flags );
+        ok( c.ContextFlags == expected_flags, "got %#lx, expected %#lx.\n", c.ContextFlags, expected_flags );
 
         WriteRelease( &p.sync, 4 );
     }
@@ -12625,7 +12625,7 @@ static void test_context_exception_request(void)
         c.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST;
         ret = GetThreadContext( thread, &c );
         ok( ret, "got error %lu.\n", GetLastError() );
-        todo_wine ok( c.ContextFlags == expected_flags, "got %#lx, expected %#lx.\n", c.ContextFlags, expected_flags );
+        ok( c.ContextFlags == expected_flags, "got %#lx, expected %#lx.\n", c.ContextFlags, expected_flags );
 
         WriteRelease( &p.sync, 8 );
     }
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index 0484e57eb8c..dbad562c6d3 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -1071,7 +1071,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec )
     rec->ExceptionAddress = (void *)PC_sig(sigcontext);
     save_context( &context, sigcontext );
 
-    status = send_debug_event( rec, &context, TRUE );
+    status = send_debug_event( rec, &context, TRUE, TRUE );
     if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
     {
         restore_context( &context, sigcontext );
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 5afc2cc2b91..a4bae5563a8 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -982,7 +982,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec )
     rec->ExceptionAddress = (void *)PC_sig(sigcontext);
     save_context( &context, sigcontext );
 
-    status = send_debug_event( rec, &context, TRUE );
+    status = send_debug_event( rec, &context, TRUE, TRUE );
     if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
     {
         restore_context( &context, sigcontext );
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 61df990ce61..faf09c05371 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1465,7 +1465,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr,
     struct exc_stack_layout *stack;
     size_t stack_size;
     unsigned int xstate_size;
-    NTSTATUS status = send_debug_event( rec, context, TRUE );
+    NTSTATUS status = send_debug_event( rec, context, TRUE, TRUE );
 
     if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
     {
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index c4790a00b47..be9af2c23d1 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1451,7 +1451,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec
         context->EFlags &= ~0x100;  /* clear single-step flag */
     }
 
-    status = send_debug_event( rec, context, TRUE );
+    status = send_debug_event( rec, context, TRUE, TRUE );
     if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
     {
         restore_context( xcontext, sigcontext );
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 65fa0aa9894..c3ab1317295 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -1506,7 +1506,7 @@ void wait_suspend( CONTEXT *context )
  *
  * Send an EXCEPTION_DEBUG_EVENT event to the debugger.
  */
-NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
+NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance, BOOL exception )
 {
     unsigned int ret;
     DWORD i;
@@ -1543,6 +1543,8 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c
         select_op.wait.handles[0] = handle;
 
         contexts_to_server( server_contexts, context );
+        server_contexts[0].flags |= SERVER_CTX_EXEC_SPACE;
+        server_contexts[0].exec_space.space.space = exception ? EXEC_SPACE_EXCEPTION : EXEC_SPACE_SYSCALL;
         server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE,
                        TIMEOUT_INFINITE, server_contexts, NULL );
 
@@ -1565,7 +1567,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c
  */
 NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
 {
-    NTSTATUS status = send_debug_event( rec, context, first_chance );
+    NTSTATUS status = send_debug_event( rec, context, first_chance, !(is_win64 || is_wow64() || is_old_wow64()) );
 
     if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
         return NtContinue( context, FALSE );
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 97546ca1797..2b62d5c7754 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -257,7 +257,7 @@ extern void DECLSPEC_NORETURN abort_thread( int status );
 extern void DECLSPEC_NORETURN abort_process( int status );
 extern void DECLSPEC_NORETURN exit_process( int status );
 extern void wait_suspend( CONTEXT *context );
-extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance );
+extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance, BOOL exception );
 extern BOOL validate_context_xstate( CONTEXT *context );
 extern NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USHORT machine );
 extern NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT machine );

From d1b39200a3ff39607a7a3341405b0b3656082705 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 9 Apr 2024 20:36:26 -0600
Subject: [PATCH 376/389] Revert "ntdll: Add WINE_DISABLE_WRITE_WATCH env var
 to disable write watch support."

This reverts commit 60b7ce66f2d4c96240dd8baf8e0e9110d4ebd14b.

CW-Bug-Id: #23654
---
 dlls/ntdll/unix/virtual.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index b4d0cec3a21..6c1dc3a8b88 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -4998,22 +4998,6 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ
     SIZE_T size = *size_ptr;
     NTSTATUS status = STATUS_SUCCESS;
 
-    if (type & MEM_WRITE_WATCH)
-    {
-        static int disable = -1;
-
-        if (disable == -1)
-        {
-            const char *env_var;
-
-            if ((disable = (env_var = getenv("WINE_DISABLE_WRITE_WATCH")) && atoi(env_var)))
-                FIXME("Disabling write watch support.\n");
-        }
-
-        if (disable)
-            return STATUS_NOT_SUPPORTED;
-    }
-
     /* Round parameters to a page boundary */
 
     if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE;

From 9f5933b8b2c9654ac00625acadf1b06af6938df7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 19 Jan 2024 13:42:14 +0100
Subject: [PATCH 377/389] winevulkan: Return result through NtCallbackReturn
 for the debug callbacks.

(cherry picked from commit 643538a836f33b4996730cf05dc2af77667d6150)
---
 dlls/winevulkan/loader.c | 14 +++++++++-----
 dlls/winevulkan/vulkan.c | 13 ++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c
index dbb44c556f6..e35b4f42427 100644
--- a/dlls/winevulkan/loader.c
+++ b/dlls/winevulkan/loader.c
@@ -625,15 +625,19 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32
     }
 }
 
-static BOOL WINAPI call_vulkan_debug_report_callback( struct wine_vk_debug_report_params *params, ULONG size )
+static NTSTATUS WINAPI call_vulkan_debug_report_callback( void *args, ULONG size )
 {
-    return params->user_callback(params->flags, params->object_type, params->object_handle, params->location,
-                                 params->code, params->layer_prefix, params->message, params->user_data);
+    struct wine_vk_debug_report_params *params = args;
+    VkBool32 ret = params->user_callback(params->flags, params->object_type, params->object_handle, params->location,
+                                         params->code, params->layer_prefix, params->message, params->user_data);
+    return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS );
 }
 
-static BOOL WINAPI call_vulkan_debug_utils_callback( struct wine_vk_debug_utils_params *params, ULONG size )
+static NTSTATUS WINAPI call_vulkan_debug_utils_callback( void *args, ULONG size )
 {
-    return params->user_callback(params->severity, params->message_types, &params->data, params->user_data);
+    struct wine_vk_debug_utils_params *params = args;
+    VkBool32 ret = params->user_callback(params->severity, params->message_types, &params->data, params->user_data);
+    return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS );
 }
 
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 885af7ae970..e4e437327f3 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -169,7 +169,6 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB
     struct wine_debug_utils_messenger *object;
     void *ret_ptr;
     ULONG ret_len;
-    VkBool32 result;
     unsigned int i;
 
     TRACE("%i, %u, %p, %p\n", severity, message_types, callback_data, user_data);
@@ -217,12 +216,11 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB
     params.data.pObjects = object_name_infos;
 
     /* applications should always return VK_FALSE */
-    result = KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params),
-                                 &ret_ptr, &ret_len );
+    KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params), &ret_ptr, &ret_len );
 
     free(object_name_infos);
-
-    return result;
+    if (ret_len == sizeof(VkBool32)) return *(VkBool32 *)ret_ptr;
+    return VK_FALSE;
 }
 
 static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type,
@@ -258,8 +256,9 @@ static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, Vk
     if (!params.object_handle)
         params.object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT;
 
-    return KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params),
-                               &ret_ptr, &ret_len );
+    KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params), &ret_ptr, &ret_len );
+    if (ret_len == sizeof(VkBool32)) return *(VkBool32 *)ret_ptr;
+    return VK_FALSE;
 }
 
 static void wine_vk_physical_device_free(struct wine_phys_dev *phys_dev)

From ae2f9792e462559be77532406c6eecd242dbb4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sat, 25 Nov 2023 01:44:49 +0100
Subject: [PATCH 378/389] winevulkan: Keep the create_info HWND on the surface
 wrappers.

(cherry picked from commit 982c2ede7a8e1bda5f10d5a662448948b04efbb8)
---
 dlls/winevulkan/vulkan.c         | 16 ++++++----------
 dlls/winevulkan/vulkan_private.h |  3 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index e4e437327f3..818f8e8655c 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -2566,24 +2566,20 @@ VkResult wine_vkCreateSwapchainKHR(VkDevice device_handle, const VkSwapchainCrea
     return res;
 }
 
-VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCreateInfoKHR *createInfo,
+VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCreateInfoKHR *create_info,
                                       const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface)
 {
     struct wine_instance *instance = wine_instance_from_handle(handle);
     struct wine_surface *object;
     VkResult res;
 
-    if (allocator)
-        FIXME("Support for allocation callbacks not implemented yet\n");
-
-    object = calloc(1, sizeof(*object));
-
-    if (!object)
-        return VK_ERROR_OUT_OF_HOST_MEMORY;
+    if (allocator) FIXME("Support for allocation callbacks not implemented yet\n");
 
-    res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->host_instance, createInfo, NULL,
-                                                    &object->driver_surface);
+    if (!(object = calloc(1, sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY;
+    object->hwnd = create_info->hwnd;
 
+    res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->host_instance, create_info,
+                                                    NULL /* allocator */, &object->driver_surface);
     if (res != VK_SUCCESS)
     {
         free(object);
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index ffae94adbe4..800036d2c2d 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -324,7 +324,8 @@ static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle(
 struct wine_surface
 {
     VkSurfaceKHR host_surface;
-    VkSurfaceKHR driver_surface; /* wine driver surface */
+    VkSurfaceKHR driver_surface;
+    HWND hwnd;
 
     struct wine_vk_mapping mapping;
 };

From 6df0775d2b15ab555de9fc7354a581412854526b Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Wed, 21 Feb 2024 14:28:49 +0100
Subject: [PATCH 379/389] winevulkan: Rename wine_device_memory mapping to
 vm_map.

To avoid conflict with handle mapping macros.

(cherry picked from commit 84e462070658464576e73c8a836ccab8fb296734)
---
 dlls/winevulkan/vulkan.c         | 12 ++++++------
 dlls/winevulkan/vulkan_private.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 818f8e8655c..073ae5faf51 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -3291,7 +3291,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo
         return result;
     }
 
-    memory->mapping = mapping;
+    memory->vm_map = mapping;
     *ret = wine_device_memory_to_handle(memory);
     return VK_SUCCESS;
 }
@@ -3308,10 +3308,10 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl
     destroy_keyed_mutex(device, memory);
     device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL);
 
-    if (memory->mapping)
+    if (memory->vm_map)
     {
         SIZE_T alloc_size = 0;
-        NtFreeVirtualMemory(GetCurrentProcess(), &memory->mapping, &alloc_size, MEM_RELEASE);
+        NtFreeVirtualMemory(GetCurrentProcess(), &memory->vm_map, &alloc_size, MEM_RELEASE);
     }
 
     if (memory->handle != INVALID_HANDLE_VALUE)
@@ -3343,9 +3343,9 @@ VkResult wine_vkMapMemory2KHR(VkDevice handle, const VkMemoryMapInfoKHR *map_inf
     VkResult result;
 
     info.memory = memory->host_memory;
-    if (memory->mapping)
+    if (memory->vm_map)
     {
-        *data = (char *)memory->mapping + info.offset;
+        *data = (char *)memory->vm_map + info.offset;
         TRACE("returning %p\n", *data);
         return VK_SUCCESS;
     }
@@ -3391,7 +3391,7 @@ VkResult wine_vkUnmapMemory2KHR(VkDevice handle, const VkMemoryUnmapInfoKHR *unm
     struct wine_device_memory *memory = wine_device_memory_from_handle(unmap_info->memory);
     VkMemoryUnmapInfoKHR info;
 
-    if (memory->mapping)
+    if (memory->vm_map)
         return VK_SUCCESS;
 
     if (!device->funcs.p_vkUnmapMemory2KHR)
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index 800036d2c2d..fe579ee7d9a 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -269,7 +269,7 @@ struct wine_device_memory
     BOOL inherit;
     DWORD access;
     HANDLE handle;
-    void *mapping;
+    void *vm_map;
     struct keyed_mutex_shm *keyed_mutex_shm;
     VkSemaphore keyed_mutex_sem;
     uint64_t keyed_mutex_instance_id;

From 25613b465686357b599a25a2409beef9fb34c941 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Wed, 21 Feb 2024 14:48:13 +0100
Subject: [PATCH 380/389] winevulkan: Use handle map for memory objects.

(cherry picked from commit 64914849ac42cebd6d6f6b88ae8b16d22e493184)
---
 dlls/winevulkan/vulkan.c         | 2 ++
 dlls/winevulkan/vulkan_private.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 073ae5faf51..16f1b30c7c6 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -3291,6 +3291,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo
         return result;
     }
 
+    WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, memory, memory->host_memory, memory);
     memory->vm_map = mapping;
     *ret = wine_device_memory_to_handle(memory);
     return VK_SUCCESS;
@@ -3306,6 +3307,7 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl
     memory = wine_device_memory_from_handle(memory_handle);
 
     destroy_keyed_mutex(device, memory);
+    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, memory);
     device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL);
 
     if (memory->vm_map)
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index fe579ee7d9a..ecd148ea48a 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -273,6 +273,8 @@ struct wine_device_memory
     struct keyed_mutex_shm *keyed_mutex_shm;
     VkSemaphore keyed_mutex_sem;
     uint64_t keyed_mutex_instance_id;
+
+    struct wine_vk_mapping mapping;
 };
 
 static inline VkDeviceMemory wine_device_memory_to_handle(struct wine_device_memory *device_memory)

From 878376338c5471d33a9d56e2ed4c674aac380cb0 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Wed, 10 Apr 2024 01:19:25 +0300
Subject: [PATCH 381/389] winevulkan: Remove handle mapping after host destory
 is called.

For VK_EXT_debug_utils callbacks on destroy / free.
---
 dlls/winevulkan/vulkan.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 16f1b30c7c6..aeb4c425df8 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -684,8 +684,8 @@ static void wine_vk_device_free(struct wine_device *device)
 
     if (device->host_device && device->funcs.p_vkDestroyDevice)
     {
-        WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device);
         device->funcs.p_vkDestroyDevice(device->host_device, NULL /* pAllocator */);
+        WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device);
     }
 
     free(device);
@@ -1419,9 +1419,8 @@ void wine_vkDestroyCommandPool(VkDevice device_handle, VkCommandPool handle,
     if (allocator)
         FIXME("Support for allocation callbacks not implemented yet\n");
 
-    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, pool);
-
     device->funcs.p_vkDestroyCommandPool(device->host_device, pool->host_command_pool, NULL);
+    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, pool);
     free(pool);
 }
 
@@ -3307,8 +3306,8 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl
     memory = wine_device_memory_from_handle(memory_handle);
 
     destroy_keyed_mutex(device, memory);
-    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, memory);
     device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL);
+    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, memory);
 
     if (memory->vm_map)
     {
@@ -3671,9 +3670,9 @@ void wine_vkDestroySwapchainKHR(VkDevice device_handle, VkSwapchainKHR handle, c
         free(swapchain->fs_hack_images);
     }
 
-    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, swapchain);
 
     device->funcs.p_vkDestroySwapchainKHR(device->host_device, swapchain->host_swapchain, NULL);
+    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, swapchain);
     free(swapchain);
 }
 
@@ -4813,8 +4812,8 @@ void wine_vkDestroySemaphore(VkDevice device_handle, VkSemaphore semaphore_handl
     if (semaphore->d3d12_fence_shm)
         NtUnmapViewOfSection(GetCurrentProcess(), semaphore->d3d12_fence_shm);
 
-    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, semaphore);
     device->funcs.p_vkDestroySemaphore(device->host_device, semaphore->semaphore, NULL);
+    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, semaphore);
 
     if (semaphore->fence_timeline_semaphore)
         device->funcs.p_vkDestroySemaphore(device->host_device, semaphore->fence_timeline_semaphore, NULL);

From 7885c8964957ccbf5ac07220fd5c437ad5d3eb0c Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Tue, 26 Mar 2024 11:01:56 +0800
Subject: [PATCH 382/389] fshack: winex11.drv: Introduce
 fs_hack_is_window_rect_fullscreen().

Introduce fs_hack_is_window_rect_fullscreen() and it replaces fs_hack_matches_current_mode()
for determining whether fshack should be enabled for a window. The difference
is that the new function considers a window with a rectangle larger than the
monitor rectangle also fullscreen. This is actually closer to the behavior of
NtUserIsWindowRectFullScreen(). Ideally, we should enable fshack for all windows
and scale them all when a ChangeDisplaySetting() call is made to change resolutions.
But that would be a bigger change and has higher overhead so let's not do that
unless necessary.

Another reason for this change is to avoid a black screen issue on Nvidia drivers.
For example, on Arch Linux with Nvidia driver 550. Call of Juarez (21980) changes
the resolution to 1024x768 then changes the game window to (-3, -22, 1030, 793).
Because the new window rectangle doesn't match the fake monitor resolution, fshack
is disabled for the window and its client window gets resized to the unscaled one.
However, the fshack monitor still has the fake 1024x768 so Vulkan swapchains need
to draw to a surface with the physical resolution. Because the unscaled client window
is smaller than the physical resolution, vkAcquireNextImageKHR() always returns
VK_ERROR_OUT_OF_DATE_KHR on Nvidia drivers. Of course, because Nvidia drivers are
proprietary so I can't confirm this is the exact cause.

CW-Bug-Id: #23466
---
 dlls/winex11.drv/fs.c     | 14 +++++++-------
 dlls/winex11.drv/window.c | 12 +++++-------
 dlls/winex11.drv/x11drv.h |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dlls/winex11.drv/fs.c b/dlls/winex11.drv/fs.c
index bda79419c69..73824021060 100644
--- a/dlls/winex11.drv/fs.c
+++ b/dlls/winex11.drv/fs.c
@@ -720,21 +720,21 @@ RECT fs_hack_real_mode( HMONITOR monitor )
     return rect;
 }
 
-/* Return whether width and height are the same as the current mode used by a monitor */
-BOOL fs_hack_matches_current_mode( HMONITOR monitor, INT width, INT height )
+/* Return whether a window rectangle is fullscreen on a fshack monitor */
+BOOL fs_hack_is_window_rect_fullscreen( HMONITOR monitor, const RECT *rect )
 {
     MONITORINFO info = {.cbSize = sizeof(MONITORINFO)};
-    BOOL matched;
+    BOOL fullscreen;
 
     TRACE( "monitor %p\n", monitor );
 
     if (!NtUserGetMonitorInfo( monitor, &info )) return FALSE;
 
-    matched = (width == info.rcMonitor.right - info.rcMonitor.left) &&
-              (height == info.rcMonitor.bottom - info.rcMonitor.top);
-    TRACE( "matched: %s\n", matched ? "TRUE" : "FALSE" );
+    fullscreen = rect->left <= info.rcMonitor.left && rect->right >= info.rcMonitor.right &&
+                 rect->top <= info.rcMonitor.top && rect->bottom >= info.rcMonitor.bottom;
+    TRACE( "fullscreen: %s\n", fullscreen ? "TRUE" : "FALSE" );
 
-    return matched;
+    return fullscreen;
 }
 
 /* Transform a point in user virtual screen coordinates to real virtual screen coordinates */
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 29773e871b0..3f64774d2cb 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -3135,9 +3135,9 @@ BOOL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
 
     if (!data && !(data = X11DRV_create_win_data( hwnd, window_rect, client_rect ))) return TRUE;
 
+
     monitor = fs_hack_monitor_from_rect( window_rect );
-    if (fs_hack_enabled( monitor ) && fs_hack_matches_current_mode( monitor, window_rect->right - window_rect->left,
-                                                                    window_rect->bottom - window_rect->top ))
+    if (fs_hack_enabled( monitor ) && fs_hack_is_window_rect_fullscreen( monitor, window_rect ))
         window_update_fshack( data, window_rect, client_rect, monitor, TRUE );
     else
         window_update_fshack( data, window_rect, client_rect, monitor, FALSE );
@@ -3500,7 +3500,7 @@ UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
     monitor = fs_hack_monitor_from_rect( rect );
     if (data->fs_hack ||
         (fs_hack_enabled( monitor ) &&
-         fs_hack_matches_current_mode( monitor, rect->right - rect->left, rect->bottom - rect->top )))
+         fs_hack_is_window_rect_fullscreen( monitor, rect )))
     {
         MONITORINFO info = {.cbSize = sizeof(MONITORINFO)};
         NtUserGetMonitorInfo( monitor, &info );
@@ -3757,8 +3757,7 @@ static void handle_window_desktop_resize( struct x11drv_win_data *data, UINT old
     HMONITOR monitor = fs_hack_monitor_from_hwnd( data->hwnd );
 
     if (fs_hack_mapping_required( monitor ) &&
-        fs_hack_matches_current_mode( monitor, data->whole_rect.right - data->whole_rect.left,
-                                      data->whole_rect.bottom - data->whole_rect.top ))
+        fs_hack_is_window_rect_fullscreen( monitor, &data->whole_rect ))
     {
         window_update_fshack( data, NULL, NULL, monitor, TRUE );
         return;
@@ -3783,8 +3782,7 @@ static void handle_window_desktop_resize( struct x11drv_win_data *data, UINT old
     }
 
     if (!fs_hack_mapping_required( monitor ) ||
-        !fs_hack_matches_current_mode( monitor, data->whole_rect.right - data->whole_rect.left,
-                                       data->whole_rect.bottom - data->whole_rect.top ))
+        !fs_hack_is_window_rect_fullscreen( monitor, &data->whole_rect ))
         window_update_fshack( data, NULL, NULL, monitor, FALSE );
 }
 
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index d60432a68e8..da610e060a6 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -710,7 +710,7 @@ extern BOOL fs_hack_mapping_required( HMONITOR monitor );
 extern BOOL fs_hack_is_integer(void);
 extern HMONITOR fs_hack_monitor_from_hwnd( HWND hwnd );
 extern HMONITOR fs_hack_monitor_from_rect( const RECT *rect );
-extern BOOL fs_hack_matches_current_mode( HMONITOR monitor, INT width, INT height );
+extern BOOL fs_hack_is_window_rect_fullscreen( HMONITOR monitor, const RECT *rect );
 extern RECT fs_hack_current_mode( HMONITOR monitor );
 extern RECT fs_hack_real_mode( HMONITOR monitor );
 extern void fs_hack_point_user_to_real( POINT *pos );

From 7e89d722a4466c3ab95b724b69800e0fec7b48d6 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 10 Apr 2024 20:25:06 -0600
Subject: [PATCH 383/389] win32u: Store desktop flags in shared memory and use
 that in is_virtual_desktop().

CW-Bug-Id: #23665
---
 dlls/win32u/winstation.c | 15 ++++++++++-----
 server/protocol.def      |  1 +
 server/winstation.c      | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c
index 2887e104c4a..fbede26d8a8 100644
--- a/dlls/win32u/winstation.c
+++ b/dlls/win32u/winstation.c
@@ -42,12 +42,17 @@ WINE_DECLARE_DEBUG_CHANNEL(win);
 
 BOOL is_virtual_desktop(void)
 {
-    HANDLE desktop = NtUserGetThreadDesktop( GetCurrentThreadId() );
-    USEROBJECTFLAGS flags = {0};
-    DWORD len;
+    const desktop_shm_t *desktop = get_desktop_shared_memory();
+    unsigned int flags;
+
+    if (!desktop) return FALSE;
+    SHARED_READ_BEGIN( desktop, desktop_shm_t )
+    {
+        flags = desktop->flags;
+    }
+    SHARED_READ_END
 
-    if (!NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len )) return FALSE;
-    return !!(flags.dwFlags & DF_WINE_CREATE_DESKTOP);
+    return !!(flags & DF_WINE_CREATE_DESKTOP);
 }
 
 /***********************************************************************
diff --git a/server/protocol.def b/server/protocol.def
index 99396170aef..aef47aa3a7b 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -928,6 +928,7 @@ struct desktop_shared_memory
     unsigned char        keystate[256];    /* asynchronous key state */
     thread_id_t          foreground_tid;   /* tid of the foreground thread */
     __int64              update_serial;
+    unsigned int         flags;
 };
 typedef volatile struct desktop_shared_memory desktop_shm_t;
 
diff --git a/server/winstation.c b/server/winstation.c
index 0cf17d00759..534078a5813 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -136,6 +136,27 @@ static const struct object_ops desktop_ops =
     desktop_destroy               /* destroy */
 };
 
+#if defined(__i386__) || defined(__x86_64__)
+#define __SHARED_INCREMENT_SEQ( x ) ++(x)
+#else
+#define __SHARED_INCREMENT_SEQ( x ) __atomic_add_fetch( &(x), 1, __ATOMIC_RELEASE )
+#endif
+
+#define SHARED_WRITE_BEGIN( object, type )                           \
+    do {                                                             \
+        const type *__shared = (object)->shared;                     \
+        type *shared = (type *)__shared;                             \
+        unsigned int __seq = __SHARED_INCREMENT_SEQ( shared->seq );  \
+        assert( (__seq & 1) != 0 );                                  \
+        do
+
+#define SHARED_WRITE_END                                             \
+        while(0);                                                    \
+        __seq = __SHARED_INCREMENT_SEQ( shared->seq ) - __seq;       \
+        assert( __seq == 1 );                                        \
+    } while(0);
+
+
 /* create a winstation object */
 static struct winstation *create_winstation( struct object *root, const struct unicode_str *name,
                                              unsigned int attr, unsigned int flags )
@@ -276,6 +297,11 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned
             desktop->flags |= (flags & DF_WINE_CREATE_DESKTOP);
             clear_error();
         }
+        SHARED_WRITE_BEGIN( desktop, desktop_shm_t )
+        {
+            shared->flags = desktop->flags;
+        }
+        SHARED_WRITE_END
     }
     return desktop;
 }
@@ -707,7 +733,15 @@ DECL_HANDLER(set_user_object_info)
         struct desktop *desktop = (struct desktop *)obj;
         reply->is_desktop = 1;
         reply->old_obj_flags = desktop->flags;
-        if (req->flags & SET_USER_OBJECT_SET_FLAGS) desktop->flags = req->obj_flags;
+        if (req->flags & SET_USER_OBJECT_SET_FLAGS)
+        {
+            desktop->flags = req->obj_flags;
+            SHARED_WRITE_BEGIN( desktop, desktop_shm_t )
+            {
+                shared->flags = desktop->flags;
+            }
+            SHARED_WRITE_END
+        }
         if (req->flags & SET_USER_OBJECT_SET_CLOSE_TIMEOUT) desktop->close_timeout_val = req->close_timeout;
     }
     else if (obj->ops == &winstation_ops)

From c3d309185319110c61d32f462ccbc1e2163c4b37 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Wed, 10 Apr 2024 20:25:45 -0600
Subject: [PATCH 384/389] user32: HACK: Avoid triggering displays update in
 GetDisplayConfigBufferSizes().

To be dropped on next rebase.

CW-Bug-Id: #23665
---
 dlls/user32/sysparams.c | 7 +++++++
 dlls/user32/user32.spec | 2 +-
 dlls/win32u/sysparams.c | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index b941f126a58..e91737cbcc2 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -999,3 +999,10 @@ LONG WINAPI SetDisplayConfig(UINT32 path_info_count, DISPLAYCONFIG_PATH_INFO *pa
 
     return ERROR_SUCCESS;
 }
+
+LONG WINAPI GetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_info,
+                                               UINT32 *num_mode_info )
+{
+    flags |= 0x40000000; /* HACK: avoid triggering display updates in NtUserGetDisplayConfigBufferSizes(). */
+    return NtUserGetDisplayConfigBufferSizes(flags, num_path_info, num_mode_info);
+}
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index e8d94f86af6..ffe5af2daa0 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -292,7 +292,7 @@
 @ stdcall GetDesktopWindow()
 @ stdcall GetDialogBaseUnits()
 @ stdcall GetDisplayAutoRotationPreferences(ptr)
-@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) NtUserGetDisplayConfigBufferSizes
+@ stdcall GetDisplayConfigBufferSizes(long ptr ptr)
 @ stdcall GetDlgCtrlID(long)
 @ stdcall GetDlgItem(long long)
 @ stdcall GetDlgItemInt(long long ptr long)
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index d505bde85f3..ac8ddb42af3 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -2427,6 +2427,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in
     volatile struct global_shared_memory *global_shared;
     struct monitor *monitor;
     UINT32 count = 0;
+    BOOL skip_update = FALSE;
 
     TRACE( "(0x%x %p %p)\n", flags, num_path_info, num_mode_info );
 
@@ -2435,6 +2436,12 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in
 
     *num_path_info = 0;
 
+    if (flags & 0x40000000)
+    {
+        flags &= ~0x40000000;
+        skip_update = TRUE;
+    }
+
     switch (flags)
     {
     case QDC_ALL_PATHS:
@@ -2450,7 +2457,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in
         FIXME( "only returning active paths\n" );
 
     /* NtUserGetDisplayConfigBufferSizes() is called by display drivers to trigger display settings update. */
-    if ((global_shared = get_global_shared_memory()))
+    if (!skip_update && (global_shared = get_global_shared_memory()))
         InterlockedIncrement( (LONG *)&global_shared->display_settings_serial );
 
     if (lock_display_devices())

From 9f43fa590ef7590549c06a4d34f5db63c38585c5 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Thu, 11 Apr 2024 20:02:03 +0300
Subject: [PATCH 385/389] winevulkan: Make client's device memory wrapper
 available to callback converter.

With VK_EXT_device_address_binding_report we can get debug_util
callbacks used to track memory bindings. Since it's the host's
implementation that starts the callback we have to be sure that we have
a way of converting it to the client side's variant before it's even
added to the handle map - i.e. we don't know the host handle at that
time yet.

ntuser_thread_info which is thread-local is used.
---
 dlls/winevulkan/vulkan.c | 27 +++++++++++++++++++++++++++
 include/ntuser.h         |  1 +
 2 files changed, 28 insertions(+)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index aeb4c425df8..c40309ee468 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -49,6 +49,28 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
 
+static void set_memory_being_allocated(struct wine_instance *instance, struct wine_device_memory *memory)
+{
+    struct ntuser_thread_info *thread_info;
+    if (!instance->enable_wrapper_list) return;
+    thread_info = NtUserGetThreadInfo();
+    thread_info->vulkan_data = (uintptr_t) memory;
+}
+
+static uint64_t get_memory_being_allocated(uint64_t host_handle)
+{
+    struct ntuser_thread_info *thread_info;
+    struct wine_device_memory *memory;
+
+    thread_info = NtUserGetThreadInfo();
+    if (!thread_info->vulkan_data) return 0;
+
+    memory = (struct wine_device_memory*) (uintptr_t) thread_info->vulkan_data;
+    memory->host_memory = host_handle;
+
+    return (uintptr_t) memory;
+}
+
 static int debug_level;
 
 static BOOL is_wow64(void)
@@ -200,6 +222,8 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB
         if (wine_vk_is_type_wrapped(callback_data->pObjects[i].objectType))
         {
             object_name_infos[i].objectHandle = wine_vk_get_wrapper(object->instance, callback_data->pObjects[i].objectHandle);
+            if (!object_name_infos[i].objectHandle && object_name_infos[i].objectType == VK_OBJECT_TYPE_DEVICE_MEMORY)
+                object_name_infos[i].objectHandle = get_memory_being_allocated(callback_data->pObjects[i].objectHandle);
             if (!object_name_infos[i].objectHandle)
             {
                 WARN("handle conversion failed 0x%s\n", wine_dbgstr_longlong(callback_data->pObjects[i].objectHandle));
@@ -3251,7 +3275,10 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo
         }
     }
 
+    set_memory_being_allocated(device->phys_dev->instance, memory);
     result = device->funcs.p_vkAllocateMemory(device->host_device, &info, NULL, &memory->host_memory);
+    set_memory_being_allocated(device->phys_dev->instance, NULL);
+
     if (result == VK_SUCCESS && memory->handle == INVALID_HANDLE_VALUE && export_info && export_info->handleTypes & VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT)
     {
         get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
diff --git a/include/ntuser.h b/include/ntuser.h
index 0677f114aea..bf65f214bc2 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -87,6 +87,7 @@ struct ntuser_thread_info
     UINT           default_imc;       /* default input context */
     UINT64         client_imm;        /* client IMM thread info */
     UINT64         wmchar_data;       /* client data for WM_CHAR mappings */
+    UINT64         vulkan_data;       /* used by winevulkan for tls */
 };
 
 static inline struct ntuser_thread_info *NtUserGetThreadInfo(void)

From b11119b3805815969955afeffbc5f1d109390095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 12 Apr 2024 11:16:14 +0200
Subject: [PATCH 386/389] HACK: mfplat: Enable new media source by default for
 more games.

CW-Bug-Id: #23618
---
 dlls/mfplat/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index facb39ee3d6..3d1fe615a5a 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -6304,6 +6304,7 @@ static HRESULT resolver_create_gstreamer_handler(IMFByteStreamHandler **handler)
         if (!strcmp(sgi, "399810") /* Call of Cthulhu */) env = "1";
         if (!strcmp(sgi, "606880") /* Greedfall */) env = "1";
         if (!strcmp(sgi, "692850") /* Bloodstained */) env = "1";
+        if (!strcmp(sgi, "934700") /* Dead Island 2 */) env = "1";
     }
     if (env && atoi(env)) return CoCreateInstance(&CLSID_GStreamerByteStreamHandler2, NULL, CLSCTX_INPROC_SERVER, &IID_IMFByteStreamHandler, (void **)handler);
 

From 5316d6828aa7d7616a02213e4aa16880af8946bd Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 12 Apr 2024 15:20:17 -0600
Subject: [PATCH 387/389] ntdll: Implement NtQuerySystemInformation(
 SystemProcessIdInformation ).

CW-Bug-Id: #23669
---
 dlls/ntdll/tests/info.c  | 129 +++++++++++++++++++++++++++++++++++++++
 dlls/ntdll/unix/system.c |  37 +++++++++++
 dlls/wow64/struct32.h    |   6 ++
 dlls/wow64/system.c      |  18 ++++++
 include/winternl.h       |   6 ++
 server/process.c         |   5 +-
 server/protocol.def      |   1 +
 7 files changed, 201 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 4118aae5e91..c574285abe8 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -21,6 +21,7 @@
 #include "ntdll_test.h"
 #include <winnls.h>
 #include <stdio.h>
+#include <psapi.h>
 
 static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
 static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG);
@@ -3758,6 +3759,133 @@ static void test_system_debug_control(void)
     }
 }
 
+static void test_process_id(void)
+{
+    char image_name_buffer[1024 * sizeof(WCHAR)];
+    UNICODE_STRING *image_name = (UNICODE_STRING *)image_name_buffer;
+    SYSTEM_PROCESS_ID_INFORMATION info;
+    unsigned int i, length;
+    DWORD pids[2048];
+    WCHAR name[2048];
+    NTSTATUS status;
+    HANDLE process;
+    ULONG len;
+    BOOL bret;
+
+    status = NtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, image_name,
+                                        sizeof(image_name_buffer), NULL );
+    ok( !status, "got %#lx.\n", status );
+    length = image_name->Length;
+    image_name->Buffer[length] = 0;
+
+    len = 0xdeadbeef;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, NULL, 0, &len );
+    ok( status == STATUS_INFO_LENGTH_MISMATCH || (is_wow64 && status == STATUS_ACCESS_VIOLATION), "got %#lx.\n", status );
+    ok( len == sizeof(info) || (is_wow64 && len == 0xdeadbeef), "got %#lx.\n", len );
+
+    info.ProcessId = (void *)0xdeadbeef;
+    info.ImageName.Length = info.ImageName.MaximumLength = 0;
+    info.ImageName.Buffer = NULL;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( status == STATUS_INVALID_CID, "got %#lx.\n", status );
+    ok( !info.ImageName.Length, "got %#x.\n", info.ImageName.Length );
+    ok( !info.ImageName.MaximumLength, "got %#x.\n", info.ImageName.MaximumLength );
+
+    info.ProcessId = (void *)(ULONG_PTR)GetCurrentProcessId();
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx.\n", status );
+    ok( len == sizeof(info), "got %#lx.\n", len );
+    ok( !info.ImageName.Length, "got %#x.\n", info.ImageName.Length );
+    ok( info.ImageName.MaximumLength == length + 2 || (is_wow64 && !info.ImageName.MaximumLength),
+        "got %#x.\n", info.ImageName.MaximumLength );
+
+    info.ImageName.MaximumLength = sizeof(name);
+    len = 0xdeadbeef;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( status == STATUS_ACCESS_VIOLATION, "got %#lx.\n", status );
+    ok( len == sizeof(info), "got %#lx.\n", len );
+    ok( info.ImageName.Length == length || (is_wow64 && !info.ImageName.Length),
+        "got %u.\n", info.ImageName.Length );
+    ok( info.ImageName.MaximumLength == length + 2 || (is_wow64 && !info.ImageName.Length),
+        "got %#x.\n", info.ImageName.MaximumLength );
+
+    info.ProcessId = (void *)0xdeadbeef;
+    info.ImageName.MaximumLength = sizeof(name);
+    info.ImageName.Buffer = name;
+    info.ImageName.Length = 0;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( status == STATUS_INVALID_CID, "got %#lx.\n", status );
+    ok( !info.ImageName.Length, "got %#x.\n", info.ImageName.Length );
+    ok( info.ImageName.MaximumLength == sizeof(name), "got %#x.\n", info.ImageName.MaximumLength );
+    ok( info.ImageName.Buffer == name, "got %p, %p.\n", info.ImageName.Buffer, name );
+
+    info.ProcessId = NULL;
+    info.ImageName.MaximumLength = sizeof(name);
+    info.ImageName.Buffer = name;
+    info.ImageName.Length = 0;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( status == STATUS_INVALID_CID, "got %#lx.\n", status );
+    ok( !info.ImageName.Length, "got %#x.\n", info.ImageName.Length );
+    ok( info.ImageName.MaximumLength == sizeof(name), "got %#x.\n", info.ImageName.MaximumLength );
+    ok( info.ImageName.Buffer == name, "got non NULL.\n" );
+
+    info.ProcessId = NULL;
+    info.ImageName.MaximumLength = sizeof(name);
+    info.ImageName.Buffer = name;
+    info.ImageName.Length = 4;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( status == STATUS_INVALID_PARAMETER, "got %#lx.\n", status );
+    ok( info.ImageName.Length == 4, "got %#x.\n", info.ImageName.Length );
+    ok( info.ImageName.MaximumLength == sizeof(name), "got %#x.\n", info.ImageName.MaximumLength );
+    ok( info.ImageName.Buffer == name, "got non NULL.\n" );
+
+    info.ProcessId = (void *)(ULONG_PTR)GetCurrentProcessId();
+    info.ImageName.MaximumLength = sizeof(name);
+    info.ImageName.Buffer = name;
+    info.ImageName.Length = 4;
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), NULL );
+    ok( status == STATUS_INVALID_PARAMETER, "got %#lx.\n", status );
+    ok( info.ImageName.Length == 4, "got %#x.\n", info.ImageName.Length );
+    ok( info.ImageName.MaximumLength == sizeof(name), "got %#x.\n", info.ImageName.MaximumLength );
+
+    info.ImageName.Length = 0;
+    memset( name, 0xcc, sizeof(name) );
+    status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+    ok( !status, "got %#lx.\n", status );
+    ok( info.ImageName.Length == length, "got %#x.\n", info.ImageName.Length );
+    ok( len == sizeof(info), "got %#lx.\n", len );
+    ok( info.ImageName.MaximumLength == info.ImageName.Length + 2, "got %#x.\n", info.ImageName.MaximumLength );
+    ok( !name[info.ImageName.Length / 2], "got %#x.\n", name[info.ImageName.Length / 2] );
+
+    ok( info.ImageName.Length == image_name->Length, "got %#x, %#x.\n", info.ImageName.Length, image_name->Length );
+    ok( !wcscmp( name, image_name->Buffer ), "got %s, %s.\n", debugstr_w(name), debugstr_w(image_name->Buffer) );
+
+    bret = EnumProcesses( pids, sizeof(pids), &len );
+    ok( bret, "got error %lu.\n", GetLastError() );
+    for (i = 0; i < len / sizeof(*pids); ++i)
+    {
+        process = OpenProcess( PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pids[i] );
+        if (pids[i] && !process && GetLastError() != ERROR_ACCESS_DENIED)
+        {
+            /* process is gone already. */
+            continue;
+        }
+        info.ProcessId = (void *)(ULONG_PTR)pids[i];
+        info.ImageName.Length = 0;
+        info.ImageName.MaximumLength = sizeof(name);
+        info.ImageName.Buffer = name;
+        status = pNtQuerySystemInformation( SystemProcessIdInformation, &info, sizeof(info), &len );
+        ok( info.ImageName.Buffer == name || (!info.ImageName.MaximumLength && !info.ImageName.Length),
+            "got %p, %p, pid %lu, lengh %u / %u.\n", info.ImageName.Buffer, name, pids[i],
+            info.ImageName.Length, info.ImageName.MaximumLength );
+        if (pids[i])
+            ok( !status, "got %#lx, pid %lu.\n", status, pids[i] );
+        else
+            ok( status == STATUS_INVALID_CID, "got %#lx, pid %lu.\n", status, pids[i] );
+        if (process) CloseHandle( process );
+    }
+}
+
 START_TEST(info)
 {
     char **argv;
@@ -3834,4 +3962,5 @@ START_TEST(info)
     test_ThreadEnableAlignmentFaultFixup();
     test_process_instrumentation_callback();
     test_system_debug_control();
+    test_process_id();
 }
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 2a3f107e26b..0e77e7d7b14 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -3499,6 +3499,43 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
         break;
     }
 
+    case SystemProcessIdInformation: /* 88 */
+    {
+        SYSTEM_PROCESS_ID_INFORMATION *id = info;
+        UNICODE_STRING *str = &id->ImageName;
+        BOOL valid_buffer;
+
+        len = sizeof(*id);
+        if (len > size)                ret = STATUS_INFO_LENGTH_MISMATCH;
+        else if (id->ImageName.Length) ret = STATUS_INVALID_PARAMETER;
+        else if (!id->ProcessId)       ret = STATUS_INVALID_CID;
+
+        if (ret) break;
+
+        valid_buffer = virtual_check_buffer_for_write( str->Buffer, str->MaximumLength );
+        SERVER_START_REQ( get_process_image_name )
+        {
+            req->pid = HandleToULong( id->ProcessId );
+            if (valid_buffer) wine_server_set_reply( req, str->Buffer, str->MaximumLength );
+            ret = wine_server_call( req );
+            if (ret == STATUS_BUFFER_TOO_SMALL) ret = STATUS_INFO_LENGTH_MISMATCH;
+            if (ret == STATUS_SUCCESS && reply->len + 2 > str->MaximumLength) ret = STATUS_INFO_LENGTH_MISMATCH;
+            if (ret == STATUS_SUCCESS || ret == STATUS_INFO_LENGTH_MISMATCH) str->MaximumLength = reply->len + 2;
+            if (!ret && valid_buffer)
+            {
+                str->Length = reply->len;
+                str->Buffer[reply->len / 2] = 0;
+            }
+            else if (!valid_buffer && (!ret || ret == STATUS_INFO_LENGTH_MISMATCH))
+            {
+                str->Length = reply->len;
+                ret = STATUS_ACCESS_VIOLATION;
+            }
+        }
+        SERVER_END_REQ;
+        break;
+    }
+
     case SystemDynamicTimeZoneInformation:  /* 102 */
     {
         RTL_DYNAMIC_TIME_ZONE_INFORMATION tz;
diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h
index 482f1297b28..daa89b84dfc 100644
--- a/dlls/wow64/struct32.h
+++ b/dlls/wow64/struct32.h
@@ -524,6 +524,12 @@ typedef struct
     ULONG Flags;
 } SYSTEM_CACHE_INFORMATION32;
 
+typedef struct
+{
+    ULONG ProcessId;
+    UNICODE_STRING32 ImageName;
+} SYSTEM_PROCESS_ID_INFORMATION32;
+
 typedef struct
 {
     ULONG  OwnerPid;
diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c
index 51c568fedda..c3012dc2492 100644
--- a/dlls/wow64/system.c
+++ b/dlls/wow64/system.c
@@ -406,6 +406,24 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformation( UINT *args )
         }
         return status;
 
+    case SystemProcessIdInformation:
+    {
+        SYSTEM_PROCESS_ID_INFORMATION32 *info32 = ptr;
+        SYSTEM_PROCESS_ID_INFORMATION info;
+
+        if (retlen) *retlen = sizeof(*info32);
+        if (len < sizeof(*info32)) return STATUS_INFO_LENGTH_MISMATCH;
+
+        info.ProcessId = ULongToHandle( info32->ProcessId );
+        unicode_str_32to64( &info.ImageName, &info32->ImageName );
+        if (!(status = NtQuerySystemInformation( class, &info, sizeof(info), NULL )))
+        {
+            info32->ImageName.MaximumLength = info.ImageName.MaximumLength;
+            info32->ImageName.Length = info.ImageName.Length;
+        }
+        return status;
+    }
+
     case SystemHandleInformation:  /* SYSTEM_HANDLE_INFORMATION */
         if (len >= sizeof(SYSTEM_HANDLE_INFORMATION32))
         {
diff --git a/include/winternl.h b/include/winternl.h
index fb07df24eb3..d151719f898 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2991,6 +2991,12 @@ typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION
     UCHAR TableBuffer[1];
 } SYSTEM_FIRMWARE_TABLE_INFORMATION, *PSYSTEM_FIRMWARE_TABLE_INFORMATION;
 
+typedef struct _SYSTEM_PROCESS_ID_INFORMATION
+{
+    void *ProcessId;
+    UNICODE_STRING ImageName;
+} SYSTEM_PROCESS_ID_INFORMATION, *PSYSTEM_PROCESS_ID_INFORMATION;
+
 typedef struct _TIME_FIELDS
 {   CSHORT Year;
     CSHORT Month;
diff --git a/server/process.c b/server/process.c
index 20d959b661f..050950bc206 100644
--- a/server/process.c
+++ b/server/process.c
@@ -1586,7 +1586,10 @@ DECL_HANDLER(get_process_debug_info)
 /* fetch the name of the process image */
 DECL_HANDLER(get_process_image_name)
 {
-    struct process *process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION );
+    struct process *process;
+
+    if (req->pid) process = get_process_from_id( req->pid );
+    else          process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION );
 
     if (!process) return;
     if (process->image)
diff --git a/server/protocol.def b/server/protocol.def
index aef47aa3a7b..4ec9b5a5f43 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1113,6 +1113,7 @@ typedef volatile struct input_shared_memory input_shm_t;
 /* Fetch the name of the process image */
 @REQ(get_process_image_name)
     obj_handle_t handle;           /* process handle */
+    process_id_t pid;              /* process id */
     int          win32;            /* return a win32 filename? */
 @REPLY
     data_size_t  len;              /* len in bytes required to store filename */

From 518fc943216f201aafe7b983b34b060c7a4c991e Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Mon, 15 Apr 2024 12:25:00 +0300
Subject: [PATCH 388/389] win32u: Update Nvidia's DriverVersion to match
 552.12.

---
 dlls/win32u/sysparams.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index ac8ddb42af3..2e6e0915091 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -1406,7 +1406,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param )
             break;
         /* Nvidia */
         case 0x10de:
-            sprintf( buffer, "31.0.15.3625" );
+            sprintf( buffer, "31.0.15.5212" );
             break;
         /* Default value for any other vendor. */
         default:

From e201d531f0492692cc3d1e270044c36b7b84dfed Mon Sep 17 00:00:00 2001
From: peterjc123 <peter_jiachen@163.com>
Date: Tue, 16 Apr 2024 09:35:14 +0800
Subject: [PATCH 389/389] wg_parser: Add missing argument flags for
 wow64_wg_parser_stream_enable

---
 dlls/winegstreamer/wg_parser.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 2d00f4247e0..6769783fb69 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -2329,11 +2329,13 @@ static NTSTATUS wow64_wg_parser_stream_enable(void *args)
     {
         wg_parser_stream_t stream;
         PTR32 format;
+        UINT32 flags;
     } *params32 = args;
     struct wg_parser_stream_enable_params params =
     {
         .stream = params32->stream,
         .format = ULongToPtr(params32->format),
+        .flags = params32->flags,
     };
 
     return wg_parser_stream_enable(&params);