From dffcd7e6d61a43855170bf739e27de09c95fbc0b Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 12 Nov 2018 14:44:54 +1100 Subject: [PATCH] Added wmvcore-WMCheckURlExtension patchset --- patches/patchinstall.sh | 19 ++++++ ...ore-Add-stub-for-WMCheckURlExtension.patch | 60 +++++++++++++++++++ .../wmvcore-WMCheckURlExtension/definition | 1 + 3 files changed, 80 insertions(+) create mode 100644 patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch create mode 100644 patches/wmvcore-WMCheckURlExtension/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d1c911f4..443de50c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -390,6 +390,7 @@ patch_enable_all () enable_wintab32_improvements="$1" enable_wintrust_WTHelperGetProvCertFromChain="$1" enable_wintrust_WinVerifyTrust="$1" + enable_wmvcore_WMCheckURlExtension="$1" enable_wow64cpu_Wow64Transition="$1" enable_wpcap_Dynamic_Linking="$1" enable_ws2_32_APC_Performance="$1" @@ -1333,6 +1334,9 @@ patch_enable () wintrust-WinVerifyTrust) enable_wintrust_WinVerifyTrust="$2" ;; + wmvcore-WMCheckURlExtension) + enable_wmvcore_WMCheckURlExtension="$2" + ;; wow64cpu-Wow64Transition) enable_wow64cpu_Wow64Transition="$2" ;; @@ -7867,6 +7871,21 @@ if test "$enable_wintrust_WTHelperGetProvCertFromChain" -eq 1; then ) >> "$patchlist" fi +# Patchset wmvcore-WMCheckURlExtension +# | +# | This patchset fixes the following Wine bugs: +# | * [#44300] wmvcore: Add stub for WMCheckURlExtension +# | +# | Modified files: +# | * dlls/wmvcore/wmvcore.spec, dlls/wmvcore/wmvcore_main.c, include/wmsdkidl.idl +# | +if test "$enable_wmvcore_WMCheckURlExtension" -eq 1; then + patch_apply wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch + ( + printf '%s\n' '+ { "Vijay Kiran Kamuju", "wmvcore: Add stub for WMCheckURlExtension.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wpcap-Dynamic_Linking # | # | Modified files: diff --git a/patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch b/patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch new file mode 100644 index 00000000..03e7a423 --- /dev/null +++ b/patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch @@ -0,0 +1,60 @@ +From 10f582be96ce5acf9e4dd48b3af865fb47917ff8 Mon Sep 17 00:00:00 2001 +From: Vijay Kiran Kamuju +Date: Thu, 11 Jan 2018 14:09:57 +0100 +Subject: [PATCH] wmvcore: Add stub for WMCheckURlExtension + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 +Signed-off-by: Vijay Kiran Kamuju +--- + dlls/wmvcore/wmvcore.spec | 2 +- + dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ + include/wmsdkidl.idl | 2 ++ + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec +index f3e3b64..61c3c08 100644 +--- a/dlls/wmvcore/wmvcore.spec ++++ b/dlls/wmvcore/wmvcore.spec +@@ -1,4 +1,4 @@ +-@ stub WMCheckURLExtension ++@ stdcall WMCheckURLExtension(wstr) + @ stdcall WMCheckURLScheme(wstr) + @ stub WMCreateBackupRestorerPrivate + @ stub WMCreateSyncReaderPriv +diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c +index 690885e..14014ee 100644 +--- a/dlls/wmvcore/wmvcore_main.c ++++ b/dlls/wmvcore/wmvcore_main.c +@@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) + return S_OK; + } + ++HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) ++{ ++ FIXME("(%s): stub\n", wine_dbgstr_w(url)); ++ ++ if (!url) ++ return E_INVALIDARG; ++ ++ return NS_E_INVALID_NAME; ++} ++ + HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) + { + FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); +diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl +index 5bc8546..bb7bfee 100644 +--- a/include/wmsdkidl.idl ++++ b/include/wmsdkidl.idl +@@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown + [in] DWORD flags); + }; + ++cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") ++cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") + cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") + +-- +1.9.1 + diff --git a/patches/wmvcore-WMCheckURlExtension/definition b/patches/wmvcore-WMCheckURlExtension/definition new file mode 100644 index 00000000..6cf4872a --- /dev/null +++ b/patches/wmvcore-WMCheckURlExtension/definition @@ -0,0 +1 @@ +Fixes: [44300] wmvcore: Add stub for WMCheckURlExtension