user: Added fast W->A mapping for WM_IME_CHAR.

This commit is contained in:
Alexandre Julliard 2006-05-18 12:28:07 +02:00
parent 6c4082df74
commit f6ba476d91
1 changed files with 15 additions and 12 deletions

View File

@ -992,18 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM
{ {
switch(msg) switch(msg)
{ {
case WM_IME_CHAR:
{
WCHAR wch = LOWORD(*pwparam);
BYTE ch[2];
if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)ch, 2, NULL, NULL ) == 2)
*pwparam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(*pwparam) );
else
*pwparam = MAKEWPARAM( ch[0], HIWORD(*pwparam) );
}
return 0;
case WM_PAINTCLIPBOARD: case WM_PAINTCLIPBOARD:
case WM_SIZECLIPBOARD: case WM_SIZECLIPBOARD:
FIXME_(msg)("message %s (%04x) needs translation, please report\n",SPY_GetMsgName(msg, hwnd),msg ); FIXME_(msg)("message %s (%04x) needs translation, please report\n",SPY_GetMsgName(msg, hwnd),msg );
@ -3008,6 +2996,21 @@ static LRESULT WINPROC_CallProc32WTo32A( WNDPROC func, HWND hwnd, UINT msg, WPAR
} }
break; break;
case WM_IME_CHAR:
{
WCHAR wch = LOWORD(wParam);
BYTE ch[2];
DWORD len;
RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, &wch, sizeof(WCHAR) );
if (len == 2)
wParam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wParam) );
else
wParam = MAKEWPARAM( ch[0], HIWORD(wParam) );
ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
}
break;
default: default:
if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) {
ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n", ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",