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

Timestamp:

Sep 16, 2015 9:40:54 AM (9 years ago)

Author:

vboxsync

Message:

DnD: Renamed DNDDIRDROPPEDFILES to DnDDroppedFiles and restructured it for being a class.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp (moved) (moved from trunk/src/VBox/GuestHost/DragAndDrop/DnDDir.cpp ) (7 diffs)

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

@@ -28 +28 @@
 #include <VBox/GuestHost/DragAndDrop.h>
 
-int DnDDirDroppedAddFile(PDNDDIRDROPPEDFILES pDir, const char *pszFile)
-{
-    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
+DnDDroppedFiles::DnDDroppedFiles(void)
+    : hDir(NULL)
+    , fOpen(false) { }
+
+DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, uint32_t fFlags)
+    : hDir(NULL)
+    , fOpen(false)
+{
+    OpenEx(pszPath, fFlags);
+}
+
+DnDDroppedFiles::~DnDDroppedFiles(void)
+{
+    Reset(true /* fRemoveDropDir */);
+}
+
+int DnDDroppedFiles::AddFile(const char *pszFile)
+{
     AssertPtrReturn(pszFile, VERR_INVALID_POINTER);
 
-    if (!pDir->lstFiles.contains(pszFile))
-        pDir->lstFiles.append(pszFile);
+    if (!this->lstFiles.contains(pszFile))
+        this->lstFiles.append(pszFile);
     return VINF_SUCCESS;
 }
 
-int DnDDirDroppedAddDir(PDNDDIRDROPPEDFILES pDir, const char *pszDir)
-{
-    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
+int DnDDroppedFiles::AddDir(const char *pszDir)
+{
     AssertPtrReturn(pszDir, VERR_INVALID_POINTER);
 
-    if (!pDir->lstDirs.contains(pszDir))
-        pDir->lstDirs.append(pszDir);
+    if (!this->lstDirs.contains(pszDir))
+        this->lstDirs.append(pszDir);
     return VINF_SUCCESS;
 }
 
-static int dndDirDroppedFilesCreate(uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir)
-{
+const char *DnDDroppedFiles::GetDirAbs(void) const
+{
+    return this->strPathAbs.c_str();
+}
+
+bool DnDDroppedFiles::IsOpen(void) const
+{
+    return this->fOpen;
+}
+
+int DnDDroppedFiles::OpenEx(const char *pszPath, uint32_t fFlags)
+{
+    AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
     AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER); /* Flags not supported yet. */
-    AssertPtrReturn(ppDir, VERR_INVALID_POINTER);
-
-    PDNDDIRDROPPEDFILES pDir = (PDNDDIRDROPPEDFILES)RTMemAlloc(sizeof(DNDDIRDROPPEDFILES));
-    if (pDir)
-    {
-        pDir->hDir  = NULL;
-        pDir->fOpen = false;
-
-        *ppDir = pDir;
-        return VINF_SUCCESS;
-    }
-
-    return VERR_NO_MEMORY;
-}
-
-int DnDDirDroppedFilesCreateAndOpenEx(const char *pszPath, uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir)
-{
-    AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
-    AssertPtrReturn(ppDir, VERR_INVALID_POINTER);
-
-    PDNDDIRDROPPEDFILES pDir;
-    int rc = dndDirDroppedFilesCreate(fFlags, &pDir);
-    if (RT_FAILURE(rc))
-        return rc;
+
+    int rc;
 
     do
     {
         char pszDropDir[RTPATH_MAX];
-        if (RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath) <= 0)
-        {
-            rc = VERR_NO_MEMORY;
-            break;
-        }
+        size_t cchDropDir = RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath);
 
         /** @todo On Windows we also could use the registry to override
@@ -90 +89 @@
 
         /* Append our base drop directory. */
-        int rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), "VirtualBox Dropped Files"); /** @todo Make this tag configurable? */
+        rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), "VirtualBox Dropped Files"); /** @todo Make this tag configurable? */
         if (RT_FAILURE(rc))
             break;
@@ -128 +127 @@
             if (RT_SUCCESS(rc))
             {
-                pDir->hDir       = phDir;
-                pDir->strPathAbs = pszDropDir;
-                pDir->fOpen      = true;
+                this->hDir       = phDir;
+                this->strPathAbs = pszDropDir;
+                this->fOpen      = true;
             }
         }
@@ -136 +135 @@
     } while (0);
 
-    if (RT_SUCCESS(rc))
-    {
-        *ppDir = pDir;
-    }
-    else
-        DnDDirDroppedFilesDestroy(pDir);
-
-    return rc;
-}
-
-int DnDDirDroppedFilesCreateAndOpenTemp(uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir)
+    return rc;
+}
+
+int DnDDroppedFiles::OpenTemp(uint32_t fFlags)
 {
     AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER); /* Flags not supported yet. */
-    AssertPtrReturn(ppDir, VERR_INVALID_POINTER);
-
-    PDNDDIRDROPPEDFILES pDir;
 
     /*
@@ -161 +150 @@
     int rc = RTPathTemp(szTemp, sizeof(szTemp));
     if (RT_SUCCESS(rc))
-        rc = DnDDirDroppedFilesCreateAndOpenEx(szTemp, fFlags, &pDir);
-
+        rc = OpenEx(szTemp, fFlags);
+
+    return rc;
+}
+
+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))
     {
-        *ppDir = pDir;
-    }
-    else
-        DnDDirDroppedFilesDestroy(pDir);
-
-    return rc;
-}
-
-void DnDDirDroppedFilesDestroy(PDNDDIRDROPPEDFILES pDir)
-{
-    AssertPtrReturnVoid(pDir);
-
-    RTMemFree(pDir);
-}
-
-int DnDDirDroppedFilesClose(PDNDDIRDROPPEDFILES pDir, bool fRemove)
-{
-    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
-
-    int rc = VINF_SUCCESS;
-    if (pDir->fOpen)
-    {
-        rc = RTDirClose(pDir->hDir);
-        if (RT_SUCCESS(rc))
-        {
-            pDir->fOpen = false;
-            pDir->hDir  = NULL;
-        }
-    }
-    if (RT_SUCCESS(rc))
-    {
-        pDir->lstDirs.clear();
-        pDir->lstFiles.clear();
-
-        if (   fRemove
-            && pDir->strPathAbs.isNotEmpty())
+        this->lstDirs.clear();
+        this->lstFiles.clear();
+
+        if (   fRemoveDropDir
+            && this->strPathAbs.isNotEmpty())
         {
             /* Try removing the (empty) drop directory in any case. */
-            rc = RTDirRemove(pDir->strPathAbs.c_str());
+            rc = RTDirRemove(this->strPathAbs.c_str());
             if (RT_SUCCESS(rc)) /* Only clear if successfully removed. */
-                pDir->strPathAbs = "";
-        }
-    }
-
-    return rc;
-}
-
-const char *DnDDirDroppedFilesGetDirAbs(PDNDDIRDROPPEDFILES pDir)
-{
-    AssertPtrReturn(pDir, NULL);
-    return pDir->strPathAbs.c_str();
-}
-
-int DnDDirDroppedFilesRollback(PDNDDIRDROPPEDFILES pDir)
-{
-    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
-
-    if (pDir->strPathAbs.isEmpty())
+                this->strPathAbs = "";
+        }
+    }
+
+    return rc;
+}
+
+int DnDDroppedFiles::Rollback(void)
+{
+    if (this->strPathAbs.isEmpty())
         return VINF_SUCCESS;
+
+    Assert(this->fOpen);
+    Assert(this->hDir != NULL);
 
     int rc = VINF_SUCCESS;
@@ -231 +199 @@
      * Note: Only remove empty directories, never ever delete
      *       anything recursive here! Steam (tm) knows best ... :-) */
-    for (size_t i = 0; i < pDir->lstFiles.size(); i++)
-    {
-        rc2 = RTFileDelete(pDir->lstFiles.at(i).c_str());
+    for (size_t i = 0; i < this->lstFiles.size(); i++)
+    {
+        rc2 = RTFileDelete(this->lstFiles.at(i).c_str());
         if (RT_SUCCESS(rc))
             rc = rc2;
     }
 
-    for (size_t i = 0; i < pDir->lstDirs.size(); i++)
-    {
-        rc2 = RTDirRemove(pDir->lstDirs.at(i).c_str());
+    for (size_t i = 0; i < this->lstDirs.size(); i++)
+    {
+        rc2 = RTDirRemove(this->lstDirs.at(i).c_str());
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -246 +214 @@
 
     /* Try to remove the empty root dropped files directory as well. */
-    rc2 = RTDirRemove(pDir->strPathAbs.c_str());
+    rc2 = RTDirRemove(this->strPathAbs.c_str());
     if (RT_SUCCESS(rc))
         rc = rc2;