Hans Leidekker : winecfg: Update Windows 7 version to Service Pack 1.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: ed3c9837027210fed1d71e52a211ee593e5ad83c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed3c9837027210fed1d71e52a2...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Mon Sep 27 12:18:19 2010 +0200

winecfg: Update Windows 7 version to Service Pack 1.
(cherry picked from commit 92b7f57e1e94fcdd8a132404629bcda8afa9eb9c)

---

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

diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 9d06d8f..e109905 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -152,9 +152,9 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
     },
     /* WIN7 */
     {
-        sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB0, VER_PLATFORM_WIN32_NT,
-        {' ',0},
-        0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
+        sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT,
+        {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0},
+        1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
     }
 };
 
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index cf07fe8..39ecd4e 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -48,7 +48,7 @@ static const struct
     const char *szProductType;
 } win_versions[] =
 {
-    { "win7",    "Windows 7",      6,  1, 0x1DB0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
+    { "win7",    "Windows 7",      6,  1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"},
     { "win2008", "Windows 2008",   6,  0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"},
     { "vista",   "Windows Vista",  6,  0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"},
     { "win2003", "Windows 2003",   5,  2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},