From a101f89071e36a39ebf12a37c16e8f371ded920a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 16 Nov 2023 11:07:12 +1100 Subject: [PATCH] Rebase against b0ad8b8cfb6e664cc6cfdd87ddb28af077149417. --- ...-versions-of-RtlEnterCriticalSection.patch | 14 +++---- ...mporary-signal-handler-during-proces.patch | 40 +++++++++---------- staging/upstream-commit | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch b/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch index 9c7eb868..89f30d1c 100644 --- a/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch +++ b/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch @@ -1,4 +1,4 @@ -From af5cd4a865337f9e37ad3e8548e325fcb0f51d54 Mon Sep 17 00:00:00 2001 +From 4dd82c635bcf8c2c7d070d6c5786787ff2d7d887 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 5 Aug 2017 03:38:38 +0200 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection / @@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection / 1 file changed, 34 insertions(+) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 34af6b780cf..27de37d5b88 100644 +index a7967a6c242..8b088f9d3c3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -26,6 +26,7 @@ +@@ -28,6 +28,7 @@ #include "winnt.h" #include "winternl.h" #include "unixlib.h" @@ -20,9 +20,9 @@ index 34af6b780cf..27de37d5b88 100644 #include "wine/asm.h" #define DECLARE_CRITICAL_SECTION(cs) \ -@@ -88,6 +89,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; - extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args ) DECLSPEC_HIDDEN; - extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args ) DECLSPEC_HIDDEN; +@@ -94,6 +95,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data; + extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args ); + extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args ); +/* inline version of RtlEnterCriticalSection */ +static inline void enter_critical_section( RTL_CRITICAL_SECTION *crit ) @@ -61,5 +61,5 @@ index 34af6b780cf..27de37d5b88 100644 { ULONG size; -- -2.33.0 +2.42.0 diff --git a/patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch b/patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch index b05fb4d0..6aedd21c 100644 --- a/patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch +++ b/patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch @@ -1,4 +1,4 @@ -From 3986e2d381e2b78d0bc572b7014f2445aa4bc6fd Mon Sep 17 00:00:00 2001 +From c9909ae014ff7bada1f22d1f4aee2f75092e495a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= 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 3cde6b726a2..f4a20d052c8 100644 +index 8d4ee296de1..c9497c90e3d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c -@@ -2398,6 +2398,8 @@ void __wine_main( int argc, char *argv[], char *envp[] ) +@@ -2384,6 +2384,8 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] ) #endif virtual_init(); @@ -28,7 +28,7 @@ index 3cde6b726a2..f4a20d052c8 100644 #ifdef __APPLE__ diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c -index 28cb2222809..b3b55a11e4f 100644 +index 5ba429c6364..219be90e10d 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1566,6 +1566,12 @@ void signal_init_process(void) @@ -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 d98268bcd54..2b92bbd7ed3 100644 +index d9e35e32a51..6b529eea09e 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c -@@ -1594,6 +1594,12 @@ void signal_init_process(void) +@@ -1592,6 +1592,12 @@ void signal_init_process(void) exit(1); } @@ -62,7 +62,7 @@ index d98268bcd54..2b92bbd7ed3 100644 /*********************************************************************** * syscall_dispatcher_return_slowpath diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c -index 11bdd9c1ea6..f688795ab91 100644 +index 42d14cabd07..a4e1b4923e5 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1839,6 +1839,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext ) @@ -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 0204139631f..f8831b80a2b 100644 +index 753cd472544..665d9954569 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c -@@ -2455,6 +2455,12 @@ void signal_init_process(void) +@@ -2622,6 +2622,12 @@ void signal_init_process(void) exit(1); } @@ -149,22 +149,22 @@ index 0204139631f..f8831b80a2b 100644 /*********************************************************************** * call_init_thunk diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h -index e1cace7ba78..0ea15f48787 100644 +index cac2c4fb9a3..c003ce80273 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; - extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; - extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; - extern void signal_init_process(void) DECLSPEC_HIDDEN; -+extern void signal_init_early(void) DECLSPEC_HIDDEN; +@@ -276,6 +276,7 @@ extern void signal_init_threading(void); + extern NTSTATUS signal_alloc_thread( TEB *teb ); + extern void signal_free_thread( TEB *teb ); + extern void signal_init_process(void); ++extern void signal_init_early(void); extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, - BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN; - extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; + BOOL suspend, TEB *teb ); + extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c -index b5fdeb5707b..03ce50d0677 100644 +index cc446de6250..f93740e9f4f 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 ) +@@ -3958,7 +3958,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) } #endif @@ -174,5 +174,5 @@ index b5fdeb5707b..03ce50d0677 100644 struct thread_stack_info stack_info; if (!is_inside_thread_stack( page, &stack_info )) -- -2.40.1 +2.42.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 59f04ace..0260f913 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -137638e185e9302602bcd9cc796d7bcfa03caee5 +b0ad8b8cfb6e664cc6cfdd87ddb28af077149417