Changeset 85021 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 1, 2020 11:42:30 AM (5 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.

File:

• trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (1 diff)

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();