Changeset 31282 in vbox for trunk

Timestamp:

Aug 2, 2010 11:08:29 AM (15 years ago)

Author:

vboxsync

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

64309

Message:

Some fixes for Guest Additions version lookup.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -468 +468 @@
             VBoxGlobal::tr ("Disabled", "details report (Nested Paging)");
         QString addVersionStr = console.GetGuest().GetAdditionsVersion();
+        if (addVersionStr.isEmpty())
+        {
+            /*
+             * If we got back an empty string from GetAdditionsVersion() we either
+             * really don't have the Guest Additions version yet or the guest is running
+             * older Guest Additions (< 3.2.0) which don't provide VMMDevReq_ReportGuestInfo2,
+             * so get the version + revision from the (hopefully) provided guest properties
+             * instead.
+             */
+            QString addVersion = m.GetGuestPropertyValue("/VirtualBox/GuestAdd/Version");
+            QString addRevision = m.GetGuestPropertyValue("/VirtualBox/GuestAdd/Revision");
+            if (!addVersion.isEmpty() && !addRevision.isEmpty())
+            {
+                /* Some Guest Additions versions had interchanged version + revision values,
+                 * so check if the version value at least has a dot to identify it and change
+                 * both values to reflect the right content. */
+                if (!addVersion.contains("."))
+                {
+                    QString addTemp = addVersion;
+                    addVersion = addRevision;
+                    addRevision = addTemp;
+                }
+
+                addVersionStr = addVersion
+                              + "r"
+                              + addRevision;
+            }
+        }
         if (addVersionStr.isEmpty())
             addVersionStr = tr ("Not Detected", "guest additions");

trunk/src/VBox/Main/GuestImpl.cpp

@@ -1493 +1493 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mData.mAdditionsVersion = aAdditionsVersion;
+    if (!aVersionName.isEmpty())
+        mData.mAdditionsVersion = aAdditionsVersion + " " + aVersionName;
+    else
+        mData.mAdditionsVersion = aAdditionsVersion;
 }