Changeset 9928 for trunk/src/user32

Timestamp:

Mar 20, 2003, 10:15:31 AM (23 years ago)

Author:

sandervl

Message:

WindowFromPoint: only send WM_NCHITTEST to windows belonging to the current thread

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• window.cpp (modified) (2 diffs)
• windowmsg.cpp (modified) (2 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.65 2003-02-13 10:12:24 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.66 2003-03-20 09:15:31 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -31 +31 @@
 #define  INCL_PM
 #define  INCL_DOSPROCESS
+#define  INCL_WINMESSAGEMGR
+#define  INCL_DOSSEMAPHORES
+#define  INCL_DOSERRORS
 #include <os2wrap.h>
 #include <odinwrap.h>

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.131 2003-02-13 10:12:27 sandervl Exp $ */
+/* $Id: window.cpp,v 1.132 2003-03-20 09:15:31 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1731 +1731 @@
 #endif
     {
+        DWORD dwThreadId = GetCurrentThreadId();
+
+        //Don't send WM_NCHITTEST if this window doesn't belong to the current thread
+        if(dwThreadId != GetWindowThreadProcessId(hwnd, NULL))
+        {
+            return TRUE;
+        }
         hittest = SendMessageA(hwnd, WM_NCHITTEST, 0, MAKELONG(point.x, point.y));
         if(hittest != HTTRANSPARENT) {

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.40 2003-02-27 14:22:22 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.41 2003-03-20 09:15:31 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -169 +169 @@
 BOOL WIN32API WaitMessage(void)
 {
-    dprintf2(("USER32: WaitMessage"));
-    return OSLibWinWaitMessage();
+#ifdef DEBUG
+    MSG msg;
+
+    if(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE) == FALSE) {
+          dprintf2(("USER32: WaitMessage %x", GetThreadHAB()));
+    }
+    else  dprintf2(("USER32: WaitMessage %x; message %x present", GetThreadHAB(), msg.message));
+#endif
+
+    BOOL ret = OSLibWinWaitMessage();
+#ifdef DEBUG
+    if(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE) == FALSE) {
+          dprintf2(("USER32: WaitMessage returned with no message in the queue"));
+    }
+#endif
+    return ret;
 }
 //******************************************************************************