Changeset 8129 for trunk/src

Timestamp:

Mar 28, 2002, 12:26:00 PM (23 years ago)

Author:

sandervl

Message:

Gracefully handle WM_QUIT message sent by window list

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.53 2002-02-26 11:12:25 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.54 2002-03-28 11:25:59 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -323 +323 @@
                 if (os2msg.msg == WM_TIMER)
                     eaten = TIMER_HandleTimer(&os2msg);
+                if (os2msg.msg == WM_QUIT && ((ULONG)os2msg.mp2 != 0) ) {
+                    // Don't return FALSE when the window list sends us
+                    // a WM_QUIT message, improper killing can lead to
+                    // application crashes.
+                    // In the WM_QUIT handler in pmwindow we send a WM_CLOSE
+                    // in this case. When the app calls PostQuitMessage (mp2 == 0),
+                    // then we handle it the normal way
+                    rc = 1; 
+                }
         } while (eaten);
   }

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.83 2002-02-13 15:10:46 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.84 2002-03-28 11:25:59 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -165 +165 @@
     case WM_QUIT:
         winMsg->message = WINWM_QUIT;
+        if (fMsgRemoved && win32wnd && (ULONG)os2Msg->mp2 != 0) {
+            // mp2 != 0 -> sent by window list; be nice and close
+            // the window first
+            win32wnd->MsgClose();
+        }
         break;
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.170 2002-03-20 10:30:06 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.171 2002-03-28 11:26:00 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -889 +889 @@
     }
 
+#ifdef DEBUG
+    case WM_CLOSE:
+    {
+        dprintf(("PMFRAME: WM_CLOSE %x", hwnd));
+        goto RunDefFrameWndProc;
+    }
+#endif
+
     case WM_PAINT:
     {