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

Timestamp:

Dec 24, 1999, 7:42:46 PM (26 years ago)

Author:

sandervl

Message:

Message handling rewrite

File:

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

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.10 1999-12-16 00:11:49 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.11 1999-12-24 18:39:13 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -21 +21 @@
 #include <win.h>
 #include <heapstring.h>
+#include <handlemanager.h>
 #include "oslibwin.h"
 #include "oslibmsg.h"
@@ -45 +46 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API TranslateMessage( const MSG * arg1)
-{
-//    return O32_TranslateMessage(arg1);
-   return TRUE;
+BOOL WIN32API TranslateMessage( const MSG * msg)
+{
+   return OSLibWinTranslateMessage((MSG *)msg);
 }
 //******************************************************************************
@@ -70 +70 @@
 
     fFoundMsg = OSLibWinPeekMsg(msg, 0, uMsgFilterMin, uMsgFilterMax,
-                                (fuRemoveMsg & PM_REMOVE) ? 1 : 0, FALSE);
+                                fuRemoveMsg, FALSE);
     if(fFoundMsg) {
-        if (msg->message == WM_QUIT && (fuRemoveMsg & (PM_REMOVE))) {
+        if (msg->message == WM_QUIT && (fuRemoveMsg & PM_REMOVE)) {
             //TODO: Post WM_QUERYENDSESSION message when WM_QUIT received and system is shutting down
         }
@@ -991 +991 @@
 {
  DWORD queueStatus;
-
-  dprintf(("USER32:GetInputState()"));
+ BOOL  rc;
+
   queueStatus = OSLibWinQueryQueueStatus();
 
-  return (queueStatus & (QS_KEY | QS_MOUSEBUTTON)) ? TRUE : FALSE;
+  rc = (queueStatus & (QS_KEY | QS_MOUSEBUTTON)) ? TRUE : FALSE;
+  dprintf(("USER32:GetInputState() returned %d", rc));
+  return rc;
 }
 //******************************************************************************
@@ -1032 +1034 @@
         return WAIT_TIMEOUT;
   }
-  return O32_MsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
-}
+  //SvL: Call handlemanager function as we need to translate handles
+  return HMMsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
+}