Changeset 40273 in vbox for trunk

Timestamp:

Feb 28, 2012 1:08:24 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76499

Message:

FE/Qt: 6061: Fixing GUI crash with debug assertion in UISession (framebuffer creation/cleanup issue).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UISession.cpp (modified) (8 diffs)
• UISession.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
     /* Common variables: */
     , m_pMenuPool(0)
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    , m_FrameBufferVector(sessionReference.GetMachine().GetMonitorCount())
-#endif
     , m_machineState(KMachineState_Null)
 #if defined(Q_WS_WIN)
@@ -140 +137 @@
             this, SIGNAL(sigCPUExecutionCapChange()));
 
+    /* Prepare framebuffers: */
+    prepareFramebuffers();
+
     /* Prepare main menu: */
     prepareMenuPool();
@@ -163 +163 @@
     cleanupMenuPool();
 
+    /* Cleanup framebuffers: */
+    cleanupFramebuffers();
+
     /* Destroy the console event handler */
     UIConsoleEventHandler::destroy();
@@ -170 +173 @@
     if (m_alphaCursor)
         DestroyIcon(m_alphaCursor);
-#endif
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    for (int i = m_FrameBufferVector.size() - 1; i >= 0; --i)
-    {
-        UIFrameBuffer *pFb = m_FrameBufferVector[i];
-        if (pFb)
-        {
-            /* Warn framebuffer about its no more necessary: */
-            pFb->setDeleted(true);
-            /* Detach framebuffer from Display: */
-            CDisplay display = session().GetConsole().GetDisplay();
-            display.SetFramebuffer(i, CFramebuffer(NULL));
-            /* Release the reference: */
-            pFb->Release();
-        }
-    }
 #endif
 }
@@ -661 +647 @@
 }
 
+void UISession::prepareFramebuffers()
+{
+    /* Each framebuffer will be really prepared on first UIMachineView creation: */
+    m_frameBufferVector.resize(m_session.GetMachine().GetMonitorCount());
+}
+
 void UISession::prepareMenuPool()
 {
@@ -729 +721 @@
     delete m_pMenuPool;
     m_pMenuPool = 0;
+}
+
+void UISession::cleanupFramebuffers()
+{
+    /* Cleanup framebuffers finally: */
+    for (int i = m_frameBufferVector.size() - 1; i >= 0; --i)
+    {
+        UIFrameBuffer *pFb = m_frameBufferVector[i];
+        if (pFb)
+        {
+            /* Warn framebuffer about its no more necessary: */
+            pFb->setDeleted(true);
+            /* Detach framebuffer from Display: */
+            CDisplay display = session().GetConsole().GetDisplay();
+            display.SetFramebuffer(i, CFramebuffer(NULL));
+            /* Release the reference: */
+            pFb->Release();
+        }
+    }
+    m_frameBufferVector.clear();
 }
 
@@ -1047 +1059 @@
 }
 
-UIFrameBuffer* UISession::frameBuffer(ulong screenId) const
-{
-    Assert(screenId < (ulong)m_FrameBufferVector.size());
-    return m_FrameBufferVector.value((int)screenId, NULL);
-}
-
-int UISession::setFrameBuffer(ulong screenId, UIFrameBuffer* pFrameBuffer)
-{
-    Assert(screenId < (ulong)m_FrameBufferVector.size());
-    if (screenId < (ulong)m_FrameBufferVector.size())
-    {
-        m_FrameBufferVector[(int)screenId] = pFrameBuffer;
-        return VINF_SUCCESS;
-    }
-    return VERR_INVALID_PARAMETER;
+UIFrameBuffer* UISession::frameBuffer(ulong uScreenId) const
+{
+    Assert(uScreenId < (ulong)m_frameBufferVector.size());
+    return m_frameBufferVector.value((int)uScreenId, 0);
+}
+
+void UISession::setFrameBuffer(ulong uScreenId, UIFrameBuffer* pFrameBuffer)
+{
+    Assert(uScreenId < (ulong)m_frameBufferVector.size());
+    if (uScreenId < (ulong)m_frameBufferVector.size())
+        m_frameBufferVector[(int)uScreenId] = pFrameBuffer;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -147 +147 @@
     void setMouseIntegrated(bool fIsMouseIntegrated) { m_fIsMouseIntegrated = fIsMouseIntegrated; }
 
-    /* return a persisted framebuffer for the given screen
-     * see comment below for the m_FrameBufferVector field */
-    UIFrameBuffer* frameBuffer(ulong screenId) const;
-    /* @return VINF_SUCCESS - on success
-     * VERR_INVALID_PARAMETER - if screenId is invalid */
-    int setFrameBuffer(ulong screenId, UIFrameBuffer* pFrameBuffer);
+    /* Returns existing framebuffer for the given screen-number;
+     * Returns 0 (asserts) if screen-number attribute is out of bounds: */
+    UIFrameBuffer* frameBuffer(ulong uScreenId) const;
+    /* Sets framebuffer for the given screen-number;
+     * Ignores (asserts) if screen-number attribute is out of bounds: */
+    void setFrameBuffer(ulong uScreenId, UIFrameBuffer* pFrameBuffer);
 
 signals:
@@ -200 +200 @@
 
     /* Prepare helpers: */
+    void prepareFramebuffers();
     void prepareMenuPool();
     void loadSessionSettings();
@@ -206 +207 @@
     void saveSessionSettings();
     void cleanupMenuPool();
+    void cleanupFramebuffers();
 
     /* Common helpers: */
@@ -223 +225 @@
     UIMachineMenuBar *m_pMenuPool;
 
-    /** Used for keeping track of the framebuffers accross view object
-     * re-creation. */
-    QVector<UIFrameBuffer*> m_FrameBufferVector;
+    /* Frame-buffers vector: */
+    QVector<UIFrameBuffer*> m_frameBufferVector;
 
     /* Common variables: */