Changeset 97834 in vbox for trunk/src/VBox/GuestHost/DragAndDrop

Timestamp:

Dec 19, 2022 5:05:55 PM (2 years ago)

Author:

vboxsync

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

154920

Message:

DnD/TransferList: Fixed returning wrong buffer sizes in DnDTransferListGetRootsEx() + added testcases for it.

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDTransferList.cpp (modified) (1 diff)
• testcase/tstDnDTransferList.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/DragAndDrop/DnDTransferList.cpp

@@ -1068 +1068 @@
             rc = RTStrCopy(szPath, sizeof(szPath), pcszPathRootTmp);
             AssertRCBreak(rc);
-            cchString += RTStrNLen(pcszPathRootTmp, RTPATH_MAX);
         }
 

trunk/src/VBox/GuestHost/DragAndDrop/testcase/tstDnDTransferList.cpp

@@ -155 +155 @@
     RTTEST_CHECK(hTest, RTPathCompare(DnDTransferListGetRootPathAbs(&list), szPathTest) == 0);
 
+    /* Validate returned lengths. */
+    pszBuf = NULL;
+    RTTEST_CHECK_RC(hTest, DnDTransferListGetRootsEx(&list, DNDTRANSFERLISTFMT_URI, "/base/", "\r\n", &pszBuf, &cbBuf), VINF_SUCCESS);
+    RTTEST_CHECK_MSG(hTest, RTStrCmp(pszBuf, "file:///base/bin/\r\nfile:///base/lib/\r\n") == 0, (hTest, "Got '%s'", pszBuf));
+    RTTEST_CHECK_MSG(hTest, cbBuf == strlen(pszBuf) + 1, (hTest, "Got %d, expected %d\n", cbBuf, strlen(pszBuf) + 1));
+    RTStrFree(pszBuf);
+
+    pszBuf = NULL;
+    RTTEST_CHECK_RC(hTest, DnDTransferListGetRootsEx(&list, DNDTRANSFERLISTFMT_NATIVE, "/base/", "\r\n", &pszBuf, &cbBuf), VINF_SUCCESS);
+    RTTEST_CHECK_MSG(hTest, RTStrCmp(pszBuf, "/base/bin/\r\n/base/lib/\r\n") == 0, (hTest, "Got '%s'", pszBuf));
+    RTTEST_CHECK_MSG(hTest, cbBuf == strlen(pszBuf) + 1, (hTest, "Got %d, expected %d\n", cbBuf, strlen(pszBuf) + 1));
+    RTStrFree(pszBuf);
+
+    /* Validate roots with a new base. */
     pszBuf = NULL;
     RTTEST_CHECK_RC(hTest, DnDTransferListGetRootsEx(&list, DNDTRANSFERLISTFMT_NATIVE, "/native/base/path", "\n", &pszBuf, &cbBuf), VINF_SUCCESS);