Changeset 93642 in vbox for trunk/src/VBox

Timestamp:

Feb 7, 2022 2:36:58 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Addendum to r149783. Getting rid of temporary CUanttended instance during OS detection from ISO.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (5 diffs)
• UIWizardNewVM.h (modified) (2 diffs)
• UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
• UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)
• UIWizardNewVMNameOSTypePage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -560 +560 @@
 }
 
-// void UIWizardNewVM::setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData)
-// {
-//     m_unattendedInstallData = unattendedInstallData;
-// }
-
 CMedium &UIWizardNewVM::virtualDisk()
 {
@@ -634 +629 @@
 }
 
-const QString &UIWizardNewVM::detectedOSTypeId() const
-{
-    return m_strDetectedOSTypeId;
-}
-
-void UIWizardNewVM::setDetectedOSTypeId(const QString &strDetectedOSTypeId)
-{
-    m_strDetectedOSTypeId = strDetectedOSTypeId;
+QString UIWizardNewVM::detectedOSTypeId() const
+{
+    AssertReturn(!m_comUnattended.isNull(), QString());
+    return m_comUnattended.GetDetectedOSTypeId();
 }
 
@@ -717 +708 @@
 void UIWizardNewVM::setISOFilePath(const QString &strISOFilePath)
 {
+    /* am I being a paranoid?: */
+    QFileInfo isoFileInfo(strISOFilePath);
+    if (!isoFileInfo.exists())
+        return;
+
     AssertReturnVoid(!m_comUnattended.isNull());
     m_comUnattended.SetIsoPath(strISOFilePath);
@@ -722 +718 @@
     setUnattendedPageVisible(isUnattendedEnabled());
     AssertReturnVoid(checkUnattendedInstallError(m_comUnattended));
+
+    m_comUnattended.DetectIsoOS();
+
+    const QVector<ULONG> &indices = m_comUnattended.GetDetectedImageIndices();
+    QVector<ulong> qIndices;
+    for (int i = 0; i < indices.size(); ++i)
+        qIndices << indices[i];
+    setDetectedWindowsImageNamesAndIndices(m_comUnattended.GetDetectedImageNames(), qIndices);
 }
 
@@ -929 +933 @@
 bool UIWizardNewVM::isOSTypeDetectionOK() const
 {
-    if (m_strDetectedOSTypeId.isEmpty())
+    QString strDetectedOSTypeId = detectedOSTypeId();
+    if (strDetectedOSTypeId.isEmpty())
         return false;
-    if (m_strDetectedOSTypeId.contains("other", Qt::CaseInsensitive))
+    if (strDetectedOSTypeId.contains("other", Qt::CaseInsensitive))
         return false;
     return true;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -83 +83 @@
         void setCreatedMachineFolder(const QString &strCreatedMachineFolder);
 
-        const QString &detectedOSTypeId() const;
-        void setDetectedOSTypeId(const QString &strDetectedOSTypeId);
+        QString detectedOSTypeId() const;
 
         const QString &guestOSFamilyId() const;
@@ -198 +197 @@
        QString m_strMachineBaseName;
 
-       /** Type Id od the OS detected from the ISO file by IUnattended. */
-       QString m_strDetectedOSTypeId;
        /* Name and index lists of the images detected from an ISO. Currently only for Windows ISOs. */
        QVector<QString> m_detectedWindowsImageNames;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -148 +148 @@
     AssertReturnVoid(pWizard);
 
-    UIWizardNewVMNameOSTypeCommon::detectOSAndImagesFromISO(strISOPath, pWizard);
+    pWizard->setISOFilePath(strISOPath);
 
     if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
@@ -154 +154 @@
     else /* Remove GuestOSTypeFromISO from the set if it is there: */
         m_userModifiedParameters.remove("GuestOSTypeFromISO");
-
-    pWizard->setISOFilePath(strISOPath);
 
     /* Update the global recent ISO path: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -311 +311 @@
 }
 
-void UIWizardNewVMNameOSTypeCommon::detectOSAndImagesFromISO(const QString &strISOPath, UIWizardNewVM *pWizard)
-{
-    if (!pWizard)
-        return;
-
-    QFileInfo isoFileInfo(strISOPath);
-    if (!isoFileInfo.exists())
-    {
-        pWizard->setDetectedOSTypeId(QString());
-        return;
-    }
-
-    CUnattended comUnatteded = uiCommon().virtualBox().CreateUnattendedInstaller();
-    comUnatteded.SetIsoPath(strISOPath);
-    comUnatteded.DetectIsoOS();
-    pWizard->setDetectedOSTypeId(comUnatteded.GetDetectedOSTypeId());
-
-    const QVector<ULONG> &indices = comUnatteded.GetDetectedImageIndices();
-    QVector<ulong> qIndices;
-    for (int i = 0; i < indices.size(); ++i)
-        qIndices << indices[i];
-    pWizard->setDetectedWindowsImageNamesAndIndices(comUnatteded.GetDetectedImageNames(), qIndices);
-}
-
 bool UIWizardNewVMNameOSTypeCommon::checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor)
 {
@@ -486 +462 @@
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(this->wizard());
     AssertReturnVoid(pWizard);
-    UIWizardNewVMNameOSTypeCommon::detectOSAndImagesFromISO(strPath, pWizard);
+
+    pWizard->setISOFilePath(strPath);
 
     if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
@@ -492 +469 @@
     else /* Remove GuestOSTypeFromISO fromthe set if it is there: */
         m_userModifiedParameters.remove("GuestOSTypeFromISO");
-
-    pWizard->setISOFilePath(strPath);
 
     /* Update the global recent ISO path: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h

@@ -43 +43 @@
     bool cleanupMachineFolder(UIWizardNewVM *pWizard, bool fWizardCancel = false);
     void composeMachineFilePath(UINameAndSystemEditor *pNameAndSystemEditor, UIWizardNewVM *pWizard);
-    void detectOSAndImagesFromISO(const QString &strISOPath, UIWizardNewVM *pWizard);
     /** Return false if ISO path is not empty but points to an missing or unreadable file. */
     bool checkISOFile(UINameAndSystemEditor *pNameAndSystemEditor);