Merge fa4d893 into 31acb6b

Author: IRainman

Src/ClassicExplorer/ClassicCopy.cpp

@@ -687,7 +687,9 @@ static LRESULT CALLBACK WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 						if (bDef)
 						{
 							delay=0;
-							if (GetWinVersion()>=WIN_VER_WIN7)
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
+							if (GetWinVersion()>=_WIN32_WINNT_WIN7)
+#endif
 							{
 								BOOL comp;
 								if (SUCCEEDED(DwmIsCompositionEnabled(&comp)) && comp)

Src/ClassicExplorer/ClassicCopyExt.cpp

@@ -38,7 +38,7 @@ STDMETHODIMP CClassicCopyExt::InvokeCommand( LPCMINVOKECOMMANDINFO pCmdInfo )
 
 HRESULT WINAPI CClassicCopyExt::UpdateRegistry( BOOL bRegister )
 {
-	if (GetWinVersion()>=WIN_VER_WIN8)
+	if (GetWinVersion()>=_WIN32_WINNT_WIN8)
 		return S_OK;
 	return _AtlModule.UpdateRegistryFromResource(IDR_CLASSICCOPYEXT,bRegister);
 }

Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.cpp

@@ -2,6 +2,9 @@
 // Open-Shell (c) 2017-2018, The Open-Shell Team
 // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
 
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <windows.h>
 #include <commctrl.h>
 #include <shlwapi.h>

Src/ClassicExplorer/ExplorerBHO.cpp

@@ -156,7 +156,7 @@ LRESULT CALLBACK CExplorerBHO::SubclassTreeProc( HWND hWnd, UINT uMsg, WPARAM wP
 			indent=0;
 
 		int treeStyle=GetSettingInt(L"TreeStyle");
-		if (treeStyle==STYLE_CLASSIC && GetWinVersion()>=WIN_VER_WIN10)
+		if (treeStyle==STYLE_CLASSIC && GetWinVersion()>= _WIN32_WINNT_WIN10)
 			treeStyle=STYLE_VISTA;
 		DWORD style=GetWindowLong(hWnd,GWL_STYLE);
 		if (treeStyle!=STYLE_VISTA)
@@ -209,7 +209,7 @@ LRESULT CALLBACK CExplorerBHO::SubclassTreeProc( HWND hWnd, UINT uMsg, WPARAM wP
 		if (GetSettingBool(L"FullIndent"))
 			indent=0;
 
-		if (GetSettingInt(L"TreeStyle")==STYLE_CLASSIC && GetWinVersion()<WIN_VER_WIN10)
+		if (GetSettingInt(L"TreeStyle")==STYLE_CLASSIC && GetWinVersion()< _WIN32_WINNT_WIN10)
 		{
 			HIMAGELIST images=TreeView_GetImageList(hWnd,TVSIL_NORMAL);
 			int cx, cy;
@@ -1109,7 +1109,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBHO::SetSite( IUnknown *pUnkSite )
 					SetProp(m_TopWindow,g_LoadedSettingsAtom,(HANDLE)1);
 					LoadSettings();
 				}
-				bool bWin8=(GetWinVersion()>=WIN_VER_WIN8);
+				bool bWin8=(GetWinVersion()>= _WIN32_WINNT_WIN8);
 
 				m_UpButtonIndex=bWin8?0:GetSettingInt(L"ShowUpButton");
 				bool bShowCaption=!bWin8 && GetSettingBool(L"ShowCaption");

Src/ClassicExplorer/ExplorerBand.cpp

@@ -539,7 +539,9 @@ static bool GetPidlPath( PIDLIST_ABSOLUTE pidl, wchar_t *path )
 	path[0]=0;
 	if (SHGetPathFromIDList(pidl,path) && *path)
 		return true;
-	if (GetWinVersion()>=WIN_VER_WIN7)
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
+	if (GetWinVersion()>= _WIN32_WINNT_WIN7)
+#endif
 	{
 		// maybe it is a library - try the default save folder
 		CComPtr<IShellItem> pShellItem;
@@ -1747,7 +1749,7 @@ void CBandWindow::UpdateToolbar( void )
 
 				if (m_pBrowserBag)
 				{
-					if (GetWinVersion()>=WIN_VER_WIN8)
+					if (GetWinVersion()>= _WIN32_WINNT_WIN8)
 					{
 						VARIANT val={VT_EMPTY};
 						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
 
 CExplorerBand::CExplorerBand( void )
 {
-	m_bSubclassRebar=GetWinVersion()>=WIN_VER_WIN7;
+	m_bSubclassRebar =
+#if _WIN32_WINNT < _WIN32_WINNT_WIN7
+		GetWinVersion() >= _WIN32_WINNT_WIN7;
+#else
+		true;
+#endif
 	m_bSubclassedRebar=false;
 	m_TopWindow=NULL;
 }

Src/ClassicExplorer/SettingsUI.cpp

@@ -252,7 +252,7 @@ class CEditToolbarDlg: public CEditCustomItemDlg
 
 LRESULT CEditToolbarDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled )
 {
-	m_Style=GetWinVersion()>=WIN_VER_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7;
+	m_Style=GetWinVersion()>=_WIN32_WINNT_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7;
 	CWindow commands=GetDlgItem(IDC_COMBOCOMMAND);
 	CWindow links=GetDlgItem(IDC_COMBOLINK);
 	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
 class CCustomToolbarDlg: public CCustomTreeDlg
 {
 public:
-	CCustomToolbarDlg( void ): CCustomTreeDlg(false,g_StdCommands,GetWinVersion()>=WIN_VER_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7,SETTINGS_STYLE_MASK) {}
+	CCustomToolbarDlg( void ): CCustomTreeDlg(false,g_StdCommands,GetWinVersion()>=_WIN32_WINNT_WIN8?SETTINGS_STYLE_WIN8:SETTINGS_STYLE_WIN7,SETTINGS_STYLE_MASK) {}
 
 protected:
 	virtual void ParseTreeItemExtra( CTreeItem *pItem, CSettingsParser &parser );
@@ -604,7 +604,7 @@ void UpdateSettings( void )
 	UpdateSetting(L"UpIconSize",CComVariant((dpi>=120)?36:30),false);
 	FindSetting(L"UpHotkey2")->pLinkTo=FindSetting(L"UpHotkey");
 
-	if (GetWinVersion()>=WIN_VER_WIN8)
+	if (GetWinVersion()>=_WIN32_WINNT_WIN8)
 	{
 		// Windows 8
 		HideSettingGroup(L"StatusBar",true);
@@ -624,7 +624,7 @@ void UpdateSettings( void )
 		UpdateSetting(L"FixFolderScroll",CComVariant(0),false);
 		UpdateSetting(L"ToolbarItems",CComVariant(g_DefaultToolbar2),false);
 
-		if (GetWinVersion()>=WIN_VER_WIN10)
+		if (GetWinVersion()>=_WIN32_WINNT_WIN10)
 		{
 			FindSetting(L"TreeStyle")[1].flags|=CSetting::FLAG_HIDDEN;
 		}
@@ -657,14 +657,14 @@ static bool g_bCopyHook0; // initial state of the copy hook before the settings
 void InitSettings( void )
 {
 	InitSettings(g_Settings,COMPONENT_EXPLORER,NULL);
-	g_bCopyHook0=GetWinVersion()<WIN_VER_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
+	g_bCopyHook0=GetWinVersion()< _WIN32_WINNT_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
 }
 
 void ClosingSettings( HWND hWnd, int flags, int command )
 {
 	if (command==IDOK)
 	{
-		bool bCopyHook=GetWinVersion()<WIN_VER_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
+		bool bCopyHook=GetWinVersion()< _WIN32_WINNT_WIN8 && (GetSettingBool(L"ReplaceFileUI") || GetSettingBool(L"ReplaceFolderUI") || GetSettingBool(L"EnableMore"));
 
 		if ((flags&CSetting::FLAG_COLD) || (bCopyHook && !g_bCopyHook0))
 			MessageBox(hWnd,LoadStringEx(IDS_NEW_SETTINGS2),LoadStringEx(IDS_APP_TITLE),MB_OK|MB_ICONWARNING);

Src/ClassicExplorer/dllmain.cpp

@@ -169,7 +169,7 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID lpRe
 		const wchar_t *exe=PathFindFileName(path);
 		g_bExplorerExe=(_wcsicmp(exe,L"explorer.exe")==0 || _wcsicmp(exe,L"verclsid.exe")==0);
 		bool bReplaceUI=false;
-		if (GetWinVersion()<=WIN_VER_WIN7)
+		if (GetWinVersion()<=_WIN32_WINNT_WIN7)
 		{
 			settings[SETTING_REPLACE_FILE].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);
 			settings[SETTING_REPLACE_FOLDER].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);

Src/ClassicExplorer/stdafx.h

@@ -12,6 +12,9 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_MODULES // compatibility with /permissive-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 
 #include "resource.h"
 #include <atlbase.h>

Src/ClassicExplorer/targetver.h

@@ -7,18 +7,15 @@
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER                          // Specifies that the minimum required platform is Windows 7.
-#define WINVER 0x0602           // Change this to the appropriate value to target other versions of Windows.
-#endif
 
-#ifndef _WIN32_WINNT            // Specifies that the minimum required platform is Windows 7.
-#define _WIN32_WINNT 0x0602     // Change this to the appropriate value to target other versions of Windows.
+#ifndef _WIN32_WINNT                   // Specifies that the minimum required platform is Windows 7.
+#define _WIN32_WINNT _WIN32_WINNT_WIN7 // Change this to the appropriate value to target other versions of Windows.
 #endif
 
-#ifndef _WIN32_WINDOWS          // Specifies that the minimum required platform is Windows 98.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#ifndef _WIN32_IE                      // Specifies that the minimum required platform is Internet Explorer 11.0.
+#define _WIN32_IE _WIN32_IE_IE110      // Change this to the appropriate value to target other versions of IE.
 #endif
 
-#ifndef _WIN32_IE                       // Specifies that the minimum required platform is Internet Explorer 7.0.
-#define _WIN32_IE 0x0700        // Change this to the appropriate value to target other versions of IE.
+#ifndef NTDDI_VERSION                  // Specifies that the minimum required platform is NTDDI for Windows 8.
+#define NTDDI_VERSION NTDDI_WIN8       // Change this to the appropriate value to target other versions of NTDDI.
 #endif

Src/ClassicIE/ClassicIE.cpp

@@ -4,6 +4,10 @@
 
 #define STRICT_TYPED_ITEMIDS
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 #include <windows.h>
 #include <commctrl.h>
 #include <shlwapi.h>