Changeset 3274 for trunk/src

Timestamp:

Mar 29, 2000, 7:16:06 PM (25 years ago)

Author:

sandervl

Message:

Peek/GetMessage bugfixes

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (5 diffs)
• windowmsg.cpp (modified) (3 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.30 2000-03-13 13:10:46 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.31 2000-03-29 17:16:06 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -25 +25 @@
 #include "oslibmsg.h"
 #include <winconst.h>
+#include <win32api.h>
 #include <win32wnd.h>
 #include "oslibutil.h"
@@ -204 +205 @@
  THDB *thdb;
  QMSG  os2msg;
+ HWND  hwndOS2 = 0;
+
+  if(hwnd) {
+        hwndOS2 = Win32BaseWindow::Win32ToOS2Handle(hwnd);
+        if(hwndOS2 == NULL) {
+                memset(pMsg, 0, sizeof(MSG));
+                dprintf(("GetMsg: window %x NOT FOUND!", hwnd));
+                SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+                return TRUE;
+        }
+  }
 
   thdb = GetThreadTHDB();
   if(thdb == NULL) {
         DebugInt3();
-        return FALSE;
+        return TRUE;
   }
 
@@ -275 +287 @@
  THDB *thdb;
  QMSG  os2msg;
+ HWND  hwndOS2 = 0;
+
+  if(hwnd && hwnd != -1) {
+        hwndOS2 = Win32BaseWindow::Win32ToOS2Handle(hwnd);
+        if(hwndOS2 == NULL) {
+                dprintf(("PeekMsg: window %x NOT FOUND!", hwnd));
+                SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+                return FALSE;
+        }
+  }
 
   thdb = GetThreadTHDB();
@@ -304 +326 @@
   do {
         eaten = FALSE;
-        rc = WinPeekMsg(thdb->hab, &os2msg, Win32BaseWindow::OS2ToWin32Handle(hwnd), TranslateWinMsg(uMsgFilterMin, TRUE),
+        rc = WinPeekMsg(thdb->hab, &os2msg, hwndOS2, TranslateWinMsg(uMsgFilterMin, TRUE),
                         TranslateWinMsg(uMsgFilterMax, FALSE), (fRemove & PM_REMOVE_W) ? PM_REMOVE : PM_NOREMOVE);
 

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.20 2000-03-23 23:06:53 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.21 2000-03-29 17:16:06 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -72 +72 @@
  BOOL fFoundMsg;
 
-    fFoundMsg = OSLibWinPeekMsg(msg, 0, uMsgFilterMin, uMsgFilterMax,
+    fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
                                 fuRemoveMsg, FALSE);
     if(fFoundMsg) {
@@ -88 +88 @@
  BOOL fFoundMsg;
 
-    fFoundMsg = OSLibWinPeekMsg(msg, 0, uMsgFilterMin, uMsgFilterMax,
+    fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
                                 fuRemoveMsg, FALSE);
     if(fFoundMsg) {