Changeset 153 for trunk/src/kernel/qwidget_pm.cpp

Timestamp:

Nov 13, 2006, 12:05:13 AM (19 years ago)

Author:

dmik

Message:

kernel: Attempted to fix some spontaneous Qt application traps during window management (seen in Psi a couple of times after showing big tool tips, see ticket:34 for more info):

• Deleted modal widgets could be left referenced by widgets they were blocking (through the QWL_QTMODAL window word).
• Custom window data was not initialized to zero after window creation.

File:

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

trunk/src/kernel/qwidget_pm.cpp

@@ -941 +941 @@
 */
 
+        // strictly speaking, PM is not obliged to initialize window data
+        // with zeroes (although seems to), so do it ourselves
+        for ( LONG i = 0; i <= QT_EXTRAWINDATASIZE - 4; i += 4 )
+            WinSetWindowULong( id, i, 0 );
+
         // When the FS_SHELLPOSITION flag is specified during WC_FRAME window
         // creation its size and position remains zero until it is shown
@@ -1083 +1088 @@
     QWidget *blockedBy = 0;
     if ( isTopLevel() )
-        blockedBy = (QWidget*) WinQueryWindowULong( winId(), QWL_QTMODAL );
+        blockedBy = (QWidget*) WinQueryWindowPtr( winId(), QWL_QTMODAL );
     if ( !blockedBy && parentWidget() )
-        blockedBy = (QWidget*) WinQueryWindowULong(
+        blockedBy = (QWidget*) WinQueryWindowPtr(
             parentWidget()->topLevelWidget()->winId(), QWL_QTMODAL );
     if ( blockedBy ) {
@@ -1151 +1156 @@
     blockedBy = 0;
     if ( parentWidget() )
-        blockedBy = (QWidget*) WinQueryWindowULong(
+        blockedBy = (QWidget*) WinQueryWindowPtr(
             parentWidget()->topLevelWidget()->winId(), QWL_QTMODAL );
     if ( blockedBy ) {