Reenabled mfplat patchset

patches/mfplat-reverts/0002-Revert-wmvcore-Move-the-async-reader-implementation-.patch

@@ -0,0 +1,168 @@
+From 2c3d9dfc09ee64767347574e0bd6e8f5511a6a54 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 9 Oct 2021 13:47:39 +1100
+Subject: [PATCH 02/22] Revert "wmvcore: Move the async reader implementation
+ to winegstreamer."
+
+This reverts commit bf7c05d87a65b7b9999d71fc0df602e3dfa2fafa.
+---
+ dlls/winegstreamer/Makefile.in                |  1 -
+ dlls/winegstreamer/winegstreamer.spec         |  1 -
+ dlls/wmvcore/Makefile.in                      |  1 +
+ .../wm_asyncreader.c => wmvcore/reader.c}     | 54 +++++++++++--------
+ dlls/wmvcore/wmvcore_main.c                   | 15 ------
+ 5 files changed, 32 insertions(+), 40 deletions(-)
+ rename dlls/{winegstreamer/wm_asyncreader.c => wmvcore/reader.c} (98%)
+
+diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
+index 17311cd663c..671e3bcb7ba 100644
+--- a/dlls/winegstreamer/Makefile.in
++++ b/dlls/winegstreamer/Makefile.in
+@@ -13,7 +13,6 @@ C_SRCS = \
+ 	mfplat.c \
+ 	quartz_parser.c \
+ 	wg_parser.c \
+-	wm_asyncreader.c \
+ 	wm_syncreader.c
+ 
+ IDL_SRCS = \
+diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec
+index bc6a390f8b1..bd9f53a7445 100644
+--- a/dlls/winegstreamer/winegstreamer.spec
++++ b/dlls/winegstreamer/winegstreamer.spec
+@@ -2,5 +2,4 @@
+ @ stdcall -private DllGetClassObject(ptr ptr ptr)
+ @ stdcall -private DllRegisterServer()
+ @ stdcall -private DllUnregisterServer()
+-@ stdcall winegstreamer_create_wm_async_reader(ptr)
+ @ stdcall winegstreamer_create_wm_sync_reader(ptr)
+diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
+index 6aed828abae..d0b230dd7c0 100644
+--- a/dlls/wmvcore/Makefile.in
++++ b/dlls/wmvcore/Makefile.in
+@@ -6,6 +6,7 @@ DELAYIMPORTS = winegstreamer
+ EXTRADLLFLAGS = -Wb,--prefer-native
+ 
+ C_SRCS = \
++	reader.c \
+ 	wmvcore_main.c \
+ 	writer.c
+ 
+diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/wmvcore/reader.c
+similarity index 98%
+rename from dlls/winegstreamer/wm_asyncreader.c
+rename to dlls/wmvcore/reader.c
+index d3fd1624f24..12ba8099ab1 100644
+--- a/dlls/winegstreamer/wm_asyncreader.c
++++ b/dlls/wmvcore/reader.c
+@@ -16,8 +16,11 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
+-#include "gst_private.h"
++#include "wmvcore.h"
++
+ #include "wmsdk.h"
++#include "wine/debug.h"
++#include "wine/heap.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
+ 
+@@ -150,7 +153,7 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface)
+     TRACE("(%p) ref=%d\n", This, ref);
+ 
+     if(!ref)
+-        free(This);
++        heap_free(This);
+ 
+     return ref;
+ }
+@@ -2036,31 +2039,36 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl =
+     packetsize_SetMinPacketSize
+ };
+ 
+-HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader)
++HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader)
+ {
+-    WMReader *object;
++    WMReader *reader;
+ 
+-    TRACE("reader %p.\n", reader);
++    TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader);
+ 
+-    if (!(object = calloc(1, sizeof(*object))))
++    reader = heap_alloc(sizeof(*reader));
++    if(!reader)
+         return E_OUTOFMEMORY;
+ 
+-    object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl;
+-    object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl;
+-    object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl;
+-    object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl;
+-    object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
+-    object->IWMReader_iface.lpVtbl = &WMReaderVtbl;
+-    object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
+-    object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
+-    object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
+-    object->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl;
+-    object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
+-    object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
+-    object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
+-    object->ref = 1;
+-
+-    TRACE("Created async reader %p.\n", object);
+-    *reader = (IWMReader *)&object->IWMReader_iface;
++    reader->IWMReader_iface.lpVtbl = &WMReaderVtbl;
++    reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
++    reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
++    reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
++    reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
++    reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
++    reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
++    reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl;
++    reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl;
++    reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl;
++    reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl;
++    reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
++    reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl;
++    reader->ref = 1;
++
++    *ret_reader = &reader->IWMReader_iface;
+     return S_OK;
+ }
++
++HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader)
++{
++    return WMCreateReader(NULL, 0, ret_reader);
++}
+diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
+index ff837921286..8d4d4251369 100644
+--- a/dlls/wmvcore/wmvcore_main.c
++++ b/dlls/wmvcore/wmvcore_main.c
+@@ -25,23 +25,8 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
+ 
+-HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader);
+ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader);
+ 
+-HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader)
+-{
+-    TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
+-
+-    return winegstreamer_create_wm_async_reader(reader);
+-}
+-
+-HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader)
+-{
+-    TRACE("reader %p.\n", reader);
+-
+-    return winegstreamer_create_wm_async_reader(reader);
+-}
+-
+ HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader)
+ {
+     TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
+-- 
+2.33.0
+

patches/mfplat-reverts/0004-Revert-wmvcore-Move-the-sync-reader-implementation-t.patch

@@ -0,0 +1,161 @@
+From 59b60c9a19de54bc0f6541395ffcf49d96437b8c Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 9 Oct 2021 13:47:42 +1100
+Subject: [PATCH 04/22] Revert "wmvcore: Move the sync reader implementation to
+ winegstreamer."
+
+This reverts commit e4767ea6126fce8b419ef10a3cfce8bf43206d6f.
+---
+ dlls/winegstreamer/Makefile.in                |  4 +--
+ dlls/winegstreamer/winegstreamer.spec         |  1 -
+ dlls/wmvcore/Makefile.in                      |  2 +-
+ .../wm_syncreader.c => wmvcore/syncreader.c}  | 33 ++++++++++++-------
+ dlls/wmvcore/wmvcore_main.c                   | 16 ---------
+ 5 files changed, 23 insertions(+), 33 deletions(-)
+ rename dlls/{winegstreamer/wm_syncreader.c => wmvcore/syncreader.c} (96%)
+
+diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
+index 671e3bcb7ba..e35df3cf3f9 100644
+--- a/dlls/winegstreamer/Makefile.in
++++ b/dlls/winegstreamer/Makefile.in
+@@ -1,6 +1,5 @@
+ MODULE    = winegstreamer.dll
+ UNIXLIB   = winegstreamer.so
+-IMPORTLIB = winegstreamer
+ IMPORTS   = strmbase strmiids uuid ole32 mfuuid
+ DELAYIMPORTS = mfplat
+ EXTRAINCL = $(GSTREAMER_CFLAGS)
+@@ -12,8 +11,7 @@ C_SRCS = \
+ 	media_source.c \
+ 	mfplat.c \
+ 	quartz_parser.c \
+-	wg_parser.c \
+-	wm_syncreader.c
++	wg_parser.c
+ 
+ IDL_SRCS = \
+ 	winegstreamer_classes.idl
+diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec
+index bd9f53a7445..b16365d0c9f 100644
+--- a/dlls/winegstreamer/winegstreamer.spec
++++ b/dlls/winegstreamer/winegstreamer.spec
+@@ -2,4 +2,3 @@
+ @ stdcall -private DllGetClassObject(ptr ptr ptr)
+ @ stdcall -private DllRegisterServer()
+ @ stdcall -private DllUnregisterServer()
+-@ stdcall winegstreamer_create_wm_sync_reader(ptr)
+diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
+index d0b230dd7c0..15c017f86d9 100644
+--- a/dlls/wmvcore/Makefile.in
++++ b/dlls/wmvcore/Makefile.in
+@@ -1,12 +1,12 @@
+ MODULE    = wmvcore.dll
+ IMPORTLIB = wmvcore
+ IMPORTS   = kernel32
+-DELAYIMPORTS = winegstreamer
+ 
+ EXTRADLLFLAGS = -Wb,--prefer-native
+ 
+ C_SRCS = \
+ 	reader.c \
++	syncreader.c \
+ 	wmvcore_main.c \
+ 	writer.c
+ 
+diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/wmvcore/syncreader.c
+similarity index 96%
+rename from dlls/winegstreamer/wm_syncreader.c
+rename to dlls/wmvcore/syncreader.c
+index 75b8e021148..b245ff20d31 100644
+--- a/dlls/winegstreamer/wm_syncreader.c
++++ b/dlls/wmvcore/syncreader.c
+@@ -16,9 +16,11 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
+-#include "gst_private.h"
+-#include "initguid.h"
++#include "wmvcore.h"
++
+ #include "wmsdk.h"
++#include "wine/debug.h"
++#include "wine/heap.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
+ 
+@@ -83,7 +85,7 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface)
+     TRACE("(%p) ref=%d\n", This, ref);
+ 
+     if(!ref)
+-        free(This);
++        heap_free(This);
+ 
+     return ref;
+ }
+@@ -603,20 +605,27 @@ static const IWMProfile3Vtbl WMProfile3Vtbl =
+     WMProfile3_GetExpectedPacketCount
+ };
+ 
+-HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader)
++HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader)
+ {
+-    WMSyncReader *object;
++    WMSyncReader *sync;
++
++    TRACE("(%p, %x, %p)\n", pcert, rights, syncreader);
+ 
+-    TRACE("reader %p.\n", reader);
++    sync = heap_alloc(sizeof(*sync));
+ 
+-    if (!(object = calloc(1, sizeof(*object))))
++    if (!sync)
+         return E_OUTOFMEMORY;
+ 
+-    object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
+-    object->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl;
+-    object->ref = 1;
++    sync->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
++    sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl;
++    sync->ref = 1;
++
++    *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface;
+ 
+-    TRACE("Created sync reader %p.\n", object);
+-    *reader = (IWMSyncReader *)&object->IWMSyncReader2_iface;
+     return S_OK;
+ }
++
++HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader)
++{
++    return WMCreateSyncReader(NULL, 0, syncreader);
++}
+diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
+index 8d4d4251369..5f93fc68e3b 100644
+--- a/dlls/wmvcore/wmvcore_main.c
++++ b/dlls/wmvcore/wmvcore_main.c
+@@ -25,22 +25,6 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
+ 
+-HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader);
+-
+-HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader)
+-{
+-    TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
+-
+-    return winegstreamer_create_wm_sync_reader(reader);
+-}
+-
+-HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **reader)
+-{
+-    TRACE("reader %p.\n", reader);
+-
+-    return winegstreamer_create_wm_sync_reader(reader);
+-}
+-
+ HRESULT WINAPI WMCheckURLExtension(const WCHAR *url)
+ {
+     FIXME("(%s): stub\n", wine_dbgstr_w(url));
+-- 
+2.33.0
+

patches/mfplat-reverts/0005-Revert-winegstreamer-Translate-GST_AUDIO_CHANNEL_POS.patch

@@ -0,0 +1,30 @@
+From 6bde437d76c256778d706da4874a4db2a37e0e3a Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 9 Oct 2021 13:47:44 +1100
+Subject: [PATCH 05/22] Revert "winegstreamer: Translate
+ GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER."
+
+This reverts commit 009c1d66fa202666f778d7df2bbcc522993935cf.
+---
+ dlls/winegstreamer/wg_parser.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
+index c3c9051a174..0c23ae6d351 100644
+--- a/dlls/winegstreamer/wg_parser.c
++++ b/dlls/winegstreamer/wg_parser.c
+@@ -159,10 +159,7 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position)
+         SPEAKER_TOP_BACK_CENTER,
+     };
+ 
+-    if (position == GST_AUDIO_CHANNEL_POSITION_MONO)
+-        return SPEAKER_FRONT_CENTER;
+-
+-    if (position >= 0 && position < ARRAY_SIZE(position_map))
++    if (position < ARRAY_SIZE(position_map))
+         return position_map[position];
+     return 0;
+ }
+-- 
+2.33.0
+

patches/mfplat-reverts/0006-Revert-winegstreamer-Trace-the-unfiltered-caps-in-si.patch

@@ -1,7 +1,7 @@
-From c7cefd4d7ba969969ad31baa4e05c3968c5ae01c Mon Sep 17 00:00:00 2001
+From 0cc0b9856041daede1d49ce5ba3bde736edd0a92 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Oct 2021 09:00:38 +1100
-Subject: [PATCH 01/17] Revert "winegstreamer: Trace the unfiltered caps in
+Subject: [PATCH 06/22] Revert "winegstreamer: Trace the unfiltered caps in
  sink_query_cb()."
 
 This reverts commit fd6315eb8f6809b89b7449f4b9dd01453de32eda.

patches/mfplat-reverts/0007-Revert-winegstreamer-Avoid-seeking-past-the-end-of-a.patch

@@ -1,7 +1,7 @@
-From 8750208931f96be6f30a13f033658eb92a51a8ef Mon Sep 17 00:00:00 2001
+From dd5d76af94c794f9679c29bec0dc436bfaa78edc Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Oct 2021 09:00:39 +1100
-Subject: [PATCH 02/17] Revert "winegstreamer: Avoid seeking past the end of an
+Subject: [PATCH 07/22] Revert "winegstreamer: Avoid seeking past the end of an
  IMFByteStream."
 
 This reverts commit 3efb72de5aca01d3d979ce697728e51bc3e99901.

patches/mfplat-reverts/0008-Revert-winegstreamer-Avoid-passing-a-NULL-buffer-to-.patch

@@ -1,7 +1,7 @@
-From 111eb77f0dc9fcf241167dec1656818e7a636f0a Mon Sep 17 00:00:00 2001
+From 9d20d8d508a65ef044a3d903eb2c96e9b4d08429 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Oct 2021 09:00:39 +1100
-Subject: [PATCH 03/17] Revert "winegstreamer: Avoid passing a NULL buffer to
+Subject: [PATCH 08/22] Revert "winegstreamer: Avoid passing a NULL buffer to
  wg_parser_push_data() in the case of a zero-length read."
 
 This reverts commit 585acfa04188f85fb9138e57d56dd44b870dca41.

patches/mfplat-reverts/0009-Revert-winegstreamer-Use-array_reserve-to-reallocate.patch

@@ -1,7 +1,7 @@
-From 6b2ebf10c196d3ced85546af54599071d750bb1d Mon Sep 17 00:00:00 2001
+From 997978816252d56a53b53d8d0a1913f78b3aad42 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Oct 2021 09:00:40 +1100
-Subject: [PATCH 04/17] Revert "winegstreamer: Use array_reserve() to
+Subject: [PATCH 09/22] Revert "winegstreamer: Use array_reserve() to
  reallocate read buffers."
 
 This reverts commit 59997c355fdc9cb5857c767b3bf16c9513b3d1f3.

patches/mfplat-reverts/0010-Revert-winegstreamer-Handle-zero-length-reads-in-src.patch

@@ -1,7 +1,7 @@
-From 611e86da3f0b7050cd10c6fa693e31d7f37d7a8a Mon Sep 17 00:00:00 2001
+From 6e82f802820e9ed145201091cd636f2e83d85e67 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Oct 2021 09:00:41 +1100
-Subject: [PATCH 05/17] Revert "winegstreamer: Handle zero-length reads in
+Subject: [PATCH 10/22] Revert "winegstreamer: Handle zero-length reads in
  src_getrange_cb()."
 
 This reverts commit 8e9d7b031f7b0c93471cfbffe8f720c34623a273.

patches/mfplat-reverts/0011-Revert-winegstreamer-Convert-the-Unix-library-to-the.patch

@@ -1,7 +1,7 @@
-From cbb33659c8d97084e41648dd6d093508d493ffd8 Mon Sep 17 00:00:00 2001
+From 29f82e04e5040e430628975484666aaecb74f311 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 6 Oct 2021 08:38:11 +1100
-Subject: [PATCH 06/17] Revert "winegstreamer: Convert the Unix library to the
+Subject: [PATCH 11/22] Revert "winegstreamer: Convert the Unix library to the
  __wine_unix_call interface."
 
 This reverts commit 4ba31162c37ea237763e650f6242535d86ffb170.

patches/mfplat-reverts/0012-Revert-winegstreamer-Return-void-from-wg_parser_stre.patch

@@ -1,7 +1,7 @@
-From 3f0ae88023b048aa9ae2d942a7d38a305a70fde2 Mon Sep 17 00:00:00 2001
+From 3753c3b6c8c99a664430805c3e7bd7273064f379 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 6 Oct 2021 08:38:12 +1100
-Subject: [PATCH 07/17] Revert "winegstreamer: Return void from
+Subject: [PATCH 12/22] Revert "winegstreamer: Return void from
  wg_parser_stream_seek()."
 
 This reverts commit 494039d0d0df8fd5b2b3442caac7bd6c0c7433c0.

patches/mfplat-reverts/0013-Revert-winegstreamer-Move-Unix-library-definitions-i.patch

@@ -1,7 +1,7 @@
-From 2060f5090f7b51b46d791b6f7997857ea7dd2797 Mon Sep 17 00:00:00 2001
+From 79181b01cb2cb9c6cafd3ea08920e892e37cd654 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 6 Oct 2021 08:38:12 +1100
-Subject: [PATCH 08/17] Revert "winegstreamer: Move Unix library definitions
+Subject: [PATCH 13/22] Revert "winegstreamer: Move Unix library definitions
  into a separate header."
 
 This reverts commit 84b870bb1fcac27288ed70d28de6a1c2649e9fe6.

patches/mfplat-reverts/0014-Revert-winegstreamer-Remove-the-no-longer-used-start.patch

@@ -1,7 +1,7 @@
-From a0f69a9083c84afe21f397fdb4c7511cff4706cd Mon Sep 17 00:00:00 2001
+From d4afee5c3a6b8875563c3f931e3eaff3e55b87dc Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 2 Oct 2021 10:35:45 +1000
-Subject: [PATCH 09/17] Revert "winegstreamer: Remove the no longer used
+Subject: [PATCH 14/22] Revert "winegstreamer: Remove the no longer used
  start_dispatch_thread() declaration."
 
 This reverts commit a87abdbe85779adf6a2a7897bd88984587880693.

patches/mfplat-reverts/0015-Revert-winegstreamer-Set-unlimited-buffering-using-a.patch

@@ -1,7 +1,7 @@
-From 49bb1f9a0024f79c5fc4bd015e87a94d9b088f3b Mon Sep 17 00:00:00 2001
+From 421567d9cdd09b1d9db8410160ac1c106a05f2f9 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 2 Oct 2021 10:35:46 +1000
-Subject: [PATCH 10/17] Revert "winegstreamer: Set unlimited buffering using a
+Subject: [PATCH 15/22] Revert "winegstreamer: Set unlimited buffering using a
  flag for wg_parser_create()."
 
 This reverts commit 45690320f933d68f613f95f0330098426fc5a08f.

patches/mfplat-reverts/0016-Revert-winegstreamer-Initialize-GStreamer-in-wg_pars.patch

@@ -1,7 +1,7 @@
-From a609f821cebb9005b52f5642c74d2e5d7a6a62c4 Mon Sep 17 00:00:00 2001
+From 1dd81b5b288ffe70164d06548cfcee61089ca0fd Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 2 Oct 2021 10:35:47 +1000
-Subject: [PATCH 11/17] Revert "winegstreamer: Initialize GStreamer in
+Subject: [PATCH 16/22] Revert "winegstreamer: Initialize GStreamer in
  wg_parser_create()."
 
 This reverts commit 3643f73ab61f05ddc9a637f8613c933dda0dd232.

patches/mfplat-reverts/0017-Revert-winegstreamer-Use-a-single-wg_parser_create-e.patch

@@ -1,7 +1,7 @@
-From 145dfaf9d560e16658710819e2b598e135ccb554 Mon Sep 17 00:00:00 2001
+From cf1958f12f33ec46546cac81d958cf38bf9245dc Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 2 Oct 2021 10:35:47 +1000
-Subject: [PATCH 12/17] Revert "winegstreamer: Use a single wg_parser_create()
+Subject: [PATCH 17/22] Revert "winegstreamer: Use a single wg_parser_create()
  entry point."
 
 This reverts commit eab189810d9c40c698bd049d9af647e195cd5993.

patches/mfplat-reverts/0018-Revert-winegstreamer-Fix-return-code-in-init_gst-fai.patch

@@ -1,7 +1,7 @@
-From d32ea8a60ed0666a860e3bb6d8bb0c2f11fc80bd Mon Sep 17 00:00:00 2001
+From 5e55fd289a3baca9c53757c3b7ace7e5f51040f4 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 19 Sep 2021 13:07:56 +1000
-Subject: [PATCH 13/17] Revert "winegstreamer: Fix return code in init_gst
+Subject: [PATCH 18/22] Revert "winegstreamer: Fix return code in init_gst
  failure case."
 
 This reverts commit b9a7e961cdd39203866be38e90b1d901595d54ba.

patches/mfplat-reverts/0019-Revert-winegstreamer-Allocate-source-media-buffers-i.patch

@@ -1,7 +1,7 @@
-From cfc2e7689ca9832750e81e11bcff48715a8de778 Mon Sep 17 00:00:00 2001
+From eb244f666ec0ed78a7ca101f735c6555648c8da6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 19 Sep 2021 13:08:02 +1000
-Subject: [PATCH 14/17] Revert "winegstreamer: Allocate source media buffers in
+Subject: [PATCH 19/22] Revert "winegstreamer: Allocate source media buffers in
  the PE components."
 
 This reverts commit 8b7390f80d866435f06f2571a93bcd67c0947673.

patches/mfplat-reverts/0020-Revert-winegstreamer-Duplicate-source-shutdown-path-.patch

@@ -1,7 +1,7 @@
-From 7ef1cf5893b686861b1704c9b87e2aa7ae29ce11 Mon Sep 17 00:00:00 2001
+From ee5ed3858dd7747358b2627511be3369f10a54c5 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 19 Sep 2021 13:08:03 +1000
-Subject: [PATCH 15/17] Revert "winegstreamer: Duplicate source shutdown path
+Subject: [PATCH 20/22] Revert "winegstreamer: Duplicate source shutdown path
  into constructor with leak fixes."
 
 This reverts commit 67734bfce31d6032cee1a8980a9022665e9e18fa.