From 17ee57bb5105f889711187e5847c744d38bf871b Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 16 Mar 2016 01:25:08 +0100 Subject: [PATCH] Added patch to fix implementation of impl_from_ITargetFrame2. --- ...ementation-of-impl_from_ITargetFrame.patch | 25 +++++++++++++++++++ patches/patchinstall.sh | 16 ++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 patches/ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch diff --git a/patches/ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch b/patches/ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch new file mode 100644 index 00000000..b8860350 --- /dev/null +++ b/patches/ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch @@ -0,0 +1,25 @@ +From 1b110d47948ea020afbfebda288d8362837b8f43 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Wed, 16 Mar 2016 01:18:05 +0100 +Subject: ieframe: Fix implementation of impl_from_ITargetFrame2. + +--- + dlls/ieframe/navigate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c +index 1027313eb..88bc7e6 100644 +--- a/dlls/ieframe/navigate.c ++++ b/dlls/ieframe/navigate.c +@@ -1243,7 +1243,7 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { + + static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface) + { +- return CONTAINING_RECORD(iface, HlinkFrame, IHlinkFrame_iface); ++ return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface); + } + + static HRESULT WINAPI TargetFrame2_QueryInterface(ITargetFrame2 *iface, REFIID riid, void **ppv) +-- +2.7.1 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fe05debf..b11bc754 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -154,6 +154,7 @@ patch_enable_all () enable_hal_KeQueryPerformanceCounter="$1" enable_hid_HidP_TranslateUsagesToI8042ScanCodes="$1" enable_hnetcfg_INetFwAuthorizedApplication="$1" + enable_ieframe_ITargetFrame2="$1" enable_ieframe_IViewObject_Draw="$1" enable_iexplore_Revert_ProductVersion="$1" enable_imagehlp_BindImageEx="$1" @@ -632,6 +633,9 @@ patch_enable () hnetcfg-INetFwAuthorizedApplication) enable_hnetcfg_INetFwAuthorizedApplication="$2" ;; + ieframe-ITargetFrame2) + enable_ieframe_ITargetFrame2="$2" + ;; ieframe-IViewObject-Draw) enable_ieframe_IViewObject_Draw="$2" ;; @@ -3850,6 +3854,18 @@ if test "$enable_hnetcfg_INetFwAuthorizedApplication" -eq 1; then ) >> "$patchlist" fi +# Patchset ieframe-ITargetFrame2 +# | +# | Modified files: +# | * dlls/ieframe/navigate.c +# | +if test "$enable_ieframe_ITargetFrame2" -eq 1; then + patch_apply ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch + ( + echo '+ { "Sebastian Lackner", "ieframe: Fix implementation of impl_from_ITargetFrame2.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ieframe-IViewObject-Draw # | # | This patchset fixes the following Wine bugs: