Changeset 55524 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 29, 2015 2:45:20 PM (10 years ago)

Author:

vboxsync

Message:

DnD: Another bugfix for protocol v1.

File:

• trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -30 +30 @@
 #include <iprt/file.h>
 #include <iprt/path.h>
+#include <iprt/uri.h>
 
 #include <iprt/cpp/utils.h> /* For unconst(). */
@@ -463 +464 @@
                         pCtx->mData.cbProcessed = 0;
 
-                        /* Assign new total size which also includes all paths + file
-                         * data to receive from the guest. */
+                        /*
+                         * Assign new total size which also includes all file data to receive
+                         * from the guest.
+                         */
                         pCtx->mData.cbToProcess = cbTotalSize;
+
+                        LogFlowFunc(("URI data => cbToProcess=%RU64\n", pCtx->mData.cbToProcess));
                     }
                 }
             }
-
-            if (RT_SUCCESS(rc))
-                rc = i_updateProcess(pCtx, cbData);
         }
     }
@@ -489 +491 @@
     AssertReturn(cbPath,     VERR_INVALID_PARAMETER);
 
-    LogFlowFunc(("pszPath=%s, cbPath=%zu, fMode=0x%x\n", pszPath, cbPath, fMode));
+    LogFlowFunc(("pszPath=%s, cbPath=%RU32, fMode=0x%x\n", pszPath, cbPath, fMode));
 
     int rc;
@@ -505 +507 @@
 
     if (RT_SUCCESS(rc))
-        rc = i_updateProcess(pCtx, cbPath);
+    {
+        if (mDataBase.mProtocolVersion <= 2)
+        {
+            /*
+             * BUG: Protocol v1 does *not* send directory names in URI format,
+             *      however, if this in a root URI directory (which came with the initial
+             *      GUEST_DND_GH_SND_DATA message(s)) the total data announced was for
+             *      root directory names which came in URI format, as an URI list.
+             *
+             *      So construct an URI path locally to keep the accounting right.
+             */
+            char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
+                                           pszPath /* pszPath */,
+                                           NULL /* pszQuery */, NULL /* pszFragment */);
+            if (pszPathURI)
+            {
+                cbPath  = strlen(pszPathURI);
+                cbPath += 3;                  /* Include "\r" + "\n" + termination -- see above. */
+
+                LogFlowFunc(("URI pszPathURI=%s, cbPathURI=%RU32\n", pszPathURI, cbPath));
+                RTStrFree(pszPathURI);
+            }
+            else
+                rc = VERR_NO_MEMORY;
+        }
+
+        if (RT_SUCCESS(rc))
+            rc = i_updateProcess(pCtx, cbPath);
+    }
 
     LogFlowFuncLeaveRC(rc);