Skip to content

Commit b906163

Browse files
committed
[0.4.11] [COMCTL32] Fix 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 release (cherry picked from commit 9d758ae)
1 parent 5037a3a commit b906163

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

dll/win32/comctl32/comctl32.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@
3535
#include "winnls.h"
3636
#include "commctrl.h"
3737

38+
#ifdef __REACTOS__
39+
// This is really ComCtl32 v5.82, the last one not supporting SxS
40+
#undef COMCTL32_VERSION // Undefines what the PSDK gave to us
41+
#define COMCTL32_VERSION 5
42+
#define COMCTL32_VERSION_MINOR 82
43+
#endif
44+
3845
extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN;
3946
extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN;
4047

@@ -186,7 +193,9 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
186193
BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
187194
BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
188195

196+
#ifndef __REACTOS__
189197
#define COMCTL32_VERSION_MINOR 81
198+
#endif
190199

191200
/* Our internal stack structure of the window procedures to subclass */
192201
typedef struct _SUBCLASSPROCS {

dll/win32/comctl32/lang/comctl_Sq.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
2121
*/
2222

23+
#ifndef __REACTOS__
2324
#include "comctl32.h"
25+
#endif
2426

2527
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
2628

0 commit comments

Comments
 (0)