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

Timestamp:

Jun 3, 2019 7:10:19 PM (6 years ago)

Author:

vboxsync

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

131065

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

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

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

@@ -57 +57 @@
   VBoxTray_DEFS     += VBOX_WITH_SHARED_CLIPBOARD_GUEST
   VBoxTray_SOURCES  += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardCache.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardArea.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \

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

@@ -72 +72 @@
 
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+/**
+ * Thread for transferring URI objects from guest to the host.
+ * For host to guest transfers we utilize our own IDataObject / IStream implementations.
+ *
+ * @returns VBox status code.
+ * @param   hThread             Thread handle.
+ * @param   pvUser              User arguments; is PVBOXCLIPBOARDWINCTX.
+ */
+static int vboxClipboardURIThread(RTTHREAD hThread, void *pvUser)
+{
+    AssertPtrReturn(pvUser, VERR_INVALID_POINTER);
+
+    LogFlowFuncEnter();
+
+    PVBOXCLIPBOARDWINCTX pWinCtx = (PVBOXCLIPBOARDWINCTX)pvUser;
+    AssertPtr(pWinCtx);
+
+    int rc = 0;
+
+    return rc;
+}
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
 
 static LRESULT vboxClipboardWinProcessMsg(PVBOXCLIPBOARDCONTEXT pCtx, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -519 +542 @@
                            if (RT_SUCCESS(rc))
                            {
-                               rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, uFormat, pszList, (uint32_t)cbList);
-                               RTMemFree(pszList);
+                               /* Spawn a worker thread, so that we don't block the window thread for too long. */
+                               rc = RTThreadCreate(&hThread, vboxClipboardURIThread, pWinCtx /* pvUser */,
+                                                   0, RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE,
+                                                   "vboxshclp");
+                               if (RT_SUCCESS(rc))
+                               {
+                                   int rc2 = RTThreadUserWait(hThread, 30 * 1000 /* Timeout in ms */);
+                                   AssertRC(rc2);
+
+                                   if (!pCtx->fStarted) /* Did the thread fail to start? */
+                                       rc = VERR_GENERAL_FAILURE; /** @todo Find a better rc. */
+                               }
                            }