Commit f94784dd authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

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

parent ca862a38
...@@ -156,6 +156,9 @@ static void test_GetVersionEx(void) ...@@ -156,6 +156,9 @@ static void test_GetVersionEx(void)
ok(ret || ok(ret ||
broken(ret == 0), /* win95 */ broken(ret == 0), /* win95 */
"Expected GetVersionExA to succeed\n"); "Expected GetVersionExA to succeed\n");
if (!infoExA.wServicePackMajor && !infoExA.wServicePackMinor)
ok(!infoExA.szCSDVersion[0], "got '%s'\n", infoExA.szCSDVersion);
} }
static void test_VerifyVersionInfo(void) static void test_VerifyVersionInfo(void)
......
...@@ -176,20 +176,17 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = ...@@ -176,20 +176,17 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
/* WIN8 */ /* WIN8 */
{ {
sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT, sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT,
{' ',0}, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
}, },
/* WIN81 */ /* WIN81 */
{ {
sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT,
{' ',0}, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
}, },
/* WIN10 */ /* WIN10 */
{ {
sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT,
{' ',0}, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
}, },
}; };
......
...@@ -48,9 +48,9 @@ static const struct ...@@ -48,9 +48,9 @@ static const struct
const char *szProductType; const char *szProductType;
} win_versions[] = } win_versions[] =
{ {
{ "win10", "Windows 10", 10, 0, 0x3839,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"}, { "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"}, { "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"}, { "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"}, { "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"}, { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment