Changeset 56901 in vbox

Timestamp:

Jul 9, 2015 2:27:36 PM (10 years ago)

Author:

vboxsync

Message:

DnD/Main: Gracefully rollback on GuestDnDURIData::Reset().

File:

• trunk/src/VBox/Main/include/GuestDnDPrivate.h (modified) (2 diffs)

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

@@ -97 +97 @@
     GuestDnDURIData(void)
         : pvScratchBuf(NULL)
-        , cbScratchBuf(0) { }
+        , cbScratchBuf(0) 
+    {
+        RT_ZERO(mDropDir);
+    }
 
     virtual ~GuestDnDURIData(void)
@@ -107 +110 @@
     {
         lstURI.Clear();
-#if 0 /* Currently the scratch buffer will be maintained elswewhere. */
+        objURI.Close();
+
+        DnDDirDroppedFilesRollback(&mDropDir);
+        DnDDirDroppedFilesClose(&mDropDir, true /* fRemove */);
+
         if (pvScratchBuf)
         {
+            Assert(cbScratchBuf);
             RTMemFree(pvScratchBuf);
             pvScratchBuf = NULL;
         }
         cbScratchBuf = 0;
-#else
-        pvScratchBuf = NULL;
-        cbScratchBuf = 0;
-#endif
     }