Changeset 85021 in vbox

Timestamp:

Jul 1, 2020 11:42:30 AM (4 years ago)

Author:

vboxsync

Message:

DnD/HGCM: A bit of work on the protocol version code; don't use guest properties to figure out what protocol to use and rather ask the host service what it supports instead. This also needs proper feature flags support next.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (2 diffs)
• HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1048 +1048 @@
     if (RT_FAILURE(rc))
         return rc;
-
-    /* Set the default protocol version to use. */
+    Assert(pCtx->uClientID);
+
+    /* Set the default protocol version we would like to use. */
     pCtx->uProtocol = 3;
-    Assert(pCtx->uClientID);
 
     /*
@@ -1062 +1062 @@
 
     /*
-     * Check if the host is >= VBox 5.0 which in case supports GUEST_DND_CONNECT.
+     * Try sending the connect message to tell the protocol version to use.
+     * Note: This might fail when the Guest Additions run on an older VBox host (< VBox 5.0) which
+     *       does not implement this command.
      */
-    bool fSupportsConnectReq = false;
+    HGCMMsgConnect Msg;
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_CONNECT, 2);
+    /** @todo Context ID not used yet. */
+    Msg.u.v3.uContext.SetUInt32(0);
+    Msg.u.v3.uProtocol.SetUInt32(pCtx->uProtocol);
+    Msg.u.v3.uFlags.SetUInt32(0); /* Unused at the moment. */
+
+    rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {
-        /* The guest property service might not be available. Not fatal. */
-        uint32_t uGuestPropSvcClientID;
-        rc2 = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
-        if (RT_SUCCESS(rc2))
-        {
-            char *pszHostVersion;
-            rc2 = VbglR3GuestPropReadValueAlloc(uGuestPropSvcClientID, "/VirtualBox/HostInfo/VBoxVer", &pszHostVersion);
-            if (RT_SUCCESS(rc2))
-            {
-                fSupportsConnectReq = RTStrVersionCompare(pszHostVersion, "5.0") >= 0;
-                LogFlowFunc(("pszHostVersion=%s, fSupportsConnectReq=%RTbool\n", pszHostVersion, fSupportsConnectReq));
-                VbglR3GuestPropReadValueFree(pszHostVersion);
-            }
-
-            VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
-        }
-
-        if (RT_FAILURE(rc2))
-            LogFlowFunc(("Retrieving host version failed with rc=%Rrc\n", rc2));
-    }
-
-    if (fSupportsConnectReq)
-    {
-        /*
-         * Try sending the connect message to tell the protocol version to use.
-         * Note: This might fail when the Guest Additions run on an older VBox host (< VBox 5.0) which
-         *       does not implement this command.
-         */
-        HGCMMsgConnect Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_CONNECT, 3);
-        /** @todo Context ID not used yet. */
-        Msg.u.v3.uContext.SetUInt32(0);
-        Msg.u.v3.uProtocol.SetUInt32(pCtx->uProtocol);
-        Msg.u.v3.uFlags.SetUInt32(0); /* Unused at the moment. */
-
-        rc2 = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
-        if (RT_FAILURE(rc2))
-            fSupportsConnectReq = false;
-
-        LogFlowFunc(("Connection request ended with rc=%Rrc\n", rc2));
-    }
-
-    if (fSupportsConnectReq)
-    {
+        /* Set the protocol version we're going to use as told by the host. */
+        rc = Msg.u.v3.uProtocol.GetUInt32(&pCtx->uProtocol); AssertRC(rc);
+
         pCtx->cbMaxChunkSize = _64K; /** @todo Use a scratch buffer on the heap? */
     }
-    else /* GUEST_DND_CONNECT not supported; the user needs to upgrade the host. */
-        rc = VERR_NOT_SUPPORTED;
+    else
+        pCtx->uProtocol = 0; /*  We're using protocol v0 (initial draft) as a fallback. */
+
+    /** @todo Implement protocol feature flags. */
 
     LogFlowFunc(("uClient=%RU32, uProtocol=%RU32, rc=%Rrc\n", pCtx->uClientID, pCtx->uProtocol, rc));

trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

@@ -489 +489 @@
                         rc = HGCMSvcGetU32(&paParms[idxProto + 1], &data.uFlags);
                     if (RT_SUCCESS(rc))
+                    {
+                        unsigned uProtocolVer = 3; /* The protocol version we're going to use. */
+
+                        /* Make sure we're only setting a protocl version we're supporting on the host. */
+                        if (data.uProtocol > uProtocolVer)
+                            data.uProtocol = uProtocolVer;
+
                         pClient->SetProtocolVer(data.uProtocol);
-                    if (RT_SUCCESS(rc))
-                    {
+
+                        /* Return the highest protocol version we're supporting. */
+                        paParms[idxProto].u.uint32 = data.uProtocol;
+
                         LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n", pClient->GetClientID(), pClient->GetProtocolVer()));
                         DO_HOST_CALLBACK();