Changeset 78809 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

May 28, 2019 10:54:53 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxClipboard.cpp (modified) (7 diffs)
• VBoxTray.cpp (modified) (1 diff)
• VBoxTray.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -55 +55 @@
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp
  ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
- VBoxTray_SOURCES  += \
+  VBoxTray_DEFS     += VBOX_WITH_SHARED_CLIPBOARD_GUEST
+  VBoxTray_SOURCES  += \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardCache.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \
@@ -61 +62 @@
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardProvider.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardProvider-VbglR3.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp \

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(&pWinCtx->URI.Transfer.Provider);
+                       pWinCtx->URI.Transfer.pDataObj = new VBoxClipboardWinDataObject(pWinCtx->URI.Transfer.pProvider);
                        if (pWinCtx->URI.Transfer.pDataObj)
                        {
@@ -416 +416 @@
                        }
                    }
+                   else
+                       LogRel(("Clipboard: Only one transfer at a time supported (current %RU32 transfer(s) active), skipping\n",
+                               pWinCtx->URI.cTransfers));
                }
 #endif
@@ -424 +427 @@
 
                VBoxClipboardWinClose();
-               /* Note: Clipboard must be closed first before calling OleSetClipboard(). */
 
                LogFunc(("VBOX_WM_SHCLPB_SET_FORMATS: cfFormat=%u, lastErr=%ld\n", cfFormat, GetLastError()));
@@ -662 +664 @@
     }
 
-    pCtx->pEnv = pEnv;
-
     if (VbglR3AutoLogonIsRemoteSession())
     {
@@ -671 +671 @@
     }
 
-    int rc;
+    pCtx->pEnv = pEnv;
+
+    int rc = VINF_SUCCESS;
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
@@ -681 +683 @@
     }
     else
+    {
         LogRel(("Clipboard: Initialized OLE\n"));
-
-    rc = pCtx->Win.URI.Transfer.Provider.SetSource(SharedClipboardProvider::SourceType_VbglR3);
-    AssertRC(rc);
+        rc = VBoxClipboardWinURIInit(&pCtx->Win.URI, SharedClipboardProvider::SourceType_VbglR3);
+    }
 #endif
 
-    /* Check that new Clipboard API is available */
-    VBoxClipboardWinCheckAndInitNewAPI(&pCtx->Win.newAPI);
-
-    rc = VbglR3ClipboardConnect(&pCtx->u32ClientID);
     if (RT_SUCCESS(rc))
     {
-        rc = vboxClipboardCreateWindow(pCtx);
+        /* Check if new Clipboard API is available. */
+        /* ignore rc */ VBoxClipboardWinCheckAndInitNewAPI(&pCtx->Win.newAPI);
+
+        rc = VbglR3ClipboardConnect(&pCtx->u32ClientID);
         if (RT_SUCCESS(rc))
         {
-            *ppInstance = pCtx;
-        }
-        else
-        {
-            VbglR3ClipboardDisconnect(pCtx->u32ClientID);
+            rc = vboxClipboardCreateWindow(pCtx);
+            if (RT_SUCCESS(rc))
+            {
+                *ppInstance = pCtx;
+            }
+            else
+            {
+                VbglR3ClipboardDisconnect(pCtx->u32ClientID);
+            }
         }
     }
@@ -821 +826 @@
 
     vboxClipboardDestroy(pCtx);
-    RT_BZERO(pCtx, sizeof(VBOXCLIPBOARDCONTEXT));
-
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST_ASF
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     OleSetClipboard(NULL); /* Make sure to flush the clipboard on destruction. */
     OleUninitialize();
+
+    VBoxClipboardWinURIDestroy(&pCtx->Win.URI);
 #endif
 

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

@@ -157 +157 @@
 {
     { &g_SvcDescDisplay,        NIL_RTTHREAD, NULL, false, false, false, false, true },
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
     { &g_SvcDescClipboard,      NIL_RTTHREAD, NULL, false, false, false, false, true },
+#endif
     { &g_SvcDescSeamless,       NIL_RTTHREAD, NULL, false, false, false, false, true },
     { &g_SvcDescVRDP,           NIL_RTTHREAD, NULL, false, false, false, false, true },

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

@@ -139 +139 @@
 
 extern VBOXSERVICEDESC g_SvcDescDisplay;
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
 extern VBOXSERVICEDESC g_SvcDescClipboard;
+#endif
 extern VBOXSERVICEDESC g_SvcDescSeamless;
 extern VBOXSERVICEDESC g_SvcDescVRDP;