Rebase against 0aa6f8e2ea1e3f2e852bef1a07d0d1f983870150.

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

@@ -1,4 +1,4 @@
-From c37ee83fb56f540a9fcb04c800ca3a6e94295e29 Mon Sep 17 00:00:00 2001
+From 0495813f7d9ba72acef7da9043594edc0e52f68b 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.
@@ -8,8 +8,8 @@ Subject: [PATCH] kernel32: Implement some processor group functions.
  ...pi-ms-win-core-kernel32-legacy-l1-1-1.spec |  2 +-
  dlls/kernel32/kernel32.spec                   |  2 +-
  dlls/kernel32/process.c                       | 26 ++++++++++++++++---
- dlls/kernel32/tests/process.c                 | 23 ++++++++++++++++
- 5 files changed, 48 insertions(+), 7 deletions(-)
+ dlls/kernel32/tests/process.c                 | 21 +++++++++++++++
+ 5 files changed, 46 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
 index e653ac6d212..b6af37ab0aa 100644
@@ -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 4b09f359b97..c1bb03080c7 100644
+index 949b262a592..9f28a3b4691 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -719,7 +719,7 @@
@@ -51,10 +51,10 @@ index 4b09f359b97..c1bb03080c7 100644
  @ stdcall -import GetModuleFileNameW(long ptr long)
  @ stdcall -import GetModuleHandleA(str)
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index ff4e79ff2b7..c0d1d8b9294 100644
+index 92582ae31de..ec37b66621f 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -624,7 +624,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
+@@ -600,7 +600,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
   */
  WORD WINAPI GetActiveProcessorGroupCount(void)
  {
@@ -65,7 +65,7 @@ index ff4e79ff2b7..c0d1d8b9294 100644
      return 1;
  }
  
-@@ -633,10 +635,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
+@@ -609,10 +611,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
   */
  DWORD WINAPI GetActiveProcessorCount(WORD group)
  {
@@ -83,7 +83,7 @@ index ff4e79ff2b7..c0d1d8b9294 100644
  }
  
  /***********************************************************************
-@@ -650,6 +656,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
+@@ -626,6 +632,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
      return cpus;
  }
  
@@ -103,26 +103,10 @@ index ff4e79ff2b7..c0d1d8b9294 100644
   *           GetFirmwareEnvironmentVariableA     (KERNEL32.@)
   */
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index 109322d6844..bdcbd4329b8 100644
+index 9fbf397ccb0..4dd88c6709a 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
-@@ -90,6 +90,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
- static BOOL   (WINAPI *pInitializeProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD, SIZE_T*);
- static BOOL   (WINAPI *pUpdateProcThreadAttribute)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD_PTR, void *,SIZE_T,void*,SIZE_T*);
- static void   (WINAPI *pDeleteProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*);
-+static DWORD  (WINAPI *pGetActiveProcessorCount)(WORD);
- 
- /* ############################### */
- static char     base[MAX_PATH];
-@@ -270,6 +271,7 @@ static BOOL init(void)
-     pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList");
-     pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute");
-     pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList");
-+    pGetActiveProcessorCount = (void *)GetProcAddress(hkernel32, "GetActiveProcessorCount");
- 
-     return TRUE;
- }
-@@ -4139,6 +4141,26 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle
+@@ -4266,6 +4266,26 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle
      CloseHandle(pipe[1]);
  }
  
@@ -149,7 +133,7 @@ index 109322d6844..bdcbd4329b8 100644
  START_TEST(process)
  {
      HANDLE job, hproc, h, h2;
-@@ -4254,6 +4276,7 @@ START_TEST(process)
+@@ -4382,6 +4402,7 @@ START_TEST(process)
      test_GetNumaProcessorNode();
      test_session_info();
      test_GetLogicalProcessorInformationEx();
@@ -158,5 +142,5 @@ index 109322d6844..bdcbd4329b8 100644
      test_ProcThreadAttributeList();
      test_SuspendProcessState();
 -- 
-2.28.0
+2.29.2
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "ef876fc54e207344b5809f40a59e3d5d610a6fda"
+	echo "0aa6f8e2ea1e3f2e852bef1a07d0d1f983870150"
 }
 
 # Show version information
@@ -3776,6 +3776,9 @@ fi
 
 # Patchset setupapi-DiskSpaceList
 # |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#50337] Roland Zenology Pro (VST3 plugin) used with carla-bridge fails to save files
+# |
 # | Modified files:
 # |   *	dlls/setupapi/diskspace.c, dlls/setupapi/queue.c, dlls/setupapi/setupapi.spec, dlls/setupapi/setupapi_private.h,
 # | 	dlls/setupapi/stubs.c, dlls/setupapi/tests/diskspace.c, include/setupapi.h

staging/upstream-commit

@@ -1 +1 @@
-ef876fc54e207344b5809f40a59e3d5d610a6fda
+0aa6f8e2ea1e3f2e852bef1a07d0d1f983870150