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

Timestamp:

May 4, 2015 12:38:57 PM (10 years ago)

Author:

vboxsync

Message:

DnD:

• Overhauled "dropped files" directory + general file handling: Keep the directories/files open when doing the actual transfers (only protocol >= 2)
• Unified "dropped files" directory creation/rollback handling for guest/host parts.

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDDir.cpp (modified) (4 diffs)
• DnDURIList.cpp (modified) (5 diffs)
• DnDURIObject.cpp (modified) (9 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #include <VBox/GuestHost/DragAndDrop.h>
 
-int DnDDirCreateDroppedFilesEx(const char *pszPath,
-                               char *pszDropDir, size_t cbDropDir)
+int DnDDirDroppedAddFile(PDNDDIRDROPPEDFILES pDir, const char *pszFile)
+{
+    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszFile, VERR_INVALID_POINTER);
+
+    if (!pDir->lstFiles.contains(pszFile))
+        pDir->lstFiles.append(pszFile);
+    return VINF_SUCCESS;
+}
+
+int DnDDirDroppedAddDir(PDNDDIRDROPPEDFILES pDir, const char *pszDir)
+{
+    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszDir, VERR_INVALID_POINTER);
+
+    if (!pDir->lstDirs.contains(pszDir))
+        pDir->lstDirs.append(pszDir);
+    return VINF_SUCCESS;
+}
+
+int DnDDirDroppedFilesCreateAndOpenEx(const char *pszPath, PDNDDIRDROPPEDFILES pDir)
 {
     AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
-    AssertPtrReturn(pszDropDir, VERR_INVALID_POINTER);
-    AssertReturn(cbDropDir, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
 
-    if (RTStrPrintf(pszDropDir, cbDropDir, "%s", pszPath) <= 0)
+    char pszDropDir[RTPATH_MAX];
+    if (RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath) <= 0)
         return VERR_NO_MEMORY;
 
@@ -42 +61 @@
 
     /* Append our base drop directory. */
-    int rc = RTPathAppend(pszDropDir, cbDropDir, "VirtualBox Dropped Files");
+    int rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), "VirtualBox Dropped Files"); /** @todo Make this tag configurable? */
     if (RT_FAILURE(rc))
         return rc;
@@ -64 +83 @@
         return rc;
 
-    rc = RTPathAppend(pszDropDir, cbDropDir, pszTime);
+    rc = RTPathAppend(pszDropDir, sizeof(pszDropDir), pszTime);
     if (RT_FAILURE(rc))
         return rc;
 
     /* Create it (only accessible by the current user) */
-    return RTDirCreateUniqueNumbered(pszDropDir, cbDropDir, RTFS_UNIX_IRWXU, 3, '-');
+    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;
+        }
+    }
+
+    return rc;
 }
 
-int DnDDirCreateDroppedFiles(char *pszDropDir, size_t cbDropDir)
+int DnDDirDroppedFilesCreateAndOpenTemp(PDNDDIRDROPPEDFILES pDir)
 {
-    AssertPtrReturn(pszDropDir, VERR_INVALID_POINTER);
-    AssertReturn(cbDropDir, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
 
     char szTemp[RTPATH_MAX];
 
-    /* Get the user's temp directory. Don't use the user's root directory (or
+    /*
+     * Get the user's temp directory. Don't use the user's root directory (or
      * something inside it) because we don't know for how long/if the data will
-     * be kept after the guest OS used it. */
+     * be kept after the guest OS used it.
+     */
     int rc = RTPathTemp(szTemp, sizeof(szTemp));
     if (RT_FAILURE(rc))
         return rc;
 
-    return DnDDirCreateDroppedFilesEx(szTemp, pszDropDir, cbDropDir);
+    return DnDDirDroppedFilesCreateAndOpenEx(szTemp, pDir);
 }
 
+int DnDDirDroppedFilesClose(PDNDDIRDROPPEDFILES pDir, bool fRemove)
+{
+    AssertPtrReturn(pDir, VERR_INVALID_POINTER);
+
+    int rc = RTDirClose(pDir->hDir);
+    if (RT_SUCCESS(rc))
+    {
+        pDir->lstDirs.clear();
+        pDir->lstFiles.clear();
+
+        if (fRemove)
+        {
+            /* Try removing the (empty) drop directory in any case. */
+            rc = RTDirRemove(pDir->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())
+        return VINF_SUCCESS;
+
+    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 ... :-) */
+    for (size_t i = 0; i < pDir->lstFiles.size(); i++)
+    {
+        rc2 = RTFileDelete(pDir->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());
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    /* Try to remove the empty root dropped files directory as well. */
+    rc2 = RTDirRemove(pDir->strPathAbs.c_str());
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    return rc;
+}
+

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

@@ -336 +336 @@
 }
 
-int DnDURIList::RootFromURIData(const void *pvData, size_t cbData,
-                                uint32_t fFlags)
+int DnDURIList::RootFromURIData(const void *pvData, size_t cbData, uint32_t fFlags)
 {
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
@@ -380 +379 @@
 }
 
-RTCString DnDURIList::RootToString(const RTCString &strBasePath /* = "" */,
+RTCString DnDURIList::RootToString(const RTCString &strPathBase /* = "" */,
                                    const RTCString &strSeparator /* = "\r\n" */)
 {
@@ -390 +389 @@
         LogFlowFunc(("pszCurRoot=%s\n", pszCurRoot));
 #endif
-        if (strBasePath.isNotEmpty())
-        {
-            char *pszPath = RTPathJoinA(strBasePath.c_str(), pszCurRoot);
+        if (strPathBase.isNotEmpty())
+        {
+            char *pszPath = RTPathJoinA(strPathBase.c_str(), pszCurRoot);
             if (pszPath)
             {
@@ -399 +398 @@
                 {
                     strRet += RTCString(pszPathURI) + strSeparator;
-#ifdef DEBUG_andy
                     LogFlowFunc(("URI: %s\n", strRet.c_str()));
-#endif
                     RTStrFree(pszPathURI);
                 }
@@ -417 +414 @@
             {
                 strRet += RTCString(pszPathURI) + strSeparator;
-#ifdef DEBUG_andy
                 LogFlowFunc(("URI: %s\n", strRet.c_str()));
-#endif
                 RTStrFree(pszPathURI);
             }

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

@@ -37 +37 @@
 DnDURIObject::DnDURIObject(void)
     : m_Type(Unknown)
-    , m_fCreationMode(0)
+    , m_fMode(0)
     , m_cbSize(0)
     , m_cbProcessed(0)
@@ -51 +51 @@
     , m_strSrcPath(strSrcPath)
     , m_strTgtPath(strDstPath)
-    , m_fCreationMode(fMode)
+    , m_fMode(fMode)
     , m_cbSize(cbSize)
     , m_cbProcessed(0)
@@ -155 +155 @@
 }
 
-int DnDURIObject::Open(Dest enmDest, uint64_t fOpen)
+int DnDURIObject::Open(Dest enmDest, uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */)
 {
     return OpenEx(  enmDest == Source
                   ? m_strSrcPath : m_strTgtPath
-                  , m_Type, enmDest, fOpen, 0 /* fFlag s*/);
+                  , m_Type, enmDest, fOpen, fMode, 0 /* fFlags */);
 }
 
 int DnDURIObject::OpenEx(const RTCString &strPath, Type enmType, Dest enmDest,
-                         uint64_t fOpen /* = 0 */, uint32_t fFlags /* = 0 */)
+                         uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */, uint32_t fFlags /* = 0 */)
 {
     int rc = VINF_SUCCESS;
@@ -198 +198 @@
                     if (RT_SUCCESS(rc))
                         rc = RTFileGetSize(u.m_hFile, &m_cbSize);
+                    if (RT_SUCCESS(rc)
+                        && fMode)
+                    {
+                        rc = RTFileSetMode(u.m_hFile, fMode);
+                    }
                     if (RT_SUCCESS(rc))
                     {
-                        LogFlowFunc(("cbSize=%RU64, fMode=%RU32\n", m_cbSize, m_fCreationMode));
+                        LogFlowFunc(("cbSize=%RU64, fMode=%RU32\n", m_cbSize, m_fMode));
                         m_cbProcessed = 0;
                     }
@@ -293 +298 @@
         case File:
         {
-            bool fDone = false;
-
             rc = OpenEx(m_strSrcPath, File, Source,
                         /* Use some sensible defaults. */
@@ -307 +310 @@
 
                     /* End of file reached or error occurred? */
-                    if (m_cbProcessed == m_cbSize)
+                    if (   m_cbSize
+                        && m_cbProcessed == m_cbSize)
                     {
                         rc = VINF_EOF;
-                        fDone = true;
                     }
                 }
-                else
-                    fDone = true;
-
-                if (fDone)
-                    closeInternal();
             }
 
@@ -351 +349 @@
     m_strSrcPath    = "";
     m_strTgtPath    = "";
-    m_fCreationMode = 0;
+    m_fMode = 0;
     m_cbSize        = 0;
     m_cbProcessed   = 0;
@@ -369 +367 @@
         case File:
         {
-            bool fDone = false;
-
             rc = OpenEx(m_strTgtPath, File, Target,
                         /* Use some sensible defaults. */
@@ -379 +375 @@
                 if (RT_SUCCESS(rc))
                     m_cbProcessed += cbWritten;
-                else
-                    fDone = true;
-
-                if (fDone)
-                    closeInternal();
             }