Rebase against upstream changes.

This commit is contained in:
Sebastian Lackner 2015-02-06 21:41:46 +01:00
parent 99fc70333a
commit 1b9fa30106

View File

@ -1,4 +1,4 @@
From 91cdcf5f955d3cbd7a22531054448dc01c171e66 Mon Sep 17 00:00:00 2001
From 987e4f22d9f0647bf6d68b9be95e79ee578094dd 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,10 +15,10 @@ Subject: ntdll: Setup a temporary signal handler during process startup to
7 files changed, 73 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index e56e78b..a33f7a0 100644
index afd1980..e344c31 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -67,6 +67,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
@@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN;
extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN;
extern void signal_init_process(void) DECLSPEC_HIDDEN;
@ -143,10 +143,10 @@ index 0fca342..5d1d756 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 05581c2..22da5d6 100644
index c71069d..07a0f6e 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2576,6 +2576,12 @@ void signal_init_process(void)
@@ -2623,6 +2623,12 @@ void signal_init_process(void)
exit(1);
}
@ -160,11 +160,11 @@ index 05581c2..22da5d6 100644
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index c8461b0..a2937c2 100644
index 3696c8e..a5d10e5 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -221,6 +221,7 @@ HANDLE thread_init(void)
static struct debug_info debug_info; /* debug info for initial thread */
@@ -224,6 +224,7 @@ HANDLE thread_init(void)
#endif
virtual_init();
+ signal_init_early();
@ -172,5 +172,5 @@ index c8461b0..a2937c2 100644
/* reserve space for shared user data */
--
2.2.1
2.2.2