Changeset 9027 for trunk/src

Timestamp:

Aug 19, 2002, 3:55:05 PM (23 years ago)

Author:

sandervl

Message:

Don't send queued WM_CHAR messages for windows that have just been destroyed. (Get/PeekMessage)

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.60 2002-08-01 16:04:19 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.61 2002-08-19 13:55:05 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -257 +257 @@
         teb->o.odin.os2msg.hwnd = 0;
     
+        if(!IsWindow(pMsg->hwnd)) {
+            //could be a queued char message for a window that was just destroyed
+            //when that's the case, we ignore it (MFC assertions are triggered by this)
+            goto continuegetmsg;
+        }
+
         // @@@PH verify this
         // if this is a keyup or keydown message, we've got to
@@ -406 +412 @@
         }
         memcpy(pMsg, &teb->o.odin.msgWCHAR, sizeof(MSG));
+
+        if(!IsWindow(pMsg->hwnd)) {
+            //could be a queued char message for a window that was just destroyed
+            //when that's the case, we ignore it (MFC assertions are triggered by this)
+            teb->o.odin.fTranslated = FALSE;
+            teb->o.odin.os2msg.msg  = 0;
+            teb->o.odin.os2msg.hwnd = 0;
+            goto continuepeekmsg;
+        }
     
         // @@@PH verify this