From: Serge Gautherie <reactos-git_serge_fake@gautherie.fr>
Date: Thu, 29 Dec 2016 09:50:31 +0100
Subject: [PSDK]
sdkddkver.h:
*Clean up a comment (style).
*Reorder/Link some defines.
*Add a comment about _CHICAGO_ (Windows 95).
*Update defaults to 0x0601 (Windows 7) from 0x0600 (Windows Vista).
*Improve/Fix "NTDDI_VERSION and _WIN32_WINNT Match" check.
CORE-12588


diff --git a/reactos/sdk/include/psdk/sdkddkver.h b/reactos/sdk/include/psdk/sdkddkver.h
index 7ffd7dc..5842019 100644
--- a/reactos/sdk/include/psdk/sdkddkver.h
+++ b/reactos/sdk/include/psdk/sdkddkver.h
@@ -10,7 +10,7 @@ Abstract:
 
     Version definitions for SDK and DDK.
 
---*/
+*/
 
 #ifndef _INC_SDKDDKVER
 #define _INC_SDKDDKVER
@@ -21,14 +21,14 @@ Abstract:
 #define _WIN32_WINNT_WINXP                  0x0501
 #define _WIN32_WINNT_WS03                   0x0502
 #define _WIN32_WINNT_WIN6                   0x0600
-#define _WIN32_WINNT_VISTA                  0x0600
-#define _WIN32_WINNT_WS08                   0x0600
-#define _WIN32_WINNT_LONGHORN               0x0600
+#define _WIN32_WINNT_LONGHORN               _WIN32_WINNT_WIN6
+#define _WIN32_WINNT_VISTA                  _WIN32_WINNT_LONGHORN
+#define _WIN32_WINNT_WS08                   _WIN32_WINNT_WIN6
 #define _WIN32_WINNT_WIN7                   0x0601
 #define _WIN32_WINNT_WIN8                   0x0602
 #define _WIN32_WINNT_WINBLUE                0x0603
 #define _WIN32_WINNT_WINTHRESHOLD           0x0A00
-#define _WIN32_WINNT_WIN10                  0x0A00
+#define _WIN32_WINNT_WIN10                  _WIN32_WINNT_WINTHRESHOLD
 
 /* _WIN32_IE */
 #define _WIN32_IE_IE20                      0x0200
@@ -49,33 +49,33 @@ Abstract:
 #define _WIN32_IE_IE110                     0x0A00
 
 /* Mappings Between IE Version  and Windows Version */
+#define _WIN32_IE_WIN98                     _WIN32_IE_IE401
+#define _WIN32_IE_WIN98SE                   _WIN32_IE_IE50
+#define _WIN32_IE_WINME                     _WIN32_IE_IE55
 #define _WIN32_IE_NT4                       _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP1                    _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP2                    _WIN32_IE_IE20
+#define _WIN32_IE_NT4SP1                    _WIN32_IE_NT4
+#define _WIN32_IE_NT4SP2                    _WIN32_IE_NT4
 #define _WIN32_IE_NT4SP3                    _WIN32_IE_IE302
 #define _WIN32_IE_NT4SP4                    _WIN32_IE_IE401
-#define _WIN32_IE_NT4SP5                    _WIN32_IE_IE401
+#define _WIN32_IE_NT4SP5                    _WIN32_IE_NT4SP4
 #define _WIN32_IE_NT4SP6                    _WIN32_IE_IE50
-#define _WIN32_IE_WIN98                     _WIN32_IE_IE401
-#define _WIN32_IE_WIN98SE                   _WIN32_IE_IE50
-#define _WIN32_IE_WINME                     _WIN32_IE_IE55
 #define _WIN32_IE_WIN2K                     _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP1                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP2                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP3                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP4                  _WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP1                  _WIN32_IE_WIN2K
+#define _WIN32_IE_WIN2KSP2                  _WIN32_IE_WIN2K
+#define _WIN32_IE_WIN2KSP3                  _WIN32_IE_WIN2K
+#define _WIN32_IE_WIN2KSP4                  _WIN32_IE_WIN2K
 #define _WIN32_IE_XP                        _WIN32_IE_IE60
 #define _WIN32_IE_XPSP1                     _WIN32_IE_IE60SP1
 #define _WIN32_IE_XPSP2                     _WIN32_IE_IE60SP2
 #define _WIN32_IE_WS03                      0x0602
 #define _WIN32_IE_WS03SP1                   _WIN32_IE_IE60SP2
 #define _WIN32_IE_WIN6                      _WIN32_IE_IE70
-#define _WIN32_IE_LONGHORN                  _WIN32_IE_IE70
+#define _WIN32_IE_LONGHORN                  _WIN32_IE_WIN6
 #define _WIN32_IE_WIN7                      _WIN32_IE_IE80
 #define _WIN32_IE_WIN8                      _WIN32_IE_IE100
 #define _WIN32_IE_WINBLUE                   _WIN32_IE_IE100
 #define _WIN32_IE_WINTHRESHOLD              _WIN32_IE_IE110
-#define _WIN32_IE_WIN10                     _WIN32_IE_IE110
+#define _WIN32_IE_WIN10                     _WIN32_IE_WINTHRESHOLD
 
 /* NTDDI_VERSION */
 #define NTDDI_WIN2K                         0x05000000
@@ -99,7 +99,7 @@ Abstract:
 #define NTDDI_WIN6SP3                       0x06000300
 #define NTDDI_WIN6SP4                       0x06000400
 #define NTDDI_LONGHORN                      NTDDI_WIN6
-#define NTDDI_VISTA                         NTDDI_WIN6
+#define NTDDI_VISTA                         NTDDI_LONGHORN
 #define NTDDI_VISTASP1                      NTDDI_WIN6SP1
 #define NTDDI_VISTASP2                      NTDDI_WIN6SP2
 #define NTDDI_VISTASP3                      NTDDI_WIN6SP3
@@ -112,7 +112,7 @@ Abstract:
 #define NTDDI_WIN8                          0x06020000
 #define NTDDI_WINBLUE                       0x06030000
 #define NTDDI_WINTHRESHOLD                  0x0A000000
-#define NTDDI_WIN10                         0x0A000000
+#define NTDDI_WIN10                         NTDDI_WINTHRESHOLD
 
 /* Version Fields in NTDDI_VERSION */
 #define OSVERSION_MASK                      0xFFFF0000UL
@@ -129,8 +129,9 @@ Abstract:
 #define NTDDI_VERSION_FROM_WIN32_WINNT(Version)  NTDDI_VERSION_FROM_WIN32_WINNT2(Version)
 
 /* Select Default _WIN32_WINNT Value */
+/* _CHICAGO_ (Windows 95) is obsolete/unsupported otherwise. */
 #if !defined(_WIN32_WINNT) && !defined(_CHICAGO_)
-#define _WIN32_WINNT    0x0600
+#define _WIN32_WINNT    0x0601
 #endif
 
 /* Choose NTDDI Version */
@@ -138,7 +139,7 @@ Abstract:
 #ifdef _WIN32_WINNT
 #define NTDDI_VERSION   NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT)
 #else
-#define NTDDI_VERSION   0x06000000
+#define NTDDI_VERSION   0x06010000
 #endif
 #endif
 
@@ -147,7 +148,7 @@ Abstract:
 #ifdef _WIN32_WINNT
 #define WINVER          _WIN32_WINNT
 #else
-#define WINVER          0x0600
+#define WINVER          0x0601
 #endif
 #endif
 
@@ -177,11 +178,13 @@ Abstract:
 #endif
 
 /* Make Sure NTDDI_VERSION and _WIN32_WINNT Match */
+#ifdef _WIN32_WINNT
 #if ((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K)) || \
     ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) || \
-    ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03))   || \
-    ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP))
+    ((OSVER(NTDDI_VERSION) == NTDDI_WS03 ) && (_WIN32_WINNT != _WIN32_WINNT_WS03 )) || \
+    ((OSVER(NTDDI_VERSION) == NTDDI_WIN6 ) && (_WIN32_WINNT != _WIN32_WINNT_WIN6 ))
 #error NTDDI_VERSION and _WIN32_WINNT mismatch!
 #endif
+#endif
 
 #endif