Changeset 33492 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 27, 2010 11:05:14 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67084

Message:

Guest Copy/Guest Additions: Update.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (2 diffs)
• globals/VBoxProblemReporter.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)

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

@@ -2381 +2381 @@
 }
 
-void VBoxProblemReporter::warnAboutIncorrectPort(QWidget *pParent) const
+void VBoxProblemReporter::cannotUpdateGuestAdditions (const CProgress &aProgress, QWidget *aParent /* = NULL */) const
+{
+    AssertWrapperOk (aProgress);
+
+    message (aParent ? aParent : mainWindowShown(),
+             Error,
+             tr ("Failed to update Guest Additions."),
+             formatErrorInfo (aProgress.GetErrorInfo()));
+}
+
+void VBoxProblemReporter::warnAboutIncorrectPort (QWidget *pParent) const
 {
     message(pParent, Error,
@@ -2388 +2398 @@
 }
 
-bool VBoxProblemReporter::confirmCancelingPortForwardingDialog(QWidget *pParent) const
+bool VBoxProblemReporter::confirmCancelingPortForwardingDialog (QWidget *pParent) const
 {
     return messageOkCancel(pParent, Question,

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

@@ -372 +372 @@
     void cannotExportAppliance (const CProgress &aProgress, CAppliance *aAppliance, QWidget *aParent = NULL) const;
 
+    void cannotUpdateGuestAdditions (const CProgress &aProgress, QWidget *aParent /* = NULL */) const;
+
     void warnAboutIncorrectPort(QWidget *pParent) const;
     bool confirmCancelingPortForwardingDialog(QWidget *pParent) const;

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

@@ -355 +355 @@
     CMachine machine = session().GetMachine();
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    QString strUuid;
-
-    CMedium image = vbox.FindMedium(strSource, KDeviceType_DVD);
-    if (image.isNull())
-    {
-        image = vbox.OpenMedium(strSource, KDeviceType_DVD, KAccessMode_ReadWrite);
-        if (vbox.isOk())
+
+#ifdef DEBUG_andy
+    /*
+     * If the already installed Guest Additions indicate a
+     * high enough run level (at the moment this is level "Desktop",
+     * which means that a user has to be logged in to acknowledge
+     * WHQL popups), try an automatic Guest Additions update.
+     */
+    CGuest guest = session().GetConsole().GetGuest();
+    QString osType = guest.GetOSTypeId();
+    ULONG ulGuestAdditionsRunLevel = guest.GetAdditionsRunLevel();
+    if (   ulGuestAdditionsRunLevel >= AdditionsRunLevelType_System // Desktop
+#if 1  /* Only Windows is supported at the moment! */
+        && (   osType.contains("Microsoft", Qt::CaseInsensitive)
+            || osType.contains("Windows", Qt::CaseInsensitive)
+           )
+#endif
+       )
+    {
+#ifdef DEBUG_andy
+        CProgress progressInstall = guest.UpdateGuestAdditions("c:\\Downloads\\VBoxGuestAdditions_3.2.8.iso");
+#else
+        CProgress progressInstall = guest.UpdateGuestAdditions(strSource);
+#endif
+#if 0
+        bool fResult = guest.isOk();
+        if (fResult)
+        {
+            vboxProblem().showModalProgressDialog(progressInstall, tr("Updating Guest Additions ..."), mainMachineWindow());
+            if (progressInstall.GetCanceled())
+                return;
+            if (!progressInstall.isOk() || progressInstall.GetResultCode() != 0)
+            {
+                vboxProblem().cannotUpdateGuestAdditions(progressInstall, mainMachineWindow());
+                return;
+            }
+        }
+#endif
+    }
+    else /* Fallback to only mounting the .ISO file. */
+    {
+#endif /* DEBUG_andy */
+        QString strUuid;
+        CMedium image = vbox.FindMedium(strSource, KDeviceType_DVD);
+        if (image.isNull())
+        {
+            image = vbox.OpenMedium(strSource, KDeviceType_DVD, KAccessMode_ReadWrite);
+            if (vbox.isOk())
+                strUuid = image.GetId();
+        }
+        else
             strUuid = image.GetId();
-    }
-    else
-        strUuid = image.GetId();
-
-    if (!vbox.isOk())
-    {
-        vboxProblem().cannotOpenMedium(0, vbox, VBoxDefs::MediumType_DVD, strSource);
-        return;
-    }
-
-    AssertMsg(!strUuid.isNull(), ("Guest Additions image UUID should be valid!\n"));
-
-    QString strCntName;
-    LONG iCntPort = -1, iCntDevice = -1;
-    /* Searching for the first suitable slot */
-    {
-        CStorageControllerVector controllers = machine.GetStorageControllers();
-        int i = 0;
-        while (i < controllers.size() && strCntName.isNull())
-        {
-            CStorageController controller = controllers[i];
-            CMediumAttachmentVector attachments = machine.GetMediumAttachmentsOfController(controller.GetName());
-            int j = 0;
-            while (j < attachments.size() && strCntName.isNull())
+
+        if (!vbox.isOk())
+        {
+            vboxProblem().cannotOpenMedium(0, vbox, VBoxDefs::MediumType_DVD, strSource);
+            return;
+        }
+
+        AssertMsg(!strUuid.isNull(), ("Guest Additions image UUID should be valid!\n"));
+
+        QString strCntName;
+        LONG iCntPort = -1, iCntDevice = -1;
+        /* Searching for the first suitable slot */
+        {
+            CStorageControllerVector controllers = machine.GetStorageControllers();
+            int i = 0;
+            while (i < controllers.size() && strCntName.isNull())
             {
-                CMediumAttachment attachment = attachments[j];
-                if (attachment.GetType() == KDeviceType_DVD)
+                CStorageController controller = controllers[i];
+                CMediumAttachmentVector attachments = machine.GetMediumAttachmentsOfController(controller.GetName());
+                int j = 0;
+                while (j < attachments.size() && strCntName.isNull())
                 {
-                    strCntName = controller.GetName();
-                    iCntPort = attachment.GetPort();
-                    iCntDevice = attachment.GetDevice();
+                    CMediumAttachment attachment = attachments[j];
+                    if (attachment.GetType() == KDeviceType_DVD)
+                    {
+                        strCntName = controller.GetName();
+                        iCntPort = attachment.GetPort();
+                        iCntDevice = attachment.GetDevice();
+                    }
+                    ++ j;
                 }
-                ++ j;
+                ++ i;
             }
-            ++ i;
-        }
-    }
-
-    if (!strCntName.isNull())
-    {
-        bool fIsMounted = false;
-
-        VBoxMedium vmedium = vboxGlobal().findMedium(strUuid);
-        CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
-
-        /* Mount medium to the predefined port/device */
-        machine.MountMedium(strCntName, iCntPort, iCntDevice, medium, false /* force */);
-        if (machine.isOk())
-            fIsMounted = true;
+        }
+
+        if (!strCntName.isNull())
+        {
+            bool fIsMounted = false;
+
+            VBoxMedium vmedium = vboxGlobal().findMedium(strUuid);
+            CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
+
+            /* Mount medium to the predefined port/device */
+            machine.MountMedium(strCntName, iCntPort, iCntDevice, medium, false /* force */);
+            if (machine.isOk())
+                fIsMounted = true;
+            else
+            {
+                /* Ask for force mounting */
+                if (vboxProblem().cannotRemountMedium(0, machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
+                                                      true /* mount? */, true /* retry? */) == QIMessageBox::Ok)
+                {
+                    /* Force mount medium to the predefined port/device */
+                    machine.MountMedium(strCntName, iCntPort, iCntDevice, medium, true /* force */);
+                    if (machine.isOk())
+                        fIsMounted = true;
+                    else
+                        vboxProblem().cannotRemountMedium(0, machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
+                                                          true /* mount? */, false /* retry? */);
+                }
+            }
+        }
         else
-        {
-            /* Ask for force mounting */
-            if (vboxProblem().cannotRemountMedium(0, machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
-                                                  true /* mount? */, true /* retry? */) == QIMessageBox::Ok)
-            {
-                /* Force mount medium to the predefined port/device */
-                machine.MountMedium(strCntName, iCntPort, iCntDevice, medium, true /* force */);
-                if (machine.isOk())
-                    fIsMounted = true;
-                else
-                    vboxProblem().cannotRemountMedium(0, machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
-                                                      true /* mount? */, false /* retry? */);
-            }
-        }
-    }
-    else
-        vboxProblem().cannotMountGuestAdditions(machine.GetName());
+            vboxProblem().cannotMountGuestAdditions(machine.GetName());
+#ifdef DEBUG_andy
+    }
+#endif /* DEBUG_andy */
 }