Added patch to pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4.

README.md

@@ -34,7 +34,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [12]:**
+**Bug fixes and features included in the next upcoming release [13]:**
 
 * Add implementation for msidb commandline tool
 * Codepage conversion should fail when destination length is < 0
@@ -44,6 +44,7 @@ Included bug fixes and improvements
 * Fix calculation of listbox size when horizontal scrollbar is present ([Wine Bug #38142](https://bugs.winehq.org/show_bug.cgi?id=38142))
 * Implement additional stub functions in authz.dll
 * Implement semi-stub for d3d8 swapchain effect D3DSWAPEFFECT_COPY_VSYNC ([Wine Bug #39281](https://bugs.winehq.org/show_bug.cgi?id=39281))
+* Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4 ([Wine Bug #39356](https://bugs.winehq.org/show_bug.cgi?id=39356))
 * Protect TVM_GETITEM from invalid item pointers ([Wine Bug #33001](https://bugs.winehq.org/show_bug.cgi?id=33001))
 * Reduce stack usage of virtual memory functions ([Wine Bug #34558](https://bugs.winehq.org/show_bug.cgi?id=34558))
 * Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called ([Wine Bug #21855](https://bugs.winehq.org/show_bug.cgi?id=21855))

debian/changelog

@@ -20,6 +20,8 @@ wine-staging (1.7.52) UNRELEASED; urgency=low
   * Added patch to implement additional stub functions in authz.dll.
   * Added patch to avoid waiting for hook thread startup in
     IDirectInput8::Initialize.
+  * Added patch to pass cookie by reference to msvcrt_local_unwind4 in
+    _seh_longjmp_unwind4.
   * Removed patch to fix possible memory leak in netprofm init_networks (fixed
     upstream).
   * Removed patch for stub of dwmapi.DwmUpdateThumbnailProperties (accepted

patches/msvcrt-_seh_longjmp_unwind4/0001-msvcrt-Pass-cookie-reference-to-msvcrt_local_unwind4.patch

@@ -0,0 +1,26 @@
+From 3c3b2cc8ce0cf1acbaa409dce17315f851374bcb Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 2 Oct 2015 01:41:20 +0200
+Subject: msvcrt: Pass cookie reference to msvcrt_local_unwind4 instead of
+ value.
+
+---
+ dlls/msvcrt/except_i386.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c
+index 6cbb758..1625854 100644
+--- a/dlls/msvcrt/except_i386.c
++++ b/dlls/msvcrt/except_i386.c
+@@ -1127,7 +1127,7 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp)
+  */
+ void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp)
+ {
+-    msvcrt_local_unwind4( (void *)jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration,
++    msvcrt_local_unwind4( (ULONG *)&jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration,
+                           jmp->TryLevel, (void *)jmp->Ebp );
+ }
+ 
+-- 
+2.5.1
+

patches/msvcrt-_seh_longjmp_unwind4/definition

@@ -0,0 +1 @@
+Fixes: [39356] Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4

patches/patchinstall.sh

@@ -179,6 +179,7 @@ patch_enable_all ()
 	enable_msvcp90_basic_string_dtor="$1"
 	enable_msvcrt_Math_Precision="$1"
 	enable_msvcrt_StdHandle_RefCount="$1"
+	enable_msvcrt__seh_longjmp_unwind4="$1"
 	enable_msvfw32_Image_Size="$1"
 	enable_ntdll_APC_Performance="$1"
 	enable_ntdll_APC_Start_Process="$1"
@@ -637,6 +638,9 @@ patch_enable ()
 		msvcrt-StdHandle_RefCount)
 			enable_msvcrt_StdHandle_RefCount="$2"
 			;;
+		msvcrt-_seh_longjmp_unwind4)
+			enable_msvcrt__seh_longjmp_unwind4="$2"
+			;;
 		msvfw32-Image_Size)
 			enable_msvfw32_Image_Size="$2"
 			;;
@@ -3894,6 +3898,21 @@ if test "$enable_msvcrt_StdHandle_RefCount" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset msvcrt-_seh_longjmp_unwind4
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#39356] Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4
+# |
+# | Modified files:
+# |   *	dlls/msvcrt/except_i386.c
+# |
+if test "$enable_msvcrt__seh_longjmp_unwind4" -eq 1; then
+	patch_apply msvcrt-_seh_longjmp_unwind4/0001-msvcrt-Pass-cookie-reference-to-msvcrt_local_unwind4.patch
+	(
+		echo '+    { "Sebastian Lackner", "msvcrt: Pass cookie reference to msvcrt_local_unwind4 instead of value.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset msvfw32-Image_Size
 # |
 # | This patchset fixes the following Wine bugs: