Changeset 84998 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

Timestamp:

Jun 29, 2020 4:34:22 PM (5 years ago)

Author:

vboxsync

Message:

DnD: Greatly simplified usage / API of the DnDURIObject class.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

@@ -397 +397 @@
      * Enter the main loop of retieving files + directories.
      */
-    DnDURIObject objFile(DnDURIObject::Type_File);
+    DnDURIObject objFile;
 
     char szPathName[RTPATH_MAX] = { 0 };
@@ -497 +497 @@
                                 uint32_t fCreationMode = (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR;
 #endif
-                                rc = objFile.OpenEx(strPathAbs, DnDURIObject::View_Target, fOpen, fCreationMode);
+                                rc = objFile.Init(DnDURIObject::Type_File, strPathAbs);
                                 if (RT_SUCCESS(rc))
                                 {
-                                    rc = pDroppedFiles->AddFile(strPathAbs.c_str());
+                                    rc = objFile.Open(fOpen, fCreationMode);
                                     if (RT_SUCCESS(rc))
                                     {
-                                        cbFileWritten = 0;
-                                        objFile.SetSize(cbFileSize);
+                                        rc = pDroppedFiles->AddFile(strPathAbs.c_str());
+                                        if (RT_SUCCESS(rc))
+                                        {
+                                            cbFileWritten = 0;
+                                            objFile.SetSize(cbFileSize);
+                                        }
                                     }
                                 }
@@ -1534 +1538 @@
     AssertReturn(pObj->GetType() == DnDURIObject::Type_Directory, VERR_INVALID_PARAMETER);
 
-    RTCString strPath = pObj->GetDestPathAbs();
+    RTCString strPath = pObj->GetPath();
     LogFlowFunc(("strDir=%s (%zu), fMode=0x%x\n",
                  strPath.c_str(), strPath.length(), pObj->GetMode()));
@@ -1574 +1578 @@
         return VERR_NO_MEMORY;
 
-    RTCString strPath = pObj->GetDestPathAbs();
+    RTCString strPath = pObj->GetPath();
 
     LogFlowFunc(("strFile=%s (%zu), cbSize=%RU64, fMode=0x%x\n", strPath.c_str(), strPath.length(),