marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: SzCSDVersion is an empty string on Windows 8 and up. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Hans Leidekker 2016-10-04 13:28:33 +02:00 committed by Alexandre Julliard
parent ca862a3849
commit f94784ddba
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/kernel32/tests/version.c
View File

@ -156,6 +156,9 @@ static void test_GetVersionEx(void)
ok(ret ||
broken(ret == 0), /* win95 */
"Expected GetVersionExA to succeed\n");
if (!infoExA.wServicePackMajor && !infoExA.wServicePackMinor)
ok(!infoExA.szCSDVersion[0], "got '%s'\n", infoExA.szCSDVersion);
}
static void test_VerifyVersionInfo(void)

9
dlls/ntdll/version.c
View File

@ -176,20 +176,17 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
/* WIN8 */
{
sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT,
{' ',0},
0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
{0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
},
/* WIN81 */
{
sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT,
{' ',0},
0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
{0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
},
/* WIN10 */
{
sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT,
{' ',0},
0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
{0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
},
};

6
programs/winecfg/appdefaults.c
View File

@ -48,9 +48,9 @@ static const struct
const char *szProductType;
} win_versions[] =
{
{ "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
{ "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
{ "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
{ "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"},
{ "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"},
{ "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"},
{ "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},
{ "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"},
{ "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},