ntdll: szCSDVersion is an empty string on Windows 8 and up.
Hans Leidekker
hans at codeweavers.com
Tue Oct 4 06:28:33 CDT 2016
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
dlls/kernel32/tests/version.c | 3 +++
dlls/ntdll/version.c | 9 +++------
programs/winecfg/appdefaults.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index a47e52c..4182c06 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -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)
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index b6cafc6..06f9827 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -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
},
};
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 91478fc..f674824 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -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"},
--
2.1.4
More information about the wine-patches
mailing list