Changeset 99937 in vbox for trunk/src/VBox/Additions/common

Timestamp:

May 23, 2023 3:38:52 PM (2 years ago)

Author:

vboxsync

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

157594

Message:

Shared Clipboard: Added new testcase for the HTTP server in combination with the Shared Clipboard API, various updates and general improvements. bugref:9437

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (3 diffs)

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

@@ -718 +718 @@
     if (pRootList)
     {
-        SHCLROOTLISTHDR srcRootListHdr;
-        rc = vbglR3ClipboardRootListHdrRead(pCtx, &srcRootListHdr);
-        if (RT_SUCCESS(rc))
-        {
-            pRootList->Hdr.cRoots = srcRootListHdr.cRoots;
-            pRootList->Hdr.fRoots = 0; /** @todo Implement this. */
-
-            if (srcRootListHdr.cRoots)
+        rc = vbglR3ClipboardRootListHdrRead(pCtx, &pRootList->Hdr);
+        if (RT_SUCCESS(rc))
+        {
+            if (pRootList->Hdr.cRoots)
             {
                 pRootList->paEntries =
-                    (PSHCLROOTLISTENTRY)RTMemAllocZ(srcRootListHdr.cRoots * sizeof(SHCLROOTLISTENTRY));
+                    (PSHCLROOTLISTENTRY)RTMemAllocZ(pRootList->Hdr.cRoots * sizeof(SHCLROOTLISTENTRY));
                 if (pRootList->paEntries)
                 {
-                    for (uint32_t i = 0; i < srcRootListHdr.cRoots; i++)
+                    for (uint32_t i = 0; i < pRootList->Hdr.cRoots; i++)
                     {
                         SHCLROOTLISTENTRY *pEntry = &pRootList->paEntries[i];
@@ -2116 +2112 @@
                         LogFlowFunc(("pszPath=%s\n", openParmsList.pszPath));
 
-                        SHCLLISTHANDLE hList = SHCLLISTHANDLE_INVALID;
+                        SHCLLISTHANDLE hList = NIL_SHCLLISTHANDLE;
                         rc = ShClTransferListOpen(pTransfer, &openParmsList, &hList);
 
@@ -2154 +2150 @@
                 /** @todo Handle filter + list features. */
 
-                SHCLLISTHANDLE hList  = SHCLLISTHANDLE_INVALID;
+                SHCLLISTHANDLE hList  = NIL_SHCLLISTHANDLE;
                 uint32_t       fFlags = 0;
                 rc = VbglR3ClipboardListHdrReadRecvReq(pCmdCtx, &hList, &fFlags);