Changeset 78897 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

May 31, 2019 3:23:14 PM (6 years ago)

Author:

vboxsync

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

131016

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-uri.cpp (modified) (5 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -44 +44 @@
         darwin-pasteboard.cpp
 ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+ VBoxSharedClipboard_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_HOST
  VBoxSharedClipboard_SOURCES += \
         VBoxSharedClipboardSvc-uri.cpp \
@@ -51 +52 @@
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardProvider.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardProvider-HostService.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIObject.cpp

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -54 +54 @@
     /** Pointer to the client state (parent). */
     VBOXCLIPBOARDCLIENTSTATE      *pState;
-    /** The transfer's own (local) cache.
+    /** The transfer's own (local) area.
      *  The cache itself has a clipboard area ID assigned. */
-    SharedClipboardCache           Cache;
+    SharedClipboardArea            Cache;
     /** The transfer's URI list, containing the fs object root entries. */
     SharedClipboardURIList         List;

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

@@ -114 +114 @@
     AssertPtrReturn(pState,    VERR_INVALID_POINTER);
 
-    int rc = pTransfer->Cache.OpenTemp(SHAREDCLIPBOARDCACHE_FLAGS_NONE);
+    int rc = pTransfer->Cache.OpenTemp(SHAREDCLIPBOARDAREA_FLAGS_NONE);
     if (RT_SUCCESS(rc))
     {
@@ -128 +128 @@
     }
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -209 +210 @@
     RT_NOREF(u32ClientID, paParms, tsArrival, pfAsync);
 
+    LogFlowFunc(("u32ClientID=%RU32, u32Function=%RU32, cParms=%RU32, g_pfnExtension=%p\n",
+                 u32ClientID, u32Function, cParms, g_pfnExtension));
+
     const PVBOXCLIPBOARDCLIENTDATA pClientData = (PVBOXCLIPBOARDCLIENTDATA)pvClient;
+    AssertPtrReturn(pClientData, VERR_INVALID_POINTER);
 
     /* Check if we've the right mode set. */
@@ -274 +279 @@
             if (cParms == VBOX_SHARED_CLIPBOARD_CPARMS_READ_DATA_HDR)
             {
-                if (   RT_SUCCESS(rc)
-                    && g_pfnExtension)
+                if (g_pfnExtension)
                 {
                     VBOXCLIPBOARDEXTAREAPARMS parms;
@@ -642 +646 @@
     }
 
-#ifdef DEBUG_andy
-    AssertRC(rc);
-#endif
-
     LogFlowFuncLeaveRC(rc);
     return rc;

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

@@ -75 +75 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_SHARED_CLIPBOARD
+#include <VBox/log.h>
+
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #include <VBox/HostServices/VBoxClipboardExt.h>
@@ -82 +84 @@
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
+
 #include <VBox/err.h>
 #include <VBox/vmm/ssm.h>
@@ -376 +379 @@
     vboxSvcClipboardCompleteReadData(pClientData, VERR_NO_DATA, 0);
 
-#ifdef VBOX_VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     vboxClipboardSvcURITransferDestroy(&pClientData->Transfer);
 #endif
@@ -417 +420 @@
 
     int rc = VBoxClipboardSvcImplConnect(pClientData, VBoxSvcClipboardGetHeadless());
-#ifdef VBOX_VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     if (RT_SUCCESS(rc))
     {
-        rc = vboxClipboardSvcURITransferCreate(&pClientData->Transfer);
+        rc = vboxClipboardSvcURITransferCreate(&pClientData->Transfer, &pClientData->State);
         if (RT_SUCCESS(rc))
         {
@@ -608 +611 @@
 
                             g_fReadingData = true;
-                            rc = g_pfnExtension (g_pvExtension, VBOX_CLIPBOARD_EXT_FN_DATA_READ, &parms, sizeof (parms));
+                            rc = g_pfnExtension(g_pvExtension, VBOX_CLIPBOARD_EXT_FN_DATA_READ, &parms, sizeof (parms));
                             LogFlowFunc(("DATA: g_fDelayedAnnouncement = %d, g_u32DelayedFormats = 0x%x\n", g_fDelayedAnnouncement, g_u32DelayedFormats));
                             if (g_fDelayedAnnouncement)