Alexandre Julliard : user: Added fast A-> W mapping for WM_CHAR and related messages.

Alexandre Julliard julliard at wine.codeweavers.com
Mon May 22 05:19:07 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 34610d1150db66a300ac859e95d539b54b13139a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=34610d1150db66a300ac859e95d539b54b13139a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat May 20 18:57:36 2006 +0200

user: Added fast A->W mapping for WM_CHAR and related messages.

---

 dlls/user/winproc.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c
index 99347f1..ae5b864 100644
--- a/dlls/user/winproc.c
+++ b/dlls/user/winproc.c
@@ -775,20 +775,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND 
     case LB_GETTEXTLEN:
         return 1;  /* need to map result */
 
-    case WM_CHARTOITEM:
-    case WM_MENUCHAR:
-    case WM_CHAR:
-    case WM_DEADCHAR:
-    case WM_SYSCHAR:
-    case WM_SYSDEADCHAR:
-    case EM_SETPASSWORDCHAR:
-        *pwparam = map_wparam_char_AtoW( *pwparam, 1 );
-        return 0;
-
-    case WM_IME_CHAR:
-        *pwparam = map_wparam_char_AtoW( *pwparam, 2 );
-        return 0;
-
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
         FIXME_(msg)("message %s (0x%x) needs translation, please report\n", SPY_GetMsgName(msg, hwnd), msg );
@@ -2704,6 +2690,20 @@ LRESULT WINPROC_CallProcAtoW( winproc_ca
         }
         break;
 
+    case WM_CHARTOITEM:
+    case WM_MENUCHAR:
+    case WM_CHAR:
+    case WM_DEADCHAR:
+    case WM_SYSCHAR:
+    case WM_SYSDEADCHAR:
+    case EM_SETPASSWORDCHAR:
+        ret = callback( hwnd, msg, map_wparam_char_AtoW(wParam,1), lParam, result, arg );
+        break;
+
+    case WM_IME_CHAR:
+        ret = callback( hwnd, msg, map_wparam_char_AtoW(wParam,2), lParam, result, arg );
+        break;
+
     default:
         if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) {
             ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",




More information about the wine-cvs mailing list