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

Timestamp:

May 25, 2001, 9:59:30 PM (24 years ago)

Author:

sandervl

Message:

Post(Thread)/SendMessage updates & fixes

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.37 2001-04-27 17:36:37 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.38 2001-05-25 19:59:29 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -128 +128 @@
 
     if(msg >= WINWM_USER)
-        return WIN32APP_POSTMSG;
+        return msg + WIN32APP_POSTMSG;
 
     for(int i=0;i<MAX_MSGTRANSTAB;i++)
@@ -143 +143 @@
     }
 
-    //not found, probaby WIN32APP_POSTMSG
-    return WIN32APP_POSTMSG;
+    //not found, get everything
+    dprintf(("WARNING: TranslateWinMsg: message %x not found", msg));
+    return 0;
 }
 //******************************************************************************
@@ -351 +352 @@
 
   if(rc == FALSE) {
-    return FALSE;
+      return FALSE;
   }
 
@@ -358 +359 @@
      //unused PM message; dispatch immediately and grab next one
      dprintf2(("OSLibWinPeekMsg: Untranslated message; dispatched immediately"));
-     rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, TranslateWinMsg(uMsgFilterMin, TRUE),
-                     TranslateWinMsg(uMsgFilterMax, FALSE), PM_REMOVE);
+     if(!(fRemove & PM_REMOVE_W)) {
+         rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, TranslateWinMsg(uMsgFilterMin, TRUE),
+                         TranslateWinMsg(uMsgFilterMax, FALSE), PM_REMOVE);
+     }
      WinDispatchMsg(teb->o.odin.hab, &os2msg);
      return OSLibWinPeekMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax,
@@ -454 +457 @@
  POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
 
-    packet->Msg    = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-
-    return (ULONG)WinSendMsg(hwnd, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
+    packet->wParam   = wParam;
+    packet->lParam   = lParam;
+
+    return (ULONG)WinSendMsg(hwnd, WIN32APP_POSTMSG+msg, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
 }
 //******************************************************************************
@@ -464 +466 @@
 ULONG OSLibWinBroadcastMsg(ULONG msg, ULONG wParam, ULONG lParam, BOOL fSend)
 {
-    return WinBroadcastMsg(HWND_DESKTOP, msg, (MPARAM)wParam, (MPARAM)lParam,
+    return WinBroadcastMsg(HWND_DESKTOP, WIN32APP_POSTMSG+msg, (MPARAM)wParam, (MPARAM)lParam,
                            (fSend) ? BMSG_SEND : BMSG_POST);
 }
@@ -473 +475 @@
  POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
 
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    return WinPostMsg(hwnd, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
+    packet->wParam   = wParam;
+    packet->lParam   = lParam;
+    return WinPostMsg(hwnd, WIN32APP_POSTMSG+msg, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
 }
 //******************************************************************************
@@ -509 +510 @@
 //    }
     dprintf(("PostThreadMessageA %x %x %x %x", threadid, msg, wParam, lParam));
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
-}
-//******************************************************************************
-//******************************************************************************
-
+    packet->wParam   = wParam;
+    packet->lParam   = lParam;
+    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF+msg, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
+}
+//******************************************************************************
+//******************************************************************************
+