Changeset 58212 in vbox for trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp

Timestamp:

Oct 13, 2015 11:49:33 AM (9 years ago)

Author:

vboxsync

Message:

DnD: Updates.

• Introduced protocol changelog in DragAndDropSvc.h.
• Implemented protocol v3 with HOST_DND_HG_SND_DATA_HDR message for doing proper object accounting, among other parameters like checksumming and compression flags.
• Encapsulated a lot of functionality in class hierarchies.
• Renamed a lot of functions to make the usage more clear.
• Various other bugfixes.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp (modified) (7 diffs)

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

@@ -28 +28 @@
 #include <VBox/GuestHost/DragAndDrop.h>
 
+#ifdef LOG_GROUP
+ #undef LOG_GROUP
+#endif
+#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
+
 DnDDroppedFiles::DnDDroppedFiles(void)
     : hDir(NULL)
-    , fOpen(false) { }
-
-DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, uint32_t fFlags)
+    , fOpen(0) { }
+
+DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, uint32_t fOpen)
     : hDir(NULL)
-    , fOpen(false)
-{
-    OpenEx(pszPath, fFlags);
+    , fOpen(0)
+{
+    OpenEx(pszPath, fOpen);
 }
 
 DnDDroppedFiles::~DnDDroppedFiles(void)
 {
-    Reset(true /* fRemoveDropDir */);
+    /* Only make sure to not leak any handles and stuff, don't delete any
+     * directories / files here. */
+    closeInternal();
 }
 
@@ -62 +70 @@
 }
 
+int DnDDroppedFiles::closeInternal(void)
+{
+    int rc;
+    if (this->hDir != NULL)
+    {
+        rc = RTDirClose(this->hDir);
+        if (RT_SUCCESS(rc))
+            this->hDir = NULL;
+    }
+    else
+        rc = VINF_SUCCESS;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int DnDDroppedFiles::Close(void)
+{
+    return closeInternal();
+}
+
 const char *DnDDroppedFiles::GetDirAbs(void) const
 {
@@ -69 +98 @@
 bool DnDDroppedFiles::IsOpen(void) const
 {
-    return this->fOpen;
+    return (this->hDir != NULL);
 }
 
@@ -129 +158 @@
                 this->hDir       = phDir;
                 this->strPathAbs = pszDropDir;
-                this->fOpen      = true;
+                this->fOpen      = fFlags;
             }
         }
@@ -135 +164 @@
     } while (0);
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -157 +187 @@
 int DnDDroppedFiles::Reset(bool fRemoveDropDir)
 {
-    int rc = VINF_SUCCESS;
-    if (this->fOpen)
-    {
-        rc = RTDirClose(this->hDir);
-        if (RT_SUCCESS(rc))
-        {
-            this->fOpen = false;
-            this->hDir  = NULL;
-        }
-    }
-    if (RT_SUCCESS(rc))
-    {
-        this->lstDirs.clear();
-        this->lstFiles.clear();
-
-        if (   fRemoveDropDir
-            && this->strPathAbs.isNotEmpty())
-        {
-            /* Try removing the (empty) drop directory in any case. */
-            rc = RTDirRemove(this->strPathAbs.c_str());
-            if (RT_SUCCESS(rc)) /* Only clear if successfully removed. */
-                this->strPathAbs = "";
-        }
-    }
-
-    return rc;
+    int rc = closeInternal();
+    if (RT_SUCCESS(rc))
+    {
+        if (fRemoveDropDir)
+        {
+            rc = Rollback();
+        }
+        else
+        {
+            this->lstDirs.clear();
+            this->lstFiles.clear();
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int DnDDroppedFiles::Reopen(void)
+{
+    if (this->strPathAbs.isEmpty())
+        return VERR_NOT_FOUND;
+
+    return OpenEx(this->strPathAbs.c_str(), this->fOpen);
 }
 
@@ -190 +218 @@
         return VINF_SUCCESS;
 
-    Assert(this->fOpen);
-    Assert(this->hDir != NULL);
-
     int rc = VINF_SUCCESS;
-    int rc2;
 
     /* Rollback by removing any stuff created.
      * Note: Only remove empty directories, never ever delete
      *       anything recursive here! Steam (tm) knows best ... :-) */
+    int rc2;
     for (size_t i = 0; i < this->lstFiles.size(); i++)
     {
         rc2 = RTFileDelete(this->lstFiles.at(i).c_str());
+        if (RT_SUCCESS(rc2))
+            this->lstFiles.removeAt(i);
+
+        if (RT_SUCCESS(rc))
+           rc = rc2;
+        /* Keep going. */
+    }
+
+    for (size_t i = 0; i < this->lstDirs.size(); i++)
+    {
+        rc2 = RTDirRemove(this->lstDirs.at(i).c_str());
+        if (RT_SUCCESS(rc2))
+            this->lstDirs.removeAt(i);
+
         if (RT_SUCCESS(rc))
             rc = rc2;
-    }
-
-    for (size_t i = 0; i < this->lstDirs.size(); i++)
-    {
-        rc2 = RTDirRemove(this->lstDirs.at(i).c_str());
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    /* Try to remove the empty root dropped files directory as well. */
-    rc2 = RTDirRemove(this->strPathAbs.c_str());
+        /* Keep going. */
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        Assert(this->lstFiles.isEmpty());
+        Assert(this->lstDirs.isEmpty());
+
+        rc2 = closeInternal();
+        if (RT_SUCCESS(rc2))
+        {
+            /* Try to remove the empty root dropped files directory as well.
+             * Might return VERR_DIR_NOT_EMPTY or similar. */
+            rc2 = RTDirRemove(this->strPathAbs.c_str());
+        }
+    }
+
     if (RT_SUCCESS(rc))
         rc = rc2;
 
-    return rc;
-}
-
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+