wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-04-20 15:57:54 +02:00
parent c282ffecac
commit 1566e72122
7 changed files with 27 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -86,7 +86,7 @@ for more details.*
* Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
* Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
* Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
* Avoid crash when trying to bind mshtml event scripts to window ([Wine Bug #38419](https://bugs.winehq.org/show_bug.cgi?id=38419))
* ~~Avoid crash when trying to bind mshtml event scripts to window~~ ([Wine Bug #38419](https://bugs.winehq.org/show_bug.cgi?id=38419))
* Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
* Avoid race-conditions in NtReadFile() operations with write watches.
* Avoid race-conditions of async WSARecv() operations with write watches.

4
debian/changelog vendored
View File

@ -1,3 +1,7 @@
wine-staging (1.7.42) UNRELEASED; urgency=low
* Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 20 Apr 2015 15:55:51 +0200
wine-staging (1.7.41) unstable; urgency=low
* Updated server-PeekMessage patchset to reset message filter in accept_hardware_message call (fixes Wine Staging Bug #211).
* Updated ntdll-FileDispositionInformation patchset to block deleting mapped files (by Qian Hong, fixes Wine Staging Bug #228).

28
patches/mshtml-Event_Scripts/0001-mshtml-Avoid-crash-when-trying-to-bind-event-scripts.patch
View File

@ -1,28 +0,0 @@
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
View File

@ -1 +0,0 @@
Fixes: [38419] Avoid crash when trying to bind mshtml event scripts to window

24
patches/msxml3-Coverity/0001-msxml3-Add-a-missing-break-Coverity.patch
View File

@ -1,24 +0,0 @@
From 5533c5dcaaecdca695a44018611d37d06ffe6522 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 18 Apr 2015 23:31:02 +0200
Subject: msxml3: Add a missing break (Coverity).
---
dlls/msxml3/node.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 7119a43..1ddc9bf 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -2055,6 +2055,7 @@ IXMLDOMNode *create_node( xmlNodePtr node )
new_node->ref = 1;
init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL);
pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface;
+ break;
}
default:
ERR("Called for unsupported node type %d\n", node->type);
--
2.3.5

15
patches/ntdll-DVD_Read_Size/0001-ntdll-Fix-expected-IOCTL_DVD_READ_STRUCTURE-expected.patch
View File

@ -1,17 +1,18 @@
From 702df64368e9d8fbdeac60a5f0fd17f98cac139d Mon Sep 17 00:00:00 2001
From bb710e8476f67b51076f25866657f97c7907c442 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Mon, 22 Dec 2014 20:32:29 -0700
Subject: ntdll: Fix expected IOCTL_DVD_READ_STRUCTURE expected output size. (rev 2)
Subject: ntdll: Fix expected IOCTL_DVD_READ_STRUCTURE expected output size.
(rev 2)
---
dlls/ntdll/cdrom.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 62c3d16..6ff120b 100644
index 25a3fde..4407277 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -2492,6 +2492,28 @@ static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region)
@@ -2491,6 +2491,28 @@ static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region)
#endif
}
@ -40,8 +41,8 @@ index 62c3d16..6ff120b 100644
/******************************************************************
* DVD_ReadStructure
*
@@ -3095,7 +3117,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice,
status = DVD_GetRegion(fd, lpOutBuffer);
@@ -3097,7 +3119,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice,
}
break;
case IOCTL_DVD_READ_STRUCTURE:
- sz = sizeof(DVD_LAYER_DESCRIPTOR);
@ -50,5 +51,5 @@ index 62c3d16..6ff120b 100644
else if (nOutBufferSize < sz || !lpOutBuffer) status = STATUS_BUFFER_TOO_SMALL;
else
--
2.2.2
2.3.5

63
patches/patchinstall.sh
View File

@ -130,12 +130,10 @@ 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"
enable_msvfw32_Image_Size="$1"
enable_msxml3_Coverity="$1"
enable_ntdll_APC_Performance="$1"
enable_ntdll_APC_Start_Process="$1"
enable_ntdll_Activation_Context="$1"
@ -466,9 +464,6 @@ 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"
;;
@ -481,9 +476,6 @@ patch_enable ()
msvfw32-Image_Size)
enable_msvfw32_Image_Size="$2"
;;
msxml3-Coverity)
enable_msxml3_Coverity="$2"
;;
ntdll-APC_Performance)
enable_ntdll_APC_Performance="$2"
;;
@ -2689,20 +2681,6 @@ 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:
@ -2744,6 +2722,20 @@ 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:
@ -3054,21 +3046,6 @@ 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:
@ -3131,18 +3108,6 @@ if test "$enable_msvfw32_Image_Size" -eq 1; then
) >> "$patchlist"
fi
# Patchset msxml3-Coverity
# |
# | Modified files:
# | * dlls/msxml3/node.c
# |
if test "$enable_msxml3_Coverity" -eq 1; then
patch_apply msxml3-Coverity/0001-msxml3-Add-a-missing-break-Coverity.patch
(
echo '+ { "Sebastian Lackner", "msxml3: Add a missing break (Coverity).", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-APC_Performance
# |
# | Modified files: