Changeset 78725 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

Timestamp:

May 24, 2019 1:15:59 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

File:

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

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

@@ -393 +393 @@
                    if (pWinCtx->URI.cTransfers == 0) /* Only allow one transfer at a time for now. */
                    {
-                       pWinCtx->URI.Transfer.pDataObj = new VBoxClipboardWinDataObject(/* No additional formats needed right now */);
+                       pWinCtx->URI.Transfer.pDataObj = new VBoxClipboardWinDataObject(&pWinCtx->URI.Transfer.Provider);
                        if (pWinCtx->URI.Transfer.pDataObj)
                        {
-                           rc = pWinCtx->URI.Transfer.pDataObj->Init(pCtx->u32ClientID);
+                           rc = pWinCtx->URI.Transfer.pDataObj->Init();
                            if (RT_SUCCESS(rc))
                            {
@@ -662 +662 @@
     }
 
+    pCtx->pEnv = pEnv;
+
     if (VbglR3AutoLogonIsRemoteSession())
     {
@@ -668 +670 @@
         return VERR_NOT_SUPPORTED;
     }
+
+    int rc;
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
@@ -678 +682 @@
     else
         LogRel(("Clipboard: Initialized OLE\n"));
+
+    rc = pCtx->Win.URI.Transfer.Provider.SetSource(SharedClipboardProvider::SourceType_VbglR3);
+    AssertRC(rc);
 #endif
-
-    RT_BZERO(pCtx, sizeof(VBOXCLIPBOARDCONTEXT));
-
-    pCtx->pEnv = pEnv;
 
     /* Check that new Clipboard API is available */
     VBoxClipboardWinCheckAndInitNewAPI(&pCtx->Win.newAPI);
 
-    int rc = VbglR3ClipboardConnect(&pCtx->u32ClientID);
+    rc = VbglR3ClipboardConnect(&pCtx->u32ClientID);
     if (RT_SUCCESS(rc))
     {