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

Timestamp:

Dec 13, 2022 5:26:12 PM (2 years ago)

Author:

vboxsync

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

154874

Message:

DnD: Resolved a @todo: Return rc when closing DnD objects.

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDTransferList.cpp (modified) (1 diff)
• DnDTransferObject.cpp (modified) (5 diffs)

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

@@ -280 +280 @@
                     if (   fIsFile
                         && !(fFlags & DNDTRANSFERLIST_FLAGS_KEEP_OPEN)) /* Shall we keep the file open while being added to this list? */
-                        DnDTransferObjectClose(pObj);
+                        rc = DnDTransferObjectClose(pObj);
                 }
 

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

@@ -47 +47 @@
 *   Prototypes                                                                                                                   *
 *********************************************************************************************************************************/
-static void dndTransferObjectCloseInternal(PDNDTRANSFEROBJECT pObj);
+static int dndTransferObjectCloseInternal(PDNDTRANSFEROBJECT pObj);
 static int dndTransferObjectQueryInfoInternal(PDNDTRANSFEROBJECT pObj);
 
@@ -178 +178 @@
  * Closes the object's internal handles (to files / ...).
  *
+ * @returns VBox status code.
  * @param   pObj                DnD transfer object to close internally.
  */
-static void dndTransferObjectCloseInternal(PDNDTRANSFEROBJECT pObj)
-{
-    AssertPtrReturnVoid(pObj);
-
-    int rc;
-
-    LogRel2(("DnD: Closing '%s'\n", pObj->pszPath));
+static int dndTransferObjectCloseInternal(PDNDTRANSFEROBJECT pObj)
+{
+    AssertPtrReturn(pObj, VERR_INVALID_POINTER);
+
+    int rc = VINF_SUCCESS;
+
+    if (pObj->pszPath)
+        LogRel2(("DnD: Closing '%s'\n", pObj->pszPath));
 
     switch (pObj->enmType)
@@ -226 +228 @@
     }
 
-    /** @todo Return rc. */
+    return rc;
 }
 
@@ -233 +235 @@
  * This also closes the internal handles associated with the object (to files / ...).
  *
+ * @returns VBox status code.
  * @param   pObj                DnD transfer object to close.
  */
-void DnDTransferObjectClose(PDNDTRANSFEROBJECT pObj)
-{
-    AssertPtrReturnVoid(pObj);
-
-    dndTransferObjectCloseInternal(pObj);
+int DnDTransferObjectClose(PDNDTRANSFEROBJECT pObj)
+{
+    AssertPtrReturn(pObj, VERR_INVALID_POINTER);
+
+    return dndTransferObjectCloseInternal(pObj);
 }
 
@@ -616 +619 @@
     LogFlowFuncEnter();
 
-    dndTransferObjectCloseInternal(pObj);
+    int vrc2 = dndTransferObjectCloseInternal(pObj);
+    AssertRCReturnVoid(vrc2);
 
     pObj->enmType    = DNDTRANSFEROBJTYPE_UNKNOWN;