Changeset 32180 in vbox

Timestamp:

Sep 1, 2010 2:47:33 PM (14 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: fixed compatibility with VBox 3.2 hosts

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp

@@ -41 +41 @@
      *            first in order to accept all other VMMDev messages! Otherwise you'd get
      *            a VERR_NOT_SUPPORTED error.
+     *
+     * VBox version <= 3.2: VMMDevReportGuestInfo must always come first.
      */
     VMMDevReportGuestInfo2 *pReq = NULL;
+    VMMDevReportGuestInfo *pReq3 = NULL;
     int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof (VMMDevReportGuestInfo2), VMMDevReq_ReportGuestInfo2);
     Log(("VBoxGuestReportGuestInfo: VbglGRAlloc VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
@@ -53 +56 @@
         pReq->guestInfo.additionsFeatures = 0; /* Not (never?) used. */
         RTStrCopy(pReq->guestInfo.szName, sizeof(pReq->guestInfo.szName), VBOX_VERSION_STRING);
-
-        rc = VbglGRPerform(&pReq->header);
-        Log(("VBoxGuestReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
-        if (rc == VERR_NOT_IMPLEMENTED) /* Compatibility with older hosts. */
-            rc = VINF_SUCCESS;
-        VbglGRFree(&pReq->header);
-    }
-
-    /*
-     * VMMDevReportGuestInfo acts as a beacon and signals the host that all guest information is
-     * now complete.  So always send this report last!
-     */
-    if (RT_SUCCESS(rc))
-    {
-        VMMDevReportGuestInfo *pReq3 = NULL;
+        
         rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq3, sizeof (VMMDevReportGuestInfo), VMMDevReq_ReportGuestInfo);
         Log(("VBoxGuestReportGuestInfo: VbglGRAlloc VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
@@ -75 +64 @@
             pReq3->guestInfo.osType = enmOSType;
 
-            rc = VbglGRPerform(&pReq3->header);
-            Log(("VBoxGuestReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
+            rc = VbglGRPerform(&pReq->header);
+            Log(("VBoxGuestReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
+            if (rc == VERR_NOT_IMPLEMENTED)
+            {
+                /* Compatibility with pre VBox-3.2 hosts -- VMMDevReportGuestInfo2 not implemented. */
+                rc = VINF_SUCCESS;
+            }
+            if (rc == VERR_NOT_SUPPORTED)
+            {
+                /* Compatibility with VBox 3.2 hosts:
+                 * They rely on sending VMMDevReportGuestInfo as the very first request */
+                rc = VbglGRPerform(&pReq3->header);
+                Log(("VBoxGuestReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
+                rc = VbglGRPerform(&pReq->header);
+                Log(("VBoxGuestReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
+            }
+            else
+            {
+                /*
+                 * Hosts newer than VBox 3.2:
+                 * VMMDevReportGuestInfo acts as a beacon and signals the host that all
+                 * guest information is now complete. So always send this report last!
+                 */
+                rc = VbglGRPerform(&pReq3->header);
+                Log(("VBoxGuestReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
+            }
             VbglGRFree(&pReq3->header);
         }
+        VbglGRFree(&pReq->header);
     }