Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK]

Browse source 
Fix COMCTL32_VERSION definition.

[COMCTL32]
The comctl32 we currently have in trunk cannot pretend to be version 6+ (it was currently reporting version 6.82, aka something for Windows 20? ) Fix it and make it report 5.82 instead.
CORE-10457

svn path=/trunk/; revision=69755
This commit is contained in:
Hermès Bélusca-Maïto 2015-10-31 17:25:32 +00:00
parent 5de8b3d15c
commit 3e27c724d1
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/comctl32/resource.h
View file

@ -59,4 +59,7 @@
#define IDI_TT_WARN_SM 25
#define IDI_TT_ERROR_SM 28
#define COMCTL32_VERSION_MINOR 81
// 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

2
reactos/dll/win32/comctl32/rsrc.rc
View file

@ -30,7 +30,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 "5.82"
#define WINE_PRODUCTVERSION WINE_FILEVERSION
#define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR

7
reactos/include/psdk/commctrl.h
View file

@ -102,7 +102,12 @@ extern "C" {
COLORREF clrBtnShadow;
} COLORSCHEME,*LPCOLORSCHEME;
#define COMCTL32_VERSION 6
#if (_WIN32_IE >= 0x0500)
#if (_WIN32_WINNT >= 0x0501)
#define COMCTL32_VERSION 6
#else
#define COMCTL32_VERSION 5
#endif
#define CCM_SETVERSION (CCM_FIRST+0x7)
#define CCM_GETVERSION (CCM_FIRST+0x8)