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

Timestamp:

Feb 19, 2024 2:55:20 PM (9 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Condensed more code by adding a new Windows-specific function SharedClipboardWinTransferHandOffToDataObject(). bugref:9437

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -179 +179 @@
     AssertPtr(pCtx);
 
-    switch(ShClTransferGetDir(pCbCtx->pTransfer))
+    PSHCLTRANSFER pTransfer = pCbCtx->pTransfer;
+    AssertPtr(pTransfer);
+
+    switch(ShClTransferGetDir(pTransfer))
     {
         case SHCLTRANSFERDIR_FROM_REMOTE: /* G->H */
         {
-            SharedClipboardWinDataObject *pObj = pCtx->Win.pDataObjInFlight;
-            if (pObj)
-            {
-                rc = pObj->SetTransfer(pCbCtx->pTransfer);
-                if (RT_SUCCESS(rc))
-                    rc = pObj->SetStatus(SharedClipboardWinDataObject::Running);
-
-                pCtx->Win.pDataObjInFlight = NULL; /* Hand off to Windows. */
-            }
-            else
-                AssertMsgFailed(("No data object in flight!\n"));
-
+            rc = SharedClipboardWinTransferHandOffToDataObject(&pCtx->Win, pTransfer);
             break;
         }
@@ -200 +192 @@
         case SHCLTRANSFERDIR_TO_REMOTE: /* H->G */
         {
-            rc = SharedClipboardWinTransferGetRootsFromClipboard(&pCtx->Win, pCbCtx->pTransfer);
+            rc = SharedClipboardWinTransferGetRootsFromClipboard(&pCtx->Win, pTransfer);
             break;
         }