Module: wine Branch: master Commit: 0463d01f151fb3d7c7acf26c7628683fefb6c130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0463d01f151fb3d7c7acf26c76...
Author: Hans Leidekker hans@codeweavers.com Date: Wed Dec 11 10:50:19 2013 +0100
ntdll: Report the latest service pack for 64-bit Windows XP.
---
dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index f4b1093..57e586a 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -138,8 +138,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WINXP64 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, 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 + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, + 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K3 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index fdb0a71..3b83860 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -56,7 +56,7 @@ static const struct { "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 2", 2, 0, "ServerNT"}, #ifdef _WIN64 - { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, + { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, #else { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"},