Author: hbelusca Date: Sat Oct 31 17:25:32 2015 New Revision: 69755
URL: http://svn.reactos.org/svn/reactos?rev=69755&view=rev Log: [PSDK] 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
Modified: trunk/reactos/dll/win32/comctl32/resource.h trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/include/psdk/commctrl.h
Modified: trunk/reactos/dll/win32/comctl32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/resource... ============================================================================== --- trunk/reactos/dll/win32/comctl32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/resource.h [iso-8859-1] Sat Oct 31 17:25:32 2015 @@ -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
Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc?... ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sat Oct 31 17:25:32 2015 @@ -30,7 +30,7 @@ #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
Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?rev... ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Oct 31 17:25:32 2015 @@ -102,7 +102,12 @@ 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)