Changeset 7211 for trunk/src/user32/oslibmsg.cpp

Timestamp:

Oct 26, 2001, 11:10:57 AM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.46 2001-10-25 15:35:53 phaller Exp $ */
+/* $Id: oslibmsg.cpp,v 1.47 2001-10-26 09:10:12 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -21 +21 @@
 #define  INCL_DOSPROCESS
 #include <os2wrap.h>
+#include <odinwrap.h>
 #include <string.h>
 #include <misc.h>
@@ -37 +38 @@
 #define DBG_LOCALLOG    DBG_oslibmsg
 #include "dbglocal.h"
+
+
+ODINDEBUGCHANNEL(USER32-OSLIBMSG)
 
 
@@ -116 +120 @@
 void WinToOS2MsgTranslate(MSG *winMsg, QMSG *os2Msg, BOOL isUnicode)
 {
+  dprintf(("WinToOS2MsgTranslate not implemented"));
 //  memcpy(os2Msg, winMsg, sizeof(MSG));
 //  os2Msg->hwnd = Win32ToOS2Handle(winMsg->hwnd);
@@ -201 +206 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
+BOOL i_OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                     BOOL isUnicode)
 {
@@ -239 +244 @@
         teb->o.odin.os2msg.msg  = 0;
         teb->o.odin.os2msg.hwnd = 0;
+    
+        // @@@PH verify this
+        // if this is a keyup or keydown message, we've got to
+        // call the keyboard hook here
+        if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+        {
+          ProcessKbdHook(pMsg, TRUE);
+        }
+    
         return (pMsg->message != WINWM_QUIT);
   }
@@ -288 +302 @@
   if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
   {
-//    if(ProcessKbdHookLL(pMsg, TRUE))
-//      goto continuegetmsg;
-    
-    // @@@PH
     // only supposed to be called upon WM_KEYDOWN
     // and WM_KEYUP according to docs.
@@ -299 +309 @@
   return rc;
 }
+BOOL OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
+                    BOOL isUnicode)
+{
+  dprintf(("OSLibWinGetMsg enter"));
+  BOOL fRes = i_OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, isUnicode);
+  dprintf(("OSLibWinGetMsg leave"));
+  return fRes;
+}
+
+
 //******************************************************************************
 //PeekMessage retrieves only messages associated with the window identified by the 
@@ -311 +331 @@
 //TODO: Not working as specified right now!
 //******************************************************************************
-BOOL OSLibWinPeekMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
+BOOL i_OSLibWinPeekMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                      DWORD fRemove, BOOL isUnicode)
 {
@@ -350 +370 @@
         }
         memcpy(pMsg, &teb->o.odin.msgWCHAR, sizeof(MSG));
+    
+        // @@@PH verify this
+        // if this is a keyup or keydown message, we've got to
+        // call the keyboard hook here
+        if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+        {
+          ProcessKbdHook(pMsg, fRemove);
+        }
         return TRUE;
   }
@@ -393 +421 @@
   if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
   {
-//    if(ProcessKbdHookLL(pMsg, fRemove))
-//      goto continuepeekmsg;
-
-    // @@@PH
     // only supposed to be called upon WM_KEYDOWN
     // and WM_KEYUP according to docs.
@@ -405 +429 @@
   return rc;
 }
+BOOL OSLibWinPeekMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
+                    BOOL fRemove, BOOL isUnicode)
+{
+  dprintf(("OSLibWinPeekMsg enter"));
+  BOOL fRes = i_OSLibWinPeekMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, fRemove, isUnicode);
+  dprintf(("OSLibWinPeekMsg leave"));
+  return fRes;
+}
+
 //******************************************************************************
 //******************************************************************************