Changeset 10216 for trunk/src/user32/oslibmsg.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/oslibmsg.cpp (modified) (9 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.74 2003-08-06 11:00:44 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.75 2003-08-08 13:30:19 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -236 +236 @@
 // Check for a queued WM_CHAR message (e.g. inserted by TranslateMessage)
 //******************************************************************************
-BOOL ReturnQueuedWMCHAR(LPMSG pMsg, TEB *teb, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax, 
+BOOL ReturnQueuedWMCHAR(LPMSG pMsg, TEB *teb, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                         BOOL isUnicode, BOOL fRemove)
 {
@@ -251 +251 @@
                 return FALSE;
         }
-    
+
         if(fRemove & PM_REMOVE_W) {
             teb->o.odin.fTranslated = FALSE;
@@ -276 +276 @@
         // call the keyboard hook here
         // send keyboard messages to the registered hooks
-        if(fRemove & PM_REMOVE_W) 
+        if(fRemove & PM_REMOVE_W)
         {
             switch (pMsg->message)
@@ -291 +291 @@
             }
         }
-    
+
         //GetMessageW and PeekMessageW expect the character code in UTF-16
         //(we save it in ascii format)
@@ -298 +298 @@
             CHAR  charA;
             WCHAR charW;
-    
+
             charA = pMsg->wParam;
             MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
@@ -400 +400 @@
             goto continuegetmsg;
         break;
-    case WINWM_CHAR:
-    case WINWM_SYSCHAR:
+    case WINWM_IME_CHAR:
         // prevent from calling wrong DispatchMsg() (DBCS generated WM_CHAR)
         memset( &teb->o.odin.winmsg, 0, sizeof( MSG ));
@@ -464 +463 @@
         ULONG ulPMFilter;
 
-        for(int i=0;i<uMsgFilterMax-uMsgFilterMin+1;i++) 
+        for(int i=0;i<uMsgFilterMax-uMsgFilterMin+1;i++)
         {
             rc = 0;
@@ -523 +522 @@
                 goto continuepeekmsg;
             break;
-        case WINWM_CHAR:
-        case WINWM_SYSCHAR:
+        case WINWM_IME_CHAR:
             // prevent from calling wrong DispatchMsg() (DBCS generated WM_CHAR)
             memset( &teb->o.odin.winmsg, 0, sizeof( MSG ));