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

Timestamp:

Jul 10, 2015 6:09:14 AM (9 years ago)

Author:

vboxsync

Message:

DnD: Changed DnDURIList's allocation scheme for stored DnDURIObject objects.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (5 diffs)

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

@@ -43 +43 @@
 DnDURIList::~DnDURIList(void)
 {
+    Clear();
 }
 
@@ -60 +61 @@
             LogFlowFunc(("File '%s' -> '%s' (%RU64)\n", pcszSource, pcszTarget, (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;
-            }
+            DnDURIObject *pObjFile= new DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget);
+            if (pObjFile)
+            {
+                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 = pObjFile->Open(DnDURIObject::Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, objInfo.Attr.fMode);
+                }
+
+                if (RT_SUCCESS(rc))
+                {
+                    m_lstTree.append(pObjFile);
+
+                    m_cTotal++;
+                    m_cbTotal += pObjFile->GetSize();
+                }
+            }
+            else
+                rc = VERR_NO_MEMORY;
         }
         else if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
@@ -79 +85 @@
             LogFlowFunc(("Directory '%s' -> '%s' \n", pcszSource, pcszTarget));
 
-            m_lstTree.append(DnDURIObject(DnDURIObject::Directory, pcszSource, pcszTarget,
-                             objInfo.Attr.fMode, 0 /* Size */));
+            DnDURIObject *pObjDir= new DnDURIObject(DnDURIObject::Directory, pcszSource, pcszTarget,
+                                                    objInfo.Attr.fMode, 0 /* Size */);
+            if (pObjDir)
+            {
+                m_lstTree.append(pObjDir);
+            }
+            else
+                rc = VERR_NO_MEMORY;
 
             /** @todo Add DNDURILIST_FLAGS_KEEP_OPEN handling. */
@@ -397 +409 @@
 {
     m_lstRoot.clear();
+
+    for (size_t i = 0; i < m_lstTree.size(); i++)
+    {
+        DnDURIObject *pCurObj = m_lstTree.at(i);
+        AssertPtr(pCurObj);
+        RTMemFree(pCurObj);
+    }
     m_lstTree.clear();
 
@@ -408 +427 @@
         return;
 
-    DnDURIObject &curObj = m_lstTree.first();
-
-    uint64_t cbSize = curObj.GetSize();
+    DnDURIObject *pCurObj = m_lstTree.first();
+    AssertPtr(pCurObj);
+
+    uint64_t cbSize = pCurObj->GetSize();
     Assert(m_cbTotal >= cbSize);
     m_cbTotal -= cbSize; /* Adjust total size. */
 
-    curObj.Close();
+    pCurObj->Close();
+    RTMemFree(pCurObj);
 
     m_lstTree.removeFirst();