Changeset 10189 for trunk/src

Timestamp:

Jul 31, 2003, 2:25:57 PM (22 years ago)

Author:

sandervl

Message:

Convert WM_CHAR characters to UTF-16 for unicode windows

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.111 2003-07-28 11:27:46 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.112 2003-07-31 12:25:57 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -37 +37 @@
 #include <winscan.h>
 #include <winkeyboard.h>
+#include <winnls.h>
 #include "hook.h"
 #include "user32api.h"
@@ -56 +57 @@
 
 //******************************************************************************
+//
+// setThreadQueueExtraCharMessage: queues WM_CHAR message so it is retrieved
+//                                 by GetMessage & PeekMessage
+//
+// NOTE: Automatically converts ascii character code to UTF-16 if the target
+//       window is unicode.
+//
 //******************************************************************************
 BOOL setThreadQueueExtraCharMessage(TEB* teb, MSG* pExtraMsg)
@@ -63 +71 @@
     // there's still an already translated message to be processed
     return FALSE;
+
+  //Unicode windows expect the character code in UTF-16
+  if(IsWindowUnicode(pExtraMsg->hwnd))
+  {
+      CHAR  charA;
+      WCHAR charW;
+
+      charA = pExtraMsg->wParam;
+      MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
+      pExtraMsg->wParam= charW;
+      dprintf(("setThreadQueueExtraCharMessage: Convert to Unicode src=%x res=%x", charA, charW ));
+  }
+
   teb->o.odin.fTranslated = TRUE;
   memcpy(&teb->o.odin.msgWCHAR, pExtraMsg, sizeof(MSG));
@@ -1161 +1182 @@
       // insert message into the queue
       setThreadQueueExtraCharMessage(teb, &extramsg);
+
       return TRUE;
     }