Merge Winehq commit:

Yoshiro Takeno <taro-x@justsystem.co.jp>
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
This commit is contained in:
Steven Edwards 2004-03-20 21:21:03 +00:00
parent 5a868930ca
commit 50ec7d086b

View file

@ -293,7 +293,6 @@ const struct builtin_class_descr EDIT_builtin_class =
{ {
#ifdef __REACTOS__ #ifdef __REACTOS__
L"Edit", /* name */ L"Edit", /* name */
/* FIXME: Add CS_PARENTDC when the handling of WM_ERASEBKGND will be fixed! */
CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */ CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */
(WNDPROC)EditWndProcW, /* procW */ (WNDPROC)EditWndProcW, /* procW */
(WNDPROC)EditWndProcA, /* procA */ (WNDPROC)EditWndProcA, /* procA */
@ -858,7 +857,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
strng[0] = wParam >> 8; strng[0] = wParam >> 8;
strng[1] = wParam & 0xff; 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); EDIT_WM_Char(es, charW);
break; break;
} }