From 50ec7d086b95d32c6517fd4a31ccaa2823d79dc1 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Sat, 20 Mar 2004 21:21:03 +0000 Subject: [PATCH] Merge Winehq commit: Yoshiro Takeno In Windows, the leading byte for multibyte characters are set to upper byte. If single byte character is used, the upper byte is set to 0. svn path=/trunk/; revision=8820 --- reactos/lib/user32/controls/edit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/lib/user32/controls/edit.c b/reactos/lib/user32/controls/edit.c index bf7bf0a447b..34202d66362 100644 --- a/reactos/lib/user32/controls/edit.c +++ b/reactos/lib/user32/controls/edit.c @@ -293,7 +293,6 @@ const struct builtin_class_descr EDIT_builtin_class = { #ifdef __REACTOS__ L"Edit", /* name */ - /* FIXME: Add CS_PARENTDC when the handling of WM_ERASEBKGND will be fixed! */ CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */ (WNDPROC)EditWndProcW, /* procW */ (WNDPROC)EditWndProcA, /* procA */ @@ -858,7 +857,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, strng[0] = wParam >> 8; strng[1] = wParam & 0xff; - MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); + if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); + else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); EDIT_WM_Char(es, charW); break; }