Changeset 85587 in vbox for trunk

Timestamp:

Jul 31, 2020 5:14:22 PM (4 years ago)

Author:

vboxsync

Message:

DnD/VbglR3: Fixes for sending raw meta data to host.

File:

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

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

@@ -1667 +1667 @@
     RT_ZERO(dataHdr);
 
-    /* For raw data only the total size is required to be specified. */
+    dataHdr.cbMeta  = (uint32_t)cbData;
     dataHdr.cbTotal = cbData;
 
@@ -1757 +1757 @@
     LogFlowFunc(("pszFormat=%s, pvData=%p, cbData=%RU32\n", pszFormat, pvData, cbData));
 
+    LogRel2(("DnD: Sending %RU32 bytes meta data in format '%s'\n", cbData, pszFormat));
+
     int rc;
     if (DnDMIMEHasFileURLs(pszFormat, strlen(pszFormat)))
@@ -1776 +1778 @@
             DnDTransferListDestroy(&lstTransfer);
         }
-
-        if (RT_FAILURE(rc))
-            LogRel(("DnD: Sending guest meta data to host failed with %Rrc\n", rc));
     }
     else
@@ -1785 +1784 @@
     if (RT_FAILURE(rc))
     {
-        int rc2 = VbglR3DnDGHSendError(pCtx, rc);
-        if (RT_FAILURE(rc2))
-            LogFlowFunc(("Unable to send error (%Rrc) to host, rc=%Rrc\n", rc, rc2));
+        LogRel(("DnD: Sending data failed with rc=%Rrc\n", rc));
+
+        if (rc != VERR_CANCELLED)
+        {
+            int rc2 = VbglR3DnDGHSendError(pCtx, rc);
+            if (RT_FAILURE(rc2))
+                LogFlowFunc(("Unable to send error (%Rrc) to host, rc=%Rrc\n", rc, rc2));
+        }
     }