Changeset 57776 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 16, 2015 9:40:54 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102712

Message:

DnD: Renamed DNDDIRDROPPEDFILES to DnDDroppedFiles and restructured it for being a class.

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.
      */
-    PDNDDIRDROPPEDFILES pDroppedFiles;
-    const char *pszDropDir = NULL;
-    int rc = DnDDirDroppedFilesCreateAndOpenTemp(0 /* fFlags */, &pDroppedFiles);
-    if (RT_SUCCESS(rc))
-        pszDropDir = DnDDirDroppedFilesGetDirAbs(pDroppedFiles);
+    DnDDroppedFiles droppedFiles;
+    int rc = droppedFiles.OpenTemp(0 /* fFlags */);
+    if (RT_FAILURE(rc))
+    {
+        RTMemFree(pvChunk);
+        return VERR_NO_MEMORY;
+    }
+
+    const char *pszDropDir = droppedFiles.GetDirAbs();
+    AssertPtr(pszDropDir);
 
     /*
@@ -421 +426 @@
                         rc = RTDirCreate(pszPathAbs, fCreationMode, 0);
                         if (RT_SUCCESS(rc))
-                            rc = DnDDirDroppedAddDir(pDroppedFiles, pszPathAbs);
+                            rc = droppedFiles.AddDir(pszPathAbs);
 
                         RTStrFree(pszPathAbs);
@@ -488 +493 @@
                                 if (RT_SUCCESS(rc))
                                 {
-                                    rc = DnDDirDroppedAddFile(pDroppedFiles, strPathAbs.c_str());
+                                    rc = droppedFiles.AddFile(strPathAbs.c_str());
                                     if (RT_SUCCESS(rc))
                                     {
@@ -571 +576 @@
     if (RT_FAILURE(rc))
     {
-        int rc2 = DnDDirDroppedFilesRollback(pDroppedFiles);
+        int rc2 = droppedFiles.Rollback();
         AssertRC(rc2); /* Not fatal, don't report back to host. */
     }
@@ -620 +625 @@
      * by the client's drag'n drop operation lateron.
      */
-    int rc2 = DnDDirDroppedFilesClose(pDroppedFiles, false);
+    int rc2 = droppedFiles.Reset(false /* fRemoveDropDir */);
     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);