Changeset 34535 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Nov 30, 2010 5:46:14 PM (14 years ago)

Author:

vboxsync

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

68326

Message:

Manifest comparison.

Location:

trunk/src/VBox/Runtime/common/vfs

Files:

• vfsbase.cpp (modified) (1 diff)
• vfsmemory.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -2401 +2401 @@
 }
 
+
+RTDECL(int) RTVfsFileSeek(RTVFSFILE hVfsFile, RTFOFF offSeek, uint32_t uMethod, uint64_t *poffActual)
+{
+    RTVFSFILEINTERNAL *pThis = hVfsFile;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->uMagic == RTVFSFILE_MAGIC, VERR_INVALID_HANDLE);
+
+    AssertReturn(   uMethod == RTFILE_SEEK_BEGIN
+                 || uMethod == RTFILE_SEEK_CURRENT
+                 || uMethod == RTFILE_SEEK_END, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(poffActual, VERR_INVALID_POINTER);
+
+    RTFOFF offActual = 0;
+    RTVfsLockAcquireWrite(pThis->Stream.Base.hLock);
+    int rc = pThis->pOps->pfnSeek(pThis->Stream.Base.pvThis, offSeek, uMethod, &offActual);
+    RTVfsLockReleaseWrite(pThis->Stream.Base.hLock);
+    if (RT_SUCCESS(rc) && poffActual)
+    {
+        Assert(offActual >= 0);
+        *poffActual = offActual;
+    }
+
+    return rc;
+}

trunk/src/VBox/Runtime/common/vfs/vfsmemory.cpp

@@ -269 +269 @@
     }
     else
-        *pcbRead = cbLeftToRead = pSgBuf->paSegs[0].cbSeg;
+    {
+        cbLeftToRead = pSgBuf->paSegs[0].cbSeg;
+        if (pcbRead)
+            *pcbRead = cbLeftToRead;
+    }
 
     /*
@@ -767 +771 @@
             if (RT_SUCCESS(rc))
             {
+                pThis->pCurExt   = RTListGetFirst(&pThis->ExtentHead, RTVFSMEMEXTENT, Entry);
+                pThis->offCurPos = 0;
+
                 if (!(fFlags & RTFILE_O_WRITE))
                 {