Changeset 37596 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jun 22, 2011 7:30:06 PM (14 years ago)

Author:

vboxsync

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

72442

Message:

*: RTFILE becomes a pointer, RTFileOpen++ expands it's flags paramter from uint32_t to uint64_t.

Location:

trunk/src/VBox/Runtime/r3

Files:

• fileio.cpp (modified) (6 diffs)
• linux/fileaio-linux.cpp (modified) (2 diffs)
• posix/RTFileQueryFsSizes-posix.cpp (modified) (1 diff)
• posix/fileaio-posix.cpp (modified) (3 diffs)
• posix/fileio-posix.cpp (modified) (28 diffs)
• posix/fileio2-posix.cpp (modified) (6 diffs)
• posix/filelock-posix.cpp (modified) (5 diffs)
• posix/rand-posix.cpp (modified) (1 diff)
• win/fileaio-win.cpp (modified) (3 diffs)
• win/fileio-win.cpp (modified) (45 diffs)
• win/rtFileNativeSetAttributes-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/fileio.cpp

@@ -107 +107 @@
  * @internal
  */
-int rtFileRecalcAndValidateFlags(uint32_t *pfOpen)
+int rtFileRecalcAndValidateFlags(uint64_t *pfOpen)
 {
     /*
@@ -128 +128 @@
             break;
         default:
-            AssertMsgFailed(("Invalid RW value, fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("Invalid RW value, fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }
@@ -135 +135 @@
      * Validate                                                                                                                                       .
      */
-    AssertMsgReturn(fOpen & RTFILE_O_ACCESS_MASK, ("Missing RTFILE_O_READ/WRITE: fOpen=%#x\n", fOpen), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(fOpen & RTFILE_O_ACCESS_MASK, ("Missing RTFILE_O_READ/WRITE: fOpen=%#llx\n", fOpen), VERR_INVALID_PARAMETER);
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-    AssertMsgReturn(!(fOpen & (~RTFILE_O_VALID_MASK | RTFILE_O_NON_BLOCK)), ("%#x\n", fOpen), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fOpen & (~(uint64_t)RTFILE_O_VALID_MASK | RTFILE_O_NON_BLOCK)), ("%#llx\n", fOpen), VERR_INVALID_PARAMETER);
 #else
-    AssertMsgReturn(!(fOpen & ~RTFILE_O_VALID_MASK), ("%#x\n", fOpen), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fOpen & ~(uint64_t)RTFILE_O_VALID_MASK), ("%#llx\n", fOpen), VERR_INVALID_PARAMETER);
 #endif
-    AssertMsgReturn((fOpen & (RTFILE_O_TRUNCATE | RTFILE_O_WRITE)) != RTFILE_O_TRUNCATE, ("%#x\n", fOpen), VERR_INVALID_PARAMETER);
+    AssertMsgReturn((fOpen & (RTFILE_O_TRUNCATE | RTFILE_O_WRITE)) != RTFILE_O_TRUNCATE, ("%#llx\n", fOpen), VERR_INVALID_PARAMETER);
 
     switch (fOpen & RTFILE_O_ACTION_MASK)
@@ -150 +150 @@
             break;
         case RTFILE_O_OPEN:
-            AssertMsgReturn(!(RTFILE_O_NOT_CONTENT_INDEXED & fOpen), ("%#x\n", fOpen), VERR_INVALID_PARAMETER);
+            AssertMsgReturn(!(RTFILE_O_NOT_CONTENT_INDEXED & fOpen), ("%#llx\n", fOpen), VERR_INVALID_PARAMETER);
         case RTFILE_O_OPEN_CREATE:
         case RTFILE_O_CREATE:
@@ -156 +156 @@
             break;
         default:
-            AssertMsgFailed(("Invalid action value: fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("Invalid action value: fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }
@@ -176 +176 @@
             break;
         default:
-            AssertMsgFailed(("Invalid deny value: fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("Invalid deny value: fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }

trunk/src/VBox/Runtime/r3/linux/fileaio-linux.cpp

@@ -105 +105 @@
     int16_t   i16Priority;
     /** The file descriptor. */
-    uint32_t  File;
+    uint32_t  uFileDesc;
     /** The userspace pointer to the buffer containing/receiving the data. */
     void     *pvBuf;
@@ -379 +379 @@
      */
     pReqInt->AioCB.u16IoOpCode = uTransferDirection;
-    pReqInt->AioCB.File        = (uint32_t)hFile;
+    pReqInt->AioCB.uFileDesc   = RTFileToNative(hFile);
     pReqInt->AioCB.off         = off;
     pReqInt->AioCB.cbTransfer  = cbTransfer;

trunk/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp

@@ -48 +48 @@
     struct statvfs StatVFS;
     RT_ZERO(StatVFS);
-    if (fstatvfs(hFile, &StatVFS))
+    if (fstatvfs(RTFileToNative(hFile), &StatVFS))
         return RTErrConvertFromErrno(errno);
 

trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -407 +407 @@
     pReqInt->fFlush               = false;
     pReqInt->AioCB.aio_lio_opcode = uTransferDirection;
-    pReqInt->AioCB.aio_fildes     = (int)hFile;
+    pReqInt->AioCB.aio_fildes     = RTFileToNative(hFile);
     pReqInt->AioCB.aio_offset     = off;
     pReqInt->AioCB.aio_nbytes     = cbTransfer;
@@ -445 +445 @@
 
     pReqInt->fFlush           = true;
-    pReqInt->AioCB.aio_fildes = (int)hFile;
+    pReqInt->AioCB.aio_fildes = RTFileToNative(hFile);
     pReqInt->AioCB.aio_offset = 0;
     pReqInt->AioCB.aio_nbytes = 0;

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -93 +93 @@
 
 
-RTR3DECL(int) RTFileOpen(PRTFILE pFile, const char *pszFilename, uint32_t fOpen)
+RTR3DECL(int) RTFileOpen(PRTFILE pFile, const char *pszFilename, uint64_t fOpen)
 {
     /*
@@ -111 +111 @@
     if (fOpen & RTFILE_O_NON_BLOCK)
     {
-        AssertMsgFailed(("Invalid parameters! fOpen=%#x\n", fOpen));
+        AssertMsgFailed(("Invalid parameters! fOpen=%#llx\n", fOpen));
         return VERR_INVALID_PARAMETER;
     }
@@ -177 +177 @@
             break;
         default:
-            AssertMsgFailed(("RTFileOpen received an invalid RW value, fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("RTFileOpen received an invalid RW value, fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }
@@ -322 +322 @@
         if (iErr == 0)
         {
-            *pFile = (RTFILE)fh;
-            Assert((int)*pFile == fh);
-            LogFlow(("RTFileOpen(%p:{%RTfile}, %p:{%s}, %#x): returns %Rrc\n",
+            *pFile = (RTFILE)(uintptr_t)fh;
+            Assert((intptr_t)*pFile == fh);
+            LogFlow(("RTFileOpen(%p:{%RTfile}, %p:{%s}, %#llx): returns %Rrc\n",
                      pFile, *pFile, pszFilename, pszFilename, fOpen, rc));
             return VINF_SUCCESS;
@@ -335 +335 @@
 
 
-RTR3DECL(int)  RTFileOpenBitBucket(PRTFILE phFile, uint32_t fAccess)
+RTR3DECL(int)  RTFileOpenBitBucket(PRTFILE phFile, uint64_t fAccess)
 {
     AssertReturn(   fAccess == RTFILE_O_READ
@@ -345 +345 @@
 
 
-RTR3DECL(int)  RTFileClose(RTFILE File)
-{
-    if (File == NIL_RTFILE)
-        return VINF_SUCCESS;
-    if (close((int)File) == 0)
+RTR3DECL(int)  RTFileClose(RTFILE hFile)
+{
+    if (hFile == NIL_RTFILE)
+        return VINF_SUCCESS;
+    if (close(RTFileToNative(hFile)) == 0)
         return VINF_SUCCESS;
     return RTErrConvertFromErrno(errno);
@@ -357 +357 @@
 RTR3DECL(int) RTFileFromNative(PRTFILE pFile, RTHCINTPTR uNative)
 {
-    if (    uNative < 0
-        ||  (RTFILE)uNative != (RTUINTPTR)uNative)
+    AssertCompile(sizeof(uNative) == sizeof(*pFile));
+    if (uNative < 0)
     {
         AssertMsgFailed(("%p\n", uNative));
@@ -369 +369 @@
 
 
-RTR3DECL(RTHCINTPTR) RTFileToNative(RTFILE File)
-{
-    AssertReturn(File != NIL_RTFILE, -1);
-    return (RTHCINTPTR)File;
+RTR3DECL(RTHCINTPTR) RTFileToNative(RTFILE hFile)
+{
+    AssertReturn(hFile != NIL_RTFILE, -1);
+    return (intptr_t)hFile;
 }
 
@@ -411 +411 @@
 
 
-RTR3DECL(int)  RTFileSeek(RTFILE File, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
+RTR3DECL(int)  RTFileSeek(RTFILE hFile, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
 {
     static const unsigned aSeekRecode[] =
@@ -438 +438 @@
     }
 
-    off_t offCurrent = lseek((int)File, (off_t)offSeek, aSeekRecode[uMethod]);
+    off_t offCurrent = lseek(RTFileToNative(hFile), (off_t)offSeek, aSeekRecode[uMethod]);
     if (offCurrent != ~0)
     {
@@ -449 +449 @@
 
 
-RTR3DECL(int)  RTFileRead(RTFILE File, void *pvBuf, size_t cbToRead, size_t *pcbRead)
+RTR3DECL(int)  RTFileRead(RTFILE hFile, void *pvBuf, size_t cbToRead, size_t *pcbRead)
 {
     if (cbToRead <= 0)
@@ -457 +457 @@
      * Attempt read.
      */
-    ssize_t cbRead = read((int)File, pvBuf, cbToRead);
+    ssize_t cbRead = read(RTFileToNative(hFile), pvBuf, cbToRead);
     if (cbRead >= 0)
     {
@@ -468 +468 @@
             while ((ssize_t)cbToRead > cbRead)
             {
-                ssize_t cbReadPart = read((int)File, (char*)pvBuf + cbRead, cbToRead - cbRead);
+                ssize_t cbReadPart = read(RTFileToNative(hFile), (char*)pvBuf + cbRead, cbToRead - cbRead);
                 if (cbReadPart <= 0)
                 {
@@ -485 +485 @@
 
 
-RTR3DECL(int)  RTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
+RTR3DECL(int)  RTFileWrite(RTFILE hFile, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
 {
     if (cbToWrite <= 0)
@@ -493 +493 @@
      * Attempt write.
      */
-    ssize_t cbWritten = write((int)File, pvBuf, cbToWrite);
+    ssize_t cbWritten = write(RTFileToNative(hFile), pvBuf, cbToWrite);
     if (cbWritten >= 0)
     {
@@ -504 +504 @@
             while ((ssize_t)cbToWrite > cbWritten)
             {
-                ssize_t cbWrittenPart = write((int)File, (const char *)pvBuf + cbWritten, cbToWrite - cbWritten);
+                ssize_t cbWrittenPart = write(RTFileToNative(hFile), (const char *)pvBuf + cbWritten, cbToWrite - cbWritten);
                 if (cbWrittenPart <= 0)
                     return RTErrConvertFromErrno(errno);
@@ -516 +516 @@
 
 
-RTR3DECL(int)  RTFileSetSize(RTFILE File, uint64_t cbSize)
+RTR3DECL(int)  RTFileSetSize(RTFILE hFile, uint64_t cbSize)
 {
     /*
@@ -529 +529 @@
 
 #if defined(_MSC_VER) || (defined(RT_OS_OS2) && (!defined(__INNOTEK_LIBC__) || __INNOTEK_LIBC__ < 0x006))
-    if (chsize((int)File, (off_t)cbSize) == 0)
+    if (chsize(RTFileToNative(hFile), (off_t)cbSize) == 0)
 #else
     /* This relies on a non-standard feature of FreeBSD, Linux, and OS/2
@@ -535 +535 @@
      * than the file.)
      */
-    if (ftruncate((int)File, (off_t)cbSize) == 0)
+    if (ftruncate(RTFileToNative(hFile), (off_t)cbSize) == 0)
 #endif
         return VINF_SUCCESS;
@@ -542 +542 @@
 
 
-RTR3DECL(int)   RTFileGetSize(RTFILE File, uint64_t *pcbSize)
+RTR3DECL(int)   RTFileGetSize(RTFILE hFile, uint64_t *pcbSize)
 {
     struct stat st;
-    if (!fstat((int)File, &st))
+    if (!fstat(RTFileToNative(hFile), &st))
     {
         *pcbSize = st.st_size;
@@ -554 +554 @@
 
 
-/**
- * Determine the maximum file size.
- *
- * @returns IPRT status code.
- * @param   File        Handle to the file.
- * @param   pcbMax      Where to store the max file size.
- * @see     RTFileGetMaxSize.
- */
-RTR3DECL(int) RTFileGetMaxSizeEx(RTFILE File, PRTFOFF pcbMax)
+RTR3DECL(int) RTFileGetMaxSizeEx(RTFILE hFile, PRTFOFF pcbMax)
 {
     /*
@@ -568 +560 @@
      */
     uint64_t offOld;
-    int rc = RTFileSeek(File, 0, RTFILE_SEEK_CURRENT, &offOld);
+    int rc = RTFileSeek(hFile, 0, RTFILE_SEEK_CURRENT, &offOld);
     if (RT_FAILURE(rc))
         return rc;
@@ -588 +580 @@
             if (pcbMax)
                 *pcbMax = offLow;
-            return RTFileSeek(File, offOld, RTFILE_SEEK_BEGIN, NULL);
-        }
-
-        rc = RTFileSeek(File, offLow + cbInterval, RTFILE_SEEK_BEGIN, NULL);
+            return RTFileSeek(hFile, offOld, RTFILE_SEEK_BEGIN, NULL);
+        }
+
+        rc = RTFileSeek(hFile, offLow + cbInterval, RTFILE_SEEK_BEGIN, NULL);
         if (RT_FAILURE(rc))
             offHigh = offLow + cbInterval;
@@ -600 +592 @@
 
 
-RTR3DECL(bool) RTFileIsValid(RTFILE File)
-{
-    if (File != NIL_RTFILE)
-    {
-        int fFlags = fcntl(File, F_GETFD);
+RTR3DECL(bool) RTFileIsValid(RTFILE hFile)
+{
+    if (hFile != NIL_RTFILE)
+    {
+        int fFlags = fcntl(RTFileToNative(hFile), F_GETFD);
         if (fFlags >= 0)
             return true;
@@ -612 +604 @@
 
 
-RTR3DECL(int)  RTFileFlush(RTFILE File)
-{
-    if (fsync((int)File))
+RTR3DECL(int)  RTFileFlush(RTFILE hFile)
+{
+    if (fsync(RTFileToNative(hFile)))
         return RTErrConvertFromErrno(errno);
     return VINF_SUCCESS;
@@ -620 +612 @@
 
 
-RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet)
-{
-    int rc = ioctl((int)File, ulRequest, pvData);
+RTR3DECL(int) RTFileIoCtl(RTFILE hFile, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet)
+{
+    int rc = ioctl(RTFileToNative(hFile), ulRequest, pvData);
     if (piRet)
         *piRet = rc;
@@ -629 +621 @@
 
 
-RTR3DECL(int) RTFileSetMode(RTFILE File, RTFMODE fMode)
+RTR3DECL(int) RTFileSetMode(RTFILE hFile, RTFMODE fMode)
 {
     /*
@@ -638 +630 @@
         return VERR_INVALID_PARAMETER;
 
-    if (fchmod((int)File, fMode & RTFS_UNIX_MASK))
+    if (fchmod(RTFileToNative(hFile), fMode & RTFS_UNIX_MASK))
     {
         int rc = RTErrConvertFromErrno(errno);
-        Log(("RTFileSetMode(%RTfile,%RTfmode): returns %Rrc\n", File, fMode, rc));
+        Log(("RTFileSetMode(%RTfile,%RTfmode): returns %Rrc\n", hFile, fMode, rc));
         return rc;
     }

trunk/src/VBox/Runtime/r3/posix/fileio2-posix.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -69 +69 @@
 
 
-RTR3DECL(int) RTFileQueryInfo(RTFILE File, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
+RTR3DECL(int) RTFileQueryInfo(RTFILE hFile, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
 {
     /*
      * Validate input.
      */
-    if (File == NIL_RTFILE)
-    {
-        AssertMsgFailed(("Invalid File=%RTfile\n", File));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (!pObjInfo)
-    {
-        AssertMsgFailed(("Invalid pObjInfo=%p\n", pObjInfo));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertReturn(hFile != NIL_RTFILE, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pObjInfo, VERR_INVALID_PARAMETER);
     if (    enmAdditionalAttribs < RTFSOBJATTRADD_NOTHING
         ||  enmAdditionalAttribs > RTFSOBJATTRADD_LAST)
@@ -95 +87 @@
      */
     struct stat Stat;
-    if (fstat((int)File, &Stat))
+    if (fstat(RTFileToNative(hFile), &Stat))
     {
         int rc = RTErrConvertFromErrno(errno);
-        Log(("RTFileQueryInfo(%RTfile,,%d): returns %Rrc\n", File, enmAdditionalAttribs, rc));
+        Log(("RTFileQueryInfo(%RTfile,,%d): returns %Rrc\n", hFile, enmAdditionalAttribs, rc));
         return rc;
     }
@@ -135 +127 @@
     }
 
-    LogFlow(("RTFileQueryInfo(%RTfile,,%d): returns VINF_SUCCESS\n", File, enmAdditionalAttribs));
+    LogFlow(("RTFileQueryInfo(%RTfile,,%d): returns VINF_SUCCESS\n", hFile, enmAdditionalAttribs));
     return VINF_SUCCESS;
 }
 
 
-RTR3DECL(int) RTFileSetTimes(RTFILE File, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
+RTR3DECL(int) RTFileSetTimes(RTFILE hFile, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
                              PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime)
 {
@@ -163 +155 @@
     {
         RTFSOBJINFO ObjInfo;
-        int rc = RTFileQueryInfo(File, &ObjInfo, RTFSOBJATTRADD_UNIX);
+        int rc = RTFileQueryInfo(hFile, &ObjInfo, RTFSOBJATTRADD_UNIX);
         if (RT_FAILURE(rc))
             return rc;
@@ -170 +162 @@
     }
 
-    if (futimes((int)File, aTimevals))
+    if (futimes(RTFileToNative(hFile), aTimevals))
     {
         int rc = RTErrConvertFromErrno(errno);
-        Log(("RTFileSetTimes(%RTfile,%p,%p,,): returns %Rrc\n", File, pAccessTime, pModificationTime, rc));
+        Log(("RTFileSetTimes(%RTfile,%p,%p,,): returns %Rrc\n", hFile, pAccessTime, pModificationTime, rc));
         return rc;
     }

trunk/src/VBox/Runtime/r3/posix/filelock-posix.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -50 +50 @@
 
 
-RTR3DECL(int)  RTFileLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
@@ -83 +83 @@
 
     Assert(RTFILE_LOCK_WAIT);
-    if (fcntl(File, (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
+    if (fcntl(RTFileToNative(hFile), (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
 
@@ -95 +95 @@
 
 
-RTR3DECL(int)  RTFileChangeLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileChangeLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
 {
     /** @todo We never returns VERR_FILE_NOT_LOCKED for now. */
-    return RTFileLock(File, fLock, offLock, cbLock);
+    return RTFileLock(hFile, fLock, offLock, cbLock);
 }
 
 
-RTR3DECL(int)  RTFileUnlock(RTFILE File, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileUnlock(RTFILE hFile, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
@@ -126 +126 @@
     fl.l_pid    = 0;
 
-    if (fcntl(File, F_SETLK, &fl) >= 0)
+    if (fcntl(RTFileToNative(hFile), F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
 

trunk/src/VBox/Runtime/r3/posix/rand-posix.cpp

@@ -79 +79 @@
     pThis->u32Magic = ~RTRANDINT_MAGIC;
     int fd = pThis->u.File.hFile;
-    pThis->u.File.hFile = NIL_RTFILE;
+    pThis->u.File.hFile = -1;
     RTMemFree(pThis);
     close(fd);

trunk/src/VBox/Runtime/r3/win/fileaio-win.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -189 +189 @@
 
     pReqInt->enmTransferDirection  = enmTransferDirection;
-    pReqInt->hFile                 = (HANDLE)hFile;
+    pReqInt->hFile                 = RTFileToNative(hFile);
     pReqInt->Overlapped.Offset     = (DWORD)(off & 0xffffffff);
     pReqInt->Overlapped.OffsetHigh = (DWORD)(off >> 32);
@@ -318 +318 @@
     RTFILEAIOCTX_VALID_RETURN(pCtxInt);
 
-    HANDLE hTemp = CreateIoCompletionPort((HANDLE)hFile, pCtxInt->hIoCompletionPort, 0, 1);
+    HANDLE hTemp = CreateIoCompletionPort(RTFileToNative(hFile), pCtxInt->hIoCompletionPort, 0, 1);
     if (hTemp != pCtxInt->hIoCompletionPort)
         rc = RTErrConvertFromWin32(GetLastError());

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -55 +55 @@
  *
  * @returns Success indicator. Extended error information obtainable using GetLastError().
- * @param   File        Filehandle.
+ * @param   hFile       Filehandle.
  * @param   offSeek     Offset to seek.
  * @param   poffNew     Where to store the new file offset. NULL allowed.
  * @param   uMethod     Seek method. (The windows one!)
  */
-DECLINLINE(bool) MySetFilePointer(RTFILE File, uint64_t offSeek, uint64_t *poffNew, unsigned uMethod)
+DECLINLINE(bool) MySetFilePointer(RTFILE hFile, uint64_t offSeek, uint64_t *poffNew, unsigned uMethod)
 {
     bool            fRc;
@@ -69 +69 @@
     if (off.LowPart != INVALID_SET_FILE_POINTER)
     {
-        off.LowPart = SetFilePointer((HANDLE)File, off.LowPart, &off.HighPart, uMethod);
+        off.LowPart = SetFilePointer((HANDLE)RTFileToNative(hFile), off.LowPart, &off.HighPart, uMethod);
         fRc = off.LowPart != INVALID_SET_FILE_POINTER;
     }
@@ -75 +75 @@
     {
         SetLastError(NO_ERROR);
-        off.LowPart = SetFilePointer((HANDLE)File, off.LowPart, &off.HighPart, uMethod);
+        off.LowPart = SetFilePointer(RTFileToNative(hFile), off.LowPart, &off.HighPart, uMethod);
         fRc = GetLastError() == NO_ERROR;
     }
 #else
-    fRc = SetFilePointerEx((HANDLE)File, off, &off, uMethod);
+    fRc = SetFilePointerEx((HANDLE)RTFileToNative(hFile), off, &off, uMethod);
 #endif
     if (fRc && poffNew)
@@ -92 +92 @@
  *
  * @returns true for file size limit exceeded.
- * @param   File        Filehandle.
+ * @param   hFile       Filehandle.
  * @param   offSeek     Offset to seek.
  * @param   uMethod     The seek method.
  */
-DECLINLINE(bool) IsBeyondLimit(RTFILE File, uint64_t offSeek, unsigned uMethod)
+DECLINLINE(bool) IsBeyondLimit(RTFILE hFile, uint64_t offSeek, unsigned uMethod)
 {
     bool fIsBeyondLimit = false;
@@ -108 +108 @@
  * file seeking, only at the time of writing (and some other odd ones we cannot make use of). */
     uint64_t offCurrent;
-    if (MySetFilePointer(File, 0, &offCurrent, FILE_CURRENT))
-    {
-        if (!MySetFilePointer(File, offSeek, NULL, uMethod))
+    if (MySetFilePointer(hFile, 0, &offCurrent, FILE_CURRENT))
+    {
+        if (!MySetFilePointer(hFile, offSeek, NULL, uMethod))
             fIsBeyondLimit = GetLastError() == ERROR_SEEK;
         else /* Restore file pointer on success. */
-            MySetFilePointer(File, offCurrent, NULL, FILE_BEGIN);
+            MySetFilePointer(hFile, offCurrent, NULL, FILE_BEGIN);
     }
 
@@ -135 +135 @@
 
 
-RTR3DECL(RTHCINTPTR) RTFileToNative(RTFILE File)
-{
-    AssertReturn(File != NIL_RTFILE, (RTHCINTPTR)INVALID_HANDLE_VALUE);
-    return (RTHCINTPTR)File;
-}
-
-
-RTR3DECL(int) RTFileOpen(PRTFILE pFile, const char *pszFilename, uint32_t fOpen)
+RTR3DECL(RTHCINTPTR) RTFileToNative(RTFILE hFile)
+{
+    AssertReturn(hFile != NIL_RTFILE, (RTHCINTPTR)INVALID_HANDLE_VALUE);
+    return (RTHCINTPTR)hFile;
+}
+
+
+RTR3DECL(int) RTFileOpen(PRTFILE pFile, const char *pszFilename, uint64_t fOpen)
 {
     /*
@@ -186 +186 @@
             break;
         default:
-            AssertMsgFailed(("Impossible fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("Impossible fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }
@@ -207 +207 @@
             break;
         default:
-            AssertMsgFailed(("Impossible fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("Impossible fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }
@@ -228 +228 @@
                 case RTFILE_O_READWRITE:     dwDesiredAccess |= FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE; break;
                 default:
-                    AssertMsgFailed(("Impossible fOpen=%#x\n", fOpen));
+                    AssertMsgFailed(("Impossible fOpen=%#llx\n", fOpen));
                     return VERR_INVALID_PARAMETER;
             }
@@ -246 +246 @@
         case RTFILE_O_DENY_NOT_DELETE | RTFILE_O_DENY_READWRITE:dwShareMode = FILE_SHARE_DELETE; break;
         default:
-            AssertMsgFailed(("Impossible fOpen=%#x\n", fOpen));
+            AssertMsgFailed(("Impossible fOpen=%#llx\n", fOpen));
             return VERR_INVALID_PARAMETER;
     }
@@ -329 +329 @@
 
 
-RTR3DECL(int)  RTFileOpenBitBucket(PRTFILE phFile, uint32_t fAccess)
+RTR3DECL(int)  RTFileOpenBitBucket(PRTFILE phFile, uint64_t fAccess)
 {
     AssertReturn(   fAccess == RTFILE_O_READ
@@ -339 +339 @@
 
 
-RTR3DECL(int)  RTFileClose(RTFILE File)
-{
-    if (File == NIL_RTFILE)
-        return VINF_SUCCESS;
-    if (CloseHandle((HANDLE)File))
+RTR3DECL(int)  RTFileClose(RTFILE hFile)
+{
+    if (hFile == NIL_RTFILE)
+        return VINF_SUCCESS;
+    if (CloseHandle((HANDLE)RTFileToNative(hFile)))
         return VINF_SUCCESS;
     return RTErrConvertFromWin32(GetLastError());
@@ -372 +372 @@
 
 
-RTR3DECL(int)  RTFileSeek(RTFILE File, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
+RTR3DECL(int)  RTFileSeek(RTFILE hFile, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
 {
     static ULONG aulSeekRecode[] =
@@ -393 +393 @@
      * Execute the seek.
      */
-    if (MySetFilePointer(File, offSeek, poffActual, aulSeekRecode[uMethod]))
+    if (MySetFilePointer(hFile, offSeek, poffActual, aulSeekRecode[uMethod]))
         return VINF_SUCCESS;
     return RTErrConvertFromWin32(GetLastError());
@@ -399 +399 @@
 
 
-RTR3DECL(int)  RTFileRead(RTFILE File, void *pvBuf, size_t cbToRead, size_t *pcbRead)
+RTR3DECL(int)  RTFileRead(RTFILE hFile, void *pvBuf, size_t cbToRead, size_t *pcbRead)
 {
     if (cbToRead <= 0)
@@ -407 +407 @@
 
     ULONG cbRead = 0;
-    if (ReadFile((HANDLE)File, pvBuf, cbToReadAdj, &cbRead, NULL))
+    if (ReadFile((HANDLE)RTFileToNative(hFile), pvBuf, cbToReadAdj, &cbRead, NULL))
     {
         if (pcbRead)
@@ -418 +418 @@
             {
                 ULONG cbReadPart = 0;
-                if (!ReadFile((HANDLE)File, (char*)pvBuf + cbRead, cbToReadAdj - cbRead, &cbReadPart, NULL))
+                if (!ReadFile((HANDLE)RTFileToNative(hFile), (char*)pvBuf + cbRead, cbToReadAdj - cbRead, &cbReadPart, NULL))
                     return RTErrConvertFromWin32(GetLastError());
                 if (cbReadPart == 0)
@@ -446 +446 @@
             ULONG cbToRead   = RT_MIN(cbChunk, cbToReadAdj - cbRead);
             ULONG cbReadPart = 0;
-            if (!ReadFile((HANDLE)File, (char *)pvBuf + cbRead, cbToRead, &cbReadPart, NULL))
+            if (!ReadFile((HANDLE)RTFileToNative(hFile), (char *)pvBuf + cbRead, cbToRead, &cbReadPart, NULL))
             {
                 /* If we failed because the buffer is too big, shrink it and
@@ -478 +478 @@
 
 
-RTR3DECL(int)  RTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
+RTR3DECL(int)  RTFileWrite(RTFILE hFile, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
 {
     if (cbToWrite <= 0)
@@ -486 +486 @@
 
     ULONG cbWritten = 0;
-    if (WriteFile((HANDLE)File, pvBuf, cbToWriteAdj, &cbWritten, NULL))
+    if (WriteFile((HANDLE)RTFileToNative(hFile), pvBuf, cbToWriteAdj, &cbWritten, NULL))
     {
         if (pcbWritten)
@@ -497 +497 @@
             {
                 ULONG cbWrittenPart = 0;
-                if (!WriteFile((HANDLE)File, (char*)pvBuf + cbWritten, cbToWriteAdj - cbWritten, &cbWrittenPart, NULL))
+                if (!WriteFile((HANDLE)RTFileToNative(hFile), (char*)pvBuf + cbWritten,
+                               cbToWriteAdj - cbWritten, &cbWrittenPart, NULL))
                 {
                     int rc = RTErrConvertFromWin32(GetLastError());
                     if (   rc == VERR_DISK_FULL
-                        && IsBeyondLimit(File, cbToWriteAdj - cbWritten, FILE_CURRENT)
+                        && IsBeyondLimit(RTFileToNative(hFile), cbToWriteAdj - cbWritten, FILE_CURRENT)
                        )
                         rc = VERR_FILE_TOO_BIG;
@@ -532 +533 @@
             ULONG cbToWrite     = RT_MIN(cbChunk, cbToWriteAdj - cbWritten);
             ULONG cbWrittenPart = 0;
-            if (!WriteFile((HANDLE)File, (const char *)pvBuf + cbWritten, cbToWrite, &cbWrittenPart, NULL))
+            if (!WriteFile((HANDLE)RTFileToNative(hFile), (const char *)pvBuf + cbWritten, cbToWrite, &cbWrittenPart, NULL))
             {
                 /* If we failed because the buffer is too big, shrink it and
@@ -545 +546 @@
                 int rc = RTErrConvertFromWin32(dwErr);
                 if (   rc == VERR_DISK_FULL
-                    && IsBeyondLimit(File, cbToWriteAdj - cbWritten, FILE_CURRENT))
+                    && IsBeyondLimit(hFile, cbToWriteAdj - cbWritten, FILE_CURRENT))
                     rc = VERR_FILE_TOO_BIG;
                 return rc;
@@ -566 +567 @@
     int rc = RTErrConvertFromWin32(dwErr);
     if (   rc == VERR_DISK_FULL
-        && IsBeyondLimit(File, cbToWriteAdj - cbWritten, FILE_CURRENT))
+        && IsBeyondLimit(hFile, cbToWriteAdj - cbWritten, FILE_CURRENT))
         rc = VERR_FILE_TOO_BIG;
     return rc;
@@ -572 +573 @@
 
 
-RTR3DECL(int)  RTFileFlush(RTFILE File)
-{
-    if (!FlushFileBuffers((HANDLE)File))
+RTR3DECL(int)  RTFileFlush(RTFILE hFile)
+{
+    if (!FlushFileBuffers((HANDLE)RTFileToNative(hFile)))
     {
         int rc = GetLastError();
@@ -584 +585 @@
 
 
-RTR3DECL(int)  RTFileSetSize(RTFILE File, uint64_t cbSize)
+RTR3DECL(int)  RTFileSetSize(RTFILE hFile, uint64_t cbSize)
 {
     /*
@@ -591 +592 @@
     int         rc;
     uint64_t    offCurrent;
-    if (MySetFilePointer(File, 0, &offCurrent, FILE_CURRENT))
+    if (MySetFilePointer(hFile, 0, &offCurrent, FILE_CURRENT))
     {
         /*
          * Set new file pointer.
          */
-        if (MySetFilePointer(File, cbSize, NULL, FILE_BEGIN))
+        if (MySetFilePointer(hFile, cbSize, NULL, FILE_BEGIN))
         {
             /* set file pointer */
-            if (SetEndOfFile((HANDLE)File))
+            if (SetEndOfFile((HANDLE)RTFileToNative(hFile)))
             {
                 /*
@@ -605 +606 @@
                  * If the old pointer was beyond the new file end, ignore failure.
                  */
-                if (    MySetFilePointer(File, offCurrent, NULL, FILE_BEGIN)
+                if (    MySetFilePointer(hFile, offCurrent, NULL, FILE_BEGIN)
                     ||  offCurrent > cbSize)
                     return VINF_SUCCESS;
@@ -614 +615 @@
              */
             rc = GetLastError();
-            MySetFilePointer(File, offCurrent, NULL, FILE_BEGIN);
+            MySetFilePointer(hFile, offCurrent, NULL, FILE_BEGIN);
         }
         else
@@ -626 +627 @@
 
 
-RTR3DECL(int)  RTFileGetSize(RTFILE File, uint64_t *pcbSize)
+RTR3DECL(int)  RTFileGetSize(RTFILE hFile, uint64_t *pcbSize)
 {
     ULARGE_INTEGER  Size;
-    Size.LowPart = GetFileSize((HANDLE)File, &Size.HighPart);
+    Size.LowPart = GetFileSize((HANDLE)RTFileToNative(hFile), &Size.HighPart);
     if (Size.LowPart != INVALID_FILE_SIZE)
     {
@@ -641 +642 @@
 
 
-RTR3DECL(int) RTFileGetMaxSizeEx(RTFILE File, PRTFOFF pcbMax)
+RTR3DECL(int) RTFileGetMaxSizeEx(RTFILE hFile, PRTFOFF pcbMax)
 {
     /** @todo r=bird:
@@ -653 +654 @@
 
 
-RTR3DECL(bool) RTFileIsValid(RTFILE File)
-{
-    if (File != NIL_RTFILE)
-    {
-        DWORD dwType = GetFileType((HANDLE)File);
+RTR3DECL(bool) RTFileIsValid(RTFILE hFile)
+{
+    if (hFile != NIL_RTFILE)
+    {
+        DWORD dwType = GetFileType((HANDLE)RTFileToNative(hFile));
         switch (dwType)
         {
@@ -679 +680 @@
 #define HIGH_DWORD(u64) (((DWORD *)&u64)[1])
 
-RTR3DECL(int)  RTFileLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
@@ -704 +705 @@
 
     /* Note: according to Microsoft, LockFileEx API call is available starting from NT 3.5 */
-    if (LockFileEx((HANDLE)File, dwFlags, 0, LOW_DWORD(cbLock), HIGH_DWORD(cbLock), &Overlapped))
+    if (LockFileEx((HANDLE)RTFileToNative(hFile), dwFlags, 0, LOW_DWORD(cbLock), HIGH_DWORD(cbLock), &Overlapped))
         return VINF_SUCCESS;
 
@@ -711 +712 @@
 
 
-RTR3DECL(int)  RTFileChangeLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileChangeLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
@@ -723 +724 @@
 
     /* Remove old lock. */
-    int rc = RTFileUnlock(File, offLock, cbLock);
+    int rc = RTFileUnlock(hFile, offLock, cbLock);
     if (RT_FAILURE(rc))
         return rc;
 
     /* Set new lock. */
-    rc = RTFileLock(File, fLock, offLock, cbLock);
+    rc = RTFileLock(hFile, fLock, offLock, cbLock);
     if (RT_SUCCESS(rc))
         return rc;
@@ -734 +735 @@
     /* Try to restore old lock. */
     unsigned fLockOld = (fLock & RTFILE_LOCK_WRITE) ? fLock & ~RTFILE_LOCK_WRITE : fLock | RTFILE_LOCK_WRITE;
-    rc = RTFileLock(File, fLockOld, offLock, cbLock);
+    rc = RTFileLock(hFile, fLockOld, offLock, cbLock);
     if (RT_SUCCESS(rc))
         return VERR_FILE_LOCK_VIOLATION;
@@ -742 +743 @@
 
 
-RTR3DECL(int)  RTFileUnlock(RTFILE File, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileUnlock(RTFILE hFile, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
 
-    if (UnlockFile((HANDLE)File, LOW_DWORD(offLock), HIGH_DWORD(offLock), LOW_DWORD(cbLock), HIGH_DWORD(cbLock)))
+    if (UnlockFile((HANDLE)RTFileToNative(hFile),
+                   LOW_DWORD(offLock), HIGH_DWORD(offLock),
+                   LOW_DWORD(cbLock), HIGH_DWORD(cbLock)))
         return VINF_SUCCESS;
 
@@ -754 +757 @@
 
 
-RTR3DECL(int) RTFileQueryInfo(RTFILE File, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
+RTR3DECL(int) RTFileQueryInfo(RTFILE hFile, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs)
 {
     /*
      * Validate input.
      */
-    if (File == NIL_RTFILE)
-    {
-        AssertMsgFailed(("Invalid File=%RTfile\n", File));
+    if (hFile == NIL_RTFILE)
+    {
+        AssertMsgFailed(("Invalid hFile=%RTfile\n", hFile));
         return VERR_INVALID_PARAMETER;
     }
@@ -780 +783 @@
      */
     BY_HANDLE_FILE_INFORMATION Data;
-    if (!GetFileInformationByHandle((HANDLE)File, &Data))
+    if (!GetFileInformationByHandle((HANDLE)RTFileToNative(hFile), &Data))
     {
         DWORD dwErr = GetLastError();
@@ -851 +854 @@
 
 
-RTR3DECL(int) RTFileSetTimes(RTFILE File, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
+RTR3DECL(int) RTFileSetTimes(RTFILE hFile, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
                              PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime)
 {
@@ -873 +876 @@
 
     int rc = VINF_SUCCESS;
-    if (!SetFileTime((HANDLE)File, pCreationTimeFT, pLastAccessTimeFT, pLastWriteTimeFT))
+    if (!SetFileTime((HANDLE)RTFileToNative(hFile), pCreationTimeFT, pLastAccessTimeFT, pLastWriteTimeFT))
     {
         DWORD Err = GetLastError();
         rc = RTErrConvertFromWin32(Err);
         Log(("RTFileSetTimes(%RTfile, %p, %p, %p, %p): SetFileTime failed with lasterr %d (%Rrc)\n",
-             File, pAccessTime, pModificationTime, pChangeTime, pBirthTime, Err, rc));
+             hFile, pAccessTime, pModificationTime, pChangeTime, pBirthTime, Err, rc));
     }
     return rc;
@@ -890 +893 @@
 
 
-RTR3DECL(int) RTFileSetMode(RTFILE File, RTFMODE fMode)
+RTR3DECL(int) RTFileSetMode(RTFILE hFile, RTFMODE fMode)
 {
     /*
@@ -900 +903 @@
 
     ULONG FileAttributes = (fMode & RTFS_DOS_MASK) >> RTFS_DOS_SHIFT;
-    int Err = rtFileNativeSetAttributes((HANDLE)File, FileAttributes);
+    int Err = rtFileNativeSetAttributes((HANDLE)hFile, FileAttributes);
     if (Err != ERROR_SUCCESS)
     {
         int rc = RTErrConvertFromWin32(Err);
         Log(("RTFileSetMode(%RTfile, %RTfmode): rtFileNativeSetAttributes (0x%08X) failed with err %d (%Rrc)\n",
-             File, fMode, FileAttributes, Err, rc));
+             hFile, fMode, FileAttributes, Err, rc));
         return rc;
     }

trunk/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp

@@ -60 +60 @@
 
     /** @todo resolve dynamically to avoid dragging in NtDll? */
-    NTSTATUS Status = NtSetInformationFile(hFile,
+    NTSTATUS Status = NtSetInformationFile(RTFileToNative(hFile),
                                            &IoStatusBlock,
                                            &Info,