Rebase against 900dfca3899d52f3085c713e26af06aa5aea37a4.

This commit is contained in:
Alistair Leslie-Hughes
2023-07-18 11:18:33 +10:00
parent 4482bd3493
commit 6b7e43830c
6 changed files with 105 additions and 126 deletions

View File

@@ -1,4 +1,4 @@
From 4935d5a693f839352e94094c2bbfeb361baff009 Mon Sep 17 00:00:00 2001
From 3986e2d381e2b78d0bc572b7014f2445aa4bc6fd 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: [PATCH] ntdll: Setup a temporary signal handler during process
@@ -45,10 +45,10 @@ index 28cb2222809..b3b55a11e4f 100644
/***********************************************************************
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index f553aac1993..192baf23251 100644
index d98268bcd54..2b92bbd7ed3 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -1576,6 +1576,12 @@ void signal_init_process(void)
@@ -1594,6 +1594,12 @@ void signal_init_process(void)
exit(1);
}
@@ -60,7 +60,7 @@ index f553aac1993..192baf23251 100644
+}
/***********************************************************************
* call_init_thunk
* syscall_dispatcher_return_slowpath
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 11bdd9c1ea6..f688795ab91 100644
--- a/dlls/ntdll/unix/signal_i386.c
@@ -132,10 +132,10 @@ index 11bdd9c1ea6..f688795ab91 100644
/***********************************************************************
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 8302976706c..a1d118b61da 100644
index 0204139631f..f8831b80a2b 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2640,6 +2640,12 @@ void signal_init_process(void)
@@ -2455,6 +2455,12 @@ void signal_init_process(void)
exit(1);
}
@@ -149,7 +149,7 @@ index 8302976706c..a1d118b61da 100644
/***********************************************************************
* call_init_thunk
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 16bf5cc2c78..c03d8675244 100644
index e1cace7ba78..0ea15f48787 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -268,6 +268,7 @@ extern void signal_init_threading(void) DECLSPEC_HIDDEN;
@@ -161,7 +161,7 @@ index 16bf5cc2c78..c03d8675244 100644
BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index a06f675af7c..a7705e78fb4 100644
index b5fdeb5707b..03ce50d0677 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -3703,7 +3703,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )