Changeset 87640 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

Timestamp:

Feb 8, 2021 3:57:38 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Cleaned up guest feature flag handling in VbglR3ClipboardConnectEx().

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (4 diffs)

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

@@ -99 +99 @@
      */
     pCtx->idClient              = 0;
+    pCtx->fGuestFeatures        = fGuestFeatures;
     pCtx->fHostFeatures         = 0;
     pCtx->fGuestFeatures        = VBOX_SHCL_GF_NONE;
@@ -107 +108 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
     /* Indicate that this guest supports Shared Clipboard file transfers. */
-    pCtx->fGuestFeatures       |= VBOX_SHCL_GF_0_TRANSFERS;
+    pCtx->fGuestFeatures |= VBOX_SHCL_GF_0_TRANSFERS;
 # ifdef RT_OS_WINDOWS
     /* Indicate that on Windows guest OSes we have our own IDataObject implementation which
      * integrates nicely into the guest's Windows Explorer showing / handling the Shared Clipboard file transfers. */
-    pCtx->fGuestFeatures       |= VBOX_SHCL_GF_0_TRANSFERS_FRONTEND;
+    pCtx->fGuestFeatures |= VBOX_SHCL_GF_0_TRANSFERS_FRONTEND;
 # endif
     pCtx->Transfers.cbChunkSize    = VBOX_SHCL_DEFAULT_CHUNK_SIZE; /** @todo Make this configurable. */
@@ -126 +127 @@
          * Next is reporting our features.  If this fails, assume older host.
          */
-        rc = VbglR3ClipboardReportFeatures(pCtx->idClient, fGuestFeatures, &pCtx->fHostFeatures);
+        rc = VbglR3ClipboardReportFeatures(pCtx->idClient, pCtx->fGuestFeatures, &pCtx->fHostFeatures);
         if (RT_SUCCESS(rc))
         {
-            pCtx->fGuestFeatures = fGuestFeatures;
-
             LogRel2(("Shared Clipboard: Guest features: %#RX64 - Host features: %#RX64\n",
                      pCtx->fGuestFeatures, pCtx->fHostFeatures));
@@ -2226 +2225 @@
                     {
                         uint32_t cbRead;
-                        rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, &cbRead, fFlags);
+                        rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, fFlags, &cbRead);
                         if (RT_SUCCESS(rc))
                             rc = VbglR3ClipboardObjWriteSend(pCmdCtx, hObj, pvBuf, cbRead, NULL /* pcbWritten */);