Changeset 107662 in vbox

Timestamp:

Jan 10, 2025 3:01:24 PM (4 months ago)

Author:

vboxsync

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

166754

Message:

src/VBox/Main/src-client/GuestSessionImplTasks.cpp: Fixed warnings found by Parfait (change of signedness on implicit conversion). Also fixes VFS seeking when copying a file to the guest (unused so far). Needs backport. jiraref:VBP-1424

File:

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

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

@@ -718 +718 @@
  * @param  fileDst            Guest file (destination) to copy to the guest. Must be in opened and ready state already.
  * @param  fFileCopyFlags     File copy flags.
- * @param  offCopy            Offset (in bytes) where to start copying the source file.
+ * @param  offCopy            Absolute offset (in bytes) where to start reading from the source file.
+ *                            Set to UINT64_MAX to read following chunk at the current VFS file read position.
+ *                            Set to 0 to rewind reading the file.
  * @param  cbSize             Size (in bytes) to copy from the source file.
  */
@@ -736 +738 @@
     int vrc = VINF_SUCCESS;
 
-    if (offCopy)
+    if (offCopy != UINT64_MAX)
     {
         uint64_t offActual;
-        vrc = RTVfsFileSeek(hVfsFile, offCopy, RTFILE_SEEK_END, &offActual);
+        vrc = RTVfsFileSeek(hVfsFile, (RTFOFF)offCopy, RTFILE_SEEK_BEGIN, &offActual);
         if (RT_FAILURE(vrc))
         {
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(tr("Seeking to offset %RU64 of host file \"%s\" failed: %Rrc"),
-                                           offCopy, strSrcFile.c_str(), vrc));
+                                Utf8StrFmt(tr("Seeking to offset %RU64 (%#x) of host file \"%s\" failed: %Rrc"),
+                                           offCopy, offCopy, strSrcFile.c_str(), vrc));
             return vrc;
         }
@@ -963 +965 @@
 
             vrc = fileCopyToGuestInner(szSrcReal, hSrcFile, strDst, dstFile,
-                                       fFileCopyFlags, 0 /* Offset, unused */, srcObjInfo.cbObject);
+                                       fFileCopyFlags, UINT64_MAX /* Offset, unused */, srcObjInfo.cbObject);
 
             int vrc2 = RTVfsFileRelease(hSrcFile);
@@ -2672 +2674 @@
             else
             {
-                vrc = fileCopyToGuestInner(strFileSrc, hVfsFile, strFileDst, dstFile, FileCopyFlag_None, 0 /*offCopy*/, cbSrcSize);
+                vrc = fileCopyToGuestInner(strFileSrc, hVfsFile, strFileDst, dstFile, FileCopyFlag_None,
+                                           UINT64_MAX /* Offset, unused */, cbSrcSize);
 
                 int vrc2 = fileClose(dstFile);