Alexandre Julliard : kernel32/tests: Fix codepage test for UTF-8 default codepage.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 273ab6c774ee41908b38eb6b2ca03f686eb44085
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=273ab6c774ee41908b38eb6b2ca03f686eb44085

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Mar 23 18:31:12 2022 +0100

kernel32/tests: Fix codepage test for UTF-8 default codepage.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/tests/codepage.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c
index 33eeebcc617..b0dbd812346 100644
--- a/dlls/kernel32/tests/codepage.c
+++ b/dlls/kernel32/tests/codepage.c
@@ -1152,7 +1152,8 @@ static void test_threadcp(void)
         ret = GetCPInfoExA(CP_THREAD_ACP, 0, &cpi);
         ok(ret, "GetCPInfoExA failed for lcid %04lx, error %ld\n", lcids[i].lcid, GetLastError());
         if (lcids[i].threadcp)
-            ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04lx, should be %u\n",
+            ok(cpi.CodePage == lcids[i].threadcp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */,
+               "wrong codepage %u for lcid %04lx, should be %u\n",
                cpi.CodePage, lcids[i].lcid, lcids[i].threadcp);
         else
             ok(cpi.CodePage == acp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */,
@@ -1185,8 +1186,10 @@ static void test_threadcp(void)
     {
         SetThreadLocale(isleads[i].lcid);
 
+        GetCPInfoExA(CP_THREAD_ACP, 0, &cpi);
         islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads[i].testchar);
-        ok(islead == isleads[i].islead, "wrong islead %i for test char %x in lcid %04lx.  should be %i\n",
+        ok(islead == isleads[i].islead || (cpi.CodePage == CP_UTF8 && !islead),
+           "wrong islead %i for test char %x in lcid %04lx.  should be %i\n",
             islead, isleads[i].testchar, isleads[i].lcid, isleads[i].islead);
     }