Changeset 39898 in vbox

Timestamp:

Jan 27, 2012 3:27:29 PM (13 years ago)

Author:

vboxsync

Message:

GuestImpl.cpp: Work around the version/revision mixup bug in the 3.1.0 guest additions. (just happened to be installed in a vm I was running...)

File:

• trunk/src/VBox/Main/src-client/GuestImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -219 +219 @@
             /*
              * If we're running older guest additions (< 3.2.0) try get it from
-             * the guest properties.
+             * the guest properties.  Detected switched around Version and
+             * Revision in early 3.1.x releases (see r57115).
              */
             ComPtr<IMachine> ptrMachine = mParent->machine();
@@ -226 +227 @@
             Bstr bstr;
             hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Version").raw(), bstr.asOutParam());
+            if (SUCCEEDED(hrc))
+            {
+                Utf8Str str(bstr);
+                if (str.count('.') == 0)
+                    hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Revision").raw(), bstr.asOutParam());
+                str = bstr;
+                if (str.count('.') != 2)
+                    hrc = E_FAIL;
+            }
+
             if (SUCCEEDED(hrc))
                 bstr.detachTo(a_pbstrAdditionsVersion);
@@ -260 +271 @@
             /*
              * If we're running older guest additions (< 3.2.0) try get it from
-             * the guest properties.
+             * the guest properties. Detected switched around Version and
+             * Revision in early 3.1.x releases (see r57115).
              */
             ComPtr<IMachine> ptrMachine = mParent->machine();
@@ -272 +284 @@
                 uint32_t uRevision;
                 int vrc = RTStrToUInt32Full(str.c_str(), 0, &uRevision);
+                if (vrc != VINF_SUCCESS && str.count('.') == 2)
+                {
+                    hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Version").raw(), bstr.asOutParam());
+                    if (SUCCEEDED(hrc))
+                    {
+                        str = bstr;
+                        vrc = RTStrToUInt32Full(str.c_str(), 0, &uRevision);
+                    }
+                }
                 if (vrc == VINF_SUCCESS)
                     *a_puAdditionsRevision = uRevision;
@@ -281 +302 @@
                 /* Return 0 if we don't know. */
                 *a_puAdditionsRevision = 0;
-                hrc = 0;
+                hrc = S_OK;
             }
         }