Rebase against 0ae1669ec2798193b11fd2d2ac74d51203f673b2.

patches/eventfd_synchronization/0013-server-Create-eventfd-file-descriptors-for-process-o.patch

@@ -1,4 +1,4 @@
-From e3bc0f8b38f7f68fe132db47a0fc239af4843181 Mon Sep 17 00:00:00 2001
+From f2dc92d71f8d78d6396c6c98010d4709696ac43c Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 15:11:12 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for process objects.
@@ -49,7 +49,7 @@ index 7ca4ca89394..6a0a367124d 100644
  void esync_init(void);
 +int esync_create_fd( int initval, int flags );
 diff --git a/server/process.c b/server/process.c
-index e95c33132e6..7cf8953f47e 100644
+index af7aef0cdac..0be707404f4 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -49,6 +49,7 @@
@@ -77,7 +77,7 @@ index e95c33132e6..7cf8953f47e 100644
      no_satisfied,                /* satisfied */
      no_signal,                   /* signal */
      no_get_fd,                   /* get_fd */
-@@ -553,6 +555,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
+@@ -555,6 +557,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
      process->trace_data      = 0;
      process->rawinput_mouse  = NULL;
      process->rawinput_kbd    = NULL;
@@ -96,9 +96,9 @@ index e95c33132e6..7cf8953f47e 100644
      return process;
  
 @@ -655,6 +661,7 @@ static void process_destroy( struct object *obj )
-     if (process->id) free_ptid( process->id );
      if (process->token) release_object( process->token );
      free( process->dir_cache );
+     free( process->image );
 +    if (do_esync()) close( process->esync_fd );
  }
  
@@ -118,10 +118,10 @@ index e95c33132e6..7cf8953f47e 100644
  {
      access = default_map_access( obj, access );
 diff --git a/server/process.h b/server/process.h
-index caab869c8a0..afa90581b97 100644
+index 0997a759330..638497857b3 100644
 --- a/server/process.h
 +++ b/server/process.h
-@@ -95,6 +95,7 @@ struct process
+@@ -87,6 +87,7 @@ struct process
      const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */
      const struct rawinput_device *rawinput_kbd;   /* rawinput keyboard device, if any */
      struct list          kernel_object;   /* list of kernel object pointers */
@@ -130,5 +130,5 @@ index caab869c8a0..afa90581b97 100644
  
  #define CPU_FLAG(cpu) (1 << (cpu))
 -- 
-2.20.1
+2.30.1
 

patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch

@@ -1,4 +1,4 @@
-From 0495813f7d9ba72acef7da9043594edc0e52f68b Mon Sep 17 00:00:00 2001
+From 2ce47e07be60a3306855c625f4ffc75d039085ec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 4 Feb 2017 16:20:37 +0100
 Subject: [PATCH] kernel32: Implement some processor group functions.
@@ -38,7 +38,7 @@ index 4998af04d9b..5ce8e24713b 100644
  @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
  @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index 949b262a592..9f28a3b4691 100644
+index d14bf010383..d7eb984c0cd 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -719,7 +719,7 @@
@@ -51,10 +51,10 @@ index 949b262a592..9f28a3b4691 100644
  @ stdcall -import GetModuleFileNameW(long ptr long)
  @ stdcall -import GetModuleHandleA(str)
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 92582ae31de..ec37b66621f 100644
+index 41a5b34af19..dc136365f50 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -600,7 +600,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
+@@ -609,7 +609,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
   */
  WORD WINAPI GetActiveProcessorGroupCount(void)
  {
@@ -65,7 +65,7 @@ index 92582ae31de..ec37b66621f 100644
      return 1;
  }
  
-@@ -609,10 +611,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
+@@ -618,10 +620,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
   */
  DWORD WINAPI GetActiveProcessorCount(WORD group)
  {
@@ -83,7 +83,7 @@ index 92582ae31de..ec37b66621f 100644
  }
  
  /***********************************************************************
-@@ -626,6 +632,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
+@@ -635,6 +641,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
      return cpus;
  }
  
@@ -103,11 +103,11 @@ index 92582ae31de..ec37b66621f 100644
   *           GetFirmwareEnvironmentVariableA     (KERNEL32.@)
   */
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index 9fbf397ccb0..4dd88c6709a 100644
+index 762e114a988..4bf68401268 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
-@@ -4266,6 +4266,26 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle
-     CloseHandle(pipe[1]);
+@@ -4327,6 +4327,26 @@ static void test_dead_process(void)
+     CloseHandle(pi.hThread);
  }
  
 +static void test_GetActiveProcessorCount(void)
@@ -133,7 +133,7 @@ index 9fbf397ccb0..4dd88c6709a 100644
  START_TEST(process)
  {
      HANDLE job, hproc, h, h2;
-@@ -4382,6 +4402,7 @@ START_TEST(process)
+@@ -4443,6 +4463,7 @@ START_TEST(process)
      test_GetNumaProcessorNode();
      test_session_info();
      test_GetLogicalProcessorInformationEx();
@@ -142,5 +142,5 @@ index 9fbf397ccb0..4dd88c6709a 100644
      test_ProcThreadAttributeList();
      test_SuspendProcessState();
 -- 
-2.29.2
+2.30.1
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "580413032c61bc142078d08efb1d1167fe385a97"
+	echo "0ae1669ec2798193b11fd2d2ac74d51203f673b2"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-580413032c61bc142078d08efb1d1167fe385a97
+0ae1669ec2798193b11fd2d2ac74d51203f673b2