Changeset 896 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 14, 2007 11:03:34 AM (18 years ago)

Author:

vboxsync

Message:

1803: FE/Qt leaks memory on Windows

It looks like QCursor uses HCURSOR handle “as is” without copying, so it is not correct to destroy WinAPI HCURSOR just after setting cursor to console viewport.
Unfortunately QCursor will not destroy icon under HCURSOR handle during self-destruction so it is necessary:

1. to make VBoxConsoleView class member – HCURSOR handle,
2. to destroy HCURSOR handle after new cursor is set for viewport,
3. to destroy HCURSOR handle if it is not required any more (upon VBoxConsoleView destruction).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -83 +83 @@
 
     void onFullscreenChange (bool on);
-    
+
     void fixModifierState (LONG *codes, uint *count);
 
@@ -206 +206 @@
     VBoxDefs::RenderMode mode;
 
+#if defined(Q_WS_WIN)
+    HCURSOR mAlphaCursor;
+#endif
+
 #if defined (VBOX_GUI_USE_REFRESH_TIMER)
     QPixmap pm;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -302 +302 @@
     {
         QApplication::postEvent (
-            view, new RuntimeErrorEvent (!!fatal, QString::fromUcs2 (id), 
+            view, new RuntimeErrorEvent (!!fatal, QString::fromUcs2 (id),
                                          QString::fromUcs2 (message)));
         return S_OK;
@@ -355 +355 @@
     , muCapsLockAdaptionCnt (2)
     , mode (rm)
+#if defined(Q_WS_WIN)
+    , mAlphaCursor (NULL)
+#endif
 {
     Assert (!cconsole.isNull() &&
@@ -477 +480 @@
         UnhookWindowsHookEx (g_kbdhook);
     g_view = 0;
+    if (mAlphaCursor)
+        DestroyIcon (mAlphaCursor);
 #endif
 
@@ -672 +677 @@
 {
     /// @todo (r=dmik) not currently sure is this method necessary to
-    //  fix fullscreen toggle problems (invalid areas) on Linux/SDL    
+    //  fix fullscreen toggle problems (invalid areas) on Linux/SDL
 //    if (fb)
 //    {
@@ -2155 +2160 @@
         HBITMAP hBitmap;
         void *lpBits;
-        HCURSOR hAlphaCursor = NULL;
 
         ::ZeroMemory (&bi, sizeof (BITMAPV5HEADER));
@@ -2262 +2266 @@
             ii.hbmColor = hBitmap;
 
-            hAlphaCursor = CreateIconIndirect (&ii);
+            HCURSOR hAlphaCursor = CreateIconIndirect (&ii);
             Assert (hAlphaCursor);
             if (hAlphaCursor)
@@ -2268 +2272 @@
                 viewport()->setCursor (QCursor (hAlphaCursor));
                 ok = true;
-                DestroyIcon (hAlphaCursor);
+                if (mAlphaCursor)
+                    DestroyIcon (mAlphaCursor);
+                mAlphaCursor = hAlphaCursor;
             }
         }