Skip to content

Commit 7001c41

Browse files
IRainmanIRainman
authored
Merge 018b218 into 31acb6b 
2 parents 31acb6b + 018b218 commit 7001c41

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

+313
-307
lines changed

‎Src/ClassicExplorer/ClassicCopy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ 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 (GetWinVersion()>=_WIN32_WINNT_WIN7)
691691
{
692692
BOOL comp;
693693
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ 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 (GetWinVersion()>= _WIN32_WINNT_WIN7)
543543
{
544544
// maybe it is a library - try the default save folder
545545
CComPtr<IShellItem> pShellItem;
@@ -1747,7 +1747,7 @@ void CBandWindow::UpdateToolbar( void )
17471747

17481748
if (m_pBrowserBag)
17491749
{
1750-
if (GetWinVersion()>=WIN_VER_WIN8)
1750+
if (GetWinVersion()>= _WIN32_WINNT_WIN8)
17511751
{
17521752
VARIANT val={VT_EMPTY};
17531753
if (SUCCEEDED(m_pBrowserBag->Read(g_ComboPaneEnabled,&val,NULL)) && val.vt==VT_BOOL && !val.boolVal)
@@ -1983,7 +1983,7 @@ void CBandWindow::SetBrowsers( IShellBrowser *pBrowser, IWebBrowser2 *pWebBrowse
19831983

19841984
CExplorerBand::CExplorerBand( void )
19851985
{
1986-
m_bSubclassRebar=GetWinVersion()>=WIN_VER_WIN7;
1986+
m_bSubclassRebar=GetWinVersion()>= _WIN32_WINNT_WIN7;
19871987
m_bSubclassedRebar=false;
19881988
m_TopWindow=NULL;
19891989
}

‎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>

0 commit comments

Comments
 (0)