Changeset 85714 in vbox for trunk/src/VBox/HostServices/DragAndDrop

Timestamp:

Aug 12, 2020 12:40:56 PM (5 years ago)

Author:

vboxsync

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

139858

Message:

HGCM / DnD: Removed the protocol version from the generic HGCM client implementation and integrated it into the DnD host service instead (for keeping backwards compatibility).

File:

• trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (10 diffs)

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

@@ -53 +53 @@
     DragAndDropClient(uint32_t idClient)
         : HGCM::Client(idClient)
+        , uProtocolVerDeprecated(0)
         , fGuestFeatures0(VBOX_DND_GF_NONE)
         , fGuestFeatures1(VBOX_DND_GF_NONE)
@@ -70 +71 @@
 public:
 
+    /** Protocol version used by this client.
+     *  Deprecated; only used for keeping backwards compatibility. */
+    uint32_t                uProtocolVerDeprecated;
     /** Guest feature flags, VBOX_DND_GF_0_XXX. */
     uint64_t                fGuestFeatures0;
@@ -531 +535 @@
     if (rc == VINF_SUCCESS) /* Note: rc might be VINF_HGCM_ASYNC_EXECUTE! */
     {
-        LogFlowFunc(("Client %RU32: Protocol v%RU32\n", pClient->GetClientID(), pClient->GetProtocolVer()));
-
         rc = VERR_INVALID_PARAMETER; /* Play safe by default. */
 
         /* Whether the client's advertised protocol sends context IDs with commands. */
-        const bool fHasCtxID = pClient->GetProtocolVer() >= 3;
+        const bool fHasCtxID = pClient->uProtocolVerDeprecated >= 3;
 
         /* Current parameter index to process. */
@@ -619 +621 @@
                     data.uProtocol = uProtocolVer;
 
-                pClient->SetProtocolVer(data.uProtocol);
+                pClient->uProtocolVerDeprecated = data.uProtocol;
 
                 /* Return the highest protocol version we're supporting. */
@@ -626 +628 @@
                 paParms[idxParm - 1].u.uint32 = data.uProtocol;
 
-                LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n", pClient->GetClientID(), pClient->GetProtocolVer()));
+                LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n",
+                             pClient->GetClientID(), pClient->uProtocolVerDeprecated));
 
                 DO_HOST_CALLBACK();
@@ -668 +671 @@
                 data.hdr.uMagic = CB_MAGIC_DND_HG_REQ_DATA;
 
-                switch (pClient->GetProtocolVer())
+                switch (pClient->uProtocolVerDeprecated)
                 {
                     case 3:
@@ -724 +727 @@
                 data.hdr.uMagic = CB_MAGIC_DND_GH_ACK_PENDING;
 
-                switch (pClient->GetProtocolVer())
+                switch (pClient->uProtocolVerDeprecated)
                 {
                     case 3:
@@ -798 +801 @@
                 LogFlowFunc(("GUEST_DND_GH_SND_DATA\n"));
 
-                switch (pClient->GetProtocolVer())
+                switch (pClient->uProtocolVerDeprecated)
                 {
                     case 3:
@@ -889 +892 @@
                 LogFlowFunc(("GUEST_DND_GH_SND_FILE_DATA\n"));
 
-                switch (pClient->GetProtocolVer())
+                switch (pClient->uProtocolVerDeprecated)
                 {
                     /* Protocol v3 adds (optional) checksums. */
@@ -1097 +1100 @@
                 int rc2 = pClient->SetDeferredMsgInfo(HOST_DND_CANCEL,
                                                       /* Protocol v3+ also contains the context ID. */
-                                                      pClient->GetProtocolVer() >= 3 ? 1 : 0);
+                                                      pClient->uProtocolVerDeprecated >= 3 ? 1 : 0);
                 pClient->CompleteDeferred(rc2);