From 858177509874abb731028f93a2e7ee00efa53b16 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Thu, 8 Dec 2022 22:22:11 -0600
Subject: [PATCH] Rebase against 7acd3aa429f2d45d96f4699906dc81e47ebd9c13.

---
 .../0001-comctl32-Bump-version-to-6.0.patch      | 16 ++++++++--------
 patches/patchinstall.sh                          |  2 +-
 .../0002-shell32-Add-security-property-tab.patch |  9 +++++----
 staging/upstream-commit                          |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch b/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch
index 8ddaa16e..bd7aeee4 100644
--- a/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch
+++ b/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch
@@ -1,4 +1,4 @@
-From c88a1acf9ac625cb2a7cbfc90ac3bb2d426889a0 Mon Sep 17 00:00:00 2001
+From 7362e037e8160046fffcf062a663ea8e7ac45290 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 12 Nov 2019 18:13:20 +0800
 Subject: [PATCH] comctl32: Bump version to 6.0.
@@ -14,10 +14,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
-index 66b341ae5ad..1af9baea7ee 100644
+index 7dfdf089eb1..17ec7eeab40 100644
 --- a/dlls/comctl32/comctl32.h
 +++ b/dlls/comctl32/comctl32.h
-@@ -193,7 +193,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
+@@ -194,7 +194,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
  BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
  BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN;
  
@@ -40,12 +40,12 @@ index c9aa1ba6253..be6e2425193 100644
  #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
  
 diff --git a/include/commctrl.h b/include/commctrl.h
-index dfd2f4a37d2..0784478ce14 100644
+index a54de13d8b2..e0b0e22d4dc 100644
 --- a/include/commctrl.h
 +++ b/include/commctrl.h
-@@ -51,7 +51,7 @@ enum _LI_METRIC
- HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
- HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
+@@ -59,7 +59,7 @@ enum _LI_METRIC
+ WINCOMMCTRLAPI HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
+ WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
  
 -#define COMCTL32_VERSION                5  /* dll version */
 +#define COMCTL32_VERSION                6  /* dll version */
@@ -53,5 +53,5 @@ index dfd2f4a37d2..0784478ce14 100644
  #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
  #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 -- 
-2.25.1
+2.35.1
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index f69bad4c..e14277f0 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "0da7ad35f130a2ea59380dcad2179b972b3a909d"
+	echo "7acd3aa429f2d45d96f4699906dc81e47ebd9c13"
 }
 
 # Show version information
diff --git a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch
index f72b8627..18da03db 100644
--- a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch
+++ b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch
@@ -1,4 +1,4 @@
-From e62cf6e3f75669dd83486af4c8c826d4221a5f92 Mon Sep 17 00:00:00 2001
+From de4cd156d5a676091d4a7e38265161819a69137e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 8 May 2017 23:33:45 +0200
 Subject: [PATCH] shell32: Add security property tab.
@@ -11,10 +11,11 @@ Subject: [PATCH] shell32: Add security property tab.
  4 files changed, 438 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
-index 13af5aa0dfc..e743bed9ca2 100644
+index ad2f8cc0e45..8efcbfb4dbf 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
+ EXTRADEFS = -D_SHELL32_
  MODULE    = shell32.dll
  IMPORTLIB = shell32
 -IMPORTS   = uuid shlwapi user32 gdi32 advapi32
@@ -515,5 +516,5 @@ index 210046e729d..0f3a64f16d2 100644
  #define IDS_RECYCLEBIN_FOLDER_NAME   8964
  
 -- 
-2.38.1
+2.35.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index ca165634..b5b606c4 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-0da7ad35f130a2ea59380dcad2179b972b3a909d
+7acd3aa429f2d45d96f4699906dc81e47ebd9c13