diff --git a/README.md b/README.md index 76c589e6..6e0c6b43 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,9 @@ Wine. All those differences are also documented on the Included bugfixes and improvements ================================== -**Bugfixes and features included in the next upcoming release [1]:** +**Bugfixes and features included in the next upcoming release [2]:** +* Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](http://bugs.winehq.org/show_bug.cgi?id=37272 "CheatEngine 6.4 fails after remote process 'breakin', reporting 'Debugger Crash:Access violation (Last location:41)'")) * Support for FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW ([Wine Bug #35121](http://bugs.winehq.org/show_bug.cgi?id=35121 "Multiple applications/games fail to start with WinVer set to 'Windows 7' (FindFirstFileExW needs FIND_FIRST_EX_LARGE_FETCH support)(FotoQuelle Fotosoftware v4.13, QT5)")) diff --git a/debian/changelog b/debian/changelog index b77765d5..ee53cef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ wine-compholio (1.7.27) UNRELEASED; urgency=low * Fixed some issues in the patches for GetSystemTimes. * Added patch to support FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW. * Added patch to fix deadlock caused by incorrect wrapper of glu polygon/contour function. + * Added patch to avoid filling out KdHelp for usermode applications. * Removed patch to use assembly wrapper for TLS callbacks (accepted upstream). * Removed patch to fix uninitialized cch struct member in GetMenuItemInfo (accepted upstream). * Removed some patches for riched20/IText*-interface (accepted upstream). diff --git a/patches/Makefile b/patches/Makefile index db8d694d..43698cc8 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -26,6 +26,7 @@ PATCHLIST := \ comctl32-LoadIconMetric.ok \ configure-Absolute_RPATH.ok \ configure-Detect_Gnutls.ok \ + dbghelp-KdHelp.ok \ dsound-Fast_Mixer.ok \ fonts-Missing_Fonts.ok \ iphlpapi-TCP_Table.ok \ @@ -267,6 +268,24 @@ configure-Detect_Gnutls.ok: echo '+ { "configure-Detect_Gnutls", "Sebastian Lackner", "Fix detection of gnutls on Ubuntu 14.10. [rev 3]" },'; \ ) > configure-Detect_Gnutls.ok +# Patchset dbghelp-KdHelp +# | +# | Included patches: +# | * Don't fill KdHelp structure for usermode applications. [by Sebastian Lackner] +# | +# | This patchset fixes the following Wine bugs: +# | * [#37272] Don't fill KdHelp structure for usermode applications +# | +# | Modified files: +# | * dlls/dbghelp/stack.c +# | +.INTERMEDIATE: dbghelp-KdHelp.ok +dbghelp-KdHelp.ok: + $(call APPLY_FILE,dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch) + @( \ + echo '+ { "dbghelp-KdHelp", "Sebastian Lackner", "Don't fill KdHelp structure for usermode applications." },'; \ + ) > dbghelp-KdHelp.ok + # Patchset dsound-Fast_Mixer # | # | Included patches: diff --git a/patches/dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch b/patches/dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch new file mode 100644 index 00000000..2db7a99e --- /dev/null +++ b/patches/dbghelp-KdHelp/0001-dbghelp-Don-t-fill-KdHelp-structure-for-usermode-app.patch @@ -0,0 +1,32 @@ +From 78ab3400ea9c3c9ae9d85f3ee2952c20c7d68f73 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Mon, 15 Sep 2014 22:55:49 +0200 +Subject: dbghelp: Don't fill KdHelp structure for usermode applications. + +--- + dlls/dbghelp/stack.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c +index 3e1ff72..21412f6 100644 +--- a/dlls/dbghelp/stack.c ++++ b/dlls/dbghelp/stack.c +@@ -240,15 +240,6 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, + if (!cpu->stack_walk(&csw, frame, ctx)) return FALSE; + + /* we don't handle KdHelp */ +- frame->KdHelp.Thread = 0xC000FADE; +- frame->KdHelp.ThCallbackStack = 0x10; +- frame->KdHelp.ThCallbackBStore = 0; +- frame->KdHelp.NextCallback = 0; +- frame->KdHelp.FramePointer = 0; +- frame->KdHelp.KiCallUserMode = 0xD000DAFE; +- frame->KdHelp.KeUserCallbackDispatcher = 0xE000F000; +- frame->KdHelp.SystemRangeStart = 0xC0000000; +- frame->KdHelp.Reserved[0] /* KiUserExceptionDispatcher */ = 0xE0005000; + + return TRUE; + } +-- +2.1.0 + diff --git a/patches/dbghelp-KdHelp/definition b/patches/dbghelp-KdHelp/definition new file mode 100644 index 00000000..c3de36ed --- /dev/null +++ b/patches/dbghelp-KdHelp/definition @@ -0,0 +1,4 @@ +Author: Sebastian Lackner +Subject: Don't fill KdHelp structure for usermode applications. +Revision: 1 +Fixes: [37272] Don't fill KdHelp structure for usermode applications