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

Timestamp:

Jul 23, 2020 11:10:46 AM (5 years ago)

Author:

vboxsync

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

139471

Message:

DnD: Added DnDTransferListInit() / DnDTransferListInitEx().

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDTransferList.cpp (modified) (3 diffs)
• testcase/tstDnDTransferList.cpp (modified) (2 diffs)

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

@@ -64 +64 @@
     /* pcszRootPathAbs is optional. */
 
-    if (!strlen(pcszRootPathAbs))
-        return VERR_INVALID_PARAMETER;
-
-    if (pList->pszPathRootAbs)
+    if (pList->pszPathRootAbs) /* Already initialized? */
         return VERR_WRONG_ORDER;
 
@@ -86 +83 @@
 
 /**
- * Initializes a transfer list.
+ * Initializes a transfer list, extended version.
  *
  * @returns VBox status code.
@@ -92 +89 @@
  * @param   pcszRootPathAbs     Absolute root path to use for this list. Optional and can be NULL.
  */
-int DnDTransferListInit(PDNDTRANSFERLIST pList, const char *pcszRootPathAbs)
+int DnDTransferListInitEx(PDNDTRANSFERLIST pList, const char *pcszRootPathAbs)
 {
     return dndTransferListInitInternal(pList, pcszRootPathAbs);
+}
+
+/**
+ * Initializes a transfer list.
+ *
+ * @returns VBox status code.
+ * @param   pList               Transfer list to initialize.
+ */
+int DnDTransferListInit(PDNDTRANSFERLIST pList)
+{
+    return dndTransferListInitInternal(pList, NULL /* pcszRootPathAbs */);
 }
 

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

@@ -49 +49 @@
 
     /* Invalid stuff. */
-    /*RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list, NULL), VERR_INVALID_POINTER);*/
-    RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list, ""), VERR_INVALID_PARAMETER);
-    RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list, szPathWellKnown), VINF_SUCCESS);
-    RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list, szPathWellKnown), VERR_WRONG_ORDER);
+    RTTEST_CHECK_RC(hTest, DnDTransferListInitEx(&list, ""), VERR_INVALID_PARAMETER);
+    RTTEST_CHECK_RC(hTest, DnDTransferListInitEx(&list, szPathWellKnown), VINF_SUCCESS);
+    RTTEST_CHECK_RC(hTest, DnDTransferListInitEx(&list, szPathWellKnown), VERR_WRONG_ORDER);
+    DnDTransferListDestroy(&list);
+
+    /* Empty. */
+    RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list), VINF_SUCCESS);
     DnDTransferListDestroy(&list);
 
     /* Initial status. */
-    RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list, szPathWellKnown), VINF_SUCCESS);
+    RTTEST_CHECK_RC(hTest, DnDTransferListInitEx(&list, szPathWellKnown), VINF_SUCCESS);
     RTTEST_CHECK(hTest, DnDTransferListGetRootCount(&list) == 0);
     RTTEST_CHECK(hTest, DnDTransferListObjCount(&list) == 0);
@@ -94 +97 @@
 
     /* To URI data. */
-    RTTEST_CHECK_RC(hTest, DnDTransferListInit(&list, szPathWellKnown), VINF_SUCCESS);
+    RTTEST_CHECK_RC(hTest, DnDTransferListInitEx(&list, szPathWellKnown), VINF_SUCCESS);
     RTTEST_CHECK_RC(hTest, DnDTransferListAppendPath(&list, DNDTRANSFERLISTFMT_NATIVE, szPathWellKnown, DNDTRANSFERLIST_FLAGS_NONE), VINF_SUCCESS);
     RTTEST_CHECK_RC(hTest, DnDTransferListGetRootsEx(&list, DNDTRANSFERLISTFMT_NATIVE, "" /* pszBasePath */, "\n", &pszBuf, &cbBuf), VINF_SUCCESS);