From 703c84ce70457f9358d9d28a6a67e7371809ff86 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 3 Jan 2020 18:03:49 +1100
Subject: [PATCH] Added comctl32-version_6

---
 .../0001-comctl32-Bump-version-to-6.0.patch   | 57 +++++++++++++++++++
 patches/patchinstall.sh                       | 18 +++++-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch

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
new file mode 100644
index 00000000..b0a5b8c5
--- /dev/null
+++ b/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch
@@ -0,0 +1,57 @@
+From ad23e816eb724d81032306f8ac6d4faa96ccaf4a 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.
+
+An application that I have here checks comctl32.dll version information
+and refuses to run, changing DLL version to 6.0 makes it run.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/comctl32/comctl32.h  | 2 +-
+ dlls/comctl32/comctl32.rc | 2 +-
+ include/commctrl.h        | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
+index 78e97983381..42b434a96d9 100644
+--- a/dlls/comctl32/comctl32.h
++++ b/dlls/comctl32/comctl32.h
+@@ -192,7 +192,7 @@ INT  Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
+ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
+ BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
+ 
+-#define COMCTL32_VERSION_MINOR 81
++#define COMCTL32_VERSION_MINOR 0
+ 
+ /* Our internal stack structure of the window procedures to subclass */
+ typedef struct _SUBCLASSPROCS {
+diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc
+index c9aa1ba6253..be6e2425193 100644
+--- a/dlls/comctl32/comctl32.rc
++++ b/dlls/comctl32/comctl32.rc
+@@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+ #define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
+ #define WINE_FILENAME_STR "comctl32.dll"
+ #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100
+-#define WINE_FILEVERSION_STR "5.81"
++#define WINE_FILEVERSION_STR "6.00.4704.1100"
+ #define WINE_PRODUCTVERSION WINE_FILEVERSION
+ #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
+ 
+diff --git a/include/commctrl.h b/include/commctrl.h
+index 700b335fbb7..029a4b45457 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 *);
+ 
+-#define COMCTL32_VERSION                5  /* dll version */
++#define COMCTL32_VERSION                6  /* dll version */
+ 
+ #ifndef _WIN32_IE
+ #define _WIN32_IE 0x0400
+-- 
+2.24.1
+
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index aba16de0..3a9d6950 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5034d109e033fbe820829ae43adba0cc30bf9b99"
+	echo "3b1c3e57fcac4e23c0f9b376a483c4949ee7739f"
 }
 
 # Show version information
@@ -97,6 +97,7 @@ patch_enable_all ()
 	enable_combase_GetRestrictedErrorInfo="$1"
 	enable_comctl32_Listview_DrawItem="$1"
 	enable_comctl32_alpha_bitmaps="$1"
+	enable_comctl32_version_6="$1"
 	enable_comctrl_rebar_capture="$1"
 	enable_comdlg32_lpstrFileTitle="$1"
 	enable_configure_Absolute_RPATH="$1"
@@ -425,6 +426,9 @@ patch_enable ()
 		comctl32-alpha-bitmaps)
 			enable_comctl32_alpha_bitmaps="$2"
 			;;
+		comctl32-version_6)
+			enable_comctl32_version_6="$2"
+			;;
 		comctrl-rebar-capture)
 			enable_comctrl_rebar_capture="$2"
 			;;
@@ -2416,6 +2420,18 @@ if test "$enable_comctl32_alpha_bitmaps" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset comctl32-version_6
+# |
+# | Modified files:
+# |   *	dlls/comctl32/comctl32.h, dlls/comctl32/comctl32.rc, include/commctrl.h
+# |
+if test "$enable_comctl32_version_6" -eq 1; then
+	patch_apply comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch
+	(
+		printf '%s\n' '+    { "Dmitry Timoshkov", "comctl32: Bump version to 6.0.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset comctrl-rebar-capture
 # |
 # | This patchset fixes the following Wine bugs: