From: Ken Sharp <imwellcushtymelike@googlemail.com>
Subject: [PATCH 3/5] Add support for Windows Server 2012/R2
Message-Id: <54B16F4D.1070107@gmail.com>
Date: Sat, 10 Jan 2015 18:28:29 +0000

From e6b4ba6ed9ddccb10d6d2b921bb54707168877fa Mon Sep 17 00:00:00 2001
From: Ken Sharp <imwellcushtymelike@gmail.com>
Date: Sat, 10 Jan 2015 17:32:14 +0000
Subject: [PATCH 3/5] Add support for Windows Server 2012/R2

---
 dlls/ntdll/version.c           | 53 +++++++++++++++++++++++++++---------------
 programs/winecfg/appdefaults.c |  4 ++++
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index a6340eb..dd9d2dd 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -40,24 +40,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 typedef enum
 {
-    WIN20,   /* Windows 2.0 */
-    WIN30,   /* Windows 3.0 */
-    WIN31,   /* Windows 3.1 */
-    WIN95,   /* Windows 95 */
-    WIN98,   /* Windows 98 */
-    WINME,   /* Windows Me */
-    NT351,   /* Windows NT 3.51 */
-    NT40,    /* Windows NT 4.0 */
-    NT2K,    /* Windows 2000 */
-    WINXP,   /* Windows XP */
-    WINXP64, /* Windows XP 64-bit */
-    WIN2K3,  /* Windows 2003 */
-    WINVISTA,/* Windows Vista */
-    WIN2K8,  /* Windows 2008 */
-    WIN2K8R2,/* Windows 2008 R2 */
-    WIN7,    /* Windows 7 */
-    WIN8,    /* Windows 8 */
-    WIN81,   /* Windows 8.1 */
+    WIN20,     /* Windows 2.0 */
+    WIN30,     /* Windows 3.0 */
+    WIN31,     /* Windows 3.1 */
+    WIN95,     /* Windows 95 */
+    WIN98,     /* Windows 98 */
+    WINME,     /* Windows Me */
+    NT351,     /* Windows NT 3.51 */
+    NT40,      /* Windows NT 4.0 */
+    NT2K,      /* Windows 2000 */
+    WINXP,     /* Windows XP */
+    WINXP64,   /* Windows XP 64-bit */
+    WIN2K3,    /* Windows Server 2003 */
+    WINVISTA,  /* Windows Vista */
+    WIN2K8,    /* Windows Server 2008 */
+    WIN2K8R2,  /* Windows Server 2008 R2 */
+    WIN7,      /* Windows 7 */
+    WIN8,      /* Windows 8 */
+    WIN2012,   /* Windows Server 2012 */
+    WIN81,     /* Windows 8.1 */
+    WIN2012R2, /* Windows Server 2012 R2 */
     NB_WINDOWS_VERSIONS
 } WINDOWS_VERSION;
 
@@ -178,13 +180,24 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
         {' ',0},
         0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
     },
+    /* WIN2012 */
+    {
+        sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT,
+        {' ',0},
+        0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0
+    },
     /* WIN81 */
     {
         sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT,
         {' ',0},
         0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
     },
-
+    /* WIN2012R2 */
+    {
+        sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT,
+        {' ',0},
+        0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0
+    },
 };
 
 static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
@@ -206,7 +219,9 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
     "win2008r2,win2k8r2",         /* WIN2K8R2 */
     "win7",                       /* WIN7 */
     "win8",                       /* WIN8 */
+    "win2012",                    /* WIN2012 */
     "win81",                      /* WIN81 */
+    "win2012r2",                  /* WIN2012R2 */
 };
 
 
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index f625329..c37b752 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -49,6 +49,10 @@ static const struct
     const char *szProductType;
 } win_versions[] =
 {
+#ifdef _WIN64
+    { "win2012r2",   "Windows Server 2012 R2",   6,  3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "ServerNT"},
+    { "win2012",     "Windows Server 2012",      6,  2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "ServerNT"},
+#endif
     { "win2008r2",   "Windows Server 2008 R2",   6,  1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},
     { "win2008",     "Windows Server 2008",      6,  0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},
     { "win2003",     "Windows Server 2003",      5,  2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},
-- 
2.1.0