Changeset 100660 in vbox for trunk

Timestamp:

Jul 20, 2023 9:55:41 AM (19 months ago)

Author:

vboxsync

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

158499

Message:

Shared Clipboard: Added ShClTransferStop() for stopping an already started transfer (thread). bugref:9437

Location:

trunk

Files:

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

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

@@ -1129 +1129 @@
 int ShClTransferRun(PSHCLTRANSFER pTransfer, PFNSHCLTRANSFERTHREAD pfnThreadFunc, void *pvUser);
 int ShClTransferStart(PSHCLTRANSFER pTransfer);
+int ShClTransferStop(PSHCLTRANSFER pTransfer);
 int ShClTransferComplete(PSHCLTRANSFER pTransfer);
 int ShClTransferCancel(PSHCLTRANSFER pTransfer);

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

@@ -1224 +1224 @@
     pTransfer->cObjHandles     = 0;
     pTransfer->uObjHandleNext  = 1;
+
+    pTransfer->Thread.fStarted   = false;
+    pTransfer->Thread.fStop      = false;
+    pTransfer->Thread.fCancelled = false;
 
     int rc = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_INITIALIZED);
@@ -2214 +2218 @@
 
 /**
+ * Stops a started transfer.
+ *
+ * @returns VBox status code.
+ * @param   pTransfer           Clipboard transfer to stop.
+ */
+int ShClTransferStop(PSHCLTRANSFER pTransfer)
+{
+    AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
+
+    LogFlowFuncEnter();
+
+    int rc = shClTransferThreadDestroy(pTransfer, SHCL_TIMEOUT_DEFAULT_MS);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
  * Completes a transfer (as successful).
  *
@@ -2431 +2453 @@
  * Destroys the thread of a clipboard transfer.
  *
- * @returns VBox status code.
+ * @returns VBox status code. Will return thread rc.
  * @param   pTransfer           Clipboard transfer to destroy thread for.
  * @param   uTimeoutMs          Timeout (in ms) to wait for thread destruction.
@@ -2441 +2463 @@
     shClTransferLock(pTransfer);
 
-    if (pTransfer->Thread.hThread == NIL_RTTHREAD)
+    if (!pTransfer->Thread.fStarted)
     {
         shClTransferUnlock(pTransfer);
@@ -2455 +2477 @@
 
     int rcThread = VERR_IPE_UNINITIALIZED_STATUS;
+    Assert(pTransfer->Thread.hThread != NIL_RTTHREAD);
     int rc = RTThreadWait(pTransfer->Thread.hThread, uTimeoutMs, &rcThread);
 
     LogFlowFunc(("Waiting for thread resulted in %Rrc (thread exited with %Rrc)\n", rc, rcThread));
 
+    if (RT_SUCCESS(rc))
+    {
+        pTransfer->Thread.fStarted = false;
+        pTransfer->Thread.hThread  = NIL_RTTHREAD;
+
+        rc = rcThread; /* Return the thread rc to the caller. */
+    }
+    else
+        LogRel(("Shared Clipboard: Waiting for thread of transfer %RU16 failed with %Rrc\n", pTransfer->State.uID, rc));
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }