Skip to content

Commit 89d133b

Browse files
IRainmanIRainman
authored
Merge fa4d893 into 31acb6b 
2 parents 31acb6b + fa4d893 commit 89d133b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+328
-307
lines changed

‎Src/ClassicExplorer/ClassicCopy.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,9 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
687687
if (bDef)
688688
{
689689
delay=0;
690-
if (GetWinVersion()>=WIN_VER_WIN7)
690+
#if _WIN32_WINNT < _WIN32_WINNT_WIN7
691+
if (GetWinVersion()>=_WIN32_WINNT_WIN7)
692+
#endif
691693
{
692694
BOOL comp;
693695
if (SUCCEEDED(DwmIsCompositionEnabled(&comp)) && comp)

‎Src/ClassicExplorer/ClassicCopyExt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ STDMETHODIMP CClassicCopyExt::InvokeCommand( LPCMINVOKECOMMANDINFO pCmdInfo )
3838

3939
HRESULT WINAPI CClassicCopyExt::UpdateRegistry( BOOL bRegister )
4040
{
41-
if (GetWinVersion()>=WIN_VER_WIN8)
41+
if (GetWinVersion()>=_WIN32_WINNT_WIN8)
4242
return S_OK;
4343
return _AtlModule.UpdateRegistryFromResource(IDR_CLASSICCOPYEXT,bRegister);
4444
}

‎Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Open-Shell (c) 2017-2018, The Open-Shell Team
33
// Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
44

5+
#define WIN32_LEAN_AND_MEAN
6+
#define VC_EXTRALEAN
7+
#define NOMINMAX
58
#include <windows.h>
69
#include <commctrl.h>
710
#include <shlwapi.h>

‎Src/ClassicExplorer/ExplorerBHO.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ LRESULT CALLBACK CExplorerBHO::SubclassTreeProc( HWND hWnd, UINT uMsg, WPARAM wP
156156
indent=0;
157157

158158
int treeStyle=GetSettingInt(L"TreeStyle");
159-
if (treeStyle==STYLE_CLASSIC && GetWinVersion()>=WIN_VER_WIN10)
159+
if (treeStyle==STYLE_CLASSIC && GetWinVersion()>= _WIN32_WINNT_WIN10)
160160
treeStyle=STYLE_VISTA;
161161
DWORD style=GetWindowLong(hWnd,GWL_STYLE);
162162
if (treeStyle!=STYLE_VISTA)
@@ -209,7 +209,7 @@ LRESULT CALLBACK CExplorerBHO::SubclassTreeProc( HWND hWnd, UINT uMsg, WPARAM wP
209209
if (GetSettingBool(L"FullIndent"))
210210
indent=0;
211211

212-
if (GetSettingInt(L"TreeStyle")==STYLE_CLASSIC && GetWinVersion()<WIN_VER_WIN10)
212+
if (GetSettingInt(L"TreeStyle")==STYLE_CLASSIC && GetWinVersion()< _WIN32_WINNT_WIN10)
213213
{
214214
HIMAGELIST images=TreeView_GetImageList(hWnd,TVSIL_NORMAL);
215215
int cx, cy;
@@ -1109,7 +1109,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBHO::SetSite( IUnknown *pUnkSite )
11091109
SetProp(m_TopWindow,g_LoadedSettingsAtom,(HANDLE)1);
11101110
LoadSettings();
11111111
}
1112-
bool bWin8=(GetWinVersion()>=WIN_VER_WIN8);
1112+
bool bWin8=(GetWinVersion()>= _WIN32_WINNT_WIN8);
11131113

11141114
m_UpButtonIndex=bWin8?0:GetSettingInt(L"ShowUpButton");
11151115
bool bShowCaption=!bWin8 && GetSettingBool(L"ShowCaption");

‎Src/ClassicExplorer/ExplorerBand.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,9 @@ static bool GetPidlPath( PIDLIST_ABSOLUTE pidl, wchar_t *path )
539539
path[0]=0;
540540
if (SHGetPathFromIDList(pidl,path) && *path)
541541
return true;
542-
if (GetWinVersion()>=WIN_VER_WIN7)
542+
#if _WIN32_WINNT < _WIN32_WINNT_WIN7
543+
if (GetWinVersion()>= _WIN32_WINNT_WIN7)
544+
#endif
543545
{
544546
// maybe it is a library - try the default save folder
545547
CComPtr<IShellItem> pShellItem;
@@ -1747,7 +1749,7 @@ void CBandWindow::UpdateToolbar( void )
17471749

17481750
if (m_pBrowserBag)
17491751
{
1750-
if (GetWinVersion()>=WIN_VER_WIN8)
1752+
if (GetWinVersion()>= _WIN32_WINNT_WIN8)
17511753
{
17521754
VARIANT val={VT_EMPTY};
17531755
if (SUCCEEDED(m_pBrowserBag->Read(g_ComboPaneEnabled,&val,NULL)) && val.vt==VT_BOOL && !val.boolVal)
@@ -1983,7 +1985,12 @@ void CBandWindow::SetBrowsers( IShellBrowser *pBrowser, IWebBrowser2 *pWebBrowse
19831985

19841986
CExplorerBand::CExplorerBand( void )
19851987
{
1986-
m_bSubclassRebar=GetWinVersion()>=WIN_VER_WIN7;
1988+
m_bSubclassRebar =
1989+
#if _WIN32_WINNT < _WIN32_WINNT_WIN7
1990+
GetWinVersion() >= _WIN32_WINNT_WIN7;
1991+
#else
1992+
true;
1993+
#endif
19871994
m_bSubclassedRebar=false;
19881995
m_TopWindow=NULL;
19891996
}

‎Src/ClassicExplorer/SettingsUI.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class CEditToolbarDlg: public CEditCustomItemDlg
252252

253253
LRESULT CEditToolbarDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled )
254254
{
255-
m_Style=GetWinVersion()>=WIN_VER_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7;
255+
m_Style=GetWinVersion()>=_WIN32_WINNT_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7;
256256
CWindow commands=GetDlgItem(IDC_COMBOCOMMAND);
257257
CWindow links=GetDlgItem(IDC_COMBOLINK);
258258
InitDialog(commands,g_StdCommands,m_Style,SETTINGS_STYLE_MASK,links,g_CommonLinks);
@@ -428,7 +428,7 @@ LRESULT CEditToolbarDlg::OnReset( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
428428
class CCustomToolbarDlg: public CCustomTreeDlg
429429
{
430430
public:
431-
CCustomToolbarDlg( void ): CCustomTreeDlg(false,g_StdCommands,GetWinVersion()>=WIN_VER_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7,SETTINGS_STYLE_MASK) {}
431+
CCustomToolbarDlg( void ): CCustomTreeDlg(false,g_StdCommands,GetWinVersion()>=_WIN32_WINNT_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7,SETTINGS_STYLE_MASK) {}
432432

433433
protected:
434434
virtual void ParseTreeItemExtra( CTreeItem *pItem, CSettingsParser &parser );
@@ -604,7 +604,7 @@ void UpdateSettings( void )
604604
UpdateSetting(L"UpIconSize",CComVariant((dpi>=120)?36:30),false);
605605
FindSetting(L"UpHotkey2")->pLinkTo=FindSetting(L"UpHotkey");
606606

607-
if (GetWinVersion()>=WIN_VER_WIN8)
607+
if (GetWinVersion()>=_WIN32_WINNT_WIN8)
608608
{
609609
// Windows 8
610610
HideSettingGroup(L"StatusBar",true);
@@ -624,7 +624,7 @@ void UpdateSettings( void )
624624
UpdateSetting(L"FixFolderScroll",CComVariant(0),false);
625625
UpdateSetting(L"ToolbarItems",CComVariant(g_DefaultToolbar2),false);
626626

627-
if (GetWinVersion()>=WIN_VER_WIN10)
627+
if (GetWinVersion()>=_WIN32_WINNT_WIN10)
628628
{
629629
FindSetting(L"TreeStyle")[1].flags|=CSetting::FLAG_HIDDEN;
630630
}
@@ -657,14 +657,14 @@ static bool g_bCopyHook0; // initial state of the copy hook before the settings
657657
void InitSettings( void )
658658
{
659659
InitSettings(g_Settings,COMPONENT_EXPLORER,NULL);
660-
g_bCopyHook0=GetWinVersion()<WIN_VER_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
660+
g_bCopyHook0=GetWinVersion()< _WIN32_WINNT_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
661661
}
662662

663663
void ClosingSettings( HWND hWnd, int flags, int command )
664664
{
665665
if (command==IDOK)
666666
{
667-
bool bCopyHook=GetWinVersion()<WIN_VER_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
667+
bool bCopyHook=GetWinVersion()< _WIN32_WINNT_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
668668

669669
if ((flags&CSetting::FLAG_COLD) || (bCopyHook && !g_bCopyHook0))
670670
MessageBox(hWnd,LoadStringEx(IDS_NEW_SETTINGS2),LoadStringEx(IDS_APP_TITLE),MB_OK|MB_ICONWARNING);

‎Src/ClassicExplorer/dllmain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID lpRe
169169
const wchar_t *exe=PathFindFileName(path);
170170
g_bExplorerExe=(_wcsicmp(exe,L"explorer.exe")==0 || _wcsicmp(exe,L"verclsid.exe")==0);
171171
bool bReplaceUI=false;
172-
if (GetWinVersion()<=WIN_VER_WIN7)
172+
if (GetWinVersion()<=_WIN32_WINNT_WIN7)
173173
{
174174
settings[SETTING_REPLACE_FILE].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);
175175
settings[SETTING_REPLACE_FOLDER].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);

‎Src/ClassicExplorer/stdafx.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
#define _ATL_NO_AUTOMATIC_NAMESPACE
1313
#define _ATL_MODULES // compatibility with /permissive-
1414
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
15+
#define VC_EXTRALEAN
16+
#define NOMINMAX
17+
#define _ATL_ALL_WARNINGS
1518

1619
#include "resource.h"
1720
#include <atlbase.h>

‎Src/ClassicExplorer/targetver.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77

88
// Modify the following defines if you have to target a platform prior to the ones specified below.
99
// Refer to MSDN for the latest info on corresponding values for different platforms.
10-
#ifndef WINVER // Specifies that the minimum required platform is Windows 7.
11-
#define WINVER 0x0602 // Change this to the appropriate value to target other versions of Windows.
12-
#endif
1310

14-
#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows 7.
15-
#define _WIN32_WINNT 0x0602 // Change this to the appropriate value to target other versions of Windows.
11+
#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows 7.
12+
#define _WIN32_WINNT _WIN32_WINNT_WIN7 // Change this to the appropriate value to target other versions of Windows.
1613
#endif
1714

18-
#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98.
19-
#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
15+
#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 11.0.
16+
#define _WIN32_IE _WIN32_IE_IE110 // Change this to the appropriate value to target other versions of IE.
2017
#endif
2118

22-
#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0.
23-
#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE.
19+
#ifndef NTDDI_VERSION // Specifies that the minimum required platform is NTDDI for Windows 8.
20+
#define NTDDI_VERSION NTDDI_WIN8 // Change this to the appropriate value to target other versions of NTDDI.
2421
#endif

‎Src/ClassicIE/ClassicIE.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#define STRICT_TYPED_ITEMIDS
66
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
7+
#define WIN32_LEAN_AND_MEAN
8+
#define VC_EXTRALEAN
9+
#define NOMINMAX
10+
#define _ATL_ALL_WARNINGS
711
#include <windows.h>
812
#include <commctrl.h>
913
#include <shlwapi.h>

‎Src/ClassicIE/ClassicIEDLL/DrawCaption.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ static LRESULT CALLBACK SubclassCaptionProc( HWND hWnd, UINT uMsg, WPARAM wParam
152152
{
153153
// exclude the caption buttons
154154
rc.right-=g_SysButtonSize.cx+5;
155-
if (GetWinVersion()==WIN_VER_VISTA) rc.bottom++;
155+
#if _WIN32_WINNT > _WIN32_WINNT_VISTA
156+
if (GetWinVersion()==_WIN32_WINNT_VISTA) rc.bottom++;
157+
#endif
156158
if (!bMaximized)
157159
{
158160
rc.left+=g_CustomCaption[0].leftPadding;
@@ -176,10 +178,10 @@ static LRESULT CALLBACK SubclassCaptionProc( HWND hWnd, UINT uMsg, WPARAM wParam
176178
rc.left+=iconSize;
177179
}
178180
rc.left+=g_CustomCaption[1].iconPadding;
179-
if (GetWinVersion()>=WIN_VER_WIN10)
181+
if (GetWinVersion()>=_WIN32_WINNT_WIN10)
180182
rc.bottom++;
181183
}
182-
if (GetWinVersion()<WIN_VER_WIN10)
184+
if (GetWinVersion()<_WIN32_WINNT_WIN10)
183185
rc.top=rc.bottom-g_SysButtonSize.cy;
184186
HFONT font0=(HFONT)SelectObject(hdcPaint,font);
185187
RECT rcText={0,0,0,0};

‎Src/ClassicIE/ClassicIEDLL/SettingsUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void UpgradeSettings( bool bShared )
5151

5252
void UpdateSettings( void )
5353
{
54-
bool bWin8=(GetWinVersion()>=WIN_VER_WIN8);
54+
bool bWin8=(GetWinVersion()>=_WIN32_WINNT_WIN8);
5555

5656
BOOL bComposition=0;
5757
if (FAILED(DwmIsCompositionEnabled(&bComposition)))
@@ -75,7 +75,7 @@ void UpdateSettings( void )
7575

7676
UpdateSetting(L"Glow",CComVariant(bComposition?1:0),false);
7777
UpdateSetting(L"MaxGlow",CComVariant(bComposition?1:0),false);
78-
UpdateSetting(L"CenterCaption",CComVariant((bWin8 && GetWinVersion()<WIN_VER_WIN10)?1:0),false);
78+
UpdateSetting(L"CenterCaption",CComVariant((bWin8 && GetWinVersion()<_WIN32_WINNT_WIN10)?1:0),false);
7979

8080
// create a dummy window to get a theme
8181
HWND hwnd=CreateWindow(L"#32770",L"",WS_OVERLAPPEDWINDOW,0,0,0,0,NULL,NULL,NULL,0);

‎Src/ClassicIE/ClassicIEDLL/stdafx.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
#define _ATL_NO_AUTOMATIC_NAMESPACE
1616
#define _ATL_MODULES // compatibility with /permissive-
1717
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
18+
#define VC_EXTRALEAN
19+
#define WIN32_LEAN_AND_MEAN
20+
#define NOMINMAX
21+
#define _ATL_ALL_WARNINGS
22+
1823

1924
#include "resource.h"
2025
#include <atlbase.h>

‎Src/ClassicIE/ClassicIEDLL/targetver.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77

88
// Modify the following defines if you have to target a platform prior to the ones specified below.
99
// Refer to MSDN for the latest info on corresponding values for different platforms.
10-
#ifndef WINVER // Specifies that the minimum required platform is Windows 7.
11-
#define WINVER 0x0602 // Change this to the appropriate value to target other versions of Windows.
12-
#endif
1310

14-
#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows 7.
15-
#define _WIN32_WINNT 0x0602 // Change this to the appropriate value to target other versions of Windows.
11+
#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows 7.
12+
#define _WIN32_WINNT _WIN32_WINNT_WIN7 // Change this to the appropriate value to target other versions of Windows.
1613
#endif
1714

18-
#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98.
19-
#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
15+
#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 11.0.
16+
#define _WIN32_IE _WIN32_IE_IE110 // Change this to the appropriate value to target other versions of IE.
2017
#endif
2118

22-
#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0.
23-
#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE.
19+
#ifndef NTDDI_VERSION // Specifies that the minimum required platform is NTDDI for Windows 8.
20+
#define NTDDI_VERSION NTDDI_WIN8 // Change this to the appropriate value to target other versions of NTDDI.
2421
#endif

‎Src/Lib/ResourceHelper.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Classic Shell (c) 2009-2017, Ivo Beltchev
2-
// Open-Shell (c) 2017-2018, The Open-Shell Team
2+
// Open-Shell (c) 2017-2024, The Open-Shell Team
33
// Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
44

55
#include "stdafx.h"
@@ -648,7 +648,7 @@ DWORD GetVersionEx( HINSTANCE hInstance, DWORD *pBuild )
648648
}
649649

650650
// Returns the Windows version - 0x600, 0x601, ...
651-
WORD GetWinVersion( void )
651+
WORD GetWinVersion()
652652
{
653653
static WORD version;
654654
if (!version)
@@ -660,29 +660,29 @@ WORD GetWinVersion( void )
660660
return version;
661661
}
662662

663-
static bool IsWin81Update1Helper( void )
663+
static bool IsWin81Update1Helper()
664664
{
665665
DWORD build;
666666
DWORD ver=GetVersionEx(GetModuleHandle(L"user32.dll"),&build);
667-
return HIWORD(ver)==WIN_VER_WIN81 && build>17000;
667+
return HIWORD(ver)==_WIN32_WINNT_WINBLUE && build>17000;
668668
}
669669

670670
// Returns true if the version is Win81 Update1 or later
671-
bool IsWin81Update1( void )
671+
bool IsWin81Update1()
672672
{
673673
static bool bIsUpdate1=IsWin81Update1Helper();
674674
return bIsUpdate1;
675675
}
676676

677-
static bool IsWin10RS1Helper( void )
677+
static bool IsWin10RS1Helper()
678678
{
679679
DWORD build;
680680
DWORD ver=GetVersionEx(GetModuleHandle(L"user32.dll"),&build);
681681
return ver>MAKELONG(14000,10<<8);
682682
}
683683

684684
// Returns true if the version is Windows10 RS1 or later
685-
bool IsWin10RS1( void )
685+
bool IsWin10RS1()
686686
{
687687
static bool bIsRS1=IsWin10RS1Helper();
688688
return bIsRS1;
@@ -720,14 +720,14 @@ static RTL_OSVERSIONINFOW GetOSVersion()
720720
return ver;
721721
}
722722

723-
static bool IsWin10RS4Helper( void )
723+
static bool IsWin10RS4Helper()
724724
{
725725
auto version = GetOSVersion();
726726
return version.dwMajorVersion > 8 && version.dwBuildNumber > 17131;
727727
}
728728

729729
// Returns true if the version is Windows10 RS4 (Spring Creator Update) or later
730-
bool IsWin10RS4( void )
730+
bool IsWin10RS4()
731731
{
732732
static bool bIsRS4=IsWin10RS4Helper();
733733
return bIsRS4;
@@ -740,7 +740,7 @@ static bool IsWin11Helper()
740740
}
741741

742742
// Returns true if the version is Windows11 or later
743-
bool IsWin11(void)
743+
bool IsWin11()
744744
{
745745
static bool bIsWin11 = IsWin11Helper();
746746
return bIsWin11;

‎Src/Lib/ResourceHelper.h

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Classic Shell (c) 2009-2017, Ivo Beltchev
2-
// Open-Shell (c) 2017-2018, The Open-Shell Team
2+
// Open-Shell (c) 2017-2024, The Open-Shell Team
33
// Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
44

55
#pragma once
@@ -49,23 +49,17 @@ HICON CreateDisabledIcon( HICON hIcon, int iconSize );
4949
// Returns the version of a given module
5050
DWORD GetVersionEx( HINSTANCE hInstance, DWORD *pBuild=NULL );
5151

52-
const int WIN_VER_VISTA=0x600;
53-
const int WIN_VER_WIN7 =0x601;
54-
const int WIN_VER_WIN8 =0x602;
55-
const int WIN_VER_WIN81=0x603;
56-
const int WIN_VER_WIN10=0xA00;
57-
5852
// Returns the Windows version - 0x600, 0x601, ...
59-
WORD GetWinVersion( void );
53+
WORD GetWinVersion();
6054

6155
// Returns true if the version is Win81 Update1
62-
bool IsWin81Update1( void );
56+
bool IsWin81Update1();
6357

6458
// Returns true if the version is Windows10 RS1 or later
65-
bool IsWin10RS1( void );
59+
bool IsWin10RS1();
6660

6761
// Returns true if the version is Windows10 RS4 (Spring Creator Update) or later
68-
bool IsWin10RS4( void );
62+
bool IsWin10RS4();
6963

7064
// Returns true if the version is Windows11 or later
7165
bool IsWin11();

‎Src/Lib/StringUtils.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
#include <stdarg.h>
4242

4343
#if defined(_WIN32) || defined(_WIN64)
44+
#define VC_EXTRALEAN
45+
#define NOMINMAX
4446
#include <windows.h>
4547
#endif
4648

0 commit comments

Comments
 (0)