diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index da999457..58a127ac 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -251,6 +251,7 @@ patch_enable_all () enable_opengl32_glDebugMessageCallback="$1" enable_quartz_AsyncReader="$1" enable_quartz_MediaSeeking_Positions="$1" + enable_quartz_Silence_FIXMEs="$1" enable_rasapi32_RasEnumDevicesA="$1" enable_riched20_IText_Interface="$1" enable_rpcrt4_Pipe_Transport="$1" @@ -897,6 +898,9 @@ patch_enable () quartz-MediaSeeking_Positions) enable_quartz_MediaSeeking_Positions="$2" ;; + quartz-Silence_FIXMEs) + enable_quartz_Silence_FIXMEs="$2" + ;; rasapi32-RasEnumDevicesA) enable_rasapi32_RasEnumDevicesA="$2" ;; @@ -5416,6 +5420,18 @@ if test "$enable_quartz_MediaSeeking_Positions" -eq 1; then ) >> "$patchlist" fi +# Patchset quartz-Silence_FIXMEs +# | +# | Modified files: +# | * dlls/quartz/parser.c +# | +if test "$enable_quartz_Silence_FIXMEs" -eq 1; then + patch_apply quartz-Silence_FIXMEs/0001-quartz-Don-t-print-FIXME-for-IAMFilterMiscFlags-in-p.patch + ( + echo '+ { "Christian Costa", "quartz: Don'\''t print FIXME for IAMFilterMiscFlags in parsers.", 1 },'; + ) >> "$patchlist" +fi + # Patchset rasapi32-RasEnumDevicesA # | # | This patchset fixes the following Wine bugs: diff --git a/patches/quartz-Silence_FIXMEs/0001-quartz-Don-t-print-FIXME-for-IAMFilterMiscFlags-in-p.patch b/patches/quartz-Silence_FIXMEs/0001-quartz-Don-t-print-FIXME-for-IAMFilterMiscFlags-in-p.patch new file mode 100644 index 00000000..f3fe2ff3 --- /dev/null +++ b/patches/quartz-Silence_FIXMEs/0001-quartz-Don-t-print-FIXME-for-IAMFilterMiscFlags-in-p.patch @@ -0,0 +1,30 @@ +From 9d18943140ce1ee26d238bf257a8b52cc6332e8e Mon Sep 17 00:00:00 2001 +From: Christian Costa +Date: Fri, 19 Feb 2016 10:01:14 +0100 +Subject: quartz: Don't print FIXME for IAMFilterMiscFlags in parsers. + +--- + dlls/quartz/parser.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c +index fd98787..fcc88a7 100644 +--- a/dlls/quartz/parser.c ++++ b/dlls/quartz/parser.c +@@ -155,8 +155,12 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * + return S_OK; + } + +- if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) ++ if (!IsEqualIID(riid, &IID_IPin) && ++ !IsEqualIID(riid, &IID_IVideoWindow) && ++ !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) ++ { + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); ++ } + + return E_NOINTERFACE; + } +-- +2.7.0 + diff --git a/patches/quartz-Silence_FIXMEs/definition b/patches/quartz-Silence_FIXMEs/definition new file mode 100644 index 00000000..80459db4 --- /dev/null +++ b/patches/quartz-Silence_FIXMEs/definition @@ -0,0 +1 @@ +Fixes: Silence repeated FIXME message in Parser_QueryInterface