Index: /trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp =================================================================== --- /trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (revision 37596) +++ /trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (revision 37597) @@ -635,9 +635,9 @@ FD_SET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet); # if 1 /* it seems like this select is blocking the write... */ - rc = select(RT_MAX(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1, + rc = select(RT_MAX(RTPipeToNative(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR)) + 1, &RdSet, NULL, &XcptSet, NULL); # else struct timeval tv = { 0, 1000 }; - rc = select(RTFileToPipe(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1, + rc = select(RTPipeToNative(pThis->hWakeupPipeR), RTFileToNative(pThis->hDeviceFileR) + 1, &RdSet, NULL, &XcptSet, &tv); # endif @@ -659,5 +659,5 @@ size_t cbRead; if ( FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &RdSet) - || FD_ISSET(pThis->hWakeupPipeR, &XcptSet)) + || FD_ISSET(RTPipeToNative(pThis->hWakeupPipeR), &XcptSet)) { rc = RTPipeRead(pThis->hWakeupPipeR, abBuffer, 1, &cbRead); @@ -1276,5 +1276,5 @@ /* Linux & darwin needs a separate thread which monitors the status lines. */ # ifndef RT_OS_LINUX - ioctl(pThis->DeviceFile, TIOCMGET, &pThis->fStatusLines); + ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMGET, &pThis->fStatusLines); # endif rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "SerMon"); Index: /trunk/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp =================================================================== --- /trunk/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp (revision 37596) +++ /trunk/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp (revision 37597) @@ -26,5 +26,4 @@ -#define RTMEM_WRAP_TO_EF_APIS /******************************************************************************* * Header Files * @@ -50,14 +49,4 @@ #include "internal/iprt.h" #include - -#ifdef IN_RING0 /* till RTFILE is changed in types.h */ -# include -typedef struct RTFILENEWINT *RTFILENEW; -typedef RTFILENEW *PRTFILENEW; -# undef NIL_RTFILE -# define RTFILE RTFILENEW -# define PRTFILE PRTFILENEW -# define NIL_RTFILE ((RTFILENEW)-1) -#endif #include @@ -197,5 +186,5 @@ * Darwin kernel file handle data. */ -typedef struct RTFILENEWINT +typedef struct RTFILEINT { /** Magic value (RTFILE_MAGIC). */ @@ -209,12 +198,12 @@ /** The vnode returned by vnode_open. */ vnode_t hVnode; -} RTFILENEWINT; -/** Magic number for RTFILENEWINT::u32Magic (To Be Determined). */ +} RTFILEINT; +/** Magic number for RTFILEINT::u32Magic (To Be Determined). */ #define RTFILE_MAGIC UINT32_C(0x01020304) -RTDECL(int) RTFileOpen(PRTFILE phFile, const char *pszFilename, uint32_t fOpen) -{ - RTFILENEWINT *pThis = (RTFILENEWINT *)RTMemAllocZ(sizeof(*pThis)); +RTDECL(int) RTFileOpen(PRTFILE phFile, const char *pszFilename, uint64_t fOpen) +{ + RTFILEINT *pThis = (RTFILEINT *)RTMemAllocZ(sizeof(*pThis)); if (!pThis) return VERR_NO_MEMORY; @@ -286,5 +275,5 @@ return VINF_SUCCESS; - RTFILENEWINT *pThis = hFile; + RTFILEINT *pThis = hFile; AssertPtrReturn(pThis, VERR_INVALID_HANDLE); AssertReturn(pThis->u32Magic == RTFILE_MAGIC, VERR_INVALID_HANDLE); @@ -300,5 +289,5 @@ RTDECL(int) RTFileReadAt(RTFILE hFile, RTFOFF off, void *pvBuf, size_t cbToRead, size_t *pcbRead) { - RTFILENEWINT *pThis = hFile; + RTFILEINT *pThis = hFile; AssertPtrReturn(pThis, VERR_INVALID_HANDLE); AssertReturn(pThis->u32Magic == RTFILE_MAGIC, VERR_INVALID_HANDLE); Index: /trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp (revision 37596) +++ /trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp (revision 37597) @@ -5,5 +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,5 +50,5 @@ -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,5 +83,5 @@ 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; int iErr = errno; @@ -102,5 +102,5 @@ else f |= LOCK_SH; - if (!flock(File, f)) + if (!flock(RTFileToNative(hFile), f)) return VINF_SUCCESS; iErr = errno; @@ -117,12 +117,12 @@ -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); @@ -148,5 +148,5 @@ fl.l_pid = 0; - if (fcntl(File, F_SETLK, &fl) >= 0) + if (fcntl(RTFileToNative(hFile), F_SETLK, &fl) >= 0) return VINF_SUCCESS; @@ -155,5 +155,5 @@ { /* A SMB hack, see RTFileLock. */ - if (!flock(File, LOCK_UN)) + if (!flock(RTFileToNative(hFile), LOCK_UN)) return VINF_SUCCESS; } Index: /trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp (revision 37596) +++ /trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp (revision 37597) @@ -638,5 +638,5 @@ DISK_GEOMETRY DriveGeo; DWORD cbDriveGeo; - if (DeviceIoControl((HANDLE)hFile, + if (DeviceIoControl((HANDLE)RTFileToNative(hFile), IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &DriveGeo, sizeof(DriveGeo), &cbDriveGeo, NULL)) @@ -652,5 +652,5 @@ GET_LENGTH_INFORMATION DiskLenInfo; DWORD junk; - if (DeviceIoControl((HANDLE)hFile, + if (DeviceIoControl((HANDLE)RTFileToNative(hFile), IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, &DiskLenInfo, sizeof(DiskLenInfo), &junk, (LPOVERLAPPED)NULL)) @@ -668,16 +668,15 @@ } else - { rc = RTErrConvertFromWin32(GetLastError()); - } + #elif defined(RT_OS_DARWIN) struct stat DevStat; - if (!fstat(hFile, &DevStat) && S_ISBLK(DevStat.st_mode)) + if (!fstat(RTFileToNative(hFile), &DevStat) && S_ISBLK(DevStat.st_mode)) { uint64_t cBlocks; uint32_t cbBlock; - if (!ioctl(hFile, DKIOCGETBLOCKCOUNT, &cBlocks)) + if (!ioctl(RTFileToNative(hFile), DKIOCGETBLOCKCOUNT, &cBlocks)) { - if (!ioctl(hFile, DKIOCGETBLOCKSIZE, &cbBlock)) + if (!ioctl(RTFileToNative(hFile), DKIOCGETBLOCKSIZE, &cbBlock)) cbSize = cBlocks * cbBlock; else @@ -689,11 +688,13 @@ else rc = VERR_INVALID_PARAMETER; + #elif defined(RT_OS_SOLARIS) struct stat DevStat; - if (!fstat(hFile, &DevStat) && ( S_ISBLK(DevStat.st_mode) - || S_ISCHR(DevStat.st_mode))) + if ( !fstat(RTFileToNative(hFile), &DevStat) + && ( S_ISBLK(DevStat.st_mode) + || S_ISCHR(DevStat.st_mode))) { struct dk_minfo mediainfo; - if (!ioctl(hFile, DKIOCGMEDIAINFO, &mediainfo)) + if (!ioctl(RTFileToNative(hFile), DKIOCGMEDIAINFO, &mediainfo)) cbSize = mediainfo.dki_capacity * mediainfo.dki_lbsize; else @@ -702,10 +703,11 @@ else rc = VERR_INVALID_PARAMETER; + #elif defined(RT_OS_FREEBSD) struct stat DevStat; - if (!fstat(hFile, &DevStat) && S_ISCHR(DevStat.st_mode)) + if (!fstat(RTFileToNative(hFile), &DevStat) && S_ISCHR(DevStat.st_mode)) { off_t cbMedia = 0; - if (!ioctl(hFile, DIOCGMEDIASIZE, &cbMedia)) + if (!ioctl(RTFileToNative(hFile), DIOCGMEDIASIZE, &cbMedia)) { cbSize = cbMedia; @@ -1012,6 +1014,5 @@ * contain dirty buffers. */ - RTFILE hFile = NIL_RTFILE; - + RTFILE hFile; rc = RTFileOpen(&hFile, pszUri, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE); if (RT_SUCCESS(rc))