Changeset 80905 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Sep 19, 2019 12:14:07 PM (5 years ago)

Author:

vboxsync

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

133480

Message:

Shared Clipboard/Transfers: Update.

File:

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

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

@@ -94 +94 @@
 *********************************************************************************************************************************/
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-static DECLCALLBACK(void) vboxClipboardTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
-static DECLCALLBACK(void) vboxClipboardTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+static DECLCALLBACK(int)  vboxClipboardOnTransferStartCallback(PSHCLTRANSFERCALLBACKDATA pData);
+static DECLCALLBACK(void) vboxClipboardOnTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+static DECLCALLBACK(void) vboxClipboardOnTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
 #endif
 
@@ -183 +184 @@
 }
 
-static DECLCALLBACK(void) vboxClipboardTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
-{
-    RT_NOREF(rc);
-
-    LogFlowFunc(("pData=%p, rc=%Rrc\n", pData, rc));
+static DECLCALLBACK(int) vboxClipboardOnTransferStartCallback(PSHCLTRANSFERCALLBACKDATA pData)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+    AssertPtr(pCtx);
+
+    LogFlowFunc(("pCtx=%p\n", pCtx));
+
+    int rc = SharedClipboardWinOpen(pCtx->Win.hWnd);
+    if (RT_SUCCESS(rc))
+    {
+        PSHCLTRANSFER pTransfer;
+        rc = SharedClipboardTransferCreate(&pTransfer);
+        if (RT_SUCCESS(rc))
+            rc = SharedClipboardTransferInit(pTransfer, 0 /* uID */,
+                                             SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL);
+        if (RT_SUCCESS(rc))
+        {
+            /* The data data in CF_HDROP format, as the files are locally present and don't need to be
+             * presented as a IDataObject or IStream. */
+            HANDLE hClip = hClip = GetClipboardData(CF_HDROP);
+            if (hClip)
+            {
+                HDROP hDrop = (HDROP)GlobalLock(hClip);
+                if (hDrop)
+                {
+                    char    *papszList = NULL;
+                    uint32_t cbList;
+                    rc = SharedClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
+
+                    GlobalUnlock(hClip);
+
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = SharedClipboardTransferRootsSet(pTransfer,
+                                                             papszList, cbList + 1 /* Include termination */);
+                        RTStrFree(papszList);
+                    }
+                }
+                else
+                {
+                    hClip = NULL;
+                }
+            }
+        }
+
+        SharedClipboardWinClose();
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+static DECLCALLBACK(void) vboxClipboardOnTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+    AssertPtr(pCtx);
+
+    RT_NOREF(pCtx, rc);
+
+    LogFlowFunc(("pCtx=%p, rc=%Rrc\n", pCtx, rc));
 
     LogRel2(("Shared Clipboard: Transfer to destination complete\n"));
@@ -194 +250 @@
 }
 
-static DECLCALLBACK(void) vboxClipboardTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
-{
-    RT_NOREF(rc);
-
-    LogFlowFunc(("pData=%p, rc=%Rrc\n", pData, rc));
+static DECLCALLBACK(void) vboxClipboardOnTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
+{
+    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pData->pvUser;
+    AssertPtr(pCtx);
+
+    RT_NOREF(pCtx, rc);
+
+    LogFlowFunc(("pCtx=%p, rc=%Rrc\n", pCtx, rc));
 
     LogRel(("Shared Clipboard: Transfer to destination failed with %Rrc\n", rc));
@@ -770 +829 @@
                    }
                }
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+#if 0
                else if (uFormat == VBOX_SHCL_FMT_URI_LIST)
                {
@@ -979 +1038 @@
                creationCtx.enmSource = SHCLSOURCE_REMOTE;
 
-               creationCtx.Interface.pfnGetRoots      = vboxClipboardTransferGetRoots;
+               creationCtx.Interface.pfnRootsGet      = vboxClipboardTransferGetRoots;
                creationCtx.Interface.pfnListOpen      = vboxClipboardTransferListOpen;
                creationCtx.Interface.pfnListClose     = vboxClipboardTransferListClose;
@@ -1151 +1210 @@
     }
     else
+    {
         LogRel(("Shared Clipboard: Initialized OLE\n"));
+
+        /* Install callbacks. */
+        RT_ZERO(pCtx->CmdCtx.Transfers.Callbacks);
+
+        pCtx->CmdCtx.Transfers.Callbacks.pvUser = pCtx; /* Assign context as user-provided callback data. */
+
+        pCtx->CmdCtx.Transfers.Callbacks.pfnTransferStart    = vboxClipboardOnTransferStartCallback;
+        pCtx->CmdCtx.Transfers.Callbacks.pfnTransferComplete = vboxClipboardOnTransferCompleteCallback;
+        pCtx->CmdCtx.Transfers.Callbacks.pfnTransferError    = vboxClipboardOnTransferErrorCallback;
+    }
 #endif