Changeset 10240 for trunk/src

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

Location:

trunk/src/user32

Files:

• message.cpp (modified) (3 diffs)
• oslibmsg.cpp (modified) (6 diffs)
• oslibmsg.h (modified) (2 diffs)
• pmwindow.cpp (modified) (4 diffs)

trunk/src/user32/message.cpp

@@ -1 @@
-/* $Id: message.cpp,v 1.5 2002-08-01 16:04:19 sandervl Exp $ */
+/* $Id: message.cpp,v 1.6 2003-08-22 13:16:44 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -210 +210 @@
         //otherwise use WinSendMsg to send it to the right process/thread
         dprintf(("SendMessages (inter-process/thread) %x %x %x %x", Win32ToOS2Handle(hwnd), msg, wparam, lparam));
-        result = OSLibSendMessage(Win32ToOS2Handle(hwnd), msg, wparam, lparam, TRUE);
+        result = OSLibSendMessage(hwnd, Win32ToOS2Handle(hwnd), msg, wparam, lparam, TRUE);
         ret = 1;
     }
@@ -255 +255 @@
         //otherwise use WinSendMsg to send it to the right process/thread
         dprintf(("SendMessages (inter-process/thread) %x %x %x %x", Win32ToOS2Handle(hwnd), msg, wparam, lparam));
-        result = OSLibSendMessage(Win32ToOS2Handle(hwnd), msg, wparam, lparam, FALSE);
+        result = OSLibSendMessage(hwnd, Win32ToOS2Handle(hwnd), msg, wparam, lparam, FALSE);
         ret = 1;
     }

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;
+    }
 
     /*

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.22 2003-08-08 13:30:19 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.23 2003-08-22 13:16:45 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -53 +53 @@
 BOOL  OSLibPostThreadMessage(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode);
 BOOL  OSLibPostMessage(HWND hwndWin32, HWND hwndOS2, ULONG msg, ULONG wParam, ULONG lParam, BOOL fUnicode);
-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 OSLibWinBroadcastMsg(ULONG msg, ULONG wParam, ULONG lParam, BOOL fSend);
 BOOL  OSLibSendWinMessage(HWND hwnd, ULONG winmsg);

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.218 2003-07-31 15:56:44 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.219 2003-08-22 13:16:45 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -117 +117 @@
 // WM_KEYDOWN messages come in properly.
 static BOOL fKeyAltGrDown = FALSE;
-
+static BOOL fEnableCDPolling = FALSE;
 
 static char *PMDragExtractFiles(PDRAGINFO pDragInfo, ULONG *pcItems, ULONG *pulBytes);
@@ -343 +343 @@
 {
     fDragDropDisabled = fDisabled;
+}
+//******************************************************************************
+// Turn on CD Polling (window with 2 second timer to check CD disk presence) 
+// 
+// NOTE: This can cause PM hangs when executing a program for a very long time
+//       (block in IOCtl)
+//******************************************************************************
+void WIN32API CustEnableCDPolling()
+{
+    fEnableCDPolling = TRUE;
 }
 //******************************************************************************
@@ -598 +608 @@
 
         //Create CD notification window
-        if(hwndCD == 0) {
+        if(hwndCD == 0 && fEnableCDPolling) {
             hwndCD = WinCreateWindow(HWND_DESKTOP, WIN32_CDCLASS,
                                      NULL, 0, 0, 0, 0, 0,