From 648db00708ddafcbc1bcce40d755007fd2c12c39 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Fri, 13 Mar 2020 21:39:01 -0500
Subject: [PATCH] wineqtdecoder-fix-compilation: New patch set.

---
 patches/patchinstall.sh                       | 16 ++++
 .../0001-wineqtdecoder-Fix-compilation.patch  | 78 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 patches/wineqtdecoder-fix-compilation/0001-wineqtdecoder-Fix-compilation.patch

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 9806d37b..154adae4 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -325,6 +325,7 @@ patch_enable_all ()
 	enable_winemenubuilder_Desktop_Icon_Path="$1"
 	enable_wineps_drv_PostScript_Fixes="$1"
 	enable_winepulse_PulseAudio_Support="$1"
+	enable_wineqtdecoder_fix_compilation="$1"
 	enable_winex11_CandidateWindowPos="$1"
 	enable_winex11_DefaultDisplayFrequency="$1"
 	enable_winex11_MWM_Decorations="$1"
@@ -1086,6 +1087,9 @@ patch_enable ()
 		winepulse-PulseAudio_Support)
 			enable_winepulse_PulseAudio_Support="$2"
 			;;
+		wineqtdecoder-fix-compilation)
+			enable_wineqtdecoder_fix_compilation="$2"
+			;;
 		winex11-CandidateWindowPos)
 			enable_winex11_CandidateWindowPos="$2"
 			;;
@@ -6848,6 +6852,18 @@ if test "$enable_winepulse_PulseAudio_Support" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wineqtdecoder-fix-compilation
+# |
+# | Modified files:
+# |   *	dlls/wineqtdecoder/qtvdecoder.c
+# |
+if test "$enable_wineqtdecoder_fix_compilation" -eq 1; then
+	patch_apply wineqtdecoder-fix-compilation/0001-wineqtdecoder-Fix-compilation.patch
+	(
+		printf '%s\n' '+    { "Alistair Leslie-Hughes", "wineqtdecoder: Fix compilation.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset winex11-CandidateWindowPos
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/wineqtdecoder-fix-compilation/0001-wineqtdecoder-Fix-compilation.patch b/patches/wineqtdecoder-fix-compilation/0001-wineqtdecoder-Fix-compilation.patch
new file mode 100644
index 00000000..29429ef8
--- /dev/null
+++ b/patches/wineqtdecoder-fix-compilation/0001-wineqtdecoder-Fix-compilation.patch
@@ -0,0 +1,78 @@
+From 2b7f78363d8ad03c0c566ec452abc69bcac347d1 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 14 Mar 2020 10:52:14 +1100
+Subject: [PATCH] wineqtdecoder: Fix compilation.
+
+Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
+---
+ dlls/wineqtdecoder/qtvdecoder.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c
+index eaaf30acdb..41b29786cc 100644
+--- a/dlls/wineqtdecoder/qtvdecoder.c
++++ b/dlls/wineqtdecoder/qtvdecoder.c
+@@ -128,8 +128,6 @@
+ #include "qtprivate.h"
+ #include "wineqtdecoder_classes.h"
+ 
+-extern CLSID CLSID_QTVDecoder;
+-
+ WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder);
+ 
+ typedef struct QTVDecoderImpl
+@@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl
+     struct strmbase_filter filter;
+     CRITICAL_SECTION stream_cs;
+ 
++    AM_MEDIA_TYPE mt;
++
+     struct strmbase_source source;
+     IUnknown *seeking;
+ 
+@@ -266,7 +266,7 @@ error:
+     This->decodeHR = hr;
+ }
+ 
+-static HRESULT WINAPI video_decoder_Receive(struct strmbase_sink *iface, IMediaSample *pSample)
++static HRESULT WINAPI video_decoder_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample)
+ {
+     QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter);
+     HRESULT hr;
+@@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface,
+     return S_OK;
+ }
+ 
+-static HRESULT WINAPI video_decoder_DecideBufferSize(struct strmbase_source *iface,
++static HRESULT WINAPI video_decoder_source_DecideBufferSize(struct strmbase_source *iface,
+         IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest)
+ {
+     QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter);
+@@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface)
+ 
+ static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface)
+ {
+-    QTVDecoderImpl* This = impl_from_TransformFilter(pTransformFilter);
++    QTVDecoderImpl* This = impl_from_strmbase_filter(iface);
+ 
+     if (This->decompressionSession)
+         ICMDecompressionSessionRelease(This->decompressionSession);
+@@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out)
+ {
+     QTVDecoderImpl *object;
+     HRESULT hr;
++    ISeekingPassThru *passthrough;
+ 
+     if (!(object = calloc(1, sizeof(*object))))
+         return E_OUTOFMEMORY;
+@@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out)
+     ISeekingPassThru_Release(passthrough);
+ 
+     TRACE("Created video decoder %p.\n", object);
+-    *out = &object->tf.filter.IUnknown_inner;
++    *out = &object->filter.IUnknown_inner;
+     return S_OK;
+ }
+-- 
+2.25.1
+