Rebase against faf645d01632e4cf7ef056a86a675a12df39a80e.

patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch

@@ -1,4 +1,4 @@
-From dd8ab6d50d5a84d8b40fd8541184c4cc462e7bd0 Mon Sep 17 00:00:00 2001
+From af5cd4a865337f9e37ad3e8548e325fcb0f51d54 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:38:38 +0200
 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
@@ -9,7 +9,7 @@ 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 1e00dcda2ec..631876c9862 100644
+index 34af6b780cf..27de37d5b88 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
 @@ -26,6 +26,7 @@
@@ -20,9 +20,9 @@ index 1e00dcda2ec..631876c9862 100644
  #include "wine/asm.h"
  
  #define DECLARE_CRITICAL_SECTION(cs) \
-@@ -85,6 +86,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
- extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN;
- extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN;
+@@ -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;
  
 +/* inline version of RtlEnterCriticalSection */
 +static inline void enter_critical_section( RTL_CRITICAL_SECTION *crit )
@@ -61,5 +61,5 @@ index 1e00dcda2ec..631876c9862 100644
  {
      ULONG size;
 -- 
-2.30.2
+2.33.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "fdc2d415b0dd5c12c83156bd41161ff135d25105"
+	echo "faf645d01632e4cf7ef056a86a675a12df39a80e"
 }
 
 # Show version information

patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch

@@ -1,4 +1,4 @@
-From c89e6c48e313c0de0749a4526c677491764845d3 Mon Sep 17 00:00:00 2001
+From e92e88f62a08e84a29395a5b3e1f461e33dc9aa0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 24 Feb 2015 04:25:29 +0100
 Subject: [PATCH] shell32: Correct indentation in shfileop.c.
@@ -8,7 +8,7 @@ Subject: [PATCH] shell32: Correct indentation in shfileop.c.
  1 file changed, 329 insertions(+), 331 deletions(-)
 
 diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
-index 807b999d957..f0cadc67f8f 100644
+index c454fcaa594..682af15e9d8 100644
 --- a/dlls/shell32/shlfileop.c
 +++ b/dlls/shell32/shlfileop.c
 @@ -201,108 +201,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H
@@ -158,7 +158,7 @@ index 807b999d957..f0cadc67f8f 100644
 -
 -        args[0] = (DWORD_PTR)szDir;
 -        FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
--            szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args);
+-            szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (va_list*)args);
 -
 -        hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
 +    WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256];
@@ -190,7 +190,7 @@ index 807b999d957..f0cadc67f8f 100644
 +
 +    args[0] = (DWORD_PTR)szDir;
 +    FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
-+        szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args);
++        szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (va_list*)args);
 +    hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
 +
 +    ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);

staging/upstream-commit

@@ -1 +1 @@
-fdc2d415b0dd5c12c83156bd41161ff135d25105
+faf645d01632e4cf7ef056a86a675a12df39a80e