Changeset 50730 in vbox

Timestamp:

Mar 10, 2014 8:40:34 AM (11 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Use URI format here as well.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp

@@ -23 +23 @@
 #include "VBoxDnD.h"
 
+#include "VBox/GuestHost/DragAndDrop.h"
 #include "VBox/HostServices/DragAndDropSvc.h"
 
@@ -452 +453 @@
                         if (RT_SUCCESS(rc))
                         {
-                            uint32_t cbSize = cchFiles * sizeof(char);
-                            Assert(cbSize);
-
-                            mpvData = RTMemDup(pszFiles, cbSize);
-                            if (mpvData)
+                            uint32_t cbFiles = cchFiles * sizeof(char);
+                            Assert(cbFiles);
+
+                            /* Translate the list into URI elements. */
+                            DnDURIList lstURI;
+                            rc = lstURI.AppendNativePathsFromList(pszFiles, cbFiles, 
+                                                                  0 /* Flags */);
+                            if (RT_SUCCESS(rc))
                             {
-                                mcbData = cbSize;
+                                RTCString strRoot = lstURI.RootToString();
+                                size_t cbRoot = strRoot.length();
+
+                                mpvData = RTMemAllocZ(cbRoot + 1 /* Include termination */);
+                                if (mpvData)
+                                {
+                                    memcpy(mpvData, strRoot.raw(), cbRoot);
+                                    mcbData = cbRoot + 1;
+                                }
+                                else
+                                    rc = VERR_NO_MEMORY;
                             }
-                            else
-                                rc = VERR_NO_MEMORY;
                         }