Changeset 83739 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 17, 2020 8:51:27 AM (5 years ago)

Author:

vboxsync

Message:

IPRT: More VC++ 14.1 build fixes. bugref:8489

Location:

trunk/src/VBox/Runtime

Files:

• common/fs/isovfs.cpp (modified) (1 diff)
• common/fs/ntfsvfs.cpp (modified) (1 diff)
• common/misc/lockvalidator.cpp (modified) (1 diff)
• r3/win/fileio-win.cpp (modified) (4 diffs)
• r3/win/timer-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/fs/isovfs.cpp

@@ -834 +834 @@
             else
             {
-                size_t cbSkip = (offDirRec + pVol->cbSector) & ~(pVol->cbSector - 1U);
+                uint64_t cbSkip = (offDirRec + pVol->cbSector) & ~(uint64_t)(pVol->cbSector - 1U);
                 offDirRec += cbSkip;
-                pDirRec = (PCISO9660DIRREC)((uintptr_t)pDirRec + cbSkip);
+                pDirRec = (PCISO9660DIRREC)((uintptr_t)pDirRec + (size_t)cbSkip);
             }
         }

trunk/src/VBox/Runtime/common/fs/ntfsvfs.cpp

@@ -4522 +4522 @@
          */
         Assert(RT_IS_POWER_OF_TWO(pThis->cbBitmapAlloc));
-        uint64_t offLoad = offInBitmap & ~(pThis->cbBitmapAlloc - 1);
+        uint64_t offLoad = offInBitmap & ~(uint64_t)(pThis->cbBitmapAlloc - 1);
         uint32_t cbLoad  = (uint32_t)RT_MIN(cbWholeBitmap - offLoad, pThis->cbBitmapAlloc);
 

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -2727 +2727 @@
             case RTLOCKVALRECSHRDOWN_MAGIC_DEAD:
             default:
-                AssertMsgFailed(("%p: %#x\n", pRec, pRec->Core));
+                AssertMsgFailed(("%p: %#x\n", pRec, pRec->Core.u32Magic));
                 break;
         }

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

@@ -512 +512 @@
         while (cbToReadAdj > cbRead)
         {
-            ULONG cbToRead   = RT_MIN(cbChunk, cbToReadAdj - cbRead);
-            ULONG cbReadPart = 0;
-            if (!ReadFile((HANDLE)RTFileToNative(hFile), (char *)pvBuf + cbRead, cbToRead, &cbReadPart, NULL))
+            ULONG cbToReadNow = RT_MIN(cbChunk, cbToReadAdj - cbRead);
+            ULONG cbReadPart  = 0;
+            if (!ReadFile((HANDLE)RTFileToNative(hFile), (char *)pvBuf + cbRead, cbToReadNow, &cbReadPart, NULL))
             {
                 /* If we failed because the buffer is too big, shrink it and
@@ -650 +650 @@
         while (cbWritten < cbToWriteAdj)
         {
-            ULONG cbToWrite     = RT_MIN(cbChunk, cbToWriteAdj - cbWritten);
+            ULONG cbToWriteNow  = RT_MIN(cbChunk, cbToWriteAdj - cbWritten);
             ULONG cbWrittenPart = 0;
-            if (!WriteFile((HANDLE)RTFileToNative(hFile), (const char *)pvBuf + cbWritten, cbToWrite, &cbWrittenPart, NULL))
+            if (!WriteFile((HANDLE)RTFileToNative(hFile), (const char *)pvBuf + cbWritten, cbToWriteNow, &cbWrittenPart, NULL))
             {
                 /* If we failed because the buffer is too big, shrink it and
@@ -665 +665 @@
                 int rc = RTErrConvertFromWin32(dwErr);
                 if (rc == VERR_DISK_FULL)
-                    rc = rtFileWinCheckIfDiskReallyFull(hFile, RTFileTell(hFile) + cbToWrite);
+                    rc = rtFileWinCheckIfDiskReallyFull(hFile, RTFileTell(hFile) + cbToWriteNow);
                 return rc;
             }
@@ -893 +893 @@
                 InitializeObjectAttributes(&ObjAttr, &NtName, BasicInfo.Attributes & ~OBJ_INHERIT, NULL, NULL);
 
-                NTSTATUS rcNt = NtCreateFile(&hDupFile,
-                                             BasicInfo.GrantedAccess | FILE_WRITE_DATA,
-                                             &ObjAttr,
-                                             &Ios,
-                                             NULL /* AllocationSize*/,
-                                             FILE_ATTRIBUTE_NORMAL,
-                                             FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                                             FILE_OPEN,
-                                             FILE_OPEN_FOR_BACKUP_INTENT /*??*/,
-                                             NULL /*EaBuffer*/,
-                                             0 /*EaLength*/);
+                rcNt = NtCreateFile(&hDupFile,
+                                    BasicInfo.GrantedAccess | FILE_WRITE_DATA,
+                                    &ObjAttr,
+                                    &Ios,
+                                    NULL /* AllocationSize*/,
+                                    FILE_ATTRIBUTE_NORMAL,
+                                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                    FILE_OPEN,
+                                    FILE_OPEN_FOR_BACKUP_INTENT /*??*/,
+                                    NULL /*EaBuffer*/,
+                                    0 /*EaLength*/);
                 RTUtf16Free(NtName.Buffer);
                 if (NT_SUCCESS(rcNt))

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

@@ -245 +245 @@
 # ifdef USE_CATCH_UP
             pTimer->llNext.QuadPart += NSInterval;
-            LARGE_INTEGER ll;
             ll.QuadPart = RTTimeNanoTS() - pTimer->llNext.QuadPart;
             if (ll.QuadPart < -500000)
@@ -252 +251 @@
                 ll.QuadPart = -500000 / 100; /* need to catch up, do a minimum wait of 0.5ms. */
 # else
-            LARGE_INTEGER ll = pTimer->llNext;
+            ll = pTimer->llNext;
 # endif
             BOOL fRc = SetWaitableTimer(pTimer->hTimer, &ll, 0, NULL, NULL, FALSE);