Changeset 10216 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

Aug 8, 2003, 3:30:22 PM (22 years ago)

Author:

sandervl

Message:

KOM: WM_IME_CHAR generation + processing added for DBCS input

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (4 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.114 2003-08-06 11:00:45 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.115 2003-08-08 13:30:19 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -720 +720 @@
         WORD  wWinScan;
 
-        if ( (!IsDBCSEnv() && scanCode == 0) || 
-             (scanCode==0 ) && !( flags & KC_CHAR ) ) 
+        if ( (!IsDBCSEnv() && scanCode == 0) ||
+             (scanCode==0 ) && !( flags & KC_CHAR ) )
         {
             goto dummymessage;
@@ -746 +746 @@
             if( CHAR2FROMMP( os2Msg->mp2 ))     // DBCS character
             {
+                CHAR dbcsCh[ 2 ] = { CHAR1FROMMP( os2Msg->mp2 ), CHAR2FROMMP( os2Msg->mp2 )};
+
                 if( isUnicode )
                 {
-                    char  dbcsCh[] = { CHAR1FROMMP( os2Msg->mp2 ), CHAR2FROMMP( os2Msg->mp2 ), 0 };
-                    WCHAR uniChar[ 2 ];
-
-                    lstrcpynAtoW(( LPWSTR )&uniChar, ( LPCSTR )&dbcsCh, 2 );
-                    winMsg->wParam = ( WPARAM )uniChar[ 0 ];
+                    WCHAR  uniChar;
+
+                    MultiByteToWideChar( CP_ACP, 0, dbcsCh, 2, &uniChar, 1 );
+                    winMsg->wParam = ( WPARAM )uniChar;
                 }
-                // insert DBCS trail byte for Non-Unicode window
-                else if(fMsgRemoved && !(teb->o.odin.fTranslated))
-                {
-                    MSG extramsg;
-                    memcpy(&extramsg, winMsg, sizeof(MSG));
-
-                    //After SetFocus(0), all keystrokes are converted in WM_SYS*
-                    extramsg.message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR : WINWM_CHAR;
-
-                    extramsg.wParam = CHAR2FROMMP( os2Msg->mp2 );
-                    extramsg.lParam = 0;
-
-                    setThreadQueueExtraCharMessage(teb, &extramsg);
-                }
+                else
+                    winMsg->wParam = ( dbcsCh[ 0 ] << 8 ) | dbcsCh[ 1 ];
             }
         }
@@ -830 +819 @@
           else if( scanCode == 0 )
           {
-            //After SetFocus(0), all keystrokes are converted in WM_SYS*
-            winMsg->message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR :  WINWM_CHAR;
+            if( CHAR2FROMMP( os2Msg->mp2 ))
+                winMsg->message = WINWM_IME_CHAR;
+            else
+            {
+                //After SetFocus(0), all keystrokes are converted in WM_SYS*
+                winMsg->message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR :  WINWM_CHAR;
+            }
           }
           else