Changeset 100394 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 5, 2023 4:21:48 PM (20 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Also use the transfers callbacks for the Windows data object implementation. WIP. ​​bugref:9437

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (6 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -252 +252 @@
     PSHCLTXPROVIDERIFACE pIface = &pClient->Transfers.Provider.Interface;
 
+    pClient->Transfers.Provider.enmSource = pClient->State.enmSource;
+    pClient->Transfers.Provider.pvUser    = pClient;
+
+    int rc = VINF_SUCCESS;
+
     switch (ShClTransferGetDir(pTransfer))
     {
-        case SHCLTRANSFERDIR_FROM_REMOTE: /* Guest -> Host. */
+        case SHCLTRANSFERDIR_FROM_REMOTE: /* G->H */
         {
             pIface->pfnRootListRead  = shClSvcTransferIfaceGHRootListRead;
@@ -269 +274 @@
         }
 
-        case SHCLTRANSFERDIR_TO_REMOTE: /* Host -> Guest. */
+        case SHCLTRANSFERDIR_TO_REMOTE: /* H->G */
         {
             pIface->pfnRootListRead  = shClSvcWinTransferIfaceHGRootListRead;
@@ -276 +281 @@
 
         default:
-            AssertFailed();
-    }
-
-    int rc = ShClTransferSetProvider(pTransfer, &pClient->Transfers.Provider); RT_NOREF(rc);
+            AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
+            break;
+    }
+
+    if (RT_SUCCESS(rc))
+        rc = ShClTransferSetProvider(pTransfer, &pClient->Transfers.Provider); RT_NOREF(rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -287 +294 @@
  * @copydoc SHCLTRANSFERCALLBACKS::pfnOnInitialized
  *
- * Called on transfer intialization to notify the "in-flight" IDataObject about a data transfer.
+ * For G->H: Called on transfer intialization to notify the "in-flight" IDataObject about a data transfer.
+ * For H->G: Called on transfer intialization to populate the transfer's root list.
  *
  * @thread  Service main thread.
@@ -299 +307 @@
     AssertPtr(pTransfer);
 
-    const SHCLTRANSFERDIR enmDir = ShClTransferGetDir(pTransfer);
-
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("pCtx=%p, idTransfer=%RU32, enmDir=%RU32\n", pCtx, ShClTransferGetID(pTransfer), enmDir));
-
-    /* The host wants to transfer data from the guest. */
-    if (enmDir == SHCLTRANSFERDIR_FROM_REMOTE)
-    {
-        rc = RTCritSectEnter(&pCtx->Win.CritSect);
-        if (RT_SUCCESS(rc))
-        {
-            SharedClipboardWinDataObject *pObj = pCtx->Win.pDataObjInFlight;
-            AssertPtrReturnVoid(pObj);
-            rc = pObj->SetTransfer(pTransfer);
-
-            pCtx->Win.pDataObjInFlight = NULL; /* Hand off to Windows. */
-
-            int rc2 = RTCritSectLeave(&pCtx->Win.CritSect);
-            AssertRC(rc2);
-        }
-    }
-
-    if (RT_FAILURE(rc))
-        LogRel(("Shared Clipboard: Starting transfer failed, rc=%Rrc\n", rc));
-
-    LogFlowFunc(("LEAVE: idTransfer=%RU32, rc=%Rrc\n", ShClTransferGetID(pTransfer), rc));
+    switch (ShClTransferGetDir(pTransfer))
+    {
+        case SHCLTRANSFERDIR_FROM_REMOTE: /* G->H */
+        {
+            rc = RTCritSectEnter(&pCtx->Win.CritSect);
+            if (RT_SUCCESS(rc))
+            {
+                SharedClipboardWinDataObject *pObj = pCtx->Win.pDataObjInFlight;
+                AssertPtrReturnVoid(pObj);
+                rc = pObj->SetTransfer(pTransfer);
+
+                pCtx->Win.pDataObjInFlight = NULL; /* Hand off to Windows. */
+
+                int rc2 = RTCritSectLeave(&pCtx->Win.CritSect);
+                AssertRC(rc2);
+            }
+
+            break;
+        }
+
+        case SHCLTRANSFERDIR_TO_REMOTE: /* H->G */
+        {
+            rc = ShClTransferRootListRead(pTransfer); /* Calls shClSvcWinTransferIfaceHGRootListRead(). */
+            break;
+        }
+
+        default:
+            AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
+            break;
+    }
+
+    LogFlowFuncLeaveRC(rc);
 }
 
@@ -803 +818 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
         /*
-         * Init transfer callbacks.
+         * Set callbacks.
+         * Those will be registered within ShClSvcTransferInit() when a new transfer gets initialized.
          */
         RT_ZERO(pClient->Transfers.Callbacks);
+
+        pClient->Transfers.Callbacks.pvUser = pCtx; /* Assign context as user-provided callback data. */
+        pClient->Transfers.Callbacks.cbUser = sizeof(SHCLCONTEXT);
+
+        pClient->Transfers.Callbacks.pfnOnCreated     = shClSvcWinTransferOnCreatedCallback;
         pClient->Transfers.Callbacks.pfnOnInitialized = shClSvcWinTransferOnInitializedCallback;
         pClient->Transfers.Callbacks.pfnOnStarted     = shClSvcWinTransferOnStartedCallback;
         pClient->Transfers.Callbacks.pfnOnDestroy     = shClSvcWinTransferOnDestroyCallback;
-
-        pClient->Transfers.Callbacks.pvUser = pCtx; /* Assign context as user-provided callback data. */
-        pClient->Transfers.Callbacks.cbUser = sizeof(SHCLCONTEXT);
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
     }