[PATCH v4 0/1] MR8971: make_unicode: Add some halfwidth mapping exceptions.

[Bernhard Kölbl]

The nls files need regeneration, in order to get the test working.

--
  v4: make_unicode: Add some halfwidth mapping exceptions.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8971

[PATCH v4 1/1] make_unicode: Add some halfwidth mapping exceptions.

[Bernhard Kölbl]

From: Bernhard Kölbl <bkoelbl(a)codeweavers.com>

Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com>
---
 dlls/kernel32/tests/locale.c | 10 ++++++++++
 tools/make_unicode           |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 825d6f95f62..0508af6652f 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2841,6 +2841,16 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f
     ok(!ret, "%s func_ptr should fail with srclen = 0\n", func_name);
     ok(GetLastError() == ERROR_INVALID_PARAMETER,
        "%s unexpected error code %ld\n", func_name, GetLastError());
+
+    /* test for characters which don't get mapped to their
+       halfwidth counterparts on LCMAP_HALFWIDTH */
+    for (i = 0x2190; i <= 0x21ff; ++i)
+        buf[i - 0x2190] = buf2[i - 0x2190] = i;
+
+    buf[0x70] = buf2[0x70] = 0x25cb;
+    ret = func_ptr(LCMAP_HALFWIDTH, buf, 0x71, buf2, 0x71);
+    ok(ret == 0x71, "%s ret %#x, expected value 0x71\n", func_name, ret);
+    ok(!memcmp(buf, buf2, sizeof(WCHAR) * 0x71), "in- and output must be equal\n");
 }
 
 static INT LCMapStringW_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen)
diff --git a/tools/make_unicode b/tools/make_unicode
index cacc062b230..f07d2f5dc66 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -5318,6 +5318,10 @@ sub build_charmaps_data()
     $halfwidth_table[0x2019] = 0x0027;
     $halfwidth_table[0x201c] = 0x0022;
     $halfwidth_table[0x201d] = 0x0022;
+    foreach my $ch (0x2190..0x2193, 0x25cb)
+    {
+        $halfwidth_table[$ch] = $ch;
+    }
     $halfwidth_table[0x309b] = 0xff9e;
     $halfwidth_table[0x309c] = 0xff9f;
     $fullwidth_table[0x309b] = 0x3099;
-- 
GitLab

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

[Bernhard Kölbl]

v3: Test all Unicode arrows 0x2190-0x21ff.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8971#note_115868

[Alexandre Julliard (＠julliard)]

Thanks. You most likely also want to fix the corresponding LCMAP_FULLWIDTH mappings (with tests of course...)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8971#note_115886