Changeset 56903 in vbox for trunk

Timestamp:

Jul 9, 2015 3:43:22 PM (10 years ago)

Author:

vboxsync

Message:

DnD/DnDURIList: Added support for keeping objects open while in list, todos.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (1 diff)
• src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (4 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -77 +77 @@
 /** Resolve all symlinks. */
 #define DNDURILIST_FLAGS_RESOLVE_SYMLINKS       RT_BIT(1)
+/** Keep the files + directory entries open while
+ *  being in this list. */
+#define DNDURILIST_FLAGS_KEEP_OPEN              RT_BIT(2)
+/** Lazy loading: Only enumerate sub directories when needed.
+ ** @todo Implement lazy loading.  */
+#define DNDURILIST_FLAGS_LAZY                   RT_BIT(3)
 
 class DnDURIObject

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

@@ -50 +50 @@
     AssertPtrReturn(pcszTarget, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("pcszSource=%s, pcszTarget=%s\n", pcszSource, pcszTarget));
+    LogFlowFunc(("pcszSource=%s, pcszTarget=%s, fFlags=0x%x\n", pcszSource, pcszTarget, fFlags));
 
     RTFSOBJINFO objInfo;
@@ -60 +60 @@
             LogFlowFunc(("File '%s' -> '%s' (%RU64)\n", pcszSource, pcszTarget, (uint64_t)objInfo.cbObject));
 
-            m_lstTree.append(DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget,
-                             objInfo.Attr.fMode, (uint64_t)objInfo.cbObject));
-            m_cTotal++;
-            m_cbTotal += (uint64_t)objInfo.cbObject;
+            DnDURIObject objFile(DnDURIObject::File, pcszSource, pcszTarget);
+            if (fFlags & DNDURILIST_FLAGS_KEEP_OPEN) /* Shall we keep the file open while being added to this list? */
+            {
+                /** @todo Add a standard fOpen mode for this list. */
+                rc = objFile.Open(DnDURIObject::Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, objInfo.Attr.fMode);
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                m_lstTree.append(objFile);
+
+                m_cTotal++;
+                m_cbTotal += (uint64_t)objInfo.cbObject;
+            }
         }
         else if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
@@ -71 +81 @@
             m_lstTree.append(DnDURIObject(DnDURIObject::Directory, pcszSource, pcszTarget,
                              objInfo.Attr.fMode, 0 /* Size */));
+
+            /** @todo Add DNDURILIST_FLAGS_KEEP_OPEN handling. */
+
             m_cTotal++;
         }
@@ -395 +408 @@
         return;
 
-    DnDURIObject &curPath = m_lstTree.first();
-
-    uint64_t cbSize = curPath.GetSize();
+    DnDURIObject &curObj = m_lstTree.first();
+
+    uint64_t cbSize = curObj.GetSize();
     Assert(m_cbTotal >= cbSize);
     m_cbTotal -= cbSize; /* Adjust total size. */
+
+    curObj.Close();
 
     m_lstTree.removeFirst();