Changeset 775 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

Aug 4, 2010, 1:28:23 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed a possible crash and an endless PM event loop recursion when re-parenting widgets in DIVE mode. This could be seen when dragging a toolbar out of the dock widget, dragging it back then closing the application (crash) or attempting to drag the toolbar out again (endless recursion).

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1389 +1389 @@
             qApp->d_func()->closePopup(this);
         if (destroyWindow && !(windowType() == Qt::Desktop) &&
-            internalWinId() != NULLHANDLE) {
-            HWND id = internalWinId();
-            if (isWindow() && !(windowType() == Qt::Popup)) {
-                // extra data including extra->topextra has been already
-                // deleted at this point by deleteExtra() and therefore
-                // calling frameWinId() is useless -- it will return the
-                // client window handle. Use WinQueryWindow() instead.
-                id = WinQueryWindow(id, QW_PARENT);
-                Q_ASSERT(id != NULLHANDLE);
-            }
+            d->frameWinId() != NULLHANDLE) {
+            // make sure the backing store is deleted before destroying HWND --
+            // QPMDiveWindowSurface depends on that
+            delete d->topData()->backingStore;
+            d->topData()->backingStore = 0;
+            // now destroy HWND
+            HWND id = d->frameWinId();
 #if defined(QT_DEBUGWINCREATEDESTROY)
             qDebug() << "|Destroying window" << this
@@ -1472 +1469 @@
     }
 
-    if ((q->windowType() == Qt::Desktop))
-        old_fid = NULLHANDLE;
+    if (old_fid != NULLHANDLE && q->windowType() != Qt::Desktop) {
+        // make sure the backing store is deleted before destroying HWND --
+        // QPMDiveWindowSurface depends on that
+        if (extra && extra->topextra) {
+            delete extra->topextra->backingStore;
+            extra->topextra->backingStore = 0;
+            // zero the to-be-destroyed frame HWND just in case
+            extra->topextra->fId = NULLHANDLE;
+        }
+        // now destroy HWND
+        qt_WinDestroyWindow(old_fid);
+    }
+
     setWinId(0);
 
@@ -1506 +1514 @@
         setWindowTitle_helper(extra->topextra->caption);
     }
-    if (old_fid != NULLHANDLE)
-        qt_WinDestroyWindow(old_fid);
 
     if (q->testAttribute(Qt::WA_AcceptDrops) || dropSiteWasRegistered