Skip to content

Commit 018b218

Browse files
IRainmanIRainman
committed
Probably fixed Open-Shell#2055
_WIN32_WINNT is set for Windows 7. NTDDI_VERSION is set for Windows 8. _WIN32_IE is set for IE11. _WIN32_WINDOWS define is removed because it's usefulness.
1 parent a9c6084 commit 018b218

File tree

6 files changed

+36
-54
lines changed

6 files changed

+36
-54
lines changed

‎Src/ClassicExplorer/targetver.h

+6-9
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/ClassicIEDLL/targetver.h

+6-9
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/targetver.h

+6-9
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/StartMenu/StartMenuDLL/targetver.h

+6-9
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/StartMenu/StartMenuHelper/targetver.h

+6-9
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/StartMenu/targetver.h

+6-9
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

0 commit comments

Comments
 (0)