Changeset 100676 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 21, 2023 11:26:04 AM (19 months ago)

Author:

vboxsync

Message:

Shared Clipboard: HTTP transfers with multiple files are also working now. bugref:9437

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp

@@ -95 +95 @@
                             PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
 
-                            rc = ShClTransferRootsInitFromStringList(pTransfer, (const char *)pResp->Read.pvData, pResp->Read.cbData);
+                            rc = ShClTransferRootsInitFromStringListEx(pTransfer, (const char *)pResp->Read.pvData, pResp->Read.cbData,
+                                                                       "\n" /* X11-based Desktop environments separate entries with "\n" */);
 
                             RTMemFree(pResp->Read.pvData);
@@ -329 +330 @@
                         if (RT_SUCCESS(rc))
                         {
-                            char *pszURL = ShClTransferHttpServerGetUrlA(pSrv, pTransfer->State.uID);
-                            if (pszURL)
+                            char *pszURL = NULL;
+
+                            uint64_t const cRoots = ShClTransferRootsCount(pTransfer);
+                            for (uint32_t i = 0; i < cRoots; i++)
+                            {
+                                char *pszEntry = ShClTransferHttpServerGetUrlA(pSrv, ShClTransferGetID(pTransfer), i /* Entry index */);
+                                AssertPtrBreakStmt(pszEntry, rc = VERR_NO_MEMORY);
+
+                                if (i > 0)
+                                {
+                                    rc = RTStrAAppend(&pszURL, "\n"); /* Separate entries with a newline. */
+                                    AssertRCBreak(rc);
+                                }
+
+                                rc = RTStrAAppend(&pszURL, pszEntry);
+                                AssertRCBreak(rc);
+
+                                RTStrFree(pszEntry);
+                            }
+
+                            if (RT_SUCCESS(rc))
                             {
                                 *ppv = pszURL;
@@ -339 +359 @@
                                 /* ppv has ownership of pszURL. */
                             }
-                            else
-                                rc = VERR_NO_MEMORY;
                         }
                     }