Changeset 57654 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (5 diffs)
• src/VBox/GuestHost/DragAndDrop/DnDDir.cpp (modified) (3 diffs)
• src/VBox/Main/include/GuestDnDPrivate.h (modified) (3 diffs)
• src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (modified) (5 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -61 +61 @@
 int DnDDirDroppedAddFile(PDNDDIRDROPPEDFILES pDir, const char *pszFile);
 int DnDDirDroppedAddDir(PDNDDIRDROPPEDFILES pDir, const char *pszDir);
-int DnDDirDroppedFilesCreateAndOpenEx(const char *pszPath, PDNDDIRDROPPEDFILES pDir);
-int DnDDirDroppedFilesCreateAndOpenTemp(PDNDDIRDROPPEDFILES pDir);
+int DnDDirDroppedFilesCreateAndOpenEx(const char *pszPath, uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir);
+int DnDDirDroppedFilesCreateAndOpenTemp(uint32_t fFlags, PDNDDIRDROPPEDFILES *ppDir);
 int DnDDirDroppedFilesClose(PDNDDIRDROPPEDFILES pDir, bool fRemove);
+void DnDDirDroppedFilesDestroy(PDNDDIRDROPPEDFILES pDir);
 const char *DnDDirDroppedFilesGetDirAbs(PDNDDIRDROPPEDFILES pDir);
 int DnDDirDroppedFilesRollback(PDNDDIRDROPPEDFILES pDir);

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -373 +373 @@
      * Create and query the (unique) drop target directory in the user's temporary directory.
      */
-    DNDDIRDROPPEDFILES dirDroppedFiles;
+    PDNDDIRDROPPEDFILES pDroppedFiles;
     const char *pszDropDir = NULL;
-    int rc = DnDDirDroppedFilesCreateAndOpenTemp(&dirDroppedFiles);
-    if (RT_SUCCESS(rc))
-        pszDropDir = DnDDirDroppedFilesGetDirAbs(&dirDroppedFiles);
+    int rc = DnDDirDroppedFilesCreateAndOpenTemp(0 /* fFlags */, &pDroppedFiles);
+    if (RT_SUCCESS(rc))
+        pszDropDir = DnDDirDroppedFilesGetDirAbs(pDroppedFiles);
 
     /*
@@ -421 +421 @@
                         rc = RTDirCreate(pszPathAbs, fCreationMode, 0);
                         if (RT_SUCCESS(rc))
-                            rc = DnDDirDroppedAddDir(&dirDroppedFiles, pszPathAbs);
+                            rc = DnDDirDroppedAddDir(pDroppedFiles, pszPathAbs);
 
                         RTStrFree(pszPathAbs);
@@ -488 +488 @@
                                 if (RT_SUCCESS(rc))
                                 {
-                                    rc = DnDDirDroppedAddFile(&dirDroppedFiles, strPathAbs.c_str());
+                                    rc = DnDDirDroppedAddFile(pDroppedFiles, strPathAbs.c_str());
                                     if (RT_SUCCESS(rc))
                                     {
@@ -571 +571 @@
     if (RT_FAILURE(rc))
     {
-        int rc2 = DnDDirDroppedFilesRollback(&dirDroppedFiles);
+        int rc2 = DnDDirDroppedFilesRollback(pDroppedFiles);
         AssertRC(rc2); /* Not fatal, don't report back to host. */
     }
@@ -620 +620 @@
      * by the client's drag'n drop operation lateron.
      */
-    int rc2 = DnDDirDroppedFilesClose(&dirDroppedFiles, false);
+    int rc2 = DnDDirDroppedFilesClose(pDroppedFiles, false);
     if (RT_FAILURE(rc2)) /* Not fatal, don't report back to host. */
         LogFlowFunc(("Closing dropped files directory failed with %Rrc\n", rc2));
+
+    DnDDirDroppedFilesDestroy(pDroppedFiles);
 
     LogFlowFuncLeaveRC(rc);

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))

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -138 +138 @@
 {
     GuestDnDURIData(void)
-        : pvScratchBuf(NULL)
-        , cbScratchBuf(0)
-    {
-        RT_ZERO(mDropDir);
-    }
+        : pDropDir(NULL)
+        , pvScratchBuf(NULL)
+        , cbScratchBuf(0) { }
 
     virtual ~GuestDnDURIData(void)
@@ -170 +168 @@
         objCtx.Reset();
 
-        DnDDirDroppedFilesRollback(&mDropDir);
-        DnDDirDroppedFilesClose(&mDropDir, true /* fRemove */);
+        if (pDropDir)
+        {
+            int rc2 = DnDDirDroppedFilesRollback(pDropDir);
+            AssertRC(rc2);
+            rc2 = DnDDirDroppedFilesClose(pDropDir, true /* fRemove */);
+            AssertRC(rc2);
+
+            DnDDirDroppedFilesDestroy(pDropDir);
+            pDropDir = NULL;
+        }
 
         if (pvScratchBuf)
@@ -182 +188 @@
     }
 
-    DNDDIRDROPPEDFILES              mDropDir;
+    /** Pointer to dropped files object. */
+    PDNDDIRDROPPEDFILES             pDropDir;
     /** (Non-recursive) List of URI objects to handle. */
     DnDURIList                      lstURI;

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -419 +419 @@
         if (fHasURIList)
         {
-            Utf8Str strURIs = pCtx->mURI.lstURI.RootToString(RTCString(DnDDirDroppedFilesGetDirAbs(&pCtx->mURI.mDropDir)));
+            Utf8Str strURIs = pCtx->mURI.lstURI.RootToString(RTCString(DnDDirDroppedFilesGetDirAbs(pCtx->mURI.pDropDir)));
             cbData = strURIs.length();
 
@@ -604 +604 @@
 
     int rc;
-    char *pszDir = RTPathJoinA(DnDDirDroppedFilesGetDirAbs(&pCtx->mURI.mDropDir), pszPath);
+    char *pszDir = RTPathJoinA(DnDDirDroppedFilesGetDirAbs(pCtx->mURI.pDropDir), pszPath);
     if (pszDir)
     {
@@ -663 +663 @@
 
         char pszPathAbs[RTPATH_MAX];
-        rc = RTPathJoin(pszPathAbs, sizeof(pszPathAbs), DnDDirDroppedFilesGetDirAbs(&pCtx->mURI.mDropDir), pszPath);
+        rc = RTPathJoin(pszPathAbs, sizeof(pszPathAbs), DnDDirDroppedFilesGetDirAbs(pCtx->mURI.pDropDir), pszPath);
         if (RT_FAILURE(rc))
         {
@@ -1036 +1036 @@
     do
     {
-        rc = DnDDirDroppedFilesCreateAndOpenTemp(&pCtx->mURI.mDropDir);
+        rc = DnDDirDroppedFilesCreateAndOpenTemp(0 /* fFlags */, &pCtx->mURI.pDropDir);
         if (RT_FAILURE(rc))
             break;
-        LogFlowFunc(("rc=%Rrc, strDropDir=%s\n", rc, DnDDirDroppedFilesGetDirAbs(&pCtx->mURI.mDropDir)));
+        LogFlowFunc(("rc=%Rrc, strDropDir=%s\n", rc, DnDDirDroppedFilesGetDirAbs(pCtx->mURI.pDropDir)));
         if (RT_FAILURE(rc))
             break;
@@ -1100 +1100 @@
     }
 
-    if (RT_FAILURE(rc))
-    {
-        rc2 = DnDDirDroppedFilesRollback(&pCtx->mURI.mDropDir); /** @todo Inform user on rollback failure? */
-        LogFlowFunc(("Rolling back ended with rc=%Rrc\n", rc2));
-    }
-
-    rc2 = DnDDirDroppedFilesClose(&pCtx->mURI.mDropDir, RT_FAILURE(rc) ? true : false /* fRemove */);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+    if (pCtx->mURI.pDropDir)
+    {
+        if (RT_FAILURE(rc))
+        {
+            rc2 = DnDDirDroppedFilesRollback(pCtx->mURI.pDropDir); /** @todo Inform user on rollback failure? */
+            LogFlowFunc(("Rolling back ended with rc=%Rrc\n", rc2));
+        }
+
+        rc2 = DnDDirDroppedFilesClose(pCtx->mURI.pDropDir, RT_FAILURE(rc) ? true : false /* fRemove */);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+
+        DnDDirDroppedFilesDestroy(pCtx->mURI.pDropDir);
+        pCtx->mURI.pDropDir = NULL;
+    }
 
     LogFlowFuncLeaveRC(rc);