Changeset 90401 in vbox for trunk/src

Timestamp:

Jul 29, 2021 10:36:20 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Restoring disk creation stuff.

Location:

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

Files:

• editors/UIWizardDiskEditors.cpp (modified) (2 diffs)
• editors/UIWizardDiskEditors.h (modified) (1 diff)
• newvd/UIWizardNewVD.cpp (modified) (1 diff)
• newvd/UIWizardNewVD.h (modified) (2 diffs)
• newvd/UIWizardNewVDPageSizeLocation.cpp (modified) (1 diff)
• newvm/UIWizardNewVMDiskPageBasic.cpp (modified) (2 diffs)
• newvm/UIWizardNewVMDiskPageBasic.h (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -42 +42 @@
 /* Other VBox includes: */
 #include "iprt/assert.h"
+#include "iprt/fs.h"
 #include "CSystemProperties.h"
 
@@ -108 +109 @@
     return QString();
 }
+
+/* static */
+bool UIDiskEditorGroupBox::checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize)
+{
+    /* If the hard disk is split into 2GB parts then no need to make further checks: */
+    if (uVariant & KMediumVariant_VmdkSplit2G)
+        return true;
+    RTFSTYPE enmType;
+    int rc = RTFsQueryType(QFileInfo(strMediumPath).absolutePath().toLatin1().constData(), &enmType);
+    if (RT_SUCCESS(rc))
+    {
+        if (enmType == RTFSTYPE_FAT)
+        {
+            /* Limit the medium size to 4GB. minus 128 MB for file overhead: */
+            qulonglong fatLimit = _4G - _128M;
+            if (uSize >= fatLimit)
+                return false;
+        }
+    }
+    return true;
+}
+
 
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -61 +61 @@
     static QString constructMediumFilePath(const QString &strFileName, const QString &strPath);
     static QString defaultExtensionForMediumFormat(const CMediumFormat &mediumFormatRef);
+    static bool checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -129 +129 @@
     // const QString strMediumPath = field("mediumPath").toString();
     // const qulonglong uSize = field("mediumSize").toULongLong();
-    // /* Check attributes: */
-    // AssertReturn(!strMediumPath.isNull(), false);
-    // AssertReturn(uSize > 0, false);
+    /* Check attributes: */
+    AssertReturn(!m_strMediumPath.isNull(), false);
+    AssertReturn(m_uMediumSize > 0, false);
 
-    // /* Get VBox object: */
-    // CVirtualBox comVBox = uiCommon().virtualBox();
+    /* Get VBox object: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
 
-    // /* Create new virtual disk image: */
-    // CMedium comVirtualDisk = comVBox.CreateMedium(comMediumFormat.GetName(), strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
-    // if (!comVBox.isOk())
-    // {
-    //     msgCenter().cannotCreateMediumStorage(comVBox, strMediumPath, this);
-    //     return false;
-    // }
+    /* Create new virtual disk image: */
+    CMedium comVirtualDisk = comVBox.CreateMedium(m_comMediumFormat.GetName(),
+                                                  m_strMediumPath, KAccessMode_ReadWrite, KDeviceType_HardDisk);
+    if (!comVBox.isOk())
+    {
+        msgCenter().cannotCreateMediumStorage(comVBox, m_strMediumPath, this);
+        return false;
+    }
 
-    // /* Compose medium-variant: */
-    // QVector<KMediumVariant> variants(sizeof(qulonglong) * 8);
-    // for (int i = 0; i < variants.size(); ++i)
-    // {
-    //     qulonglong temp = uVariant;
-    //     temp &= Q_UINT64_C(1) << i;
-    //     variants[i] = (KMediumVariant)temp;
-    // }
+    /* Compose medium-variant: */
+    QVector<KMediumVariant> variants(sizeof(qulonglong) * 8);
+    for (int i = 0; i < variants.size(); ++i)
+    {
+        qulonglong temp = m_uMediumVariant;
+        temp &= Q_UINT64_C(1) << i;
+        variants[i] = (KMediumVariant)temp;
+    }
 
-    // /* Copy medium: */
-    // UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk,
-    //                                                                                            uSize,
-    //                                                                                            variants);
-    // connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
-    //         &uiCommon(), &UICommon::sltHandleMediumCreated);
-    // notificationCenter().append(pNotification);
+    /* Copy medium: */
+    UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk,
+                                                                                               m_uMediumSize,
+                                                                                               variants);
+    connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
+            &uiCommon(), &UICommon::sltHandleMediumCreated);
+    notificationCenter().append(pNotification);
 
     /* Positive: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

@@ -50 +50 @@
                   qulonglong uDefaultSize, WizardMode mode = WizardMode_Auto);
 
+    bool createVirtualDisk();
 
     qulonglong mediumVariant() const;
@@ -64 +65 @@
 
 protected:
-
-    /* Creates virtual-disk: */
-    bool createVirtualDisk();
 
     virtual void populatePages() /* final override */;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageSizeLocation.cpp

@@ -396 +396 @@
 bool UIWizardNewVDPageSizeLocation::validatePage()
 {
-    /* Initial result: */
     bool fResult = true;
-
-    // /* Make sure such file doesn't exist already: */
-    // const QString strMediumPath(mediumPath());
-    // fResult = !QFileInfo(strMediumPath).exists();
-    // if (!fResult)
-    // {
-    //     msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
-    //     return fResult;
-    // }
-
-    // /* Make sure we are passing FAT size limitation: */
-    // fResult = checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
-    //                                  fieldImp("mediumPath").toString(),
-    //                                  fieldImp("mediumSize").toULongLong());
-    // if (!fResult)
-    // {
-    //     msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
-    //     return fResult;
-    // }
+    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
+    AssertReturn(pWizard, false);
+    /* Make sure such file doesn't exist already: */
+    const QString strMediumPath(pWizard->mediumPath());
+    fResult = !QFileInfo(strMediumPath).exists();
+    if (!fResult)
+    {
+        msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
+        return fResult;
+    }
+
+    /* Make sure we are passing FAT size limitation: */
+    fResult = UIDiskEditorGroupBox::checkFATSizeLimitation(pWizard->mediumVariant(),
+                                     pWizard->mediumPath(),
+                                     pWizard->mediumSize());
+    if (!fResult)
+    {
+        msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
+        return fResult;
+    }
 
     // /* Lock finish button: */
     // startProcessing();
-    // /* Try to create virtual-disk: */
-    // fResult = qobject_cast<UIWizardNewVD*>(wizard())->createVirtualDisk();
+    /* Try to create virtual-disk: */
+    fResult = pWizard->createVirtualDisk();
     // /* Unlock finish button: */
     // endProcessing();

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

@@ -62 +62 @@
         return QUuid();
     return uMediumId;
-}
-
-bool UIWizardNewVMDiskPage::checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize)
-{
-    /* If the hard disk is split into 2GB parts then no need to make further checks: */
-    if (uVariant & KMediumVariant_VmdkSplit2G)
-        return true;
-
-    RTFSTYPE enmType;
-    int rc = RTFsQueryType(QFileInfo(strMediumPath).absolutePath().toLatin1().constData(), &enmType);
-    if (RT_SUCCESS(rc))
-    {
-        if (enmType == RTFSTYPE_FAT)
-        {
-            /* Limit the medium size to 4GB. minus 128 MB for file overhead: */
-            qulonglong fatLimit = _4G - _128M;
-            if (uSize >= fatLimit)
-                return false;
-        }
-    }
-
-    return true;
 }
 
@@ -458 +436 @@
         }
         /* Check FAT size limitation of the host hard drive: */
-        fResult = UIWizardNewVMDiskPage::checkFATSizeLimitation(pWizard->mediumVariant(),
+        fResult = UIDiskEditorGroupBox::checkFATSizeLimitation(pWizard->mediumVariant(),
                                                                 strMediumPath,
                                                                 pWizard->mediumSize());

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

@@ -59 +59 @@
                                 const QString &strMachineBaseName,
                                 QWidget *pCaller);
-    bool checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize);
     QString selectNewMediumLocation(UIWizardNewVM *pWizard);
 }

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

@@ -622 +622 @@
         qulonglong uVariant = pWizard->mediumVariant();
         /* Check FAT size limitation of the host hard drive: */
-        fResult =  UIWizardNewVMDiskPage::checkFATSizeLimitation(uVariant, strMediumPath, uSize);
+        fResult =  UIDiskEditorGroupBox::checkFATSizeLimitation(uVariant, strMediumPath, uSize);
         if (!fResult)
         {