Rebase against 12c09051b48507cf8bb37d500719661d0c6ad9f0

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

@@ -1,4 +1,4 @@
-From 296432e173a7d08f8f3b78df7c5a54d5ca2ca0c7 Mon Sep 17 00:00:00 2001
+From fce0ca471688700deb77c63e53e1c921ad109a68 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.
@@ -39,10 +39,10 @@ index fd1a0bcf0ab..b281fd963da 100644
  @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
  @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
 diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
-index 96180bed4ec..a71d961eefa 100644
+index ad8ebeb873a..1014dfe3c83 100644
 --- a/dlls/kernel32/cpu.c
 +++ b/dlls/kernel32/cpu.c
-@@ -276,7 +276,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
+@@ -231,7 +231,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
   */
  WORD WINAPI GetActiveProcessorGroupCount(void)
  {
@@ -53,7 +53,7 @@ index 96180bed4ec..a71d961eefa 100644
      return 1;
  }
  
-@@ -285,14 +287,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
+@@ -240,14 +242,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
   */
  DWORD WINAPI GetActiveProcessorCount(WORD group)
  {
@@ -87,11 +87,11 @@ index 96180bed4ec..a71d961eefa 100644
  
  /***********************************************************************
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index 016c3022dcb..2f34e1c763c 100644
+index d4ba5c71c13..c896469bde5 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -717,7 +717,7 @@
- @ stdcall GetLongPathNameW (wstr long long)
+ @ stdcall -import GetLongPathNameW (wstr long long)
  @ stdcall GetMailslotInfo(long ptr ptr ptr ptr)
  @ stdcall GetMaximumProcessorCount(long)
 -# @ stub GetMaximumProcessorGroupCount
@@ -155,10 +155,10 @@ index 973c1a919bb..b5ff2c69869 100644
      test_ProcThreadAttributeList();
      test_SuspendProcessState();
 diff --git a/include/winnt.h b/include/winnt.h
-index 3f91ede6a68..9484bc0e14b 100644
+index c8d4a9593ce..d4c29465862 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -6338,6 +6338,8 @@ typedef struct _GROUP_AFFINITY
+@@ -6454,6 +6454,8 @@ typedef struct _GROUP_AFFINITY
      WORD Reserved[3];
  } GROUP_AFFINITY, *PGROUP_AFFINITY;
  
@@ -168,5 +168,5 @@ index 3f91ede6a68..9484bc0e14b 100644
  {
      WORD Group;
 -- 
-2.17.1
+2.23.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "3bf7473b880eea8b8dcaa43487afda2d7b1fbd03"
+	echo "12c09051b48507cf8bb37d500719661d0c6ad9f0"
 }
 
 # Show version information