[PATCH 0/2] MR6861: nls: Set alpha bit on some Thai and Mongolian codes.

[Daniel Lehman (＠dlehman25)]

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

[PATCH 1/2] kernel32/tests: Add some tests for Thai and Mongolian codes.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/kernel32/tests/locale.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index a83afdeb1fa..14242b7caed 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -5371,6 +5371,9 @@ static void test_GetStringTypeW(void)
                   0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff,
                   0xfff9, 0xfffa, 0xfffb};
     static const WCHAR space_special[] = {0x09, 0x0d, 0x85};
+    static const WCHAR alpha_thai[] = {0xe31, 0xe34, 0xe35, 0xe36, 0xe37, 0xe38, 0xe39, 0xe3a,
+                                       0xe47, 0xe48, 0xe49, 0xe4a, 0xe4b, 0xe4c, 0xe4d, 0xe4e,
+                                       0x1885, 0x1886};
 
     WORD types[20];
     WCHAR ch[2];
@@ -5448,6 +5451,13 @@ static void test_GetStringTypeW(void)
     for (i = 0; i < 3; i++)
         ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE );
 
+    /* alpha is set for certain Thai and Mongolian */
+    memset(types, 0, sizeof(types));
+    GetStringTypeW(CT_CTYPE1, alpha_thai, 18, types);
+    for (i = 0; i < 18; i++)
+        todo_wine
+        ok(types[i] == (C1_ALPHA|C1_DEFINED), "incorrect types returned for %x -> (%x does not have %x)\n",alpha_thai[i], types[i], (C1_ALPHA|C1_DEFINED));
+
     /* surrogate pairs */
     ch[0] = 0xd800;
     memset(types, 0, sizeof(types));
-- 
GitLab


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

[PATCH 2/2] nls: Set alpha bit on some Thai and Mongolian codes.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/kernel32/tests/locale.c | 1 -
 tools/make_unicode           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 14242b7caed..625a2ceac2b 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -5455,7 +5455,6 @@ static void test_GetStringTypeW(void)
     memset(types, 0, sizeof(types));
     GetStringTypeW(CT_CTYPE1, alpha_thai, 18, types);
     for (i = 0; i < 18; i++)
-        todo_wine
         ok(types[i] == (C1_ALPHA|C1_DEFINED), "incorrect types returned for %x -> (%x does not have %x)\n",alpha_thai[i], types[i], (C1_ALPHA|C1_DEFINED));
 
     /* surrogate pairs */
diff --git a/tools/make_unicode b/tools/make_unicode
index 003b56a1a5e..4277c8c34f3 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -333,6 +333,7 @@ my %categories =
 # a few characters need additional categories that cannot be determined automatically
 my %special_categories =
 (
+    "alpha"  => [ 0xe31, 0xe34..0xe3a, 0xe47..0xe4e, 0x1885..0x1886 ],
     "xdigit" => [ ord('0')..ord('9'),ord('A')..ord('F'),ord('a')..ord('f'),
                   0xff10..0xff19, 0xff21..0xff26, 0xff41..0xff46 ],
     "space"  => [ 0x09..0x0d, 0x85 ],
-- 
GitLab

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

[PATCH 2/2] nls: Set alpha bit on some Thai and Mongolian codes.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149799

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
win.c:4070: Test failed: Expected active window 0000000004390180, got 0000000000000000.
win.c:4071: Test failed: Expected focus window 0000000004390180, got 0000000000000000.