winemac: Don't use MultiByteToWideChar in macdrv_GetKeyNameText.

Also fixes null termination tests in test_key_names. Signed-off-by: Jacek Caban <jacek@codeweavers.com>

winemac: Don't use MultiByteToWideChar in macdrv_GetKeyNameText.
916a7487 · Jacek Caban · Alexandre Julliard · f35ecdf7 · 916a7487
Commit 916a7487 authored May 25, 2022 by Jacek Caban Committed by Alexandre Julliard May 25, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

keyboard.c dlls/winemac.drv/keyboard.c +3 -2

No files found.
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1257,8 +1257,9 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size)
            {
                if (vkey_names[i].vkey == vkey)
                {
-                    len = MultiByteToWideChar(CP_UTF8, 0, vkey_names[i].name, -1, buffer, size);
+                    len = min(strlen(vkey_names[i].name) + 1, size);
-                    if (len) len--;
+                    ascii_to_unicode(buffer, vkey_names[i].name, len);
+                    if (len) buffer[--len] = 0;
                    break;
                }
            }