From 67211fa3663bf67872a34b44cbb6233b477a1e84 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Fri, 4 Oct 2019 20:27:14 +0200 Subject: [PATCH] [0.4.13][COMCTL32] Appease regression CORE-14671 & CORE-14701 Fixes the icons on some buttons being flipped vertically. Known affected apps: Lazarus IDE, Double Commander, Peazip. Beside that it also fixes transparency regressions in DVDStyler 3.0.4 (CORE-14701). Thanks to patches author Doug Lyons. The patch has not been committed to master yet and has the known side-effect of introducing flipped icons in the options-listview of Double-Commander that are drawn correctly without the hackfix. Like in last releases. --- dll/win32/comctl32/comctl32.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h index 73564eb294f..43036a1dcc9 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; @@ -187,7 +194,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 {