mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Added patch to avoid crash when trying to bind mshtml event scripts to window.
This commit is contained in:
Sebastian Lackner
parent
f1064ee0bd
commit
923966f191
@ -39,13 +39,14 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [11]:**
|
||||
**Bug fixes and features included in the next upcoming release [12]:**
|
||||
|
||||
* Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
|
||||
* Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
|
||||
* Add stub for WinSqmIsOptedIn ([Wine Bug #38388](https://bugs.winehq.org/show_bug.cgi?id=38388))
|
||||
* Add support for process specific debug channels
|
||||
* Add support for wbemprox Win32_SystemEnclosure table ([Wine Bug #34517](https://bugs.winehq.org/show_bug.cgi?id=34517))
|
||||
* Avoid crash when trying to bind mshtml event scripts to window ([Wine Bug #38419](https://bugs.winehq.org/show_bug.cgi?id=38419))
|
||||
* Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
|
||||
* Fix handling of opening read-only files for FILE_DELETE_ON_CLOSE ([Wine Bug #38417](https://bugs.winehq.org/show_bug.cgi?id=38417))
|
||||
* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38264](https://bugs.winehq.org/show_bug.cgi?id=38264))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -17,6 +17,7 @@ wine-staging (1.7.41) UNRELEASED; urgency=low
|
||||
* Added patch for implementation of mfplat.MFTRegister.
|
||||
* Added patch for stub of ntdll.WinSqmIsOptedIn.
|
||||
* Added patch for ProfileList\<UserSID> registry subkey.
|
||||
* Added patch to avoid crash when trying to bind mshtml event scripts to window.
|
||||
* Added tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
|
||||
* Removed patches to fix invalid memory access in get_registry_locale_info (accepted upstream).
|
||||
* Removed patches to avoid repeated FIXMEs in PsLookupProcessByProcessId stub (accepted upstream).
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 86412d7f8bd47ab0228e3a2375e353003f27c199 Mon Sep 17 00:00:00 2001
|
||||
From: Jacek Caban <jacek@codeweavers.com>
|
||||
Date: Sat, 18 Apr 2015 21:48:00 +0200
|
||||
Subject: mshtml: Avoid crash when trying to bind event scripts to window.
|
||||
|
||||
---
|
||||
dlls/mshtml/script.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c
|
||||
index 4590854..e38e5bf 100644
|
||||
--- a/dlls/mshtml/script.c
|
||||
+++ b/dlls/mshtml/script.c
|
||||
@@ -1506,8 +1506,10 @@ void bind_event_scripts(HTMLDocumentNode *doc)
|
||||
|
||||
if(SUCCEEDED(hres))
|
||||
bind_activex_event(doc, plugin_container, event, event_disp);
|
||||
- else
|
||||
+ else if(target_node)
|
||||
bind_node_event(doc, event_target, target_node, event, event_disp);
|
||||
+ else
|
||||
+ FIXME("binding to window not supported.\n");
|
||||
|
||||
if(target_node) {
|
||||
IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface);
|
||||
--
|
||||
2.3.5
|
||||
|
||||
1
patches/mshtml-Event_Scripts/definition
Normal file
1
patches/mshtml-Event_Scripts/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [38419] Avoid crash when trying to bind mshtml event scripts to window
|
||||
@ -130,6 +130,7 @@ patch_enable_all ()
|
||||
enable_mmdevapi_AEV_Stubs="$1"
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_mshtml_Event_Scripts="$1"
|
||||
enable_msvcp90_basic_string_wchar_dtor="$1"
|
||||
enable_msvcrt_Math_Precision="$1"
|
||||
enable_msvcrt_atof_strtod="$1"
|
||||
@ -464,6 +465,9 @@ patch_enable ()
|
||||
mscoree-CorValidateImage)
|
||||
enable_mscoree_CorValidateImage="$2"
|
||||
;;
|
||||
mshtml-Event_Scripts)
|
||||
enable_mshtml_Event_Scripts="$2"
|
||||
;;
|
||||
msvcp90-basic_string_wchar_dtor)
|
||||
enable_msvcp90_basic_string_wchar_dtor="$2"
|
||||
;;
|
||||
@ -2681,6 +2685,20 @@ if test "$enable_kernel32_Console_Handles" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-File_Permissions
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2722,20 +2740,6 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-CopyFileEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3046,6 +3050,21 @@ if test "$enable_mscoree_CorValidateImage" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mshtml-Event_Scripts
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38419] Avoid crash when trying to bind mshtml event scripts to window
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/mshtml/script.c
|
||||
# |
|
||||
if test "$enable_mshtml_Event_Scripts" -eq 1; then
|
||||
patch_apply mshtml-Event_Scripts/0001-mshtml-Avoid-crash-when-trying-to-bind-event-scripts.patch
|
||||
(
|
||||
echo '+ { "Jacek Caban", "mshtml: Avoid crash when trying to bind event scripts to window.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msvcp90-basic_string_wchar_dtor
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user