Changeset 14064 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Nov 10, 2008 11:27:40 PM (16 years ago)

Author:

vboxsync

Message:

fileio-win.cpp: shut up 64-bit MSC warnings (valid ones this time).

File:

• trunk/src/VBox/Runtime/r3/win/fileio-win.cpp (modified) (5 diffs)

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

@@ -357 +357 @@
     if (cbToRead <= 0)
         return VINF_SUCCESS;
+    ULONG cbToReadAdj = (ULONG)cbToRead;
+    AssertReturn(cbToReadAdj == cbToRead, VERR_NUMBER_TOO_BIG);
 
     ULONG cbRead = 0;
-    if (ReadFile((HANDLE)File, pvBuf, cbToRead, &cbRead, NULL))
+    if (ReadFile((HANDLE)File, pvBuf, cbToReadAdj, &cbRead, NULL))
     {
         if (pcbRead)
@@ -367 +369 @@
         {
             /* Caller expects everything to be read. */
-            while (cbToRead > cbRead)
+            while (cbToReadAdj > cbRead)
             {
                 ULONG cbReadPart = 0;
-                if (!ReadFile((HANDLE)File, (char*)pvBuf + cbRead, cbToRead - cbRead, &cbReadPart, NULL))
+                if (!ReadFile((HANDLE)File, (char*)pvBuf + cbRead, cbToReadAdj - cbRead, &cbReadPart, NULL))
                     return RTErrConvertFromWin32(GetLastError());
                 if (cbReadPart == 0)
@@ -387 +389 @@
     if (cbToWrite <= 0)
         return VINF_SUCCESS;
+    ULONG cbToWriteAdj = (ULONG)cbToWrite;
+    AssertReturn(cbToWriteAdj == cbToWrite, VERR_NUMBER_TOO_BIG);
 
     ULONG cbWritten = 0;
-    if (WriteFile((HANDLE)File, pvBuf, cbToWrite, &cbWritten, NULL))
+    if (WriteFile((HANDLE)File, pvBuf, cbToWriteAdj, &cbWritten, NULL))
     {
         if (pcbWritten)
@@ -397 +401 @@
         {
             /* Caller expects everything to be written. */
-            while (cbToWrite > cbWritten)
+            while (cbToWriteAdj > cbWritten)
             {
                 ULONG cbWrittenPart = 0;
-                if (!WriteFile((HANDLE)File, (char*)pvBuf + cbWritten, cbToWrite - cbWritten, &cbWrittenPart, NULL))
+                if (!WriteFile((HANDLE)File, (char*)pvBuf + cbWritten, cbToWriteAdj - cbWritten, &cbWrittenPart, NULL))
                 {
                     int rc = RTErrConvertFromWin32(GetLastError());
                     if (   rc == VERR_DISK_FULL
-                        && IsBeyondLimit(File, cbToWrite - cbWritten, FILE_CURRENT)
+                        && IsBeyondLimit(File, cbToWriteAdj - cbWritten, FILE_CURRENT)
                        )
                         rc = VERR_FILE_TOO_BIG;
@@ -418 +422 @@
     int rc = RTErrConvertFromWin32(GetLastError());
     if (   rc == VERR_DISK_FULL
-        && IsBeyondLimit(File, cbToWrite - cbWritten, FILE_CURRENT)
-       )
+        && IsBeyondLimit(File, cbToWriteAdj - cbWritten, FILE_CURRENT))
         rc = VERR_FILE_TOO_BIG;
     return rc;