Changeset 50830 in vbox

Timestamp:

Mar 20, 2014 4:13:19 PM (11 years ago)

Author:

vboxsync

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

92902

Message:

DnD: Bugfixes.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)
• src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (3 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -36 +36 @@
 int DnDPathSanitizeFilename(char *pszPath, size_t cbPath);
 int DnDPathSanitize(char *pszPath, size_t cbPath);
+
+/** Keep the original paths, don't convert paths to relative ones. */
+#define DNDURILIST_FLAGS_ABSOLUTE_PATHS         RT_BIT(0)
 
 class DnDURIObject
@@ -120 +123 @@
 protected:
 
-    /** List of all top-level file/directory entries. */
+    /** List of all top-level file/directory entries.
+     *  Note: All paths are kept internally as UNIX paths for
+     *        easier conversion/handling!  */
     RTCList<RTCString>     m_lstRoot;
     /** List of all URI objects added. */

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

@@ -453 +453 @@
                         if (RT_SUCCESS(rc))
                         {
+                            cchFiles += 1; /* Add string termination. */
                             uint32_t cbFiles = cchFiles * sizeof(char);
-                            Assert(cbFiles);
+
+                            LogFlowFunc(("cFiles=%u, cchFiles=%RU32, cbFiles=%RU32, pszFiles=0x%p\n",
+                                         cFiles, cchFiles, cbFiles, pszFiles));
 
                             /* Translate the list into URI elements. */
                             DnDURIList lstURI;
-                            rc = lstURI.AppendNativePathsFromList(pszFiles, cbFiles, 
-                                                                  0 /* Flags */);
+                            rc = lstURI.AppendNativePathsFromList(pszFiles, cbFiles,
+                                                                  DNDURILIST_FLAGS_ABSOLUTE_PATHS);
                             if (RT_SUCCESS(rc))
                             {
@@ -494 +497 @@
 
                 /*
-                 * Third stage: Release access to the storage medium again.
+                 * Third stage: Unlock + release access to the storage medium again.
                  */
                 switch (mFormatEtc.tymed)
@@ -508 +511 @@
             }
 
+            /* Release storage medium again. */
+            ReleaseStgMedium(&stgMed);
+
             /* Signal waiters. */
             mDroppedRc = rc;
             RTSemEventSignal(hEventDrop);
-
-            /* Release storage medium again. */
-            ReleaseStgMedium(&stgMed);
         }
     }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1082 +1082 @@
 
 static int vbglR3DnDGHProcessURIMessages(uint32_t u32ClientId,
-                                         void *pvData, uint32_t cbData)
+                                         const void *pvData, uint32_t cbData)
 {
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -430 +430 @@
             {
                 Assert(pszFileName >= pszFilePath);
-                char *pszRoot = &pszFilePath[pszFileName - pszFilePath];
+                size_t cbBase = (fFlags & DNDURILIST_FLAGS_ABSOLUTE_PATHS)
+                              ? 0 /* Use start of path as root. */
+                              : pszFileName - pszFilePath;
+                char *pszRoot = &pszFilePath[cbBase];
                 m_lstRoot.append(pszRoot);
 #ifdef DEBUG_andy
@@ -436 +439 @@
                              pszFilePath, pszFileName, pszRoot));
 #endif
-                rc = appendPathRecursive(pszFilePath,
-                                         pszFileName - pszFilePath,
+                rc = appendPathRecursive(pszFilePath, cbBase,
                                          fFlags);
             }
@@ -551 +553 @@
     {
         const char *pszCurRoot = m_lstRoot.at(i).c_str();
+#ifdef DEBUG_andy
+        LogFlowFunc(("pszCurRoot=%s\n", pszCurRoot));
+#endif
         if (strBasePath.isNotEmpty())
         {