Changeset 100545 in vbox

Timestamp:

Jul 12, 2023 12:01:33 PM (21 months ago)

Author:

vboxsync

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

158364

Message:

Shared Clipboard: Added some more utility functions for completing and cancelling transfers. bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-transfers.h (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

@@ -1125 +1125 @@
 int ShClTransferRun(PSHCLTRANSFER pTransfer, PFNSHCLTRANSFERTHREAD pfnThreadFunc, void *pvUser);
 int ShClTransferStart(PSHCLTRANSFER pTransfer);
+int ShClTransferComplete(PSHCLTRANSFER pTransfer);
+int ShClTransferCancel(PSHCLTRANSFER pTransfer);
+int ShClTransferError(PSHCLTRANSFER pTransfer, int rc);
 
 uint32_t ShClTransferAcquire(PSHCLTRANSFER pTransfer);

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

@@ -2158 +2158 @@
     LogFlowFuncLeaveRC(rc);
     return rc;
+}
+
+int ShClTransferComplete(PSHCLTRANSFER pTransfer)
+{
+    AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
+
+    LogFlowFuncEnter();
+
+    shClTransferLock(pTransfer);
+
+    AssertMsgReturnStmt(pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_STARTED,
+                        ("Wrong status (currently is %s)\n", ShClTransferStatusToStr(pTransfer->State.enmStatus)),
+                        shClTransferUnlock(pTransfer), VERR_WRONG_ORDER);
+
+    int rc = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_STOPPED);
+
+    shClTransferUnlock(pTransfer);
+
+    if (pTransfer->Callbacks.pfnOnCompleted)
+        pTransfer->Callbacks.pfnOnCompleted(&pTransfer->CallbackCtx, rc);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+static int shClTransferCancelOrError(PSHCLTRANSFER pTransfer, int rc)
+{
+    AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
+
+    LogFlowFunc(("%Rrc\n", rc));
+
+    shClTransferLock(pTransfer);
+
+    AssertMsgReturnStmt(pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_STARTED,
+                        ("Wrong status (currently is %s)\n", ShClTransferStatusToStr(pTransfer->State.enmStatus)),
+                        shClTransferUnlock(pTransfer), VERR_WRONG_ORDER);
+
+    int rc2;
+    if (rc == VERR_CANCELLED)
+    {
+        rc2 = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_CANCELED);
+
+        if (pTransfer->Callbacks.pfnOnCompleted)
+            pTransfer->Callbacks.pfnOnCompleted(&pTransfer->CallbackCtx, VERR_CANCELLED);
+    }
+    else
+    {
+        rc2 = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_ERROR);
+
+        if (pTransfer->Callbacks.pfnOnError)
+            pTransfer->Callbacks.pfnOnError(&pTransfer->CallbackCtx, rc);
+    }
+
+    shClTransferUnlock(pTransfer);
+
+    LogFlowFuncLeaveRC(rc2);
+    return rc2;
+}
+
+int ShClTransferCancel(PSHCLTRANSFER pTransfer)
+{
+    return shClTransferCancelOrError(pTransfer, VERR_CANCELLED);
+}
+
+int ShClTransferError(PSHCLTRANSFER pTransfer, int rc)
+{
+    return shClTransferCancelOrError(pTransfer, rc);
 }