wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 89ef7b59f548a76960b2278d819a8f915c81e132.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-26 04:01:25 +02:00
parent af6b4ace35
commit 229bb38973
5 changed files with 42 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch
View File

@@ -1,4 +1,4 @@
From 1cb822449427e537c098bb6b738bb983a0cf8ec1 Mon Sep 17 00:00:00 2001
From 7fd25e2e5a4397a4a4134ec50bb982b365f13534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 4 Oct 2014 02:53:22 +0200
Subject: ntdll: Setup a temporary signal handler during process startup to
@@ -15,7 +15,7 @@ Subject: ntdll: Setup a temporary signal handler during process startup to
7 files changed, 79 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index f5b5339..8d985d9 100644
index f78e4fe8f3..74e3c0a002 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
@@ -27,7 +27,7 @@ index f5b5339..8d985d9 100644
extern void debug_init(void) DECLSPEC_HIDDEN;
extern HANDLE thread_init(void) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index 1f6da96..cfb9df1 100644
index cb5f67db75..b9ec7fb874 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -974,6 +974,12 @@ void signal_init_process(void)
@@ -44,7 +44,7 @@ index 1f6da96..cfb9df1 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index bd91d81..3bd705f 100644
index 14c5260c14..7967310355 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -846,6 +846,12 @@ void signal_init_process(void)
@@ -61,10 +61,10 @@ index bd91d81..3bd705f 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index cf20483..7275233 100644
index bee6ab8694..ee8855a24c 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2035,6 +2035,31 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext )
@@ -2056,6 +2056,31 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext )
/**********************************************************************
@@ -96,7 +96,7 @@ index cf20483..7275233 100644
* segv_handler
*
* Handler for SIGSEGV and related errors.
@@ -2466,6 +2491,34 @@ void signal_init_process(void)
@@ -2493,6 +2518,34 @@ void signal_init_process(void)
exit(1);
}
@@ -132,7 +132,7 @@ index cf20483..7275233 100644
#ifdef __HAVE_VM86
/**********************************************************************
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 886da86..d2e7819 100644
index 507490a526..6adf0c343b 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -1048,6 +1048,12 @@ void signal_init_process(void)
@@ -149,10 +149,10 @@ index 886da86..d2e7819 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 9b98894..60170cc 100644
index 61bb2ddce6..1870c061c3 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2826,6 +2826,12 @@ void signal_init_process(void)
@@ -3005,6 +3005,12 @@ void signal_init_process(void)
exit(1);
}
@@ -166,11 +166,11 @@ index 9b98894..60170cc 100644
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 3696c8e..a5d10e5 100644
index 6b5e9f5c9c..3a3d6c0efd 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -224,6 +224,7 @@ HANDLE thread_init(void)
#endif
@@ -270,6 +270,7 @@ HANDLE thread_init(void)
static struct debug_info debug_info; /* debug info for initial thread */
virtual_init();
+ signal_init_early();
@@ -178,5 +178,5 @@ index 3696c8e..a5d10e5 100644
/* reserve space for shared user data */
--
2.4.3
2.12.2