[PATCH 0/2] MR6719: msvcrt: Improve DBCS support for _toupper_l().

[Jactry Zeng (＠jactry)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6719

[PATCH 1/2] msvcrt/tests: Test toupper() with DBCS.

[Jactry Zeng]

From: Jactry Zeng <jzeng(a)codeweavers.com>

---
 dlls/msvcrt/tests/string.c | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 533419fb194..967f3f20d75 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -4974,6 +4974,53 @@ static void test__strnicmp_l(void)
     setlocale(LC_ALL, "C");
 }
 
+static void test_toupper(void)
+{
+    int ret;
+
+    ok(setlocale(LC_ALL, "English_United States") != NULL, "setlocale failed.\n");
+    errno = 0xdeadbeef;
+    ret = toupper((signed char)0xf0);
+    ok(ret == 0xd0, "Got %#x.\n", ret);
+    ok(errno == EILSEQ, "Got errno %d.\n", errno);
+    errno = 0xdeadbeef;
+    ret = toupper(0xf0);
+    ok(ret == 0xd0, "Got %#x.\n", ret);
+    ok(errno == 0xdeadbeef, "Got errno %d.\n", errno);
+
+    ok(setlocale(LC_ALL, "Polish") != NULL, "setlocale failed.\n");
+    errno = 0xdeadbeef;
+    ret = toupper((signed char)0xa5);
+    ok(ret == 0xa5, "Got %#x.\n", ret);
+    ok(errno == EILSEQ, "Got errno %d.\n", errno);
+    errno = 0xdeadbeef;
+    ret = toupper((signed char)0xb9);
+    ok(ret == 0xa5, "Got %#x.\n", ret);
+    ok(errno == EILSEQ, "Got errno %d.\n", errno);
+
+    ok(setlocale(LC_ALL, "Japanese_Japan.932") != NULL, "setlocale failed.\n");
+    errno = 0xdeadbeef;
+    ret = toupper((signed char)0xf0);
+    ok(ret == (signed char)0xf0, "Got %#x.\n", ret);
+    ok(errno == EILSEQ, "Got errno %d.\n", errno);
+    errno = 0xdeadbeef;
+    ret = toupper(0xf0);
+    todo_wine ok(ret == 0xf0, "Got %#x.\n", ret);
+    ok(errno == 0xdeadbeef, "Got errno %d.\n", errno);
+
+    ok(setlocale(LC_ALL, "Chinese_China.936") != NULL, "setlocale failed.\n");
+    errno = 0xdeadbeef;
+    ret = toupper((signed char)0xf0);
+    ok(ret == (signed char)0xf0, "Got %#x.\n", ret);
+    ok(errno == EILSEQ, "Got errno %d.\n", errno);
+    errno = 0xdeadbeef;
+    ret = toupper(0xf0);
+    todo_wine ok(ret == 0xf0, "Got %#x.\n", ret);
+    ok(errno == 0xdeadbeef, "Got errno %d.\n", errno);
+
+    setlocale(LC_ALL, "C");
+}
+
 START_TEST(string)
 {
     char mem[100];
@@ -5139,4 +5186,5 @@ START_TEST(string)
     test_mbsrev();
     test__tolower_l();
     test__strnicmp_l();
+    test_toupper();
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6719

[PATCH 2/2] msvcrt: Improve DBCS support for _toupper_l().

[Jactry Zeng]

From: Jactry Zeng <jzeng(a)codeweavers.com>

---
 dlls/msvcrt/ctype.c        | 4 ++++
 dlls/msvcrt/tests/string.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 311cfacb71c..1297bc56046 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -482,7 +482,11 @@ int CDECL _toupper_l(int c, _locale_t locale)
         locinfo = locale->locinfo;
 
     if((unsigned)c < 256)
+    {
+        if(locinfo->pctype[c] & _LEADBYTE)
+            return c;
         return locinfo->pcumap[c];
+    }
 
     if(locinfo->pctype[(c>>8)&255] & _LEADBYTE)
         *p++ = (c>>8) & 255;
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 967f3f20d75..2b1efb764f6 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -5005,7 +5005,7 @@ static void test_toupper(void)
     ok(errno == EILSEQ, "Got errno %d.\n", errno);
     errno = 0xdeadbeef;
     ret = toupper(0xf0);
-    todo_wine ok(ret == 0xf0, "Got %#x.\n", ret);
+    ok(ret == 0xf0, "Got %#x.\n", ret);
     ok(errno == 0xdeadbeef, "Got errno %d.\n", errno);
 
     ok(setlocale(LC_ALL, "Chinese_China.936") != NULL, "setlocale failed.\n");
@@ -5015,7 +5015,7 @@ static void test_toupper(void)
     ok(errno == EILSEQ, "Got errno %d.\n", errno);
     errno = 0xdeadbeef;
     ret = toupper(0xf0);
-    todo_wine ok(ret == 0xf0, "Got %#x.\n", ret);
+    ok(ret == 0xf0, "Got %#x.\n", ret);
     ok(errno == 0xdeadbeef, "Got errno %d.\n", errno);
 
     setlocale(LC_ALL, "C");
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6719

[Piotr Caban (＠piotr)]

It introduces new test failures. In order to fix it please load toupper dynamically to avoid some compiler optimizations.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6719#note_85731