Changeset 57654 in vbox for trunk/src/VBox/Additions/common

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (5 diffs)

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