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

Timestamp:

Sep 8, 2015 1:16:17 PM (9 years ago)

Author:

vboxsync

Message:

DnD: Moved allocation of DNDDIRDROPPEDFILES into DnDDirDroppedFilesCreateAndOpen(Temp|Ex). Untested.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDDir.cpp (modified) (3 diffs)

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

@@ -48 +48 @@
 }
 
-int DnDDirDroppedFilesCreateAndOpenEx(const char *pszPath, PDNDDIRDROPPEDFILES pDir)
+static int dndDirDroppedFilesCreate(uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir)
+{
+    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(pDir, VERR_INVALID_POINTER);
-
-    char pszDropDir[RTPATH_MAX];
-    if (RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath) <= 0)
-        return VERR_NO_MEMORY;
-
-    /** @todo On Windows we also could use the registry to override
-     *        this path, on Posix a dotfile and/or a guest property
-     *        can be used. */
-
-    /* Append our base drop directory. */
-    int rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), "VirtualBox Dropped Files"); /** @todo Make this tag configurable? */
+    AssertPtrReturn(ppDir, VERR_INVALID_POINTER);
+
+    PDNDDIRDROPPEDFILES pDir;
+    int rc = dndDirDroppedFilesCreate(fFlags, &pDir);
     if (RT_FAILURE(rc))
         return rc;
 
-    /* Create it when necessary. */
-    if (!RTDirExists(pszDropDir))
-    {
-        rc = RTDirCreateFullPath(pszDropDir, RTFS_UNIX_IRWXU);
+    do
+    {
+        char pszDropDir[RTPATH_MAX];
+        if (RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath) <= 0)
+        {
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+
+        /** @todo On Windows we also could use the registry to override
+         *        this path, on Posix a dotfile and/or a guest property
+         *        can be used. */
+
+        /* Append our base drop directory. */
+        int rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), "VirtualBox Dropped Files"); /** @todo Make this tag configurable? */
         if (RT_FAILURE(rc))
-            return rc;
-    }
-
-    /* The actually drop directory consist of the current time stamp and a
-     * unique number when necessary. */
-    char pszTime[64];
-    RTTIMESPEC time;
-    if (!RTTimeSpecToString(RTTimeNow(&time), pszTime, sizeof(pszTime)))
-        return VERR_BUFFER_OVERFLOW;
-    rc = DnDPathSanitizeFilename(pszTime, sizeof(pszTime));
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), pszTime);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* Create it (only accessible by the current user) */
-    rc = RTDirCreateUniqueNumbered(pszDropDir, sizeof(pszDropDir), RTFS_UNIX_IRWXU, 3, '-');
-    if (RT_SUCCESS(rc))
-    {
-        PRTDIR phDir;
-        rc = RTDirOpen(&phDir, pszDropDir);
-        if (RT_SUCCESS(rc))
-        {
-            pDir->hDir       = phDir;
-            pDir->strPathAbs = pszDropDir;
-            pDir->fOpen      = true;
-        }
-    }
-
-    return rc;
-}
-
-int DnDDirDroppedFilesCreateAndOpenTemp(PDNDDIRDROPPEDFILES pDir)
-{
-    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
-
-    char szTemp[RTPATH_MAX];
+            break;
+
+        /* Create it when necessary. */
+        if (!RTDirExists(pszDropDir))
+        {
+            rc = RTDirCreateFullPath(pszDropDir, RTFS_UNIX_IRWXU);
+            if (RT_FAILURE(rc))
+                break;
+        }
+
+        /* The actually drop directory consist of the current time stamp and a
+         * unique number when necessary. */
+        char pszTime[64];
+        RTTIMESPEC time;
+        if (!RTTimeSpecToString(RTTimeNow(&time), pszTime, sizeof(pszTime)))
+        {
+            rc = VERR_BUFFER_OVERFLOW;
+            break;
+        }
+
+        rc = DnDPathSanitizeFilename(pszTime, sizeof(pszTime));
+        if (RT_FAILURE(rc))
+            break;
+
+        rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), pszTime);
+        if (RT_FAILURE(rc))
+            break;
+
+        /* Create it (only accessible by the current user) */
+        rc = RTDirCreateUniqueNumbered(pszDropDir, sizeof(pszDropDir), RTFS_UNIX_IRWXU, 3, '-');
+        if (RT_SUCCESS(rc))
+        {
+            PRTDIR phDir;
+            rc = RTDirOpen(&phDir, pszDropDir);
+            if (RT_SUCCESS(rc))
+            {
+                pDir->hDir       = phDir;
+                pDir->strPathAbs = pszDropDir;
+                pDir->fOpen      = true;
+            }
+        }
+
+    } while (0);
+
+    if (RT_SUCCESS(rc))
+    {
+        *ppDir = pDir;
+    }
+    else
+        DnDDirDroppedFilesDestroy(pDir);
+
+    return rc;
+}
+
+int DnDDirDroppedFilesCreateAndOpenTemp(uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir)
+{
+    AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER); /* Flags not supported yet. */
+    AssertPtrReturn(ppDir, VERR_INVALID_POINTER);
+
+    PDNDDIRDROPPEDFILES pDir;
 
     /*
@@ -116 +158 @@
      * be kept after the guest OS used it.
      */
+    char szTemp[RTPATH_MAX];
     int rc = RTPathTemp(szTemp, sizeof(szTemp));
-    if (RT_FAILURE(rc))
-        return rc;
-
-    return DnDDirDroppedFilesCreateAndOpenEx(szTemp, pDir);
+    if (RT_SUCCESS(rc))
+        rc = DnDDirDroppedFilesCreateAndOpenEx(szTemp, fFlags, &pDir);
+
+    if (RT_SUCCESS(rc))
+    {
+        *ppDir = pDir;
+    }
+    else
+        DnDDirDroppedFilesDestroy(pDir);
+
+    return rc;
+}
+
+void DnDDirDroppedFilesDestroy(PDNDDIRDROPPEDFILES pDir)
+{
+    AssertPtrReturnVoid(pDir);
+
+    RTMemFree(pDir);
 }
 
@@ -132 +189 @@
         rc = RTDirClose(pDir->hDir);
         if (RT_SUCCESS(rc))
+        {
             pDir->fOpen = false;
+            pDir->hDir  = NULL;
+        }
     }
     if (RT_SUCCESS(rc))