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 5c756468656afc9207c0f51f774bbc29267e1469.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-06-22 09:06:59 +10:00
parent fd5866f6f1
commit 9c8608eea6
5 changed files with 30 additions and 42 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 4b4d65ecd081ff464821625bedc77aaf532d23c7 Mon Sep 17 00:00:00 2001
From 3442d399135d784923bda352f26692cc63cc746c 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
@@ -28,10 +28,10 @@ index 6c8f3a4996d..5d35b68476b 100644
#ifdef __APPLE__
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index a0d826ea178..313fe4f1f5b 100644
index c24fa3a9b78..516c30a95d2 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -902,6 +902,12 @@ void signal_init_process(void)
@@ -892,6 +892,12 @@ void signal_init_process(void)
exit(1);
}
@@ -43,12 +43,12 @@ index a0d826ea178..313fe4f1f5b 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 669e44aaa2b..aba9c8dcf02 100644
index 5b8fff6a406..a005eb3ceaa 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -1080,6 +1080,12 @@ void signal_init_process(void)
@@ -1077,6 +1077,12 @@ void signal_init_process(void)
exit(1);
}
@@ -60,12 +60,12 @@ index 669e44aaa2b..aba9c8dcf02 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index d04935bb1b2..cb6f48b73dc 100644
index eb69af9ce0e..39a36118e22 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1781,6 +1781,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
@@ -1780,6 +1780,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
}
@@ -96,7 +96,7 @@ index d04935bb1b2..cb6f48b73dc 100644
/**********************************************************************
* segv_handler
*
@@ -2368,6 +2392,34 @@ void signal_init_process(void)
@@ -2367,6 +2391,34 @@ void signal_init_process(void)
exit(1);
}
@@ -130,12 +130,12 @@ index d04935bb1b2..cb6f48b73dc 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index c36699589d9..6a5f50c7c55 100644
index ac8eddf739e..116bbaafd79 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2630,6 +2630,12 @@ void signal_init_process(void)
@@ -2624,6 +2624,12 @@ void signal_init_process(void)
exit(1);
}
@@ -147,9 +147,9 @@ index c36699589d9..6a5f50c7c55 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index d3d303397fb..6064082f1a8 100644
index 339a93bf2db..38314688cba 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -237,6 +237,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;
@@ -158,7 +158,7 @@ index d3d303397fb..6064082f1a8 100644
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 *thunk, TEB *teb ) DECLSPEC_HIDDEN;
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 49dd3aa51e2..35a9b43d577 100644