Changeset 80907 in vbox

Timestamp:

Sep 19, 2019 1:12:34 PM (5 years ago)

Author:

vboxsync

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

133482

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-transfers.h (modified) (1 diff)
• include/VBox/HostServices/VBoxClipboardSvc.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (4 diffs)
• src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (2 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

@@ -919 +919 @@
 } SHCLTRANSFERCALLBACKDATA, *PSHCLTRANSFERCALLBACKDATA;
 
+/** Declares a Shared Clipboard transfer callback. */
 #define SHCLTRANSFERCALLBACKDECL(a_Ret, a_Name) \
     typedef DECLCALLBACK(a_Ret) RT_CONCAT(FNSHCLCALLBACK, a_Name)(PSHCLTRANSFERCALLBACKDATA pData); \
     typedef RT_CONCAT(FNSHCLCALLBACK, a_Name) RT_CONCAT(*PFNSHCLCALLBACK, a_Name);
 
+/** Declares a Shared Clipboard transfer callback with variable arguments. */
 #define SHCLTRANSFERCALLBACKDECL_VA(a_Ret, a_Name, ...) \
     typedef DECLCALLBACK(a_Ret) RT_CONCAT(FNSHCLCALLBACK, a_Name)(PSHCLTRANSFERCALLBACKDATA pData, __VA_ARGS__); \
     typedef RT_CONCAT(FNSHCLCALLBACK, a_Name) RT_CONCAT(*PFNSHCLCALLBACK, a_Name);
 
+/** Declares a Shared Clipboard transfer callback member function. */
 #define SHCLTRANSFERCALLBACKMEMBER(a_Name, a_Member) \
     RT_CONCAT(PFNSHCLCALLBACK, a_Name) a_Member;

trunk/include/VBox/HostServices/VBoxClipboardSvc.h

@@ -110 +110 @@
 
 /** Sends a transfer status to the guest side. */
-#define VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_STATUS          50
+#define VBOX_SHCL_HOST_MSG_TRANSFER_STATUS                   50
 /** Reads the root list header from the guest. */
 #define VBOX_SHCL_HOST_MSG_TRANSFER_ROOT_LIST_HDR_READ       51

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

@@ -161 +161 @@
 #endif
 
+/**
+ * Cleanup helper function for transfer callbacks.
+ *
+ * @param   pData               Callback data to cleanup.
+ */
 static void vboxClipboardTransferCallbackCleanup(PSHCLTRANSFERCALLBACKDATA pData)
 {
@@ -194 +199 @@
     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)
         {
-            /* 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)
             {
-                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))
                 {
-                    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);
-                    }
+                    rc = SharedClipboardTransferRootsSet(pData->pTransfer,
+                                                         papszList, cbList + 1 /* Include termination */);
+                    RTStrFree(papszList);
                 }
-                else
-                {
-                    hClip = NULL;
-                }
+            }
+            else
+            {
+                hClip = NULL;
             }
         }

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -117 +117 @@
 
         LogFlowFunc(("uProtocolVer=%RU32, cbChunkSize=%RU32\n", pCtx->uProtocolVer, pCtx->cbChunkSize));
+
+        LogRel(("Shared Clipboard: Client %RU32 connected, using protocol v%RU32 (cbChunkSize=%RU32\n)",
+                pCtx->uClientID, pCtx->uProtocolVer, pCtx->cbChunkSize));
+
     }
 
@@ -491 +495 @@
                        VBOX_SHCL_GUEST_FN_MSG_GET, VBOX_SHCL_CPARMS_TRANSFER_STATUS);
 
-    Msg.uContext.SetUInt32(VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_STATUS);
+    Msg.uContext.SetUInt32(VBOX_SHCL_HOST_MSG_TRANSFER_STATUS);
     Msg.enmDir.SetUInt32(0);
     Msg.enmStatus.SetUInt32(0);
@@ -1352 +1356 @@
     switch (idMsg)
     {
-        case VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_STATUS:
+        case VBOX_SHCL_HOST_MSG_TRANSFER_STATUS:
         {
             SHCLTRANSFERDIR    enmDir;
@@ -1375 +1379 @@
                         rc = vbglR3ClipboardTransferStart(pCmdCtx, pTransferCtx, uTransferID,
                                                           enmDir, enmSource, NULL /* ppTransfer */);
-                        if (RT_SUCCESS(rc))
-                        {
-
-                        }
                         break;
                     }

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -829 +829 @@
         RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_READ_DATA);
         RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_FORMATS_REPORT);
-        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_STATUS);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_TRANSFER_STATUS);
         RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_TRANSFER_ROOT_LIST_HDR_READ);
         RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_TRANSFER_ROOT_LIST_HDR_WRITE);

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -834 +834 @@
             }
 
+            RTListNodeRemove(&pInfo->Node);
+
             RTMemFree(pInfo);
-
-            RTListNodeRemove(&pInfo->Node);
+            pInfo = NULL;
         }
         else

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

@@ -2054 +2054 @@
     /* puEvent is optional. */
 
-    PSHCLCLIENTMSG pMsgReadData = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_STATUS,
+    PSHCLCLIENTMSG pMsgReadData = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_STATUS,
                                                              VBOX_SHCL_CPARMS_TRANSFER_STATUS);
     if (!pMsgReadData)

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

@@ -1495 +1495 @@
     sharedClipboardSvcClientStateReset(pClientState);
 
-    /* Register the client.
-     * Note: Do *not* memset the struct, as it contains classes (for caching). */
+    /* Register the client. */
     pClientState->uClientID    = uClientID;
-    pClientState->uProtocolVer = 0;
 
     return VINF_SUCCESS;
@@ -1526 +1524 @@
 {
     LogFlowFuncEnter();
+
+    pClientState->uProtocolVer = 0;
+    pClientState->cbChunkSize  = _64K; /** Make this configurable. */
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS