Austin English : ntdll: Add support for Windows 7 version.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f2aa80f71eb935536862164783f7bd381e85c391
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2aa80f71eb935536862164783...

Author: Austin English <austinenglish(a)gmail.com>
Date:   Thu Oct 29 20:21:40 2009 -0500

ntdll: Add support for Windows 7 version.

---

 dlls/ntdll/version.c           |    8 ++++++++
 programs/winecfg/appdefaults.c |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index c1f7cb1..ece1cb5 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -53,6 +53,7 @@ typedef enum
     WIN2K3,  /* Windows 2003 */
     WINVISTA,/* Windows Vista */
     WIN2K8,  /* Windows 2008 */
+    WIN7,    /* Windows 7 */
     NB_WINDOWS_VERSIONS
 } WINDOWS_VERSION;
 
@@ -148,6 +149,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
         sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1771, VER_PLATFORM_WIN32_NT,
         {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0},
         0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0
+    },
+    /* WIN7 */
+    {
+        sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB0, VER_PLATFORM_WIN32_NT,
+        {' ',0},
+        0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
     }
 };
 
@@ -166,6 +173,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
     "win2003,win2k3",             /* WIN2K3 */
     "vista,winvista",             /* WINVISTA*/
     "win2008,win2k8",             /* WIN2K8 */
+    "win7",                       /* WIN7 */
 };
 
 
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 4df2a4a..5cb0968 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -48,6 +48,7 @@ static const struct
     const char *szProductType;
 } win_versions[] =
 {
+    { "win7",    "Windows 7",      6,  1, 0x1DB0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
     { "win2008", "Windows 2008",   6,  0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"},
     { "vista",   "Windows Vista",  6,  0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
     { "win2003", "Windows 2003",   5,  2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},