From 6197fa1681e59d87a904f3b381467a84db3f2241 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 17 Apr 2016 08:30:26 +0200 Subject: [PATCH] ntdll-Dealloc_Thread_Stack: Temporarily reenable patchset. Without this patch, 64-bit MSYS2 runs into a STATUS_CONFLICTING_ADDRESSES issue on x86_64 during fork(). This patch is not a proper solution, so it will be disabled again in one of the future versions. --- patches/ntdll-Dealloc_Thread_Stack/definition | 1 - patches/patchinstall.sh | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/patches/ntdll-Dealloc_Thread_Stack/definition b/patches/ntdll-Dealloc_Thread_Stack/definition index 7b04369a..b0f50a6f 100644 --- a/patches/ntdll-Dealloc_Thread_Stack/definition +++ b/patches/ntdll-Dealloc_Thread_Stack/definition @@ -1,2 +1 @@ Fixes: Do not allow to deallocate thread stack for current thread -Disabled: true diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6359248f..72c8141b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -196,6 +196,7 @@ patch_enable_all () enable_ntdll_ApiSetQueryApiSetPresence="$1" enable_ntdll_CLI_Images="$1" enable_ntdll_DOS_Attributes="$1" + enable_ntdll_Dealloc_Thread_Stack="$1" enable_ntdll_DeviceType_Systemroot="$1" enable_ntdll_DllOverrides_WOW64="$1" enable_ntdll_DllRedirects="$1" @@ -765,6 +766,9 @@ patch_enable () ntdll-DOS_Attributes) enable_ntdll_DOS_Attributes="$2" ;; + ntdll-Dealloc_Thread_Stack) + enable_ntdll_Dealloc_Thread_Stack="$2" + ;; ntdll-DeviceType_Systemroot) enable_ntdll_DeviceType_Systemroot="$2" ;; @@ -4639,6 +4643,19 @@ if test "$enable_ntdll_DOS_Attributes" -eq 1; then ) >> "$patchlist" fi +# Patchset ntdll-Dealloc_Thread_Stack +# | +# | Modified files: +# | * dlls/ntdll/ntdll_misc.h, dlls/ntdll/signal_arm.c, dlls/ntdll/signal_arm64.c, dlls/ntdll/signal_i386.c, +# | dlls/ntdll/signal_powerpc.c, dlls/ntdll/signal_x86_64.c, dlls/ntdll/virtual.c +# | +if test "$enable_ntdll_Dealloc_Thread_Stack" -eq 1; then + patch_apply ntdll-Dealloc_Thread_Stack/0001-ntdll-Do-not-allow-to-allocate-thread-stack-for-curr.patch + ( + echo '+ { "Sebastian Lackner", "ntdll: Do not allow to deallocate thread stack for current thread.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ntdll-DeviceType_Systemroot # | # | This patchset fixes the following Wine bugs: