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 00a0e2cd8c4df240371ddd22516e4e3544a142ce.

Browse Source
This commit is contained in:
Zebediah Figura
2020-09-02 09:38:53 -05:00
parent db87b45e49
commit 6c6ef5bfa4
8 changed files with 136 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 56a7847900cca65126f586cb58f65ba46af203b5 Mon Sep 17 00:00:00 2001
From 1703abc6afb86f5427ba73bcf6384bdea6d0eb69 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
@@ -15,10 +15,10 @@ Subject: [PATCH] ntdll: Setup a temporary signal handler during process
7 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 69ea69ad530..c5834cd58fa 100644
index 6f25f4ae87e..f9a26e6a531 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1649,6 +1649,7 @@ void __wine_main( int argc, char *argv[], char *envp[] )
@@ -1657,6 +1657,7 @@ void __wine_main( int argc, char *argv[], char *envp[] )
#endif
virtual_init();
@@ -27,10 +27,10 @@ index 69ea69ad530..c5834cd58fa 100644
init_environment( argc, argv, envp );
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index be8e5e4b735..1f01305f629 100644
index 89baf6db3df..f5c683ec4e1 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -980,6 +980,12 @@ void signal_init_process(void)
@@ -979,6 +979,12 @@ void signal_init_process(void)
exit(1);
}
@@ -44,10 +44,10 @@ index be8e5e4b735..1f01305f629 100644
/***********************************************************************
* init_thread_context
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 169f50985e9..ccdd438b62a 100644
index cfe1c75b59f..c599ce8d308 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -1080,6 +1080,13 @@ void signal_init_process(void)
@@ -1074,6 +1074,13 @@ void signal_init_process(void)
exit(1);
}
@@ -62,10 +62,10 @@ index 169f50985e9..ccdd438b62a 100644
* init_thread_context
*/
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index bb11b50f8f7..6b5a5c6c82f 100644
index 5d4d1469472..73216888dd9 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1815,6 +1815,30 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr,
@@ -1809,6 +1809,30 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr,
}
@@ -96,7 +96,7 @@ index bb11b50f8f7..6b5a5c6c82f 100644
/**********************************************************************
* segv_handler
*
@@ -2374,6 +2398,34 @@ void signal_init_process(void)
@@ -2368,6 +2392,34 @@ void signal_init_process(void)
exit(1);
}
@@ -132,10 +132,10 @@ index bb11b50f8f7..6b5a5c6c82f 100644
/***********************************************************************
* init_thread_context
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 6b57d0cdb1b..db608b358ea 100644
index c74b8be32b8..d28b7cce8ee 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2636,6 +2636,12 @@ void signal_init_process(void)
@@ -2627,6 +2627,12 @@ void signal_init_process(void)
exit(1);
}
@@ -149,19 +149,19 @@ index 6b57d0cdb1b..db608b358ea 100644
/***********************************************************************
* init_thread_context
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index b55eb571283..806abc21fb2 100644
index ce3c14d2594..44a2b5712f5 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -227,6 +227,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;
@@ -217,6 +217,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;
+extern void signal_init_early(void) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg,
BOOL suspend, void *relay, void *thunk, TEB *teb ) DECLSPEC_HIDDEN;
BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index e3f2820de56..0d2dd6f019d 100644
index 58c84caab5f..ad2f959d61c 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -2886,7 +2886,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )