Changeset 107119 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 22, 2024 1:04:52 PM (8 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. A missing check for the uniqueness of the guest machine folder has been added.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (3 diffs)
• settings/editors/UINameAndSystemEditor.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QComboBox>
+#include <QDir>
 #include <QGridLayout>
 #include <QLabel>
@@ -167 +168 @@
 }
 
+QString UINameAndSystemEditor::fullPath() const
+{
+    QDir dir(path());
+    QString strFullPath = dir.filePath(name());
+    return QDir::cleanPath(strFullPath);
+}
+
 void UINameAndSystemEditor::setISOImagePath(const QString &strPath)
 {
@@ -234 +242 @@
 }
 
-void UINameAndSystemEditor::markNameEditor(bool fError)
+void UINameAndSystemEditor::markNameEditor(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage)
 {
     if (m_pEditorName)
-        m_pEditorName->mark(fError, tr("Invalid guest machine name"), tr("Guest machine name is valid"));
+        m_pEditorName->mark(fError, strErrorMessage, strNoErrorMessage);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h

@@ -109 +109 @@
     /** Defines the VM @a strPath. */
     void setPath(const QString &strPath);
-    /** Returns path string selected by the user. */
+    /** Returns path string selected by the user. This does not include name().*/
     QString path() const;
+    /** Returns path and name joined and cleaned. */
+    QString fullPath() const;
 
     /** Sets image path. */
@@ -127 +129 @@
 
     /** Passes the @p fError to QILineEdit::mark(bool) effectively marking it for error. */
-    void markNameEditor(bool fError);
+    void markNameEditor(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage);
     /** Passes the @p fError and @a strErrorMessage to UIFilePathSelector::mark(bool)
       *  effectively changing the background color and error-text. */

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

@@ -287 +287 @@
             if (!comHDDController.isNull())
             {
-                LONG uPortNumber = portNumberForDevice(comHDDController);
-                machine.AttachDevice(comHDDController.GetName(), uPortNumber, 0, KDeviceType_HardDisk, m_virtualDisk);
-                if (!machine.isOk())
-                    UINotificationMessage::cannotAttachDevice(machine, UIMediumDeviceType_HardDisk, m_strMediumPath,
-                                                              StorageSlot(enmHDDBus, uPortNumber, 0), notificationCenter());
+                LONG iPortNumber = portNumberForDevice(comHDDController);
+                if (iPortNumber != -1)
+                {
+                    machine.AttachDevice(comHDDController.GetName(), iPortNumber, 0, KDeviceType_HardDisk, m_virtualDisk);
+                    if (!machine.isOk())
+                        UINotificationMessage::cannotAttachDevice(machine, UIMediumDeviceType_HardDisk, m_strMediumPath,
+                                                                  StorageSlot(enmHDDBus, iPortNumber, 0), notificationCenter());
+                }
             }
         }
@@ -319 +322 @@
                     UINotificationMessage::cannotOpenMedium(vbox, strISOFilePath, notificationCenter());
             }
-            LONG uPortNumber = portNumberForDevice(comDVDController);
-            machine.AttachDevice(comDVDController.GetName(), uPortNumber, 0, KDeviceType_DVD, opticalDisk);
-            if (!machine.isOk())
-                UINotificationMessage::cannotAttachDevice(machine, UIMediumDeviceType_DVD, QString(),
-                                                          StorageSlot(enmDVDBus, 1, 0), notificationCenter());
+            LONG iPortNumber = portNumberForDevice(comDVDController);
+            if (iPortNumber != -1)
+            {
+                machine.AttachDevice(comDVDController.GetName(), iPortNumber, 0, KDeviceType_DVD, opticalDisk);
+                if (!machine.isOk())
+                    UINotificationMessage::cannotAttachDevice(machine, UIMediumDeviceType_DVD, QString(),
+                                                              StorageSlot(enmDVDBus, 1, 0), notificationCenter());
+            }
         }
         /* Save machine settings here because  portNumberForDevice needs to inquiry port attachments of the controller: */
@@ -865 +871 @@
     }
 
-
     if (!comController.isOk())
     {

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

@@ -468 +468 @@
     if (m_pNameAndSystemEditor)
     {
-        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty());
+        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty(),
+                                               tr("Guest machine name cannot be empty"), tr("Guest machine name is valid"));
         m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor),
                                                 UIWizardNewVM::tr("Invalid file path or unreadable file"),
                                                 UIWizardNewVM::tr("File path is valid"));
+        m_pNameAndSystemEditor->markNameEditor((QDir(m_pNameAndSystemEditor->fullPath()).exists()),
+                                               tr("Guest machine path is not unique"), tr("Guest machine name is valid"));
     }
     UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
@@ -629 +632 @@
                                          UIIconPool::iconSet(":/status_error_16px.png"),
                                          UIWizardNewVM::tr("Invalid ISO file"));
+            fIsComplete = false;
+        }
+        if (QDir(m_pNameAndSystemEditor->fullPath()).exists())
+        {
+            m_pToolBox->setPageTitleIcon(ExpertToolboxItems_NameAndOSType,
+                                         UIIconPool::iconSet(":/status_error_16px.png"),
+                                         UIWizardNewVM::tr("Guest machine path is not unique"));
             fIsComplete = false;
         }

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

@@ -523 +523 @@
     if (m_pNameAndSystemEditor->name().isEmpty())
         return false;
+    if (QDir(m_pNameAndSystemEditor->fullPath()).exists())
+        return false;
     return UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor);
 }
@@ -766 +768 @@
     if (m_pNameAndSystemEditor)
     {
-        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty());
+        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty(),
+                                               tr("Guest machine name cannot be empty"), tr("Guest machine name is valid"));
+        m_pNameAndSystemEditor->markNameEditor((QDir(m_pNameAndSystemEditor->fullPath()).exists()),
+                                               tr("Guest machine path is not unique"), tr("Guest machine name is valid"));
         m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor),
                                                 UIWizardNewVM::tr("Invalid file path or unreadable file"),