Changeset 88678 in vbox

Timestamp:

Apr 23, 2021 1:33:28 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Fixing regression in r143970; We should detach UISession COM stuff before COM itself is cleaned up; Otherwise any VM appears in aborted state on XPCOM hosts.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineView.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (4 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -4658 +4658 @@
     {
         /* First, make sure we don't use COM any more: */
+        emit sigAskToDetachCOM();
         m_comHost.detach();
         m_comVBox.detach();

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -73 +73 @@
     /** @name Common stuff.
      * @{ */
-        /** Asks #UIStarter listener to commit data. */
-        void sigAskToCommitData();
-    /** @} */
-
-    /** @name COM stuff.
-     * @{ */
         /** Asks #UIStarter listener to restart UI. */
         void sigAskToRestartUI();
@@ -86 +80 @@
         /** Notifies listeners about the VBoxSVC availability change. */
         void sigVBoxSVCAvailabilityChange();
+
+        /** Asks listeners to commit data. */
+        void sigAskToCommitData();
+        /** Asks listeners to detach COM. */
+        void sigAskToDetachCOM();
     /** @} */
 

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

@@ -1007 +1007 @@
 void UIMachineView::cleanupFrameBuffer()
 {
+    /* Make sure framebuffer assigned at all: */
+    if (!m_pFrameBuffer)
+        return;
+
     /* Make sure proper framebuffer assigned: */
-    AssertReturnVoid(m_pFrameBuffer);
     AssertReturnVoid(m_pFrameBuffer == uisession()->frameBuffer(screenId()));
 

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

@@ -25 +25 @@
 #include <QAbstractScrollArea>
 #include <QEventLoop>
+#include <QPointer>
 
 /* GUI includes: */
 #include "UIExtraDataDefs.h"
+#include "UIFrameBuffer.h"
 #include "UIMachineDefs.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -52 +54 @@
 class UIMachineLogic;
 class UIMachineWindow;
-class UIFrameBuffer;
 class UINativeEventFilter;
 class CConsole;
@@ -356 +357 @@
     UIMachineWindow *m_pMachineWindow;
     ulong m_uScreenId;
-    UIFrameBuffer *m_pFrameBuffer;
+    QPointer<UIFrameBuffer> m_pFrameBuffer;
     KMachineState m_previousState;
     /** HACK: when switching out of fullscreen or seamless we wish to override

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

@@ -589 +589 @@
     /* Mount medium add-hoc: */
     mountAdHocImage(KDeviceType_DVD, UIMediumDeviceType_DVD, strSource);
+}
+
+void UISession::sltDetachCOM()
+{
+    /* Cleanup everything COM related: */
+    cleanupConsoleEventHandlers();
+    cleanupFramebuffers();
+    cleanupSession();
 }
 
@@ -1116 +1124 @@
 {
     connect(this, &UISession::sigInitialized, this, &UISession::sltMarkInitialized);
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM, this, &UISession::sltDetachCOM);
 
 #ifdef VBOX_WS_MAC
@@ -1495 +1504 @@
     saveSessionSettings();
 
-    /* Cleanup framebuffers: */
-    cleanupFramebuffers();
-
-    /* Cleanup console event-handlers: */
-    cleanupConsoleEventHandlers();
-
     /* Cleanup connections: */
     cleanupConnections();
@@ -1506 +1509 @@
     /* Cleanup actions: */
     cleanupActions();
-
-    /* Cleanup session: */
-    cleanupSession();
 }
 

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

@@ -365 +365 @@
     void sltMarkInitialized() { m_fInitialized = true; }
 
+    /** Detaches COM. */
+    void sltDetachCOM();
     /** Close Runtime UI. */
     void sltCloseRuntimeUI();