Changeset 1831 for trunk/src/user32/oslibmsg.cpp

Timestamp:

Nov 24, 1999, 8:32:23 PM (26 years ago)

Author:

sandervl

Message:

desktop + misc updates

File:

• trunk/src/user32/oslibmsg.cpp (modified) (6 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.10 1999-11-10 14:16:45 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.11 1999-11-24 19:32:21 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -10 +10 @@
  *
  * TODO: Simply copy for now. Need to make a real translation
+ * TODO: Filter translation isn't correct for posted messages
  *
  */
@@ -124 +125 @@
 void OS2ToWinMsgTranslate(QMSG *os2Msg, MSG *winMsg, BOOL isUnicode)
 {
+  POSTMSG_PACKET *packet;
   int i;
 
@@ -129 +131 @@
   winMsg->hwnd = Win32Window::OS2ToWin32Handle(os2Msg->hwnd);
 
-  if(os2Msg->msg >= WIN32APP_USERMSGBASE) {
-        winMsg->message = os2Msg->msg - WIN32APP_USERMSGBASE;
+  if(os2Msg->msg == WIN32APP_POSTMSG) {
+        packet = (POSTMSG_PACKET *)os2Msg->mp2;
+        if(packet && (ULONG)os2Msg->mp1 == WIN32PM_MAGIC) {
+                winMsg->message = packet->Msg;
+                winMsg->wParam  = packet->wParam;
+                winMsg->lParam  = packet->lParam;
+        }
         return;
   }
@@ -150 +157 @@
 ULONG TranslateWinMsg(ULONG msg)
 {
+ POSTMSG_PACKET *packet;
  THDB *thdb;
 
@@ -157 +165 @@
   }
 
-  if(msg >= WINWM_USER)
-    return msg + WIN32APP_USERMSGBASE;
+  if(msg >= WIN32APP_USERMSGBASE) 
+    return WIN32APP_POSTMSG;
 
   for(int i=0;i<MAX_MSGTRANSTAB;i++)