Release v7.17

This was based on a misreading of the documentation; see the following thread:

https://gitlab.winehq.org/wine/wine/-/merge_requests/242#note_2170

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From cc964cf26e79a89fb3d7345847a23d93368e3eed Mon Sep 17 00:00:00 2001
+From c4a4d47fb07faee6ef6d20b967e21eafe6a60ea4 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Do not enumerate the registry in
@@ -13,10 +13,10 @@ not the complete list from the registry.
  3 files changed, 36 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 06756b5551e..99abab38ccf 100644
+index bb7477ed482..55ab8d246e7 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -521,7 +521,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
@@ -25,10 +25,10 @@ index 06756b5551e..99abab38ccf 100644
   *		EnableMouseInPointer (USER32.@)
   */
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index 8b84a39d009..d7520459c6d 100644
+index 8477645fad5..e92548c7402 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4481,6 +4481,40 @@ static void test_SendInput(void)
+@@ -4566,6 +4566,40 @@ static void test_SendInput(void)
      DestroyWindow( hwnd );
  }
  
@@ -69,19 +69,19 @@ index 8b84a39d009..d7520459c6d 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4523,6 +4557,7 @@ START_TEST(input)
+@@ -4608,6 +4642,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
 +    test_GetKeyboardLayoutList();
+     test_DefRawInputProc();
  
      if(pGetMouseMovePointsEx)
-         test_GetMouseMovePointsEx(argv[0]);
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index 28fc5a918c8..24782e405a7 100644
+index f3b724e7010..a971e1ee776 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -933,11 +933,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index 28fc5a918c8..24782e405a7 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -951,33 +947,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -952,33 +948,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -129,5 +129,5 @@ index 28fc5a918c8..24782e405a7 100644
  
      return count;
 -- 
-2.34.1
+2.37.2
 

patches/mfplat-streaming-support/0001-winegstreamer-HACK-Use-a-different-gst-registry-file.patch

@@ -1,40 +0,0 @@
-From 1fa010a636a2a30224ce07081d94bd3e6d9597c8 Mon Sep 17 00:00:00 2001
-From: Andrew Eikum <aeikum@codeweavers.com>
-Date: Thu, 30 Jan 2020 10:16:19 -0600
-Subject: [PATCH 01/88] winegstreamer: HACK: Use a different gst registry file
- per architecture
-
----
- dlls/winegstreamer/wg_parser.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index 5a2e970a4dd..40c394c3caf 100644
---- a/dlls/winegstreamer/wg_parser.c
-+++ b/dlls/winegstreamer/wg_parser.c
-@@ -1556,6 +1556,22 @@ static void init_gstreamer_once(void)
-     int argc = ARRAY_SIZE(args) - 1;
-     char **argv = args;
-     GError *err;
-+    const char *e;
-+
-+    if ((e = getenv("WINE_GST_REGISTRY_DIR")))
-+    {
-+        char gst_reg[PATH_MAX];
-+#if defined(__x86_64__)
-+        const char *arch = "/registry.x86_64.bin";
-+#elif defined(__i386__)
-+        const char *arch = "/registry.i386.bin";
-+#else
-+#error Bad arch
-+#endif
-+        strcpy(gst_reg, e);
-+        strcat(gst_reg, arch);
-+        setenv("GST_REGISTRY_1_0", gst_reg, 1);
-+    }
- 
-     if (!gst_init_check(&argc, &argv, &err))
-     {
--- 
-2.34.1
-

patches/mfplat-streaming-support/0002-winegstreamer-HACK-Try-harder-to-register-winegstrea.patch

@@ -1,60 +0,0 @@
-From effc9dd4081fe44b67080b3cb73f51be21e0bd51 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <z.figura12@gmail.com>
-Date: Tue, 28 Jan 2020 14:30:43 -0600
-Subject: [PATCH 02/88] winegstreamer: HACK: Try harder to register
- winegstreamer filters.
-
----
- dlls/quartz/filtergraph.c | 17 +++++++++++++++++
- dlls/winegstreamer/main.c |  2 ++
- 2 files changed, 19 insertions(+)
-
-diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
-index 1849174cf97..55462244ea9 100644
---- a/dlls/quartz/filtergraph.c
-+++ b/dlls/quartz/filtergraph.c
-@@ -5600,11 +5600,28 @@ static const IUnknownVtbl IInner_VTable =
-     FilterGraphInner_Release
- };
- 
-+static BOOL CALLBACK register_winegstreamer_proc(INIT_ONCE *once, void *param, void **ctx)
-+{
-+    HMODULE mod = LoadLibraryW(L"winegstreamer.dll");
-+    if (mod)
-+    {
-+        HRESULT (WINAPI *proc)(void) = (void *)GetProcAddress(mod, "DllRegisterServer");
-+        proc();
-+        FreeLibrary(mod);
-+    }
-+    return TRUE;
-+}
-+
- static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL threaded)
- {
-+    static INIT_ONCE once = INIT_ONCE_STATIC_INIT;
-     struct filter_graph *object;
-     HRESULT hr;
- 
-+    /* HACK: our build system makes it difficult to load gstreamer on prefix
-+     * creation, so it won't get registered. Do that here instead. */
-+    InitOnceExecuteOnce(&once, register_winegstreamer_proc, NULL, NULL);
-+
-     *out = NULL;
- 
-     if (!(object = calloc(1, sizeof(*object))))
-diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
-index f85e9995525..95b22abebb7 100644
---- a/dlls/winegstreamer/main.c
-+++ b/dlls/winegstreamer/main.c
-@@ -564,6 +564,8 @@ HRESULT WINAPI DllRegisterServer(void)
- 
-     TRACE(".\n");
- 
-+    init_gstreamer();
-+
-     if (FAILED(hr = __wine_register_resources()))
-         return hr;
- 
--- 
-2.34.1
-

patches/mfplat-streaming-support/0003-mfplat-Register-winegstreamer-interfaces-on-load.patch

@@ -1,50 +0,0 @@
-From 3487366d10a749104ac47d0dda66ab54843a94a3 Mon Sep 17 00:00:00 2001
-From: Andrew Eikum <aeikum@codeweavers.com>
-Date: Fri, 18 Dec 2020 14:08:04 -0600
-Subject: [PATCH 03/88] mfplat: Register winegstreamer interfaces on load
-
-See also "winegstreamer: HACK: Try harder to register winegstreamer
-filters."
----
- dlls/mfplat/main.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
-index 7991152f7a7..72ce560c772 100644
---- a/dlls/mfplat/main.c
-+++ b/dlls/mfplat/main.c
-@@ -1583,6 +1583,18 @@ HRESULT WINAPI MFTGetInfo(CLSID clsid, WCHAR **name, MFT_REGISTER_TYPE_INFO **in
-     return hr;
- }
- 
-+static BOOL CALLBACK register_winegstreamer_proc(INIT_ONCE *once, void *param, void **ctx)
-+{
-+    HMODULE mod = LoadLibraryW(L"winegstreamer.dll");
-+    if (mod)
-+    {
-+        HRESULT (WINAPI *proc)(void) = (void *)GetProcAddress(mod, "DllRegisterServer");
-+        proc();
-+        FreeLibrary(mod);
-+    }
-+    return TRUE;
-+}
-+
- /***********************************************************************
-  *      MFStartup (mfplat.@)
-  */
-@@ -1590,9 +1602,12 @@ HRESULT WINAPI MFStartup(ULONG version, DWORD flags)
- {
- #define MF_VERSION_XP   MAKELONG( MF_API_VERSION, 1 )
- #define MF_VERSION_WIN7 MAKELONG( MF_API_VERSION, 2 )
-+    static INIT_ONCE once = INIT_ONCE_STATIC_INIT;
- 
-     TRACE("%#lx, %#lx.\n", version, flags);
- 
-+    InitOnceExecuteOnce(&once, register_winegstreamer_proc, NULL, NULL);
-+
-     if (version != MF_VERSION_XP && version != MF_VERSION_WIN7)
-         return MF_E_BAD_STARTUP_VERSION;
- 
--- 
-2.34.1
-

patches/mfplat-streaming-support/0004-Revert-winegstreamer-Create-static-pads-on-wg_transf.patch

@@ -1,223 +0,0 @@
-From fb5e9adb5eb72fa5d8369ec2e014985450432329 Mon Sep 17 00:00:00 2001
-From: Thomas Crider <gloriouseggroll@gmail.com>
-Date: Sat, 19 Feb 2022 16:58:07 -0700
-Subject: [PATCH 04/88] Revert "winegstreamer: Create static pads on
- wg_transform struct."
-
-This reverts commit 71bf5b24d7efabfcacfa707198efc4be0da3e446.
----
- dlls/winegstreamer/gst_private.h  |  3 +-
- dlls/winegstreamer/main.c         |  9 ++----
- dlls/winegstreamer/unixlib.h      |  2 --
- dlls/winegstreamer/wg_format.c    | 40 ++----------------------
- dlls/winegstreamer/wg_transform.c | 51 +------------------------------
- dlls/winegstreamer/wma_decoder.c  |  2 +-
- 6 files changed, 7 insertions(+), 100 deletions(-)
-
-diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index a63daaf04b9..8bc9f838d29 100644
---- a/dlls/winegstreamer/gst_private.h
-+++ b/dlls/winegstreamer/gst_private.h
-@@ -96,8 +96,7 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream);
- void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate,
-         uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags);
- 
--struct wg_transform *wg_transform_create(const struct wg_format *input_format,
--        const struct wg_format *output_format);
-+struct wg_transform *wg_transform_create(void);
- void wg_transform_destroy(struct wg_transform *transform);
- 
- unsigned int wg_format_get_max_size(const struct wg_format *format);
-diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
-index 95b22abebb7..af5a691371d 100644
---- a/dlls/winegstreamer/main.c
-+++ b/dlls/winegstreamer/main.c
-@@ -254,14 +254,9 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate,
-     __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params);
- }
- 
--struct wg_transform *wg_transform_create(const struct wg_format *input_format,
--        const struct wg_format *output_format)
-+struct wg_transform *wg_transform_create(void)
- {
--    struct wg_transform_create_params params =
--    {
--        .input_format = input_format,
--        .output_format = output_format,
--    };
-+    struct wg_transform_create_params params = {0};
- 
-     if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params))
-         return NULL;
-diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
-index 4adbb694766..8e3f5e84bfb 100644
---- a/dlls/winegstreamer/unixlib.h
-+++ b/dlls/winegstreamer/unixlib.h
-@@ -232,8 +232,6 @@ struct wg_parser_stream_seek_params
- struct wg_transform_create_params
- {
-     struct wg_transform *transform;
--    const struct wg_format *input_format;
--    const struct wg_format *output_format;
- };
- 
- enum unix_funcs
-diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
-index 40b9acfefff..8f771bb8abd 100644
---- a/dlls/winegstreamer/wg_format.c
-+++ b/dlls/winegstreamer/wg_format.c
-@@ -394,43 +394,6 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format)
-     return caps;
- }
- 
--static GstCaps *wg_format_to_caps_wma(const struct wg_format *format)
--{
--    GstBuffer *buffer;
--    GstCaps *caps;
--
--    if (!(caps = gst_caps_new_empty_simple("audio/x-wma")))
--        return NULL;
--    if (format->u.wma.version)
--        gst_caps_set_simple(caps, "wmaversion", G_TYPE_INT, format->u.wma.version, NULL);
--
--    if (format->u.wma.bitrate)
--        gst_caps_set_simple(caps, "bitrate", G_TYPE_INT, format->u.wma.bitrate, NULL);
--    if (format->u.wma.rate)
--        gst_caps_set_simple(caps, "rate", G_TYPE_INT, format->u.wma.rate, NULL);
--    if (format->u.wma.depth)
--        gst_caps_set_simple(caps, "depth", G_TYPE_INT, format->u.wma.depth, NULL);
--    if (format->u.wma.channels)
--        gst_caps_set_simple(caps, "channels", G_TYPE_INT, format->u.wma.channels, NULL);
--    if (format->u.wma.block_align)
--        gst_caps_set_simple(caps, "block_align", G_TYPE_INT, format->u.wma.block_align, NULL);
--
--    if (format->u.wma.codec_data_len)
--    {
--        if (!(buffer = gst_buffer_new_and_alloc(format->u.wma.codec_data_len)))
--        {
--            gst_caps_unref(caps);
--            return NULL;
--        }
--
--        gst_buffer_fill(buffer, 0, format->u.wma.codec_data, format->u.wma.codec_data_len);
--        gst_caps_set_simple(caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL);
--        gst_buffer_unref(buffer);
--    }
--
--    return caps;
--}
--
- GstCaps *wg_format_to_caps(const struct wg_format *format)
- {
-     switch (format->major_type)
-@@ -438,7 +401,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
-         case WG_MAJOR_TYPE_UNKNOWN:
-             return NULL;
-         case WG_MAJOR_TYPE_WMA:
--            return wg_format_to_caps_wma(format);
-+            GST_FIXME("WMA format not implemented!\n");
-+            return NULL;
-         case WG_MAJOR_TYPE_AUDIO:
-             return wg_format_to_caps_audio(format);
-         case WG_MAJOR_TYPE_VIDEO:
-diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
-index e4545774428..2f225e5bc55 100644
---- a/dlls/winegstreamer/wg_transform.c
-+++ b/dlls/winegstreamer/wg_transform.c
-@@ -44,29 +44,13 @@ GST_DEBUG_CATEGORY_EXTERN(wine);
- 
- struct wg_transform
- {
--    GstPad *my_src, *my_sink;
-+    int dummy;
- };
- 
--static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer)
--{
--    struct wg_transform *transform = gst_pad_get_element_private(pad);
--
--    GST_INFO("transform %p, buffer %p.", transform, buffer);
--
--    gst_buffer_unref(buffer);
--
--    return GST_FLOW_OK;
--}
--
- NTSTATUS wg_transform_destroy(void *args)
- {
-     struct wg_transform *transform = args;
- 
--    if (transform->my_sink)
--        g_object_unref(transform->my_sink);
--    if (transform->my_src)
--        g_object_unref(transform->my_src);
--
-     free(transform);
-     return STATUS_SUCCESS;
- }
-@@ -74,10 +58,6 @@ NTSTATUS wg_transform_destroy(void *args)
- NTSTATUS wg_transform_create(void *args)
- {
-     struct wg_transform_create_params *params = args;
--    struct wg_format output_format = *params->output_format;
--    struct wg_format input_format = *params->input_format;
--    GstCaps *src_caps = NULL, *sink_caps = NULL;
--    GstPadTemplate *template = NULL;
-     struct wg_transform *transform;
-     NTSTATUS status;
- 
-@@ -89,38 +69,9 @@ NTSTATUS wg_transform_create(void *args)
-     if (!(transform = calloc(1, sizeof(*transform))))
-         goto done;
- 
--    if (!(src_caps = wg_format_to_caps(&input_format)))
--        goto done;
--    if (!(sink_caps = wg_format_to_caps(&output_format)))
--        goto done;
--
--    if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps)))
--        goto done;
--    if (!(transform->my_src = gst_pad_new_from_template(template, "src")))
--        goto done;
--    g_object_unref(template);
--    template = NULL;
--
--    if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps)))
--        goto done;
--    if (!(transform->my_sink = gst_pad_new_from_template(template, "sink")))
--        goto done;
--    g_object_unref(template);
--    template = NULL;
--
--    gst_pad_set_element_private(transform->my_sink, transform);
--    gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb);
--
-     status = STATUS_SUCCESS;
- 
- done:
--    if (template)
--        g_object_unref(template);
--    if (sink_caps)
--        gst_caps_unref(sink_caps);
--    if (src_caps)
--        gst_caps_unref(src_caps);
--
-     if (status)
-     {
-         GST_ERROR("Failed to create winegstreamer transform.");
-diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
-index 6c198706944..b14261706a7 100644
---- a/dlls/winegstreamer/wma_decoder.c
-+++ b/dlls/winegstreamer/wma_decoder.c
-@@ -78,7 +78,7 @@ static HRESULT try_create_wg_transform(struct wma_decoder *decoder)
-     if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
-         return MF_E_INVALIDMEDIATYPE;
- 
--    if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format)))
-+    if (!(decoder->wg_transform = wg_transform_create()))
-         return E_FAIL;
- 
-     return S_OK;
--- 
-2.34.1
-

patches/mfplat-streaming-support/0005-Revert-winegstreamer-Introduce-new-wg_transform-stru.patch

@@ -1,293 +0,0 @@
-From 51f5ec2a0fd00995b4ff155a89e46c7dff8e338b Mon Sep 17 00:00:00 2001
-From: Thomas Crider <gloriouseggroll@gmail.com>
-Date: Sat, 19 Feb 2022 16:58:23 -0700
-Subject: [PATCH 05/88] Revert "winegstreamer: Introduce new wg_transform
- struct."
-
-This reverts commit 51a262d368afca3ec1edf50a850dbd5339194280.
----
- dlls/winegstreamer/Makefile.in    |  1 -
- dlls/winegstreamer/gst_private.h  |  3 --
- dlls/winegstreamer/main.c         | 14 -----
- dlls/winegstreamer/unix_private.h |  5 --
- dlls/winegstreamer/unixlib.h      |  8 ---
- dlls/winegstreamer/wg_parser.c    | 13 +----
- dlls/winegstreamer/wg_transform.c | 88 -------------------------------
- dlls/winegstreamer/wma_decoder.c  | 11 ----
- 8 files changed, 2 insertions(+), 141 deletions(-)
- delete mode 100644 dlls/winegstreamer/wg_transform.c
-
-diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
-index 0bcdb3eec65..d9805e3d797 100644
---- a/dlls/winegstreamer/Makefile.in
-+++ b/dlls/winegstreamer/Makefile.in
-@@ -14,7 +14,6 @@ C_SRCS = \
- 	quartz_parser.c \
- 	wg_format.c \
- 	wg_parser.c \
--	wg_transform.c \
- 	wm_asyncreader.c \
- 	wm_reader.c \
- 	wm_syncreader.c \
-diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 8bc9f838d29..3584f465218 100644
---- a/dlls/winegstreamer/gst_private.h
-+++ b/dlls/winegstreamer/gst_private.h
-@@ -96,9 +96,6 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream);
- void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate,
-         uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags);
- 
--struct wg_transform *wg_transform_create(void);
--void wg_transform_destroy(struct wg_transform *transform);
--
- unsigned int wg_format_get_max_size(const struct wg_format *format);
- 
- HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out);
-diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
-index af5a691371d..51a71d3b4a5 100644
---- a/dlls/winegstreamer/main.c
-+++ b/dlls/winegstreamer/main.c
-@@ -254,20 +254,6 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate,
-     __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params);
- }
- 
--struct wg_transform *wg_transform_create(void)
--{
--    struct wg_transform_create_params params = {0};
--
--    if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params))
--        return NULL;
--    return params.transform;
--}
--
--void wg_transform_destroy(struct wg_transform *transform)
--{
--    __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform);
--}
--
- BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
- {
-     if (reason == DLL_PROCESS_ATTACH)
-diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h
-index f9c4da2f6ea..b483638403d 100644
---- a/dlls/winegstreamer/unix_private.h
-+++ b/dlls/winegstreamer/unix_private.h
-@@ -25,13 +25,8 @@
- 
- #include <gst/gst.h>
- 
--extern bool init_gstreamer(void) DECLSPEC_HIDDEN;
--
- extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) DECLSPEC_HIDDEN;
- extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) DECLSPEC_HIDDEN;
- extern GstCaps *wg_format_to_caps(const struct wg_format *format) DECLSPEC_HIDDEN;
- 
--extern NTSTATUS wg_transform_create(void *args) DECLSPEC_HIDDEN;
--extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN;
--
- #endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */
-diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
-index 8e3f5e84bfb..45ec606fc6a 100644
---- a/dlls/winegstreamer/unixlib.h
-+++ b/dlls/winegstreamer/unixlib.h
-@@ -229,11 +229,6 @@ struct wg_parser_stream_seek_params
-     DWORD start_flags, stop_flags;
- };
- 
--struct wg_transform_create_params
--{
--    struct wg_transform *transform;
--};
--
- enum unix_funcs
- {
-     unix_wg_parser_create,
-@@ -262,9 +257,6 @@ enum unix_funcs
- 
-     unix_wg_parser_stream_get_duration,
-     unix_wg_parser_stream_seek,
--
--    unix_wg_transform_create,
--    unix_wg_transform_destroy,
- };
- 
- #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */
-diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index 40c394c3caf..66f60d27477 100644
---- a/dlls/winegstreamer/wg_parser.c
-+++ b/dlls/winegstreamer/wg_parser.c
-@@ -1586,13 +1586,6 @@ static void init_gstreamer_once(void)
-             gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO);
- }
- 
--bool init_gstreamer(void)
--{
--    static pthread_once_t init_once = PTHREAD_ONCE_INIT;
--
--    return !pthread_once(&init_once, init_gstreamer_once);
--}
--
- static NTSTATUS wg_parser_create(void *args)
- {
-     static const init_gst_cb init_funcs[] =
-@@ -1603,10 +1596,11 @@ static NTSTATUS wg_parser_create(void *args)
-         [WG_PARSER_WAVPARSE] = wave_parser_init_gst,
-     };
- 
-+    static pthread_once_t once = PTHREAD_ONCE_INIT;
-     struct wg_parser_create_params *params = args;
-     struct wg_parser *parser;
- 
--    if (!init_gstreamer())
-+    if (pthread_once(&once, init_gstreamer_once))
-         return E_FAIL;
- 
-     if (!(parser = calloc(1, sizeof(*parser))))
-@@ -1673,7 +1667,4 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
- 
-     X(wg_parser_stream_get_duration),
-     X(wg_parser_stream_seek),
--
--    X(wg_transform_create),
--    X(wg_transform_destroy),
- };
-diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
-deleted file mode 100644
-index 2f225e5bc55..00000000000
---- a/dlls/winegstreamer/wg_transform.c
-+++ /dev/null
-@@ -1,88 +0,0 @@
--/*
-- * GStreamer transform backend
-- *
-- * Copyright 2022 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 "ntstatus.h"
--#define WIN32_NO_STATUS
--#include "winternl.h"
--#include "dshow.h"
--
--#include "unix_private.h"
--
--GST_DEBUG_CATEGORY_EXTERN(wine);
--#define GST_CAT_DEFAULT wine
--
--struct wg_transform
--{
--    int dummy;
--};
--
--NTSTATUS wg_transform_destroy(void *args)
--{
--    struct wg_transform *transform = args;
--
--    free(transform);
--    return STATUS_SUCCESS;
--}
--
--NTSTATUS wg_transform_create(void *args)
--{
--    struct wg_transform_create_params *params = args;
--    struct wg_transform *transform;
--    NTSTATUS status;
--
--    if (!init_gstreamer())
--        return STATUS_UNSUCCESSFUL;
--
--    status = STATUS_NO_MEMORY;
--
--    if (!(transform = calloc(1, sizeof(*transform))))
--        goto done;
--
--    status = STATUS_SUCCESS;
--
--done:
--    if (status)
--    {
--        GST_ERROR("Failed to create winegstreamer transform.");
--        if (transform)
--            wg_transform_destroy(transform);
--    }
--    else
--    {
--        GST_INFO("Created winegstreamer transform %p.", transform);
--        params->transform = transform;
--    }
--
--    return status;
--}
-diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
-index b14261706a7..31f735a5b1d 100644
---- a/dlls/winegstreamer/wma_decoder.c
-+++ b/dlls/winegstreamer/wma_decoder.c
-@@ -53,8 +53,6 @@ struct wma_decoder
-     LONG refcount;
-     IMFMediaType *input_type;
-     IMFMediaType *output_type;
--
--    struct wg_transform *wg_transform;
- };
- 
- static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface)
-@@ -66,10 +64,6 @@ static HRESULT try_create_wg_transform(struct wma_decoder *decoder)
- {
-     struct wg_format input_format, output_format;
- 
--    if (decoder->wg_transform)
--        wg_transform_destroy(decoder->wg_transform);
--    decoder->wg_transform = NULL;
--
-     mf_media_type_to_wg_format(decoder->input_type, &input_format);
-     if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
-         return MF_E_INVALIDMEDIATYPE;
-@@ -78,9 +72,6 @@ static HRESULT try_create_wg_transform(struct wma_decoder *decoder)
-     if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN)
-         return MF_E_INVALIDMEDIATYPE;
- 
--    if (!(decoder->wg_transform = wg_transform_create()))
--        return E_FAIL;
--
-     return S_OK;
- }
- 
-@@ -128,8 +119,6 @@ static ULONG WINAPI unknown_Release(IUnknown *iface)
- 
-     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)
--- 
-2.34.1
-

patches/mfplat-streaming-support/0006-Revert-winegstreamer-Introduce-new-WG_MAJOR_TYPE_WMA.patch

@@ -1,344 +0,0 @@
-From 01b1caa979ab811edb7b859bc8f84ee68053a991 Mon Sep 17 00:00:00 2001
-From: Thomas Crider <gloriouseggroll@gmail.com>
-Date: Sat, 19 Feb 2022 16:58:47 -0700
-Subject: [PATCH 06/88] Revert "winegstreamer: Introduce new WG_MAJOR_TYPE_WMA
- major type."
-
-This reverts commit 76e2883c4ace29279dce8ea58787871046227b1a.
----
- dlls/winegstreamer/mfplat.c        | 109 ++++++-----------------------
- dlls/winegstreamer/quartz_parser.c |   8 ---
- dlls/winegstreamer/unixlib.h       |  12 ----
- dlls/winegstreamer/wg_format.c     |   7 --
- dlls/winegstreamer/wm_reader.c     |   8 ---
- dlls/winegstreamer/wma_decoder.c   |  18 -----
- 6 files changed, 21 insertions(+), 141 deletions(-)
-
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 9b3fc429d32..a111bbe196d 100644
---- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -635,10 +635,6 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
-         case WG_MAJOR_TYPE_UNKNOWN:
-             return NULL;
- 
--        case WG_MAJOR_TYPE_WMA:
--            FIXME("WMA format not implemented!\n");
--            return NULL;
--
-         case WG_MAJOR_TYPE_AUDIO:
-             return mf_media_type_from_wg_format_audio(format);
- 
-@@ -650,11 +646,17 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
-     return NULL;
- }
- 
--static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
-+static void mf_media_type_to_wg_format_audio(IMFMediaType *type, struct wg_format *format)
- {
-     UINT32 rate, channels, channel_mask, depth;
-     unsigned int i;
-+    GUID subtype;
- 
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-+    {
-+        FIXME("Subtype is not set.\n");
-+        return;
-+    }
-     if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate)))
-     {
-         FIXME("Sample rate is not set.\n");
-@@ -690,20 +692,26 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub
- 
-     for (i = 0; i < ARRAY_SIZE(audio_formats); ++i)
-     {
--        if (IsEqualGUID(subtype, audio_formats[i].subtype) && depth == audio_formats[i].depth)
-+        if (IsEqualGUID(&subtype, audio_formats[i].subtype) && depth == audio_formats[i].depth)
-         {
-             format->u.audio.format = audio_formats[i].format;
-             return;
-         }
-     }
--    FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(subtype), depth);
-+    FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(&subtype), depth);
- }
- 
--static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
-+static void mf_media_type_to_wg_format_video(IMFMediaType *type, struct wg_format *format)
- {
-     UINT64 frame_rate, frame_size;
-     unsigned int i;
-+    GUID subtype;
- 
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-+    {
-+        FIXME("Subtype is not set.\n");
-+        return;
-+    }
-     if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
-     {
-         FIXME("Frame size is not set.\n");
-@@ -724,80 +732,18 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *sub
- 
-     for (i = 0; i < ARRAY_SIZE(video_formats); ++i)
-     {
--        if (IsEqualGUID(subtype, video_formats[i].subtype))
-+        if (IsEqualGUID(&subtype, video_formats[i].subtype))
-         {
-             format->u.video.format = video_formats[i].format;
-             return;
-         }
-     }
--    FIXME("Unrecognized video subtype %s.\n", debugstr_guid(subtype));
--}
--
--static void mf_media_type_to_wg_format_wma(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
--{
--    UINT32 rate, depth, channels, block_align, bytes_per_second, codec_data_len;
--    BYTE codec_data[64];
--    UINT32 version;
--
--    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate)))
--    {
--        FIXME("Sample rate is not set.\n");
--        return;
--    }
--    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels)))
--    {
--        FIXME("Channel count is not set.\n");
--        return;
--    }
--    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_align)))
--    {
--        FIXME("Block alignment is not set.\n");
--        return;
--    }
--    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &depth)))
--    {
--        FIXME("Depth is not set.\n");
--        return;
--    }
--    if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, codec_data, sizeof(codec_data), &codec_data_len)))
--    {
--        FIXME("Codec data is not set.\n");
--        return;
--    }
--    if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &bytes_per_second)))
--    {
--        FIXME("Bitrate is not set.\n");
--        bytes_per_second = 0;
--    }
--
--    if (IsEqualGUID(subtype, &MEDIASUBTYPE_MSAUDIO1))
--        version = 1;
--    else if (IsEqualGUID(subtype, &MFAudioFormat_WMAudioV8))
--        version = 2;
--    else if (IsEqualGUID(subtype, &MFAudioFormat_WMAudioV9))
--        version = 3;
--    else if (IsEqualGUID(subtype, &MFAudioFormat_WMAudio_Lossless))
--        version = 4;
--    else
--    {
--        assert(0);
--        return;
--    }
--
--    format->major_type = WG_MAJOR_TYPE_WMA;
--    format->u.wma.version = version;
--    format->u.wma.bitrate = bytes_per_second * 8;
--    format->u.wma.rate = rate;
--    format->u.wma.depth = depth;
--    format->u.wma.channels = channels;
--    format->u.wma.block_align = block_align;
--    format->u.wma.codec_data_len = codec_data_len;
--    memcpy(format->u.wma.codec_data, codec_data, codec_data_len);
-+    FIXME("Unrecognized video subtype %s.\n", debugstr_guid(&subtype));
- }
- 
- void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
- {
--    GUID major_type, subtype;
-+    GUID major_type;
- 
-     memset(format, 0, sizeof(*format));
- 
-@@ -806,24 +752,11 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
-         FIXME("Major type is not set.\n");
-         return;
-     }
--    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
--    {
--        FIXME("Subtype is not set.\n");
--        return;
--    }
- 
-     if (IsEqualGUID(&major_type, &MFMediaType_Audio))
--    {
--        if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) ||
--                IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV8) ||
--                IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) ||
--                IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))
--            mf_media_type_to_wg_format_wma(type, &subtype, format);
--        else
--            mf_media_type_to_wg_format_audio(type, &subtype, format);
--    }
-+        mf_media_type_to_wg_format_audio(type, format);
-     else if (IsEqualGUID(&major_type, &MFMediaType_Video))
--        mf_media_type_to_wg_format_video(type, &subtype, format);
-+        mf_media_type_to_wg_format_video(type, format);
-     else
-         FIXME("Unrecognized major type %s.\n", debugstr_guid(&major_type));
- }
-diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
-index e06c55ccfe0..45313ebda27 100644
---- a/dlls/winegstreamer/quartz_parser.c
-+++ b/dlls/winegstreamer/quartz_parser.c
-@@ -319,10 +319,6 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
-             break;
-         }
- 
--        case WG_MAJOR_TYPE_WMA:
--            FIXME("WMA format not implemented!\n");
--            return 0;
--
-         case WG_MAJOR_TYPE_UNKNOWN:
-             FIXME("Cannot guess maximum sample size for unknown format.\n");
-             return 0;
-@@ -417,10 +413,6 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool
-     case WG_MAJOR_TYPE_UNKNOWN:
-         return false;
- 
--    case WG_MAJOR_TYPE_WMA:
--        FIXME("WMA format not implemented!\n");
--        return false;
--
-     case WG_MAJOR_TYPE_AUDIO:
-         return amt_from_wg_format_audio(mt, format);
- 
-diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
-index 45ec606fc6a..82bb534b938 100644
---- a/dlls/winegstreamer/unixlib.h
-+++ b/dlls/winegstreamer/unixlib.h
-@@ -37,7 +37,6 @@ struct wg_format
-         WG_MAJOR_TYPE_UNKNOWN,
-         WG_MAJOR_TYPE_VIDEO,
-         WG_MAJOR_TYPE_AUDIO,
--        WG_MAJOR_TYPE_WMA,
-     } major_type;
- 
-     union
-@@ -89,17 +88,6 @@ struct wg_format
-             uint32_t channel_mask; /* In WinMM format. */
-             uint32_t rate;
-         } audio;
--        struct
--        {
--            uint32_t version;
--            uint32_t bitrate;
--            uint32_t rate;
--            uint32_t depth;
--            uint32_t channels;
--            uint32_t block_align;
--            uint32_t codec_data_len;
--            unsigned char codec_data[64];
--        } wma;
-     } u;
- };
- 
-diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
-index 8f771bb8abd..8952acc1c2e 100644
---- a/dlls/winegstreamer/wg_format.c
-+++ b/dlls/winegstreamer/wg_format.c
-@@ -400,9 +400,6 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
-     {
-         case WG_MAJOR_TYPE_UNKNOWN:
-             return NULL;
--        case WG_MAJOR_TYPE_WMA:
--            GST_FIXME("WMA format not implemented!\n");
--            return NULL;
-         case WG_MAJOR_TYPE_AUDIO:
-             return wg_format_to_caps_audio(format);
-         case WG_MAJOR_TYPE_VIDEO:
-@@ -422,10 +419,6 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b)
-         case WG_MAJOR_TYPE_UNKNOWN:
-             return false;
- 
--        case WG_MAJOR_TYPE_WMA:
--            GST_FIXME("WMA format not implemented!\n");
--            return false;
--
-         case WG_MAJOR_TYPE_AUDIO:
-             return a->u.audio.format == b->u.audio.format
-                     && a->u.audio.channels == b->u.audio.channels
-diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
-index 01518c6b9a8..d40afb66afd 100644
---- a/dlls/winegstreamer/wm_reader.c
-+++ b/dlls/winegstreamer/wm_reader.c
-@@ -1687,9 +1687,6 @@ HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output
-             *count = ARRAY_SIZE(video_formats);
-             break;
- 
--        case WG_MAJOR_TYPE_WMA:
--            FIXME("WMA format not implemented!\n");
--            /* fallthrough */
-         case WG_MAJOR_TYPE_AUDIO:
-         case WG_MAJOR_TYPE_UNKNOWN:
-             *count = 1;
-@@ -1736,9 +1733,6 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output,
-             format.u.audio.format = WG_AUDIO_FORMAT_S16LE;
-             break;
- 
--        case WG_MAJOR_TYPE_WMA:
--            FIXME("WMA format not implemented!\n");
--            break;
-         case WG_MAJOR_TYPE_UNKNOWN:
-             break;
-     }
-@@ -1814,8 +1808,6 @@ static const char *get_major_type_string(enum wg_major_type type)
-             return "video";
-         case WG_MAJOR_TYPE_UNKNOWN:
-             return "unknown";
--        case WG_MAJOR_TYPE_WMA:
--            return "wma";
-     }
-     assert(0);
-     return NULL;
-diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
-index 31f735a5b1d..78316059052 100644
---- a/dlls/winegstreamer/wma_decoder.c
-+++ b/dlls/winegstreamer/wma_decoder.c
-@@ -60,21 +60,6 @@ static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface)
-     return CONTAINING_RECORD(iface, struct wma_decoder, IUnknown_inner);
- }
- 
--static HRESULT try_create_wg_transform(struct wma_decoder *decoder)
--{
--    struct wg_format input_format, output_format;
--
--    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;
--
--    return S_OK;
--}
--
- static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out)
- {
-     struct wma_decoder *decoder = impl_from_IUnknown(iface);
-@@ -453,9 +438,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
-     if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->output_type)))
-         goto failed;
- 
--    if (FAILED(hr = try_create_wg_transform(decoder)))
--        goto failed;
--
-     return S_OK;
- 
- failed:
--- 
-2.34.1
-

patches/mfplat-streaming-support/0009-HACK-winegstreamer-Use-capssetter-to-ignore-non-defa.patch

@@ -1,95 +0,0 @@
-From 6317747d6b4ec2e94d92bd5f1dd4b73710cf02c4 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <z.figura12@gmail.com>
-Date: Tue, 20 Oct 2020 17:03:24 -0500
-Subject: [PATCH 09/88] HACK: winegstreamer: Use capssetter to ignore
- non-default YUV color spaces.
-
----
- dlls/winegstreamer/wg_parser.c | 53 ++++++++++++++++++++++++++++++++--
- 1 file changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index 5f3b4375b4c..b93b2c182ae 100644
---- a/dlls/winegstreamer/wg_parser.c
-+++ b/dlls/winegstreamer/wg_parser.c
-@@ -1176,7 +1176,53 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
- 
-     if (!strcmp(name, "video/x-raw"))
-     {
--        GstElement *deinterlace, *vconv, *flip, *vconv2;
-+        GstElement *capssetter, *deinterlace, *vconv, *flip, *vconv2;
-+
-+        /* Hack?: Flatten down the colorimetry to default values, without
-+         * actually modifying the video at all.
-+         *
-+         * We want to do color matrix conversions when converting from YUV to
-+         * RGB or vice versa. We do *not* want to do color matrix conversions
-+         * when converting YUV <-> YUV or RGB <-> RGB, because these are slow
-+         * (it essentially means always using the slow path, never going through
-+         * liborc). However, we have two videoconvert elements, and it's
-+         * basically impossible to know what conversions each is going to do
-+         * until caps are negotiated (without depending on some implementation
-+         * details, and even then it'snot exactly trivial). And setting
-+         * matrix-mode after caps are negotiated has no effect.
-+         *
-+         * Nor can we just retain colorimetry information the way we retain
-+         * other caps values, because videoconvert automatically clears it if
-+         * not doing passthrough. I think that this would only happen if we have
-+         * to do a double conversion, but that is possible. Not likely, but I
-+         * don't want to have to be the one to find out that there's still a
-+         * game broken.
-+         *
-+         * [Note that we'd actually kind of like to retain colorimetry
-+         * information, just in case it does ever become relevant to pass that
-+         * on to the next DirectShow filter. Hence I think the correct solution
-+         * for upstream is to get videoconvert to Not Do That.]
-+         *
-+         * So as a fallback solution, we force an identity transformation of
-+         * the caps to those with a "default" color matrix—i.e. transform the
-+         * caps, but not the data. We do this by *pre*pending a capssetter to
-+         * the front of the chain, and we remove the matrix-mode setting for the
-+         * videoconvert elements.
-+         */
-+        if (!(capssetter = gst_element_factory_make("capssetter", NULL)))
-+        {
-+            GST_ERROR("Failed to create capssetter, are %u-bit GStreamer \"good\" plugins installed?\n",
-+                    8 * (int)sizeof(void *));
-+            goto out;
-+        }
-+        gst_util_set_object_arg(G_OBJECT(capssetter), "join", "true");
-+        /* Actually, this is invalid, but it causes videoconvert to use default
-+         * colorimetry as a result. Yes, this is depending on undocumented
-+         * implementation details. It's a hack.
-+         *
-+         * Sadly there doesn't seem to be a way to get capssetter to clear
-+         * certain fields while leaving others untouched. */
-+        gst_util_set_object_arg(G_OBJECT(capssetter), "caps", "video/x-raw,colorimetry=0:0:0:0");
- 
-         /* DirectShow can express interlaced video, but downstream filters can't
-          * necessarily consume it. In particular, the video renderer can't. */
-@@ -1202,6 +1248,8 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
-             goto out;
- 
-         /* The bin takes ownership of these elements. */
-+        gst_bin_add(GST_BIN(parser->container), capssetter);
-+        gst_element_sync_state_with_parent(capssetter);
-         gst_bin_add(GST_BIN(parser->container), deinterlace);
-         gst_element_sync_state_with_parent(deinterlace);
-         gst_bin_add(GST_BIN(parser->container), vconv);
-@@ -1211,11 +1259,12 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
-         gst_bin_add(GST_BIN(parser->container), vconv2);
-         gst_element_sync_state_with_parent(vconv2);
- 
-+        gst_element_link(capssetter, deinterlace);
-         gst_element_link(deinterlace, vconv);
-         gst_element_link(vconv, flip);
-         gst_element_link(flip, vconv2);
- 
--        stream->post_sink = gst_element_get_static_pad(deinterlace, "sink");
-+        stream->post_sink = gst_element_get_static_pad(capssetter, "sink");
-         stream->post_src = gst_element_get_static_pad(vconv2, "src");
-         stream->flip = flip;
-     }
--- 
-2.34.1
-

patches/mfplat-streaming-support/0010-HACK-quartz-Keep-a-reference-on-the-IMediaPosition-i.patch

@@ -1,97 +0,0 @@
-From 9d51154a13d10305bfbb8a0e242feef0063e3957 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
-Date: Tue, 6 Jul 2021 14:06:11 +0200
-Subject: [PATCH 10/88] HACK: quartz: Keep a reference on the IMediaPosition
- interface.
-
-In the same way we do for IMediaSeeking. Both interfaces are actually
-implemented with a shared refcount and releasing both makes the filter
-be destroyed.
-
-For Tokyo Xanadu eX+ crash on launch.
-
-CW-Bug-Id: #18994
----
- dlls/quartz/filtergraph.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
-index 55462244ea9..c602d6236ba 100644
---- a/dlls/quartz/filtergraph.c
-+++ b/dlls/quartz/filtergraph.c
-@@ -61,6 +61,7 @@ struct filter
-     struct list entry;
-     IBaseFilter *filter;
-     IMediaSeeking *seeking;
-+    IMediaPosition *position;
-     WCHAR *name;
-     BOOL sorting;
- };
-@@ -542,6 +543,7 @@ static BOOL has_output_pins(IBaseFilter *filter)
- 
- static void update_seeking(struct filter *filter)
- {
-+    IMediaPosition *position;
-     IMediaSeeking *seeking;
- 
-     if (!filter->seeking)
-@@ -560,11 +562,19 @@ static void update_seeking(struct filter *filter)
-                 IMediaSeeking_Release(seeking);
-         }
-     }
-+
-+    if (!filter->position)
-+    {
-+        /* Tokyo Xanadu eX+, same as above, same developer, destroys its filter when
-+         * its IMediaPosition interface is released, so cache the interface instead
-+         * of querying for it every time. */
-+        if (SUCCEEDED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaPosition, (void **)&position)))
-+            filter->position = position;
-+    }
- }
- 
- static BOOL is_renderer(struct filter *filter)
- {
--    IMediaPosition *media_position;
-     IAMFilterMiscFlags *flags;
-     BOOL ret = FALSE;
- 
-@@ -574,16 +584,11 @@ static BOOL is_renderer(struct filter *filter)
-             ret = TRUE;
-         IAMFilterMiscFlags_Release(flags);
-     }
--    else if (SUCCEEDED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaPosition, (void **)&media_position)))
--    {
--        if (!has_output_pins(filter->filter))
--            ret = TRUE;
--        IMediaPosition_Release(media_position);
--    }
-     else
-     {
-         update_seeking(filter);
--        if (filter->seeking && !has_output_pins(filter->filter))
-+        if ((filter->seeking || filter->position) &&
-+            !has_output_pins(filter->filter))
-             ret = TRUE;
-     }
-     return ret;
-@@ -654,6 +659,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface,
-     list_add_head(&graph->filters, &entry->entry);
-     entry->sorting = FALSE;
-     entry->seeking = NULL;
-+    entry->position = NULL;
-     ++graph->version;
- 
-     return duplicate_name ? VFW_S_DUPLICATE_NAME : hr;
-@@ -721,6 +727,8 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
-             {
-                 IBaseFilter_SetSyncSource(pFilter, NULL);
-                 IBaseFilter_Release(pFilter);
-+                if (entry->position)
-+                    IMediaPosition_Release(entry->position);
-                 if (entry->seeking)
-                     IMediaSeeking_Release(entry->seeking);
-                 list_remove(&entry->entry);
--- 
-2.34.1
-

patches/mfplat-streaming-support/0011-mfplat-Stub-out-MFCreateDXGIDeviceManager-to-avoid-t.patch

@@ -1,34 +0,0 @@
-From aaa59bf183211a525221252672fdfc7be6de01e6 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Thu, 18 Mar 2021 16:54:44 -0400
-Subject: [PATCH 11/88] mfplat: Stub out MFCreateDXGIDeviceManager, to avoid
- the d3d path.
-
----
- dlls/mfplat/main.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
-index 72ce560c772..ba2f46693a8 100644
---- a/dlls/mfplat/main.c
-+++ b/dlls/mfplat/main.c
-@@ -9246,9 +9246,16 @@ static const IMFDXGIDeviceManagerVtbl dxgi_device_manager_vtbl =
- HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager)
- {
-     struct dxgi_device_manager *object;
-+    const char *do_not_create = getenv("PROTON_DO_NOT_CREATE_DXGI_DEVICE_MANAGER");
- 
-     TRACE("%p, %p.\n", token, manager);
- 
-+    if (do_not_create && do_not_create[0] != '\0')
-+    {
-+        FIXME("stubbing out\n");
-+        return E_NOTIMPL;
-+    }
-+
-     if (!token || !manager)
-         return E_POINTER;
- 
--- 
-2.34.1
-

patches/mfplat-streaming-support/0013-winegstreamer-Activate-source-pad-in-push-mode-if-it.patch

@@ -1,63 +0,0 @@
-From 75d383ab1c6b3c3872b895164c816d11de1d821c Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Tue, 9 Mar 2021 16:53:09 -0500
-Subject: [PATCH 13/88] winegstreamer: Activate source pad in push mode if it
- isn't activated in pull mode.
-
-Since our source pad is not part of any element, gstreamer won't end up activating it
-directly through the state transition.  Instead, if the downstream element doesn't
-activate the source pad into pull mode during the transition to the READY state,
-we activate our pad in push mode.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/wg_parser.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index b93b2c182ae..d7412409a27 100644
---- a/dlls/winegstreamer/wg_parser.c
-+++ b/dlls/winegstreamer/wg_parser.c
-@@ -75,7 +75,7 @@ struct wg_parser
-     pthread_mutex_t mutex;
- 
-     pthread_cond_t init_cond;
--    bool no_more_pads, has_duration, error;
-+    bool no_more_pads, has_duration, error, pull_mode;
- 
-     pthread_cond_t read_cond, read_done_cond;
-     struct
-@@ -1528,9 +1528,12 @@ static gboolean src_activate_mode_cb(GstPad *pad, GstObject *parent, GstPadMode
-     GST_DEBUG("%s source pad for parser %p in %s mode.",
-             activate ? "Activating" : "Deactivating", parser, gst_pad_mode_get_name(mode));
- 
-+    parser->pull_mode = false;
-+
-     switch (mode)
-     {
-         case GST_PAD_MODE_PULL:
-+            parser->pull_mode = activate;
-             return TRUE;
-         case GST_PAD_MODE_PUSH:
-             return activate_push(pad, activate);
-@@ -1695,6 +1698,8 @@ static NTSTATUS wg_parser_connect(void *args)
-         goto out;
- 
-     gst_element_set_state(parser->container, GST_STATE_PAUSED);
-+    if (!parser->pull_mode)
-+        gst_pad_set_active(parser->my_src, 1);
-     ret = gst_element_get_state(parser->container, NULL, NULL, -1);
-     if (ret == GST_STATE_CHANGE_FAILURE)
-     {
-@@ -1833,6 +1838,8 @@ static NTSTATUS wg_parser_disconnect(void *args)
-     pthread_mutex_unlock(&parser->mutex);
- 
-     gst_element_set_state(parser->container, GST_STATE_NULL);
-+    if (!parser->pull_mode)
-+        gst_pad_set_active(parser->my_src, 0);
-     gst_pad_unlink(parser->my_src, parser->their_sink);
-     gst_object_unref(parser->my_src);
-     gst_object_unref(parser->their_sink);
--- 
-2.34.1
-

patches/mfplat-streaming-support/0014-winegstreamer-Push-stream-start-and-segment-events-i.patch

@@ -1,60 +0,0 @@
-From c8a074d72e06a8e44cb9390126e656800d249e08 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Wed, 10 Mar 2021 10:43:03 -0500
-Subject: [PATCH 14/88] winegstreamer: Push stream-start and segment events in
- push mode.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/wg_parser.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index d7412409a27..c6e8bbcb26b 100644
---- a/dlls/winegstreamer/wg_parser.c
-+++ b/dlls/winegstreamer/wg_parser.c
-@@ -1449,6 +1449,7 @@ static void *push_data(void *arg)
- {
-     struct wg_parser *parser = arg;
-     GstBuffer *buffer;
-+    GstSegment *segment;
-     guint max_size;
- 
-     GST_DEBUG("Starting push thread.");
-@@ -1461,6 +1462,12 @@ static void *push_data(void *arg)
- 
-     max_size = parser->stop_offset ? parser->stop_offset : parser->file_size;
- 
-+    gst_pad_push_event(parser->my_src, gst_event_new_stream_start("wg_stream"));
-+
-+    segment = gst_segment_new();
-+    gst_segment_init(segment, GST_FORMAT_BYTES);
-+    gst_pad_push_event(parser->my_src, gst_event_new_segment(segment));
-+
-     for (;;)
-     {
-         ULONG size;
-@@ -1595,6 +1602,7 @@ static gboolean src_perform_seek(struct wg_parser *parser, GstEvent *event)
-     GstEvent *flush_event;
-     GstSeekFlags flags;
-     gint64 cur, stop;
-+    GstSegment *seg;
-     guint32 seqnum;
-     gdouble rate;
- 
-@@ -1628,7 +1636,12 @@ static gboolean src_perform_seek(struct wg_parser *parser, GstEvent *event)
-         gst_event_set_seqnum(flush_event, seqnum);
-         gst_pad_push_event(parser->my_src, flush_event);
-         if (thread)
-+        {
-             gst_pad_set_active(parser->my_src, 1);
-+            seg = gst_segment_new();
-+            gst_segment_init(seg, GST_FORMAT_BYTES);
-+            gst_pad_push_event(parser->my_src, gst_event_new_segment(seg));
-+        }
-     }
- 
-     return TRUE;
--- 
-2.34.1
-

patches/mfplat-streaming-support/0015-winegstreamer-Introduce-H.264-decoder-transform.patch

@@ -1,391 +0,0 @@
-From 95180a07deb9e543627a8705da2bc73ccfff70a5 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Wed, 10 Mar 2021 13:09:51 -0500
-Subject: [PATCH 15/88] winegstreamer: Introduce H.264 decoder transform.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/Makefile.in               |   1 +
- dlls/winegstreamer/decode_transform.c        | 301 +++++++++++++++++++
- dlls/winegstreamer/gst_private.h             |   2 +
- dlls/winegstreamer/main.c                    |   3 +
- dlls/winegstreamer/mfplat.c                  |   1 +
- dlls/winegstreamer/winegstreamer_classes.idl |   6 +
- 6 files changed, 314 insertions(+)
- create mode 100644 dlls/winegstreamer/decode_transform.c
-
-diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
-index c53e914e246..3da8c614ed2 100644
---- a/dlls/winegstreamer/Makefile.in
-+++ b/dlls/winegstreamer/Makefile.in
-@@ -8,6 +8,7 @@ EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
- 
- C_SRCS = \
- 	audioconvert.c \
-+	decode_transform.c \
- 	main.c \
- 	media_source.c \
- 	mfplat.c \
-diff --git a/dlls/winegstreamer/decode_transform.c b/dlls/winegstreamer/decode_transform.c
-new file mode 100644
-index 00000000000..f5d4763bde4
---- /dev/null
-+++ b/dlls/winegstreamer/decode_transform.c
-@@ -0,0 +1,301 @@
-+/* GStreamer Decoder Transform
-+ *
-+ * Copyright 2021 Derek Lesho
-+ *
-+ * 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"
-+#include "wine/heap.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
-+
-+struct mf_decoder
-+{
-+    IMFTransform IMFTransform_iface;
-+    LONG refcount;
-+};
-+
-+static struct mf_decoder *impl_mf_decoder_from_IMFTransform(IMFTransform *iface)
-+{
-+    return CONTAINING_RECORD(iface, struct mf_decoder, IMFTransform_iface);
-+}
-+
-+static HRESULT WINAPI mf_decoder_QueryInterface (IMFTransform *iface, REFIID riid, void **out)
-+{
-+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out);
-+
-+    if (IsEqualIID(riid, &IID_IMFTransform) ||
-+            IsEqualIID(riid, &IID_IUnknown))
-+    {
-+        *out = iface;
-+        IMFTransform_AddRef(iface);
-+        return S_OK;
-+    }
-+
-+    WARN("Unsupported %s.\n", debugstr_guid(riid));
-+    *out = NULL;
-+    return E_NOINTERFACE;
-+}
-+
-+static ULONG WINAPI mf_decoder_AddRef(IMFTransform *iface)
-+{
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    ULONG refcount = InterlockedIncrement(&decoder->refcount);
-+
-+    TRACE("%p, refcount %u.\n", iface, refcount);
-+
-+    return refcount;
-+}
-+
-+static ULONG WINAPI mf_decoder_Release(IMFTransform *iface)
-+{
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    ULONG refcount = InterlockedDecrement(&decoder->refcount);
-+
-+    TRACE("%p, refcount %u.\n", iface, refcount);
-+
-+    if (!refcount)
-+    {
-+        heap_free(decoder);
-+    }
-+
-+    return refcount;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum,
-+        DWORD *output_minimum, DWORD *output_maximum)
-+{
-+    TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum);
-+
-+    *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1;
-+
-+    return S_OK;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs)
-+{
-+    TRACE("%p %p %p.\n", iface, inputs, outputs);
-+
-+    *inputs = *outputs = 1;
-+
-+    return S_OK;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs,
-+        DWORD output_size, DWORD *outputs)
-+{
-+    TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
-+{
-+    FIXME("%p %u %p.\n", iface, id, info);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
-+{
-+    FIXME("%p %u %p.\n", iface, id, info);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetAttributes(IMFTransform *iface, IMFAttributes **attributes)
-+{
-+    FIXME("%p, %p.\n", iface, attributes);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetInputStreamAttributes(IMFTransform *iface, DWORD id,
-+        IMFAttributes **attributes)
-+{
-+    FIXME("%p, %u, %p.\n", iface, id, attributes);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetOutputStreamAttributes(IMFTransform *iface, DWORD id,
-+        IMFAttributes **attributes)
-+{
-+    FIXME("%p, %u, %p.\n", iface, id, attributes);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_DeleteInputStream(IMFTransform *iface, DWORD id)
-+{
-+    TRACE("%p, %u.\n", iface, id);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids)
-+{
-+    TRACE("%p, %u, %p.\n", iface, streams, ids);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
-+        IMFMediaType **type)
-+{
-+    FIXME("%p, %u, %u, %p.\n", iface, id, index, type);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
-+        IMFMediaType **type)
-+{
-+    FIXME("%p, %u, %u, %p.\n", iface, id, index, type);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
-+{
-+    FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
-+{
-+    FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
-+{
-+    FIXME("%p, %u, %p.\n", iface, id, type);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
-+{
-+    FIXME("%p, %u, %p.\n", iface, id, type);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
-+{
-+    FIXME("%p, %u, %p\n", iface, id, flags);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_GetOutputStatus(IMFTransform *iface, DWORD *flags)
-+{
-+    FIXME("%p, %p.\n", iface, flags);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper)
-+{
-+    FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper));
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event)
-+{
-+    FIXME("%p, %u, %p.\n", iface, id, event);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
-+{
-+    FIXME("%p, %u %lu.\n", iface, message, param);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
-+{
-+    FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI mf_decoder_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
-+        MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
-+{
-+    FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static const IMFTransformVtbl mf_decoder_vtbl =
-+{
-+    mf_decoder_QueryInterface,
-+    mf_decoder_AddRef,
-+    mf_decoder_Release,
-+    mf_decoder_GetStreamLimits,
-+    mf_decoder_GetStreamCount,
-+    mf_decoder_GetStreamIDs,
-+    mf_decoder_GetInputStreamInfo,
-+    mf_decoder_GetOutputStreamInfo,
-+    mf_decoder_GetAttributes,
-+    mf_decoder_GetInputStreamAttributes,
-+    mf_decoder_GetOutputStreamAttributes,
-+    mf_decoder_DeleteInputStream,
-+    mf_decoder_AddInputStreams,
-+    mf_decoder_GetInputAvailableType,
-+    mf_decoder_GetOutputAvailableType,
-+    mf_decoder_SetInputType,
-+    mf_decoder_SetOutputType,
-+    mf_decoder_GetInputCurrentType,
-+    mf_decoder_GetOutputCurrentType,
-+    mf_decoder_GetInputStatus,
-+    mf_decoder_GetOutputStatus,
-+    mf_decoder_SetOutputBounds,
-+    mf_decoder_ProcessEvent,
-+    mf_decoder_ProcessMessage,
-+    mf_decoder_ProcessInput,
-+    mf_decoder_ProcessOutput,
-+};
-+
-+HRESULT decode_transform_create(REFIID riid, void **obj)
-+{
-+    struct mf_decoder *object;
-+
-+    TRACE("%s, %p.\n", debugstr_guid(riid), obj);
-+
-+    if (!(object = heap_alloc_zero(sizeof(*object))))
-+        return E_OUTOFMEMORY;
-+
-+    object->IMFTransform_iface.lpVtbl = &mf_decoder_vtbl;
-+    object->refcount = 1;
-+
-+    *obj = &object->IMFTransform_iface;
-+    return S_OK;
-+}
-diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 3584f465218..588aa50bccd 100644
---- a/dlls/winegstreamer/gst_private.h
-+++ b/dlls/winegstreamer/gst_private.h
-@@ -119,6 +119,8 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj);
- 
- HRESULT audio_converter_create(REFIID riid, void **ret);
- 
-+HRESULT decode_transform_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
-+
- struct wm_stream
- {
-     struct wm_reader *reader;
-diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
-index 51a71d3b4a5..8f487655748 100644
---- a/dlls/winegstreamer/main.c
-+++ b/dlls/winegstreamer/main.c
-@@ -547,6 +547,9 @@ HRESULT WINAPI DllRegisterServer(void)
- 
-     init_gstreamer();
- 
-+    if (FAILED(hr = mfplat_DllRegisterServer()))
-+        return hr;
-+
-     if (FAILED(hr = __wine_register_resources()))
-         return hr;
- 
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index a111bbe196d..8b455a67aa2 100644
---- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -408,6 +408,7 @@ class_objects[] =
-     { &CLSID_VideoProcessorMFT, &video_processor_create },
-     { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create },
-     { &CLSID_WINEAudioConverter, &audio_converter_create },
-+    { &CLSID_MSH264DecoderMFT, &decode_transform_create },
- };
- 
- HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj)
-diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl
-index 90dc1dc839b..022f5f80980 100644
---- a/dlls/winegstreamer/winegstreamer_classes.idl
-+++ b/dlls/winegstreamer/winegstreamer_classes.idl
-@@ -73,3 +73,9 @@ coclass WINEAudioConverter { }
-     uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a)
- ]
- coclass CWMADecMediaObject {};
-+
-+[
-+    threading(both),
-+    uuid(62ce7e72-4c71-4d20-b15d-452831a87d9d)
-+]
-+coclass CMSH264DecoderMFT { }
--- 
-2.34.1
-

patches/mfplat-streaming-support/0016-winegstreamer-Implement-GetInputAvailableType-for-de.patch

@@ -1,158 +0,0 @@
-From 26157534099bf6653456d66d964c5c2f09f9a9a7 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Tue, 14 Dec 2021 13:36:27 +0100
-Subject: [PATCH 16/88] winegstreamer: Implement ::GetInputAvailableType for
- decode transform.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/decode_transform.c | 60 +++++++++++++++++++++++++--
- dlls/winegstreamer/gst_private.h      |  6 ++-
- dlls/winegstreamer/mfplat.c           |  7 +++-
- 3 files changed, 67 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/winegstreamer/decode_transform.c b/dlls/winegstreamer/decode_transform.c
-index f5d4763bde4..55a0c1c6c9b 100644
---- a/dlls/winegstreamer/decode_transform.c
-+++ b/dlls/winegstreamer/decode_transform.c
-@@ -29,10 +29,33 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
- 
-+const GUID *h264_input_types[] = {&MFVideoFormat_H264};
-+/* NV12 comes first https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-output-types-in-native-order . thanks to @vitorhnn */
-+const GUID *h264_output_types[] = {&MFVideoFormat_NV12, &MFVideoFormat_I420, &MFVideoFormat_IYUV, &MFVideoFormat_YUY2, &MFVideoFormat_YV12};
-+
-+static struct decoder_desc
-+{
-+    const GUID *major_type;
-+    const GUID **input_types;
-+    unsigned int input_types_count;
-+    const GUID **output_types;
-+    unsigned int output_types_count;
-+} decoder_descs[] =
-+{
-+    { /* DECODER_TYPE_H264 */
-+        &MFMediaType_Video,
-+        h264_input_types,
-+        ARRAY_SIZE(h264_input_types),
-+        h264_output_types,
-+        ARRAY_SIZE(h264_output_types),
-+    },
-+};
-+
- struct mf_decoder
- {
-     IMFTransform IMFTransform_iface;
-     LONG refcount;
-+    enum decoder_type type;
- };
- 
- static struct mf_decoder *impl_mf_decoder_from_IMFTransform(IMFTransform *iface)
-@@ -163,9 +186,36 @@ static HRESULT WINAPI mf_decoder_AddInputStreams(IMFTransform *iface, DWORD stre
- static HRESULT WINAPI mf_decoder_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
-         IMFMediaType **type)
- {
--    FIXME("%p, %u, %u, %p.\n", iface, id, index, type);
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    IMFMediaType *input_type;
-+    HRESULT hr;
- 
--    return E_NOTIMPL;
-+    TRACE("%p, %u, %u, %p\n", decoder, id, index, type);
-+
-+    if (id != 0)
-+        return MF_E_INVALIDSTREAMNUMBER;
-+
-+    if (index >= decoder_descs[decoder->type].input_types_count)
-+        return MF_E_NO_MORE_TYPES;
-+
-+    if (FAILED(hr = MFCreateMediaType(&input_type)))
-+        return hr;
-+
-+    if (FAILED(hr = IMFMediaType_SetGUID(input_type, &MF_MT_MAJOR_TYPE, decoder_descs[decoder->type].major_type)))
-+    {
-+        IMFMediaType_Release(input_type);
-+        return hr;
-+    }
-+
-+    if (FAILED(hr = IMFMediaType_SetGUID(input_type, &MF_MT_SUBTYPE, decoder_descs[decoder->type].input_types[index])))
-+    {
-+        IMFMediaType_Release(input_type);
-+        return hr;
-+    }
-+
-+    *type = input_type;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI mf_decoder_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
-@@ -284,11 +334,11 @@ static const IMFTransformVtbl mf_decoder_vtbl =
-     mf_decoder_ProcessOutput,
- };
- 
--HRESULT decode_transform_create(REFIID riid, void **obj)
-+HRESULT decode_transform_create(REFIID riid, void **obj, enum decoder_type type)
- {
-     struct mf_decoder *object;
- 
--    TRACE("%s, %p.\n", debugstr_guid(riid), obj);
-+    TRACE("%s, %p %u.\n", debugstr_guid(riid), obj, type);
- 
-     if (!(object = heap_alloc_zero(sizeof(*object))))
-         return E_OUTOFMEMORY;
-@@ -296,6 +346,8 @@ HRESULT decode_transform_create(REFIID riid, void **obj)
-     object->IMFTransform_iface.lpVtbl = &mf_decoder_vtbl;
-     object->refcount = 1;
- 
-+    object->type = type;
-+
-     *obj = &object->IMFTransform_iface;
-     return S_OK;
- }
-diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 588aa50bccd..b9379487ac2 100644
---- a/dlls/winegstreamer/gst_private.h
-+++ b/dlls/winegstreamer/gst_private.h
-@@ -119,7 +119,11 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj);
- 
- HRESULT audio_converter_create(REFIID riid, void **ret);
- 
--HRESULT decode_transform_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
-+enum decoder_type
-+{
-+    DECODER_TYPE_H264,
-+};
-+HRESULT decode_transform_create(REFIID riid, void **obj, enum decoder_type) DECLSPEC_HIDDEN;
- 
- struct wm_stream
- {
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 8b455a67aa2..93ddb90a070 100644
---- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -398,6 +398,11 @@ static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a
- 
- static const GUID CLSID_WINEAudioConverter = {0x6a170414,0xaad9,0x4693,{0xb8,0x06,0x3a,0x0c,0x47,0xc5,0x70,0xd6}};
- 
-+static HRESULT h264_decoder_create(REFIID riid, void **ret)
-+{
-+    return decode_transform_create(riid, ret, DECODER_TYPE_H264);
-+}
-+
- static const struct class_object
- {
-     const GUID *clsid;
-@@ -408,7 +413,7 @@ class_objects[] =
-     { &CLSID_VideoProcessorMFT, &video_processor_create },
-     { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create },
-     { &CLSID_WINEAudioConverter, &audio_converter_create },
--    { &CLSID_MSH264DecoderMFT, &decode_transform_create },
-+    { &CLSID_MSH264DecoderMFT, &h264_decoder_create },
- };
- 
- HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj)
--- 
-2.34.1
-

patches/mfplat-streaming-support/0017-winegstreamer-Implement-GetOutputAvailableType-for-d.patch

@@ -1,57 +0,0 @@
-From bfa940843cf60483a21e9dc135328d19f839f13a Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Wed, 10 Mar 2021 14:23:09 -0500
-Subject: [PATCH 17/88] winegstreamer: Implement ::GetOutputAvailableType for
- decode transform.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/decode_transform.c | 31 +++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/winegstreamer/decode_transform.c b/dlls/winegstreamer/decode_transform.c
-index 55a0c1c6c9b..3c71fddd67c 100644
---- a/dlls/winegstreamer/decode_transform.c
-+++ b/dlls/winegstreamer/decode_transform.c
-@@ -221,9 +221,36 @@ static HRESULT WINAPI mf_decoder_GetInputAvailableType(IMFTransform *iface, DWOR
- static HRESULT WINAPI mf_decoder_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
-         IMFMediaType **type)
- {
--    FIXME("%p, %u, %u, %p.\n", iface, id, index, type);
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    IMFMediaType *output_type;
-+    HRESULT hr;
- 
--    return E_NOTIMPL;
-+    TRACE("%p, %u, %u, %p\n", decoder, id, index, type);
-+
-+    if (id != 0)
-+        return MF_E_INVALIDSTREAMNUMBER;
-+
-+    if (index >= decoder_descs[decoder->type].output_types_count)
-+        return MF_E_NO_MORE_TYPES;
-+
-+    if (FAILED(hr = MFCreateMediaType(&output_type)))
-+        return hr;
-+
-+    if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_MAJOR_TYPE, decoder_descs[decoder->type].major_type)))
-+    {
-+        IMFMediaType_Release(output_type);
-+        return hr;
-+    }
-+
-+    if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_SUBTYPE, decoder_descs[decoder->type].output_types[index])))
-+    {
-+        IMFMediaType_Release(output_type);
-+        return hr;
-+    }
-+
-+    *type = output_type;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI mf_decoder_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
--- 
-2.34.1
-

patches/mfplat-streaming-support/0018-winegstreamer-Implement-SetInputType-for-decode-tran.patch

@@ -1,305 +0,0 @@
-From 29aad7626e6a5bcdabdacb579ff3e9b707ed8452 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Thu, 11 Mar 2021 12:33:02 -0500
-Subject: [PATCH 18/88] winegstreamer: Implement ::SetInputType for decode
- transform.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/decode_transform.c | 80 ++++++++++++++++++++++++++-
- dlls/winegstreamer/mfplat.c           | 17 +++++-
- dlls/winegstreamer/quartz_parser.c    |  1 +
- dlls/winegstreamer/unixlib.h          | 10 ++++
- dlls/winegstreamer/wg_parser.c        | 76 +++++++++++++++++++++++++
- 5 files changed, 180 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/winegstreamer/decode_transform.c b/dlls/winegstreamer/decode_transform.c
-index 3c71fddd67c..f709ef32fc1 100644
---- a/dlls/winegstreamer/decode_transform.c
-+++ b/dlls/winegstreamer/decode_transform.c
-@@ -56,6 +56,8 @@ struct mf_decoder
-     IMFTransform IMFTransform_iface;
-     LONG refcount;
-     enum decoder_type type;
-+    IMFMediaType *input_type;
-+    CRITICAL_SECTION cs;
- };
- 
- static struct mf_decoder *impl_mf_decoder_from_IMFTransform(IMFTransform *iface)
-@@ -99,6 +101,14 @@ static ULONG WINAPI mf_decoder_Release(IMFTransform *iface)
- 
-     if (!refcount)
-     {
-+        if (decoder->input_type)
-+        {
-+            IMFMediaType_Release(decoder->input_type);
-+            decoder->input_type = NULL;
-+        }
-+
-+        DeleteCriticalSection(&decoder->cs);
-+
-         heap_free(decoder);
-     }
- 
-@@ -255,9 +265,73 @@ static HRESULT WINAPI mf_decoder_GetOutputAvailableType(IMFTransform *iface, DWO
- 
- static HRESULT WINAPI mf_decoder_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
- {
--    FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags);
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    struct wg_format input_format;
-+    GUID major_type, subtype;
-+    unsigned int i;
-+    HRESULT hr;
- 
--    return E_NOTIMPL;
-+    TRACE("%p, %u, %p, %#x.\n", decoder, id, type, flags);
-+
-+    if (id != 0)
-+        return MF_E_INVALIDSTREAMNUMBER;
-+
-+    if (!type)
-+    {
-+        if (flags & MFT_SET_TYPE_TEST_ONLY)
-+            return S_OK;
-+
-+        EnterCriticalSection(&decoder->cs);
-+
-+        if (decoder->input_type)
-+        {
-+            IMFMediaType_Release(decoder->input_type);
-+            decoder->input_type = NULL;
-+        }
-+
-+        LeaveCriticalSection(&decoder->cs);
-+
-+        return S_OK;
-+    }
-+
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type)))
-+        return MF_E_INVALIDTYPE;
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-+        return MF_E_INVALIDTYPE;
-+
-+    if (!(IsEqualGUID(&major_type, decoder_descs[decoder->type].major_type)))
-+        return MF_E_INVALIDTYPE;
-+
-+    for (i = 0; i < decoder_descs[decoder->type].input_types_count; i++)
-+    {
-+        if (IsEqualGUID(&subtype, decoder_descs[decoder->type].input_types[i]))
-+            break;
-+        if (i == decoder_descs[decoder->type].input_types_count)
-+            return MF_E_INVALIDTYPE;
-+    }
-+
-+    mf_media_type_to_wg_format(type, &input_format);
-+    if (!input_format.major_type)
-+        return MF_E_INVALIDTYPE;
-+
-+    if (flags & MFT_SET_TYPE_TEST_ONLY)
-+        return S_OK;
-+
-+    EnterCriticalSection(&decoder->cs);
-+
-+    hr = S_OK;
-+
-+    if (!decoder->input_type)
-+        hr = MFCreateMediaType(&decoder->input_type);
-+
-+    if (SUCCEEDED(hr) && FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes*) decoder->input_type)))
-+    {
-+        IMFMediaType_Release(decoder->input_type);
-+        decoder->input_type = NULL;
-+    }
-+
-+    LeaveCriticalSection(&decoder->cs);
-+    return hr;
- }
- 
- static HRESULT WINAPI mf_decoder_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
-@@ -375,6 +449,8 @@ HRESULT decode_transform_create(REFIID riid, void **obj, enum decoder_type type)
- 
-     object->type = type;
- 
-+    InitializeCriticalSection(&object->cs);
-+
-     *obj = &object->IMFTransform_iface;
-     return S_OK;
- }
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 93ddb90a070..4fe11b7b6b8 100644
---- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -554,6 +554,7 @@ video_formats[] =
-     {&MFVideoFormat_YUY2,   WG_VIDEO_FORMAT_YUY2},
-     {&MFVideoFormat_YV12,   WG_VIDEO_FORMAT_YV12},
-     {&MFVideoFormat_YVYU,   WG_VIDEO_FORMAT_YVYU},
-+    {&MFVideoFormat_H264,   WG_VIDEO_FORMAT_H264},
- };
- 
- static const struct
-@@ -741,10 +742,22 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, struct wg_forma
-         if (IsEqualGUID(&subtype, video_formats[i].subtype))
-         {
-             format->u.video.format = video_formats[i].format;
--            return;
-+            break;
-         }
-     }
--    FIXME("Unrecognized video subtype %s.\n", debugstr_guid(&subtype));
-+    if (i == ARRAY_SIZE(video_formats))
-+        FIXME("Unrecognized video subtype %s.\n", debugstr_guid(&subtype));
-+
-+    if (format->u.video.format == WG_VIDEO_FORMAT_H264)
-+    {
-+        UINT32 profile, level;
-+
-+        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_MPEG2_PROFILE, &profile)))
-+            format->u.video.compressed.h264.profile = profile;
-+
-+        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_MPEG2_LEVEL, &level)))
-+            format->u.video.compressed.h264.level = level;
-+    }
- }
- 
- void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
-diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
-index 45313ebda27..0328b5ed4f5 100644
---- a/dlls/winegstreamer/quartz_parser.c
-+++ b/dlls/winegstreamer/quartz_parser.c
-@@ -271,6 +271,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
-                      * but as long as every sample fits into our allocator, we're fine. */
-                     return width * height * 3;
- 
-+                case WG_VIDEO_FORMAT_H264:
-                 case WG_VIDEO_FORMAT_UNKNOWN:
-                     FIXME("Cannot guess maximum sample size for unknown video format.\n");
-                     return 0;
-diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
-index 82bb534b938..f3db631d16d 100644
---- a/dlls/winegstreamer/unixlib.h
-+++ b/dlls/winegstreamer/unixlib.h
-@@ -62,9 +62,19 @@ struct wg_format
-                 WG_VIDEO_FORMAT_YVYU,
- 
-                 WG_VIDEO_FORMAT_CINEPAK,
-+
-+                WG_VIDEO_FORMAT_H264,
-             } format;
-             int32_t width, height;
-             uint32_t fps_n, fps_d;
-+            union
-+            {
-+                struct
-+                {
-+                    uint32_t profile;
-+                    uint32_t level;
-+                } h264;
-+            } compressed;
-         } video;
-         struct
-         {
-diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index c6e8bbcb26b..c2141fae2af 100644
---- a/dlls/winegstreamer/wg_parser.c
-+++ b/dlls/winegstreamer/wg_parser.c
-@@ -406,6 +406,22 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t
-     }
- }
- 
-+static void wg_set_caps_from_wg_format(GstCaps *caps, const struct wg_format *format)
-+{
-+    switch (format->major_type)
-+    {
-+        case WG_MAJOR_TYPE_VIDEO:
-+        {
-+            gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video.width, NULL);
-+            gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video.height, NULL);
-+            gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video.fps_n, format->u.video.fps_d, NULL);
-+            break;
-+        }
-+        default:
-+            break;
-+    }
-+}
-+
- static GstCaps *wg_format_to_caps_audio(const struct wg_format *format)
- {
-     GstAudioChannelPosition positions[32];
-@@ -447,6 +463,65 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format)
-     unsigned int i;
-     GstCaps *caps;
- 
-+    /* compressed types */
-+
-+    if (format->u.video.format == WG_VIDEO_FORMAT_H264)
-+    {
-+        const char *profile;
-+        const char *level;
-+
-+        caps = gst_caps_new_empty_simple("video/x-h264");
-+        wg_set_caps_from_wg_format(caps, format);
-+
-+        gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "byte-stream", NULL);
-+        gst_caps_set_simple(caps, "alignment", G_TYPE_STRING, "au", NULL);
-+
-+        switch (format->u.video.compressed.h264.profile)
-+        {
-+            case /* eAVEncH264VProfile_Main */ 77:  profile = "main"; break;
-+            case /* eAVEncH264VProfile_High */ 100: profile = "high"; break;
-+            case /* eAVEncH264VProfile_444 */  244: profile = "high-4:4:4"; break;
-+            default:
-+                GST_ERROR("Unrecognized H.264 profile attribute %u\n", format->u.video.compressed.h264.profile);
-+                /* fallthrough */
-+            case 0: profile = NULL;
-+        }
-+
-+        switch (format->u.video.compressed.h264.level)
-+        {
-+            case /* eAVEncH264VLevel1 */   10: level = "1";   break;
-+            case /* eAVEncH264VLevel1_1 */ 11: level = "1.1"; break;
-+            case /* eAVEncH264VLevel1_2 */ 12: level = "1.2"; break;
-+            case /* eAVEncH264VLevel1_3 */ 13: level = "1.3"; break;
-+            case /* eAVEncH264VLevel2 */   20: level = "2";   break;
-+            case /* eAVEncH264VLevel2_1 */ 21: level = "2.1"; break;
-+            case /* eAVEncH264VLevel2_2 */ 22: level = "2.2"; break;
-+            case /* eAVEncH264VLevel3 */   30: level = "3";   break;
-+            case /* eAVEncH264VLevel3_1 */ 31: level = "3.1"; break;
-+            case /* eAVEncH264VLevel3_2 */ 32: level = "3.2"; break;
-+            case /* eAVEncH264VLevel4 */   40: level = "4";   break;
-+            case /* eAVEncH264VLevel4_1 */ 41: level = "4.1"; break;
-+            case /* eAVEncH264VLevel4_2 */ 42: level = "4.2"; break;
-+            case /* eAVEncH264VLevel5 */   50: level = "5";   break;
-+            case /* eAVEncH264VLevel5_1 */ 51: level = "5.1"; break;
-+            case /* eAVEncH264VLevel5_2 */ 52: level = "5.2"; break;
-+            default:
-+                GST_ERROR("Unrecognized H.264 level attribute %u\n", format->u.video.compressed.h264.level);
-+                /* fallthrough */
-+            case 0: level = NULL;
-+        }
-+
-+        if (profile)
-+            gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL);
-+
-+        if (level)
-+            gst_caps_set_simple(caps, "level", G_TYPE_STRING, level, NULL);
-+
-+        return caps;
-+    }
-+
-+    /* uncompressed types */
-+
-     if ((video_format = wg_video_format_to_gst(format->u.video.format)) == GST_VIDEO_FORMAT_UNKNOWN)
-         return NULL;
- 
-@@ -655,6 +730,7 @@ static NTSTATUS wg_parser_stream_enable(void *args)
-             case WG_VIDEO_FORMAT_YVYU:
-             case WG_VIDEO_FORMAT_UNKNOWN:
-             case WG_VIDEO_FORMAT_CINEPAK:
-+            case WG_VIDEO_FORMAT_H264:
-                 break;
-         }
- 
--- 
-2.34.1
-

patches/mfplat-streaming-support/0019-winegstreamer-Implement-SetOutputType-for-decode-tra.patch

@@ -1,116 +0,0 @@
-From 760c4df96ca2e4deb5c7c7e26fb81713a9393e5e Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Thu, 11 Mar 2021 12:58:32 -0500
-Subject: [PATCH 19/88] winegstreamer: Implement ::SetOutputType for decode
- transform.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/decode_transform.c | 76 +++++++++++++++++++++++++--
- 1 file changed, 73 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/winegstreamer/decode_transform.c b/dlls/winegstreamer/decode_transform.c
-index f709ef32fc1..0848cb47c9d 100644
---- a/dlls/winegstreamer/decode_transform.c
-+++ b/dlls/winegstreamer/decode_transform.c
-@@ -56,7 +56,7 @@ struct mf_decoder
-     IMFTransform IMFTransform_iface;
-     LONG refcount;
-     enum decoder_type type;
--    IMFMediaType *input_type;
-+    IMFMediaType *input_type, *output_type;
-     CRITICAL_SECTION cs;
- };
- 
-@@ -107,6 +107,12 @@ static ULONG WINAPI mf_decoder_Release(IMFTransform *iface)
-             decoder->input_type = NULL;
-         }
- 
-+        if (decoder->output_type)
-+        {
-+            IMFMediaType_Release(decoder->output_type);
-+            decoder->output_type = NULL;
-+        }
-+
-         DeleteCriticalSection(&decoder->cs);
- 
-         heap_free(decoder);
-@@ -336,9 +342,73 @@ static HRESULT WINAPI mf_decoder_SetInputType(IMFTransform *iface, DWORD id, IMF
- 
- static HRESULT WINAPI mf_decoder_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
- {
--    FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags);
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    struct wg_format output_format;
-+    GUID major_type, subtype;
-+    HRESULT hr;
-+    unsigned int i;
- 
--    return E_NOTIMPL;
-+    TRACE("%p, %u, %p, %#x.\n", decoder, id, type, flags);
-+
-+    if (id != 0)
-+        return MF_E_INVALIDSTREAMNUMBER;
-+
-+    if (!type)
-+    {
-+        if (flags & MFT_SET_TYPE_TEST_ONLY)
-+            return S_OK;
-+
-+        EnterCriticalSection(&decoder->cs);
-+
-+        if (decoder->output_type)
-+        {
-+            IMFMediaType_Release(decoder->output_type);
-+            decoder->output_type = NULL;
-+        }
-+
-+        LeaveCriticalSection(&decoder->cs);
-+
-+        return S_OK;
-+    }
-+
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type)))
-+        return MF_E_INVALIDTYPE;
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-+        return MF_E_INVALIDTYPE;
-+
-+    if (!(IsEqualGUID(&major_type, decoder_descs[decoder->type].major_type)))
-+        return MF_E_INVALIDTYPE;
-+
-+    for (i = 0; i < decoder_descs[decoder->type].output_types_count; i++)
-+    {
-+        if (IsEqualGUID(&subtype, decoder_descs[decoder->type].output_types[i]))
-+            break;
-+        if (i == decoder_descs[decoder->type].output_types_count)
-+            return MF_E_INVALIDTYPE;
-+    }
-+
-+    mf_media_type_to_wg_format(type, &output_format);
-+    if (!output_format.major_type)
-+        return MF_E_INVALIDTYPE;
-+
-+    if (flags & MFT_SET_TYPE_TEST_ONLY)
-+        return S_OK;
-+
-+    EnterCriticalSection(&decoder->cs);
-+
-+    hr = S_OK;
-+
-+    if (!decoder->output_type)
-+        hr = MFCreateMediaType(&decoder->output_type);
-+
-+    if (SUCCEEDED(hr) && FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes*) decoder->output_type)))
-+    {
-+        IMFMediaType_Release(decoder->output_type);
-+        decoder->output_type = NULL;
-+    }
-+
-+    LeaveCriticalSection(&decoder->cs);
-+    return hr;
- }
- 
- static HRESULT WINAPI mf_decoder_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
--- 
-2.34.1
-

patches/mfplat-streaming-support/0020-winegstreamer-Implement-Get-Input-Output-StreamInfo-.patch

@@ -1,106 +0,0 @@
-From 372d42fdb36cef1e845eb8ac9d461d5f03974605 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Thu, 11 Mar 2021 14:40:32 -0500
-Subject: [PATCH 20/88] winegstreamer: Implement ::Get(Input/Output)StreamInfo
- for decode transform.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/decode_transform.c | 61 +++++++++++++++++++++++++--
- 1 file changed, 57 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/winegstreamer/decode_transform.c b/dlls/winegstreamer/decode_transform.c
-index 0848cb47c9d..dadd161bcc9 100644
---- a/dlls/winegstreamer/decode_transform.c
-+++ b/dlls/winegstreamer/decode_transform.c
-@@ -58,6 +58,7 @@ struct mf_decoder
-     enum decoder_type type;
-     IMFMediaType *input_type, *output_type;
-     CRITICAL_SECTION cs;
-+    BOOL video;
- };
- 
- static struct mf_decoder *impl_mf_decoder_from_IMFTransform(IMFTransform *iface)
-@@ -150,16 +151,67 @@ static HRESULT WINAPI mf_decoder_GetStreamIDs(IMFTransform *iface, DWORD input_s
- 
- static HRESULT WINAPI mf_decoder_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
- {
--    FIXME("%p %u %p.\n", iface, id, info);
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
- 
--    return E_NOTIMPL;
-+    TRACE("%p %u %p\n", decoder, id, info);
-+
-+    if (id != 0)
-+        return MF_E_INVALIDSTREAMNUMBER;
-+
-+    info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_DOES_NOT_ADDREF;
-+    info->cbAlignment = 0;
-+    info->cbSize = 0;
-+    /* TODO: retrieve following fields from gstreamer */
-+    info->hnsMaxLatency = 0;
-+    info->cbMaxLookahead = 0;
-+    return S_OK;
- }
- 
- static HRESULT WINAPI mf_decoder_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
- {
--    FIXME("%p %u %p.\n", iface, id, info);
-+    struct mf_decoder *decoder = impl_mf_decoder_from_IMFTransform(iface);
-+    MFT_OUTPUT_STREAM_INFO stream_info = {};
-+    GUID output_subtype;
-+    UINT64 framesize;
- 
--    return E_NOTIMPL;
-+    TRACE("%p %u %p\n", decoder, id, info);
-+
-+    if (id != 0)
-+        return MF_E_INVALIDSTREAMNUMBER;
-+
-+    EnterCriticalSection(&decoder->cs);
-+
-+    if (!decoder->output_type)
-+    {
-+        LeaveCriticalSection(&decoder->cs);
-+        return MF_E_TRANSFORM_TYPE_NOT_SET;
-+    }
-+
-+    if (decoder->video)
-+    {
-+        stream_info.dwFlags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER |
-+                              MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES;
-+        stream_info.cbSize = 0;
-+        if (SUCCEEDED(IMFMediaType_GetGUID(decoder->output_type, &MF_MT_SUBTYPE, &output_subtype)) &&
-+            SUCCEEDED(IMFMediaType_GetUINT64(decoder->output_type, &MF_MT_FRAME_SIZE, &framesize)))
-+        {
-+            MFCalculateImageSize(&output_subtype, framesize >> 32, (UINT32) framesize, &stream_info.cbSize);
-+        }
-+        if (!stream_info.cbSize)
-+            ERR("Failed to get desired output buffer size\n");
-+    }
-+    else
-+    {
-+        stream_info.dwFlags = MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES;
-+        stream_info.cbSize = 4;
-+    }
-+    stream_info.cbAlignment = 0;
-+
-+    LeaveCriticalSection(&decoder->cs);
-+
-+    *info = stream_info;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI mf_decoder_GetAttributes(IMFTransform *iface, IMFAttributes **attributes)
-@@ -518,6 +570,7 @@ HRESULT decode_transform_create(REFIID riid, void **obj, enum decoder_type type)
-     object->refcount = 1;
- 
-     object->type = type;
-+    object->video = decoder_descs[type].major_type == &MFMediaType_Video;
- 
-     InitializeCriticalSection(&object->cs);
- 
--- 
-2.34.1
-