Rebase against 30c074963acd05a3a31676085653460eea86bc78.

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

@@ -1,4 +1,4 @@
-From 8846243fcf799dc8a439aba399ccbb412c263de8 Mon Sep 17 00:00:00 2001
+From c9d4a9c3a65b1ff1a0c4b4042394f2fab3b2019a 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,23 +15,23 @@ 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 fdda50575d1..f7afa327391 100644
+index fa1a943fd51..5a8b0f57e42 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -2129,6 +2129,8 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] )
+@@ -2142,6 +2142,8 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] )
  #endif
  
      virtual_init();
 +    signal_init_early();
 +
-     init_environment( argc, argv, envp );
+     init_environment();
  
  #ifdef __APPLE__
 diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
-index f255328fc73..798f683c5bd 100644
+index 5115fa7ec3a..8e23007e936 100644
 --- a/dlls/ntdll/unix/signal_arm.c
 +++ b/dlls/ntdll/unix/signal_arm.c
-@@ -1605,6 +1605,12 @@ void signal_init_process(void)
+@@ -1615,6 +1615,12 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -45,10 +45,10 @@ index f255328fc73..798f683c5bd 100644
  /***********************************************************************
   *           call_init_thunk
 diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
-index 0208913010d..188c8fc205c 100644
+index f96ec330796..eaecf988c54 100644
 --- a/dlls/ntdll/unix/signal_arm64.c
 +++ b/dlls/ntdll/unix/signal_arm64.c
-@@ -1654,6 +1654,12 @@ void signal_init_process(void)
+@@ -1623,6 +1623,12 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -62,10 +62,10 @@ index 0208913010d..188c8fc205c 100644
  /***********************************************************************
   *           syscall_dispatcher_return_slowpath
 diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
-index 67221a4028c..46b298dfc69 100644
+index c64a8b1efe2..cc1eff1f40b 100644
 --- a/dlls/ntdll/unix/signal_i386.c
 +++ b/dlls/ntdll/unix/signal_i386.c
-@@ -1861,6 +1861,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
+@@ -1895,6 +1895,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
  }
  
  
@@ -96,7 +96,7 @@ index 67221a4028c..46b298dfc69 100644
  /**********************************************************************
   *		segv_handler
   *
-@@ -2431,6 +2455,34 @@ void signal_init_process(void)
+@@ -2465,6 +2489,34 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -132,10 +132,10 @@ index 67221a4028c..46b298dfc69 100644
  /***********************************************************************
   *           call_init_thunk
 diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
-index 28841de98f1..4440b60557c 100644
+index a28762915be..d22515ab921 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
-@@ -2644,6 +2644,12 @@ void signal_init_process(void)
+@@ -2659,6 +2659,12 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -149,10 +149,10 @@ index 28841de98f1..4440b60557c 100644
  /***********************************************************************
   *           call_init_thunk
 diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
-index e09d0b41981..b6def005b91 100644
+index fadad6ae824..d8eaabef781 100644
 --- a/dlls/ntdll/unix/unix_private.h
 +++ b/dlls/ntdll/unix/unix_private.h
-@@ -276,6 +276,7 @@ extern void signal_init_threading(void);
+@@ -277,6 +277,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);
@@ -161,10 +161,10 @@ index e09d0b41981..b6def005b91 100644
                                                     BOOL suspend, TEB *teb );
  extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4];
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index cc446de6250..f93740e9f4f 100644
+index e0099f1a5c2..fd0b382b368 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -3958,7 +3958,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
+@@ -3961,7 +3961,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
      }
  #endif
  
@@ -174,5 +174,5 @@ index cc446de6250..f93740e9f4f 100644
          struct thread_stack_info stack_info;
          if (!is_inside_thread_stack( page, &stack_info ))
 -- 
-2.42.0
+2.43.0
 

staging/upstream-commit

@@ -1 +1 @@
-369b540abf32869df8e9b28e283d795ae92b6a05
+30c074963acd05a3a31676085653460eea86bc78