Changeset 74715 in vbox

Timestamp:

Oct 9, 2018 11:56:08 AM (6 years ago)

Author:

vboxsync

Message:

DnD/URIList: Added support for handling UNC paths.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (1 diff)
• src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (3 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -268 +268 @@
 #define DNDURILIST_FLAGS_LAZY                   RT_BIT(3)
 
+/** Mask of all valid DnD URI list flags. */
+#define DNDURILIST_FLAGS_VALID_MASK             UINT32_C(0xF)
+
 class DnDURIList
 {

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

@@ -339 +339 @@
 {
     AssertPtrReturn(pszURI, VERR_INVALID_POINTER);
-
+    AssertReturn(!(fFlags & ~DNDURILIST_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
     /** @todo Check for string termination?  */
-#ifdef DEBUG_andy
-    LogFlowFunc(("pszPath=%s, fFlags=0x%x\n", pszURI, fFlags));
-#endif
-    int rc = VINF_SUCCESS;
-
-    /* Query the path component of a file URI. If this hasn't a
-     * file scheme NULL is returned. */
-    char *pszSrcPath = RTUriFilePath(pszURI);
-    if (pszSrcPath)
+
+    RTURIPARSED Parsed;
+    int rc = RTUriParse(pszURI, &Parsed);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    char *pszSrcPath = NULL;
+
+    /* file://host.example.com/path/to/file.txt */
+    const char *pszParsedAuthority = RTUriParsedAuthority(pszURI, &Parsed);
+    if (   pszParsedAuthority
+        && pszParsedAuthority[0] != '\0') /* Authority present? */
+    {
+        const char *pszParsedPath = RTUriParsedPath(pszURI, &Parsed);
+        if (pszParsedPath)
+        {
+            /* Always use UNIXy paths internally. */
+            if (RTStrAPrintf(&pszSrcPath,  "//%s%s", pszParsedAuthority, pszParsedPath) == -1)
+                rc = VERR_NO_MEMORY;
+        }
+        else
+            rc = VERR_INVALID_PARAMETER;
+    }
+    else
+    {
+        pszSrcPath = RTUriFilePath(pszURI);
+        if (!pszSrcPath)
+            rc = VERR_INVALID_PARAMETER;
+    }
+
+    LogFlowFunc(("pszURI=%s, fFlags=0x%x -> pszParsedAuthority=%s, pszSrcPath=%s, rc=%Rrc\n",
+                 pszURI, fFlags, pszParsedAuthority ? pszParsedAuthority : "<None>", pszSrcPath, rc));
+
+    if (RT_SUCCESS(rc))
     {
         /* Add the path to our internal file list (recursive in
@@ -366 +391 @@
                 m_lstRoot.append(pszDstPath);
 
-                LogFlowFunc(("pszFilePath=%s, pszFileName=%s, pszRoot=%s\n",
+                LogFlowFunc(("pszSrcPath=%s, pszFileName=%s, pszRoot=%s\n",
                              pszSrcPath, pszFileName, pszDstPath));
 
@@ -376 +401 @@
         else
             rc = VERR_INVALID_PARAMETER;
-
-        RTStrFree(pszSrcPath);
-    }
-    else
-        rc = VERR_INVALID_PARAMETER;
+    }
+
+    RTStrFree(pszSrcPath);
 
     LogFlowFuncLeaveRC(rc);