From 9d758ae1cdb4ab2db30d10d10bbdc0ddb06402f4 Mon Sep 17 00:00:00 2001
From: Joachim Henze <Joachim.Henze@reactos.org>
Date: Tue, 19 Jun 2018 20:56:21 +0200
Subject: [PATCH] [0.4.9] [COMCTL32] Fix regression CORE-14671

Fixes the icons on some buttons being flipped vertically.
Known affected apps: Lazarus IDE, Double Commander, Peazip.

Thanks to patches author Doug Lyons.
The patch is new and has not been committed to master yet.
---
 dll/win32/comctl32/comctl32.h        | 9 +++++++++
 dll/win32/comctl32/lang/comctl_Sq.rc | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h
index 2ced440b75b..083c3760fc7 100644
--- a/dll/win32/comctl32/comctl32.h
+++ b/dll/win32/comctl32/comctl32.h
@@ -35,6 +35,13 @@
 #include "winnls.h"
 #include "commctrl.h"
 
+#ifdef __REACTOS__
+// This is really ComCtl32 v5.82, the last one not supporting SxS
+#undef  COMCTL32_VERSION // Undefines what the PSDK gave to us
+#define COMCTL32_VERSION        5
+#define COMCTL32_VERSION_MINOR 82
+#endif
+
 extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN;
 extern HBRUSH  COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN;
 
@@ -188,7 +195,9 @@ 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;
 
+#ifndef __REACTOS__
 #define COMCTL32_VERSION_MINOR 81
+#endif
 
 /* Our internal stack structure of the window procedures to subclass */
 typedef struct _SUBCLASSPROCS {
diff --git a/dll/win32/comctl32/lang/comctl_Sq.rc b/dll/win32/comctl32/lang/comctl_Sq.rc
index fd6e6e7bf70..cb3c7f3fd7e 100644
--- a/dll/win32/comctl32/lang/comctl_Sq.rc
+++ b/dll/win32/comctl32/lang/comctl_Sq.rc
@@ -20,7 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __REACTOS__
 #include "comctl32.h"
+#endif
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL