Changeset 102274 in vbox for trunk

Timestamp:

Nov 23, 2023 1:07:40 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: UICommon: A bit of rework for UIGuestOSTypeManager prepare/cleanup procedures, to make it wiped out before COM cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (7 diffs)
• UICommon.h (modified) (4 diffs)

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

@@ -216 +216 @@
     , m_fWrappersValid(false)
     , m_fVBoxSVCAvailable(true)
-    , m_pGuestOSTypeManager(new UIGuestOSTypeManager)
     , m_pThreadPool(0)
     , m_pThreadPoolCloud(0)
+    , m_pGuestOSTypeManager(0)
     , m_pMediumEnumerator(0)
 {
@@ -227 +227 @@
 UICommon::~UICommon()
 {
-    delete m_pGuestOSTypeManager;
     /* Unassign instance: */
     s_pInstance = 0;
@@ -267 +266 @@
     /* Load translation based on the current locale: */
     UITranslator::loadLanguage();
+
+    /* Prepare guest OS type manager before COM stuff: */
+    m_pGuestOSTypeManager = new UIGuestOSTypeManager;
 
     HRESULT rc = COMBase::InitializeCOM(true);
@@ -815 +817 @@
     m_pThreadPoolCloud = 0;
 
+    /* Cleanup guest OS type manager before COM stuff: */
+    delete m_pGuestOSTypeManager;
+    m_pGuestOSTypeManager = 0;
+
     /* Starting COM cleanup: */
     m_comCleanupProtectionToken.lockForWrite();
@@ -1393 +1399 @@
 {
     emit sigCloudMachineRegistered(strProviderShortName, strProfileName, comMachine);
+}
+
+const UIGuestOSTypeManager &UICommon::guestOSTypeManager()
+{
+    /* Handle exceptional and undesired case!
+     * This object is created and destroyed within own timeframe.
+     * If pointer isn't yet initialized or already cleaned up,
+     * something is definitely wrong. */
+    AssertPtr(m_pGuestOSTypeManager);
+    if (!m_pGuestOSTypeManager)
+    {
+        m_pGuestOSTypeManager = new UIGuestOSTypeManager;
+        m_pGuestOSTypeManager->reCacheGuestOSTypes(m_comVBox.GetGuestOSTypes());
+    }
+
+    /* Return an object instance: */
+    return *m_pGuestOSTypeManager;
 }
 
@@ -2509 +2532 @@
 KGraphicsControllerType UICommon::getRecommendedGraphicsController(const QString &strGuestOSTypeId) const
 {
-    if (!m_pGuestOSTypeManager)
-        return KGraphicsControllerType_Null;
-    return m_pGuestOSTypeManager->getRecommendedGraphicsController(strGuestOSTypeId);
+    return   m_pGuestOSTypeManager
+           ? m_pGuestOSTypeManager->getRecommendedGraphicsController(strGuestOSTypeId)
+           : KGraphicsControllerType_Null;
 }
 
@@ -2947 +2970 @@
     m_strHomeFolder = virtualBox().GetHomeFolder();
 
-    /* Re-initialize guest OS Type database: */
+    /* Re-initialize guest OS type database: */
     if (m_pGuestOSTypeManager)
         m_pGuestOSTypeManager->reCacheGuestOSTypes(m_comVBox.GetGuestOSTypes());
+
     /* Mark wrappers valid: */
     m_fWrappersValid = true;

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

@@ -314 +314 @@
     /** @} */
 
-    /** @name COM: Guest OS Type stuff.
-     * @{ */
-        const UIGuestOSTypeManager &guestOSTypeManager() const { return *m_pGuestOSTypeManager; }
-    /** @} */
-
     /** @name COM: Virtual Machine stuff.
      * @{ */
@@ -354 +349 @@
                                           const QString &strProfileName,
                                           const CCloudMachine &comMachine);
+    /** @} */
+
+    /** @name COM: Guest OS type stuff.
+     * @{ */
+        const UIGuestOSTypeManager &guestOSTypeManager();
     /** @} */
 
@@ -730 +730 @@
         /** Holds whether VBoxSVC is currently available. */
         bool  m_fVBoxSVCAvailable;
-
-        UIGuestOSTypeManager *m_pGuestOSTypeManager;
     /** @} */
 
@@ -742 +740 @@
     /** @} */
 
+    /** @name Guest OS type related stuff.
+     * @{ */
+        /** Holds the guest OS type manager instance. */
+        UIGuestOSTypeManager *m_pGuestOSTypeManager;
+    /** @} */
+
     /** @name Media related stuff.
      * @{ */