Changeset 97538 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

Timestamp:

Nov 14, 2022 6:42:10 PM (3 years ago)

Author:

vboxsync

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

154568

Message:

Guest Control/Main: Some more fixes + more tests. bugref:10286

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (5 diffs)

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

@@ -1775 +1775 @@
                 }
 
-                /* Clean up the final host desitnation path. */
-                vrc = GuestPath::Translate(strDstAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
+                /* Translate the final host desitnation path. */
+                vrc = GuestPath::Translate(strDstAbs, mSession->i_getGuestPathStyle() /* Source */, PATH_STYLE_NATIVE /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -1852 +1852 @@
                     }
                 }
+            }
+
+            /* Translate the final host destination file path. */
+            vrc = GuestPath::Translate(strDstRootAbs,
+                                       mSession->i_getGuestPathStyle() /* Dest */, PATH_STYLE_NATIVE /* Source */);
+            if (RT_FAILURE(vrc))
+            {
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(tr("Translating host destination path \"%s\" failed: %Rrc"),
+                                               strDstRootAbs.c_str(), vrc));
+                break;
             }
 
@@ -2237 +2248 @@
 
                 /* Clean up the final host source path. */
-                vrc = GuestPath::Translate(strSrcAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
+                vrc = GuestPath::Translate(strSrcAbs, pList->mSourceSpec.enmPathStyle /* Source */,
+                                           pList->mSourceSpec.enmPathStyle /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -2246 +2258 @@
                 }
 
-                /* Clean up the final guest destination path. */
+                /* Translate final guest destination path. */
                 vrc = GuestPath::Translate(strDstAbs,
-                                           mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */);
+                                           PATH_STYLE_NATIVE /* Source */,  mSession->i_getGuestPathStyle() /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -2330 +2342 @@
             }
 
-            /* Cleanup the destination path. */
+            /* Translate the final guest destination file path. */
             vrc = GuestPath::Translate(strDstRootAbs,
-                                       mSession->i_getGuestPathStyle() /* Source */,  mSession->i_getGuestPathStyle() /* Dest */);
+                                       PATH_STYLE_NATIVE /* Source */,  mSession->i_getGuestPathStyle() /* Dest */);
             if (RT_FAILURE(vrc))
             {