Changeset 48720 in vbox

Timestamp:

Sep 26, 2013 3:56:16 PM (11 years ago)

Author:

vboxsync

Message:

GuestCtrl/IGuestFile: Fixed initial offset reporting when using IGuestSession::openFileEx().

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService (modified) (1 prop)
• Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)
• Main/src-client/GuestFileImpl.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -175 +175 @@
                     && uOffset)
                 {
-                    /* Seeking is optional. */
-                    int rc2 = RTFileSeek(pFile->hFile, (int64_t)uOffset, RTFILE_SEEK_BEGIN, NULL /* Current offset */);
-                    if (RT_FAILURE(rc2))
+                    /* Seeking is optional. However, the whole operation
+                     * will fail if we don't succeed seeking to the wanted position. */
+                    rc = RTFileSeek(pFile->hFile, (int64_t)uOffset, RTFILE_SEEK_BEGIN, NULL /* Current offset */);
+                    if (RT_FAILURE(rc))
                         VBoxServiceVerbose(3, "[File %s]: Seeking to offset %RU64 failed; rc=%Rrc\n",
                                            pFile->szName, uOffset, rc);

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

@@ -562 +562 @@
                               ("File ID %RU32 does not match context ID %RU32\n", mData.mID,
                                VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID)));
+
+                    /* Set the initial offset. On the guest the whole opening operation
+                     * would fail if an initial seek isn't possible. */
+                    mData.mOffCurrent = mData.mOpenInfo.mInitialOffset;
                 }