[ros-diffs] [reactos] 01/01: [KERNEL32_APITEST] Follow-up of #2131

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cc76d8afc2810b32d289…

commit 7cc76d8afc2810b32d289143e2ec488bba49e4f9
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Dec 9 20:55:13 2019 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Mon Dec 9 20:55:13 2019 +0900

    [KERNEL32_APITEST] Follow-up of #2131
---
 modules/rostests/apitests/kernel32/ConsoleCP.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/rostests/apitests/kernel32/ConsoleCP.c
b/modules/rostests/apitests/kernel32/ConsoleCP.c
index 94fcdd3c8a0..3a381977ed4 100644
--- a/modules/rostests/apitests/kernel32/ConsoleCP.c
+++ b/modules/rostests/apitests/kernel32/ConsoleCP.c
@@ -23,7 +23,7 @@ static const WCHAR u9580[] = { 0x9580, 0 };             /* 門 */
 static const WCHAR ideograph_space = (WCHAR)0x3000;     /* fullwidth space */
 static LCID lcidJapanese = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT),
SORT_DEFAULT);
 static LCID lcidRussian  = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT),
SORT_DEFAULT);
-static BOOL s_bIsVistaPlus;
+static BOOL s_bIs8Plus;
 
 static BOOL IsCJKCodePage(void)
 {
@@ -411,7 +411,7 @@ static void test_cp932(HANDLE hConOut)
         c.X = c.Y = 0;
         ret = FillConsoleOutputCharacterW(hConOut, ideograph_space, csbi.dwSize.X *
csbi.dwSize.Y, c, &len);
         ok(ret, "FillConsoleOutputCharacterW failed\n");
-        if (s_bIsVistaPlus)
+        if (s_bIs8Plus)
             ok(len == csbi.dwSize.X * csbi.dwSize.Y / 2, "len was: %ld\n",
len);
         else
             ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len);
@@ -454,7 +454,7 @@ static void test_cp932(HANDLE hConOut)
         c.X = c.Y = 0;
         ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len);
         ok(ret, "ReadConsoleOutputCharacterW failed\n");
-        if (s_bIsVistaPlus)
+        if (s_bIs8Plus)
         {
             ok(len == 3, "len was: %ld\n", len);
             ok(str[0] == 0x3000, "str[0] was: 0x%04X\n", str[0]);
@@ -479,8 +479,10 @@ START_TEST(ConsoleCP)
     HANDLE hConIn, hConOut;
     OSVERSIONINFOA osver = { sizeof(osver) };
 
+    // https://github.com/reactos/reactos/pull/2131#issuecomment-563189380
     GetVersionExA(&osver);
-    s_bIsVistaPlus = (osver.dwMajorVersion >= 6);
+    s_bIs8Plus = (osver.dwMajorVersion > 6) ||
+                 (osver.dwMajorVersion == 6 && osver.dwMinorVersion >= 2);
 
     FreeConsole();
     ok(AllocConsole(), "Couldn't alloc console\n");