Changeset 9101 for trunk/src

Timestamp:

Aug 23, 2002, 5:06:01 PM (23 years ago)

Author:

sandervl

Message:

Ugly hack added to work around crash in PM when child window calls DestroyWindow for parent or owner in WM_DESTROY handler (solution: postpone DestroyWindow for parent/owner)

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (5 diffs)
• win32wbase.h (modified) (4 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.187 2002-08-15 15:45:45 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.188 2002-08-23 15:06:00 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1070 +1070 @@
     }
 
+//hack alert; PM crashes if child calls DestroyWindow for parent/owner in WM_DESTROY
+//            handler; must postpone it, so do it here
+    case WIN32APP_POSTPONEDESTROY:
+        OSLibWinDestroyWindow(hwnd);
+        break;
+//hack end
+
 #ifdef DEBUG
     case WM_CLOSE:

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.335 2002-08-14 10:37:44 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.336 2002-08-23 15:06:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -149 +149 @@
   fParentChange    = FALSE;
   fDestroyWindowCalled = FALSE;
+  fChildDestructionInProgress = FALSE;
   fTaskList        = FALSE;
   fParentDC        = FALSE;
@@ -924 +925 @@
 
     if(fDestroyWindowCalled == FALSE)
-    {//this window was destroyed because DestroyWindow was called for it's parent
+    {//this window was destroyed because DestroyWindow was called for its parent
      //so: send a WM_PARENTNOTIFY now as that hasn't happened yet
         if((getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_NOPARENTNOTIFY))
@@ -2683 +2684 @@
 //******************************************************************************
 //Also destroys all the child windows (destroy children first, parent last)
+//TODO: Don't rely on PM to do the right thing. Send WM_(NC)DESTROY &
+//      destroy children ourselves (see Wine)
 //******************************************************************************
 BOOL Win32BaseWindow::DestroyWindow()
@@ -2760 +2763 @@
   
     fDestroyWindowCalled = TRUE;
-    return OSLibWinDestroyWindow(OS2HwndFrame);
+
+//hack alert; PM crashes if child calls DestroyWindow for parent/owner in WM_DESTROY
+//            handler; must postpone it
+    if(fChildDestructionInProgress) {
+        dprintf(("Postponing parent destruction because of dying child"));
+        OSLibPostMessageDirect(OS2HwndFrame, WIN32APP_POSTPONEDESTROY, 0, 0);
+        return TRUE;
+    }
+
+    BOOL fOldChildDestructionInProgress = FALSE;
+    if(GetParent()) {
+        Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(GetParent());
+        if(window) {
+            fOldChildDestructionInProgress = window->IsChildDestructionInProgress();
+            window->SetChildDestructionInProgress(TRUE);
+            RELEASE_WNDOBJ(window);
+        }
+    }
+//hack end
+
+    BOOL ret = OSLibWinDestroyWindow(OS2HwndFrame);
+
+//hack alert; PM crashes if child calls DestroyWindow for parent/owner in WM_DESTROY
+//            handler; must postpone it
+    if(GetParent()) {
+        Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(GetParent());
+        if(window) {
+            window->SetChildDestructionInProgress(fOldChildDestructionInProgress);
+            RELEASE_WNDOBJ(window);
+        }
+    }
+//hack end
+    return ret;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.143 2002-06-02 19:34:36 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.144 2002-08-23 15:06:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -73 +73 @@
 //NOTE Must be smaller than WIN32APP_POSTMSG!
 #define WIN32APP_SETFOCUSMSG      (WIN32APP_POSTMSG-1)
+#define WIN32APP_POSTPONEDESTROY  (WIN32APP_POSTMSG-2)
 
 #define WIN32MSG_MAGICA           0x12345678
@@ -284 +285 @@
          BOOL   IsWindowDestroyed()           { return state >= STATE_DESTROYED; };
          BOOL   IsWindowIconic();
+
+//hack alert (see DestroyWindow)
+         BOOL   IsChildDestructionInProgress() { return fChildDestructionInProgress; };
+         void   SetChildDestructionInProgress(BOOL fDestuctionInProgress) 
+         { 
+             fChildDestructionInProgress = fDestuctionInProgress;
+         };
+//hack end
+
          //Window procedure type
          BOOL   IsWindowUnicode();
@@ -415 +425 @@
                  fParentChange:1,
                  fDestroyWindowCalled:1, //DestroyWindow was called for this window
+                 fChildDestructionInProgress:1,
                  fTaskList:1,            //should be listed in PM tasklist or not
                  fXDefault:1,