Changeset 81220 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 11, 2019 8:19:05 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update.

File:

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

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

@@ -774 +774 @@
     Msg.pvFilter.SetPtr(pOpenParms->pszFilter, pOpenParms->cbFilter);
     Msg.cbPath.SetUInt32(pOpenParms->cbPath);
-    Msg.pvFilter.SetPtr(pOpenParms->pszPath, pOpenParms->cbPath);
+    Msg.pvPath.SetPtr(pOpenParms->pszPath, pOpenParms->cbPath);
+    Msg.uHandle.SetUInt64(0);
 
     int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -1776 +1777 @@
 
     int rc;
+
+    bool fErrorSent = false; /* Whether an error has been reported back to the host already. */
 
     switch (idMsg)
@@ -2094 +2097 @@
         {
             rc = VbglR3ClipboardEventGetNext(idMsg, cParms, pCmdCtx, pEvent);
+            if (RT_FAILURE(rc))
+                fErrorSent = true;
             break;
         }
+    }
+
+    if (   !fErrorSent
+        && RT_FAILURE(rc))
+    {
+        /* Report error back to the host. */
+        int rc2 = VbglR3ClipboardWriteError(pCmdCtx->uClientID, rc);
+        AssertRC(rc2);
     }
 
@@ -2158 +2171 @@
         int rc2 = VbglR3ClipboardWriteError(pCtx->uClientID, rc);
         AssertRC(rc2);
-
-   }
+    }
 
     LogFlowFuncLeaveRC(rc);