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

Timestamp:

Jul 22, 2020 10:31:03 AM (5 years ago)

Author:

vboxsync

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

139450

Message:

DnD/TransferList: Added DnDTransferListObjRemove().

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDTransferList.cpp (modified) (2 diffs)

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

@@ -737 +737 @@
 
 /**
- * Removes the first DnD transfer object from a transfer list.
- *
- * @param   pList               Transfer list to remove first entry for.
- */
-void DnDTransferListObjRemoveFirst(PDNDTRANSFERLIST pList)
+ * Removes an object from a transfer list, internal version.
+ *
+ * @param   pList               Transfer list to remove object from.
+ * @param   pObj                Object to remove. The object will be free'd and the pointer is invalid after calling.
+ */
+static void dndTransferListObjRemoveInternal(PDNDTRANSFERLIST pList, PDNDTRANSFEROBJECT pObj)
 {
     AssertPtrReturnVoid(pList);
-
-    if (!pList->cObj)
-        return;
-
-    PDNDTRANSFEROBJECT pObj = RTListGetFirst(&pList->lstObj, DNDTRANSFEROBJECT, Node);
-    AssertPtr(pObj);
+    AssertPtrReturnVoid(pObj);
+
+    /** @todo Validate if \a pObj is part of \a pList. */
 
     uint64_t cbSize = DnDTransferObjectGetSize(pObj);
@@ -756 +754 @@
 
     dndTransferListObjFree(pList, pObj);
+}
+
+/**
+ * Removes an object from a transfer list.
+ *
+ * @param   pList               Transfer list to remove object from.
+ * @param   pObj                Object to remove. The object will be free'd and the pointer is invalid after calling.
+ */
+void DnDTransferListObjRemove(PDNDTRANSFERLIST pList, PDNDTRANSFEROBJECT pObj)
+{
+    return dndTransferListObjRemoveInternal(pList, pObj);
+}
+
+/**
+ * Removes the first DnD transfer object from a transfer list.
+ *
+ * @param   pList               Transfer list to remove first entry for.
+ */
+void DnDTransferListObjRemoveFirst(PDNDTRANSFERLIST pList)
+{
+    AssertPtrReturnVoid(pList);
+
+    if (!pList->cObj)
+        return;
+
+    PDNDTRANSFEROBJECT pObj = RTListGetFirst(&pList->lstObj, DNDTRANSFEROBJECT, Node);
+    AssertPtr(pObj);
+
+    dndTransferListObjRemoveInternal(pList, pObj);
 }