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

Timestamp:

Aug 22, 2003, 3:16:45 PM (22 years ago)

Author:

sandervl

Message:

Ignore messages sent or posted to the desktop window; Post/SendMessage: use shared or local memory depending

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.75 2003-08-08 13:30:19 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.76 2003-08-22 13:16:44 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -693 +693 @@
         default:
         {
-            pMsgPacket = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
+            ULONG pid;
+
+            GetWindowThreadProcessId(hwndOdin, &pid);
+
+            //use shared or local memory depending on the target window
+            //(sfree can be used for any heap)
+            if(pid != GetCurrentProcessId()) {
+                 pMsgPacket = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
+            }
+            else pMsgPacket = (POSTMSG_PACKET *)malloc(sizeof(POSTMSG_PACKET));
+
             if (!pMsgPacket)
             {
@@ -718 +728 @@
  *
  * @returns
- * @param   hwnd        OS/2 hwnd.
+ * @param   hwndWin32   Odin window handle.
+ * @param   hwndOS2     OS/2 window handle
  * @param   msg         Odin message id.
  * @param   wParam      Message param.
@@ -724 +735 @@
  * @param   fUnicode    Unicode indicator.
  */
-ULONG OSLibSendMessage(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam, BOOL fUnicode)
+ULONG OSLibSendMessage(HWND hwndWin32, HWND hwndOS2, ULONG msg, ULONG wParam, ULONG lParam, BOOL fUnicode)
 {
     ULONG           rc;                 /* return code on packing failure */
     void *          pvMsgPacket;        /* packed message (shared memory) */
+
+    if(GetDesktopWindow() == hwndWin32) {
+        dprintf(("Ignore messages sent to the desktop window"));
+        return TRUE;
+    }
 
     /*
      * Call message packer.
      */
-    pvMsgPacket = OSLibPackMessage(NULLHANDLE, hwnd, msg, wParam, lParam, fUnicode, &rc);
+    pvMsgPacket = OSLibPackMessage(hwndWin32, hwndOS2, msg, wParam, lParam, fUnicode, &rc);
     if (!pvMsgPacket)
     {
@@ -740 +756 @@
     }
 
-    return (ULONG)WinSendMsg(hwnd, WIN32APP_POSTMSG+msg, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), pvMsgPacket);
+    return (ULONG)WinSendMsg(hwndOS2, WIN32APP_POSTMSG+msg, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), pvMsgPacket);
 }
 //******************************************************************************
@@ -779 +795 @@
 {
     void *          pvMsgPacket;        /* packed message (shared memory) */
+
+    if(GetDesktopWindow() == hwndWin32) {
+        dprintf(("Ignore messages posted to the desktop window"));
+        return TRUE;
+    }
 
     /*