Changeset 80918 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Sep 20, 2019 10:27:30 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-transfers.cpp (modified) (4 diffs)
• clipboard-win.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -2210 +2210 @@
 
 /**
+ * Returns the transfer's direction.
+ *
+ * @returns The transfer's direction.
+ * @param   pTransfer           Clipboard transfer to return direction for.
+ */
+SHCLTRANSFERDIR SharedClipboardTransferGetDir(PSHCLTRANSFER pTransfer)
+{
+    AssertPtrReturn(pTransfer, SHCLTRANSFERDIR_UNKNOWN);
+
+    return pTransfer->State.enmDir;
+}
+
+/**
  * Returns the transfer's source.
  *
@@ -2388 +2401 @@
     AssertPtrReturn(pTransferCtx, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%p\n", pTransferCtx));
+    LogFlowFunc(("pTransferCtx=%p\n", pTransferCtx));
 
     int rc = RTCritSectInit(&pTransferCtx->CritSect);
@@ -2415 +2428 @@
     AssertPtrReturnVoid(pTransferCtx);
 
-    LogFlowFunc(("%p\n", pTransferCtx));
+    LogFlowFunc(("pTransferCtx=%p\n", pTransferCtx));
 
     RTCritSectDelete(&pTransferCtx->CritSect);
@@ -2623 +2636 @@
  * @param   pTransferCtx                Transfer context to cleanup transfers for.
  */
-void SharedClipboardTransferCtxTransfersCleanup(PSHCLTRANSFERCTX pTransferCtx)
+void SharedClipboardTransferCtxCleanup(PSHCLTRANSFERCTX pTransferCtx)
 {
     AssertPtrReturnVoid(pTransferCtx);
 
-    LogFlowFunc(("cTransfers=%RU32, cRunning=%RU32\n", pTransferCtx->cTransfers, pTransferCtx->cRunning));
+    LogFlowFunc(("pTransferCtx=%p, cTransfers=%RU32, cRunning=%RU32\n",
+                 pTransferCtx, pTransferCtx->cTransfers, pTransferCtx->cRunning));
 
     /* Remove all transfers which are not in a running state (e.g. only announced). */

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp

@@ -99 +99 @@
     int rc;
 
-    LogFlowFuncEnter();
-
     const BOOL fRc = CloseClipboard();
     if (RT_UNLIKELY(!fRc))
@@ -118 +116 @@
         rc = VINF_SUCCESS;
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }