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

Timestamp:

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

Author:

sandervl

Message:

Post(Thread)/SendMessage updates & fixes

File:

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

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.24 2001-04-27 17:36:39 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.25 2001-05-25 19:59:30 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -85 +85 @@
  BOOL fFoundMsg;
  
-    dprintf2(("PeekMessagA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
+    dprintf2(("PeekMessageA %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));
+        dprintf2(("PeekMessageA %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)) {
@@ -104 +104 @@
  BOOL fFoundMsg;
 
-    dprintf2(("PeekMessagW %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
+    dprintf2(("PeekMessageW %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));
+        dprintf2(("PeekMessageW %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))) {
@@ -1051 +1051 @@
 /* Synchronization Functions */
 //******************************************************************************
-DWORD MsgWaitForMultipleObjects(DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll,
-                                DWORD dwMilliseconds, DWORD dwWakeMask)
-{
- DWORD curtime, endtime;
+DWORD WIN32API MsgWaitForMultipleObjects(DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll,
+                                         DWORD dwMilliseconds, DWORD dwWakeMask)
+{
+ DWORD curtime, endtime, ret;
  MSG msg;
 
@@ -1097 +1097 @@
   }
   //SvL: Call handlemanager function as we need to translate handles
-  return HMMsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
-}
+  //TODO: doesn't work at all if waiting for message
+  ret = HMMsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
+  return ret;
+}