Changeset 808 for trunk

Timestamp:

Oct 27, 2010, 6:11:22 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed a crash that could happen at program termination in Dive mode if a top-level window had a native HWND window embedded in it. This was partly a r775 regression and also supersedes this change at all. Closes #184.

Location:

trunk/src/gui

Files:

• kernel/qwidget_pm.cpp (modified) (2 diffs)
• painting/qwindowsurface_pm.cpp (modified) (9 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1390 +1390 @@
         if (destroyWindow && !(windowType() == Qt::Desktop) &&
             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
+            // destroy HWND
             HWND id = d->frameWinId();
 #if defined(QT_DEBUGWINCREATEDESTROY)
@@ -1470 +1466 @@
 
     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
+        // destroy HWND
         qt_WinDestroyWindow(old_fid);
     }

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -352 +352 @@
     struct WidgetData
     {
-        QWidget *widget;
         int widgetHeight;
         bool vrnDirty;
@@ -360 +359 @@
 
     WidgetData data;
-    QMap<HWND, WidgetData> *subWidgets;
+    QMap<, WidgetData> *subWidgets;
 
     void addWidget(QWidget *widget);
@@ -369 +368 @@
         if (widget == that->window())
             return &data;
-        if (!subWidgets || !subWidgets->contains(widget->internalWinId()))
+        if (!subWidgets || !subWidgets->contains(widget))
             return 0;
-        return &(*subWidgets)[widget->internalWinId()];
+        return &(*subWidgets)[widget];
     }
 
@@ -386 +385 @@
         // lazily create the sub-widget map (only when really necessary)
         if (!subWidgets)
-            subWidgets = new QMap<HWND, WidgetData>();
-        wd = &(*subWidgets)[widget->internalWinId()];
-    }
-
-    wd->widget = widget;
+            subWidgets = new QMap<QWidget *, WidgetData>();
+        wd = &(*subWidgets)[widget];
+    }
+
     wd->vrnDirty = true;
     wd->widgetHeight = 0;
@@ -418 +416 @@
         widget->removeEventFilter(this);
         widget->removePmEventFilter(this);
-        subWidgets->remove(widget->internalWinId());
+        subWidgets->remove(widget);
     }
 }
@@ -425 +423 @@
 {
     QWidget *widget = qobject_cast<QWidget *>(obj);
-    if (event->type() == QEvent::ParentAboutToChange) {
+    if (event->type() == QEvent::ParentAboutToChange ||
+        event->type() == QEvent::Destroy) {
         removeWidget(widget);
     }
@@ -466 +465 @@
                 data.vrnDirty = true;
                 if (subWidgets) {
-                    foreach(HWND hwnd, subWidgets->keys())
-                        (*subWidgets)[hwnd].vrnDirty = true;
+                    foreach(, subWidgets->keys())
+                        (*subWidgets)[].vrnDirty = true;
                 }
             }
@@ -487 +486 @@
                 data.vrnDirty = true;
                 if (subWidgets) {
-                    foreach(HWND hwnd, subWidgets->keys())
-                        (*subWidgets)[hwnd].vrnDirty = true;
+                    foreach(, subWidgets->keys())
+                        (*subWidgets)[].vrnDirty = true;
                 }
             }
@@ -530 +529 @@
 {
     if (d->subWidgets) {
-        foreach(HWND hwnd, d->subWidgets->keys())
-            d->removeWidget((*d->subWidgets)[hwnd].widget);
+        QList<QWidget *> keys = d->subWidgets->keys();
+        foreach(QWidget *w, keys)
+            d->removeWidget(w);
         Q_ASSERT(d->subWidgets->count() == 0);
         delete d->subWidgets;