Changeset 5606 for trunk/src/user32/windowmsg.cpp

Timestamp:

Apr 27, 2001, 7:36:39 PM (24 years ago)

Author:

sandervl

Message:

mouse message translation + dc reset after resize fixes

File:

• trunk/src/user32/windowmsg.cpp (modified) (12 diffs)

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.23 2001-03-25 08:50:42 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.24 2001-04-27 17:36:39 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -24 +24 @@
 #include "oslibwin.h"
 #include "oslibmsg.h"
+#include "hook.h"
 
 #define DBG_LOCALLOG    DBG_windowmsg
@@ -39 +40 @@
 LONG WIN32API DispatchMessageA(const MSG * msg)
 {
+  dprintf2(("DispatchMessageA %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
   return OSLibWinDispatchMsg((MSG *)msg);
 }
@@ -45 +47 @@
 LONG WIN32API DispatchMessageW( const MSG * msg)
 {
+  dprintf2(("DispatchMessageW %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
   return OSLibWinDispatchMsg((MSG *)msg, TRUE);
 }
@@ -57 +60 @@
 BOOL WIN32API GetMessageA( LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax)
 {
-    return OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax);
+  BOOL ret;
+
+    dprintf2(("GetMessageA %x %d-%d %d", hwnd, uMsgFilterMin, uMsgFilterMax));
+    ret = OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax);
+    HOOK_CallHooksA(WH_GETMESSAGE, HC_ACTION, PM_REMOVE, (LPARAM)pMsg);
+    return ret;
 }
 //******************************************************************************
@@ -63 +71 @@
 BOOL WIN32API GetMessageW( LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax)
 {
-    return OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, TRUE);
+  BOOL ret;
+
+    dprintf2(("GetMessageW %x %d-%d %d", hwnd, uMsgFilterMin, uMsgFilterMax));
+    ret = OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, TRUE);
+    HOOK_CallHooksW(WH_GETMESSAGE, HC_ACTION, PM_REMOVE, (LPARAM)pMsg);
+    return ret;
 }
 //******************************************************************************
@@ -71 +84 @@
 {
  BOOL fFoundMsg;
-
+ 
+    dprintf2(("PeekMessagA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
     fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
                                 fuRemoveMsg, FALSE);
     if(fFoundMsg) {
+        dprintf2(("PeekMessagA %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
+        HOOK_CallHooksA(WH_GETMESSAGE, HC_ACTION, fuRemoveMsg & PM_REMOVE, (LPARAM)msg );
         if (msg->message == WM_QUIT && (fuRemoveMsg & PM_REMOVE)) {
             //TODO: Post WM_QUERYENDSESSION message when WM_QUIT received and system is shutting down
@@ -88 +104 @@
  BOOL fFoundMsg;
 
+    dprintf2(("PeekMessagW %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
     fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
                                 fuRemoveMsg, FALSE);
     if(fFoundMsg) {
+        dprintf2(("PeekMessagW %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
+        HOOK_CallHooksW(WH_GETMESSAGE, HC_ACTION, fuRemoveMsg & PM_REMOVE, (LPARAM)msg );
         if (msg->message == WM_QUIT && (fuRemoveMsg & (PM_REMOVE))) {
             //TODO: Post WM_QUERYENDSESSION message when WM_QUIT received and system is shutting down
@@ -109 +128 @@
 DWORD WIN32API GetMessagePos(void)
 {
-    dprintf(("USER32: GetMessagePos"));
-    return OSLibWinGetMessagePos();
+ DWORD pos;
+
+    pos = OSLibWinGetMessagePos();
+    dprintf(("USER32: GetMessagePos -> (%d,%d)", HIWORD(pos), LOWORD(pos)));
+    return pos;
 }
 //******************************************************************************
@@ -994 +1016 @@
  DWORD queueStatus;
 
-    dprintf(("USER32:  GetQueueStatus"));
     queueStatus = OSLibWinQueryQueueStatus();
-
     queueStatus = MAKELONG(queueStatus, queueStatus);
+
+    dprintf(("USER32: GetQueueStatus %x returned %x", flags, queueStatus & MAKELONG(flags, flags)));
+
     return queueStatus & MAKELONG(flags, flags);
 }
@@ -1032 +1055 @@
 {
  DWORD curtime, endtime;
+ MSG msg;
 
   dprintf(("MsgWaitForMultipleObjects %x %x %d %d %x", nCount, pHandles, fWaitAll, dwMilliseconds, dwWakeMask));
@@ -1051 +1075 @@
                 if(OSLibWinWaitMessage() == FALSE) {
                         dprintf(("OSLibWinWaitMessage returned FALSE!"));
-                        return -1;
+                        return WAIT_ABANDONED;
                 }
                 if(GetQueueStatus(dwWakeMask) != 0) {
                         return WAIT_OBJECT_0;
                 }
+                //TODO: Ignoring all messages could be dangerous. But processing them,
+                //while the app doesn't expect any, isn't safe either.
+                if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
+                {
+                    if (msg.message == WM_QUIT) {
+                         dprintf(("ERROR: MsgWaitForMultipleObjects call abandoned because WM_QUIT msg was received!!"));
+                         return WAIT_ABANDONED;
+                    }
+   
+                    /* otherwise dispatch it */
+                    DispatchMessageA(&msg);
+                }
                 curtime = GetCurrentTime();
         }