[PATCH 0/2] MR1992: user32/edit: Fix WM_CHAR handler for double-byte characters.

[Akihiro Sagawa (＠sgwaki)]

After commit 2aa54a90, a double-byte character is sent to the edit control by double WM_CHAR messages. However, its WM_CHAR handler (ANSI version) can't process a double-byte character properly because the handler converts WM_CHAR to WCHAR one by one.

This fix queues the double-byte lead byte as it comes in and then uses it afterwards for the WCHAR conversion.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54337

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

[PATCH 1/2] user32/tests: Add DBCS WM_CHAR tests for edit control.

[Akihiro Sagawa]

From: Akihiro Sagawa <sagawa.aki(a)gmail.com>

---
 dlls/user32/tests/edit.c | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index b70cf2d6e06..0409b3fde7c 100644
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
@@ -3366,6 +3366,58 @@ static void test_wordbreak_proc(void)
     DestroyWindow(hwnd);
 }
 
+static void test_dbcs_WM_CHAR(void)
+{
+    WCHAR textW[] = { 0x4e00, 0x4e8c, 0x4e09, 0 }; /* one, two, three */
+    unsigned char bytes[7];
+    HWND hwnd[2];
+    int i;
+
+    WideCharToMultiByte(CP_ACP, 0, textW, -1, (char *)bytes, ARRAY_SIZE(bytes), NULL, NULL);
+    if (!IsDBCSLeadByte(bytes[0]))
+    {
+        skip("Skipping DBCS WM_CHAR test in this codepage\n");
+        return;
+    }
+    hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0);
+    hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0);
+
+    for (i = 0; i < ARRAY_SIZE(hwnd); i++)
+    {
+        const unsigned char* p;
+        WCHAR strW[4];
+        char str[7];
+        MSG msg;
+        BOOL r;
+        int n;
+
+        winetest_push_context("%c", i ? 'W' : 'A');
+
+        r = SetWindowTextA(hwnd[i], "");
+        ok(r, "SetWindowText failed\n");
+
+        for (p = bytes; *p; p++)
+            PostMessageA(hwnd[i], WM_CHAR, *p, 1);
+
+        while (PeekMessageA(&msg, hwnd[i], 0, 0, PM_REMOVE))
+            DispatchMessageA(&msg);
+
+        n = GetWindowTextW(hwnd[i], strW, ARRAY_SIZE(strW));
+        ok(n > 0, "GetWindowTextW failed\n");
+        todo_wine ok(!wcscmp(strW, textW), "got %s, expected %s\n",
+           wine_dbgstr_w(strW), wine_dbgstr_w(textW));
+
+        n = GetWindowTextA(hwnd[i], str, ARRAY_SIZE(str));
+        ok(n > 0, "GetWindowText failed\n");
+        todo_wine ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n",
+           wine_dbgstr_a(str), wine_dbgstr_a((char *)bytes));
+
+        DestroyWindow(hwnd[i]);
+
+        winetest_pop_context();
+    }
+}
+
 START_TEST(edit)
 {
     BOOL b;
@@ -3403,6 +3455,7 @@ START_TEST(edit)
     test_paste();
     test_EM_GETLINE();
     test_wordbreak_proc();
+    test_dbcs_WM_CHAR();
 
     UnregisterWindowClasses();
 }
-- 
GitLab


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

[PATCH 2/2] user32/edit: Fix WM_CHAR handler for double-byte characters.

[Akihiro Sagawa]

From: Akihiro Sagawa <sagawa.aki(a)gmail.com>

After commit 2aa54a90bd24f6aa422a2eb832a54d9afe585259, a double-byte
character is sent to the edit control by double WM_CHAR messages.
However, its WM_CHAR handler (ANSI version) can't process a double-
byte character properly because the handler converts WM_CHAR to WCHAR
one by one.
This fix queues the double-byte lead byte as it comes in and then uses
it afterwards for the WCHAR conversion.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54337
---
 dlls/user32/edit.c       | 21 +++++++++++++++++++--
 dlls/user32/tests/edit.c |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 74411d385e2..47c61f59c24 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -113,6 +113,7 @@ typedef struct
 					   should be sent to the first parent. */
 	HWND hwndListBox;		/* handle of ComboBox's listbox or NULL */
 	INT wheelDeltaRemainder;        /* scroll wheel delta left over after scrolling whole lines */
+	BYTE lead_byte;			/* DBCS lead byte store for WM_CHAR */
 	/*
 	 *	only for multi line controls
 	 */
@@ -4975,8 +4976,24 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
 		    charW = wParam;
 		else
 		{
-		    CHAR charA = wParam;
-		    MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
+		    BYTE low = wParam;
+		    DWORD cp = get_input_codepage();
+		    if (es->lead_byte)
+		    {
+			char ch[2];
+			ch[0] = es->lead_byte;
+			ch[1] = low;
+			MultiByteToWideChar(cp, 0, ch, 2, &charW, 1);
+		    }
+		    else if (IsDBCSLeadByteEx(cp, low))
+		    {
+			es->lead_byte = low;
+			result = 1;
+			break;
+		    }
+		    else
+			MultiByteToWideChar(cp, 0, (char *)&low, 1, &charW, 1);
+		    es->lead_byte = 0;
 		}
 
                 if (es->hwndListBox)
diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index 0409b3fde7c..78328ee1729 100644
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
@@ -3404,12 +3404,12 @@ static void test_dbcs_WM_CHAR(void)
 
         n = GetWindowTextW(hwnd[i], strW, ARRAY_SIZE(strW));
         ok(n > 0, "GetWindowTextW failed\n");
-        todo_wine ok(!wcscmp(strW, textW), "got %s, expected %s\n",
+        ok(!wcscmp(strW, textW), "got %s, expected %s\n",
            wine_dbgstr_w(strW), wine_dbgstr_w(textW));
 
         n = GetWindowTextA(hwnd[i], str, ARRAY_SIZE(str));
         ok(n > 0, "GetWindowText failed\n");
-        todo_wine ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n",
+        ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n",
            wine_dbgstr_a(str), wine_dbgstr_a((char *)bytes));
 
         DestroyWindow(hwnd[i]);
-- 
GitLab

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