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

Timestamp:

Nov 30, 2010 1:14:14 PM (14 years ago)

Author:

vboxsync

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

68295

Message:

IPRT: Visual C++ warnings.

Location:

trunk/src/VBox/Runtime

Files:

• common/alloc/memcache.cpp (modified) (1 diff)
• common/misc/lockvalidator.cpp (modified) (1 diff)
• common/rand/randadv.cpp (modified) (1 diff)
• common/vfs/vfsbase.cpp (modified) (3 diffs)
• common/vfs/vfsmemory.cpp (modified) (4 diffs)
• common/zip/tarvfs.cpp (modified) (2 diffs)
• generic/timerlr-generic.cpp (modified) (1 diff)
• r3/socket.cpp (modified) (6 diffs)
• r3/win/dir-win.cpp (modified) (1 diff)
• r3/win/thread-win.cpp (modified) (2 diffs)
• r3/win/tls-win.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/alloc/memcache.cpp

@@ -528 +528 @@
         Assert(iObj * pThis->cbObject == offObj);
         Assert(iObj < pThis->cPerPage);
-        AssertReturnVoid(ASMBitTest(pPage->pbmAlloc, iObj));
+        AssertReturnVoid(ASMBitTest(pPage->pbmAlloc, (int32_t)iObj));
 # endif
 

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

@@ -3751 +3751 @@
             AssertReleaseReturnVoid(iEntry < RT_ELEMENTS(pThread->LockValidator.aShrdOwners));
 
-            Assert(!ASMBitTest(&pThread->LockValidator.bmFreeShrdOwners, iEntry));
-            ASMAtomicBitSet(&pThread->LockValidator.bmFreeShrdOwners, iEntry);
+            Assert(!ASMBitTest(&pThread->LockValidator.bmFreeShrdOwners, (int32_t)iEntry));
+            ASMAtomicBitSet(&pThread->LockValidator.bmFreeShrdOwners, (int32_t)iEntry);
 
             rtThreadRelease(pThread);

trunk/src/VBox/Runtime/common/rand/randadv.cpp

@@ -369 +369 @@
     uint64_t off = u64Last - u64First;
     if (off <= UINT32_MAX)
-        return (uint64_t)pThis->pfnGetU32(pThis, 0, off) + u64First;
+        return (uint64_t)pThis->pfnGetU32(pThis, 0, (uint32_t)off) + u64First;
 
     return (    (uint64_t)pThis->pfnGetU32(pThis, 0, UINT32_MAX)
-            |  ((uint64_t)pThis->pfnGetU32(pThis, 0, off >> 32) << 32))
+            |  ((uint64_t)pThis->pfnGetU32(pThis, 0, (uint32_t)(off >> 32)) << 32))
          + u64First;
 }

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

@@ -2124 +2124 @@
 
 
-RTDECL(RTFOFF) RTVfsIoStrmPoll(RTVFSIOSTREAM hVfsIos, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                               uint32_t *pfRetEvents)
+RTDECL(int) RTVfsIoStrmPoll(RTVFSIOSTREAM hVfsIos, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
+                            uint32_t *pfRetEvents)
 {
     RTVFSIOSTREAMINTERNAL *pThis = hVfsIos;
@@ -2185 +2185 @@
             while (cb > 0)
             {
-                size_t cbToRead = RT_MIN(cb, _64K);
+                size_t cbToRead = (size_t)RT_MIN(cb, _64K);
                 RTVfsLockAcquireWrite(pThis->Base.hLock);
                 rc = RTVfsIoStrmRead(hVfsIos, pvBuf, cbToRead, true /*fBlocking*/, NULL);
@@ -2224 +2224 @@
             while (cb > 0)
             {
-                size_t cbToWrite = RT_MIN(cb, _64K);
+                size_t cbToWrite = (size_t)RT_MIN(cb, _64K);
                 RTVfsLockAcquireWrite(pThis->Base.hLock);
                 rc = RTVfsIoStrmWrite(hVfsIos, pvBuf, cbToWrite, true /*fBlocking*/, NULL);

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

@@ -326 +326 @@
                 cbThisRead = cbLeftToRead;
             else
-                cbThisRead = pNext->off - offUnsigned;
+                cbThisRead = (size_t)(pNext->off - offUnsigned);
 
             RT_BZERO(pbDst, cbThisRead);
@@ -402 +402 @@
         uint64_t cbMaxExtent = pNext->off - offExtent;
         if (cbMaxExtent < cbExtent)
-            cbExtent = cbMaxExtent;
+            cbExtent = (uint32_t)cbMaxExtent;
     }
 
@@ -490 +490 @@
          * Copy the source data into the current extent.
          */
-        uint32_t const  offDst      = offUnsigned - pExtent->off;
+        uint32_t const  offDst      = (uint32_t)(offUnsigned - pExtent->off);
         uint32_t        cbThisWrite = pExtent->cb - offDst;
         if (cbThisWrite > cbLeftToWrite)
@@ -683 +683 @@
 {
     PRTVFSMEMFILE pThis = (PRTVFSMEMFILE)pvThis;
-    return pThis->Base.ObjInfo.cbObject;
+    *pcbFile = pThis->Base.ObjInfo.cbObject;
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Runtime/common/zip/tarvfs.cpp

@@ -1121 +1121 @@
 {
     PRTZIPTARIOSTREAM pThis = (PRTZIPTARIOSTREAM)pvThis;
-    return pThis->offFile;
+    *poffActual = pThis->offFile;
+    return VINF_SUCCESS;
 }
 
@@ -1397 +1398 @@
             pIosData->cbFile            = Info.cbObject;
             pIosData->offFile           = 0;
-            pIosData->cbPadding         = Info.cbAllocated - Info.cbObject;
+            pIosData->cbPadding         = (uint32_t)(Info.cbAllocated - Info.cbObject);
             pIosData->fEndOfStream      = false;
             pIosData->hVfsIos           = pThis->hVfsIos;

trunk/src/VBox/Runtime/generic/timerlr-generic.cpp

@@ -305 +305 @@
 
             /* block. */
-            int rc = RTSemEventWait(pThis->hEvent, cNanoSeconds < 1000000 ? 1 : cNanoSeconds / 1000000);
+            int rc = RTSemEventWait(pThis->hEvent,
+                                    (RTMSINTERVAL)(cNanoSeconds < 1000000 ? 1 : cNanoSeconds / 1000000));
             if (RT_FAILURE(rc) && rc != VERR_INTERRUPTED && rc != VERR_TIMEOUT)
             {

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

@@ -958 +958 @@
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
+    int const fdMax = (int)pThis->hNative + 1;
+    AssertReturn(fdMax - 1 == pThis->hNative, VERR_INTERNAL_ERROR_5);
 
     /*
@@ -970 +972 @@
     int rc;
     if (cMillies == RT_INDEFINITE_WAIT)
-        rc = select(pThis->hNative + 1, &fdsetR, NULL, &fdsetE, NULL);
+        rc = select(fdMax, &fdsetR, NULL, &fdsetE, NULL);
     else
     {
@@ -976 +978 @@
         timeout.tv_sec = cMillies / 1000;
         timeout.tv_usec = (cMillies % 1000) * 1000;
-        rc = select(pThis->hNative + 1, &fdsetR, NULL, &fdsetE, &timeout);
+        rc = select(fdMax, &fdsetR, NULL, &fdsetE, &timeout);
     }
     if (rc > 0)
@@ -1001 +1003 @@
     AssertReturn(!(fEvents & ~RTSOCKET_EVT_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
+    int const fdMax = (int)pThis->hNative + 1;
+    AssertReturn(fdMax - 1 == pThis->hNative, VERR_INTERNAL_ERROR_5);
 
     *pfEvents = 0;
@@ -1023 +1027 @@
     int rc;
     if (cMillies == RT_INDEFINITE_WAIT)
-        rc = select(pThis->hNative + 1, &fdsetR, &fdsetW, &fdsetE, NULL);
+        rc = select(fdMax, &fdsetR, &fdsetW, &fdsetE, NULL);
     else
     {
@@ -1029 +1033 @@
         timeout.tv_sec = cMillies / 1000;
         timeout.tv_usec = (cMillies % 1000) * 1000;
-        rc = select(pThis->hNative + 1, &fdsetR, &fdsetW, &fdsetE, &timeout);
+        rc = select(fdMax, &fdsetR, &fdsetW, &fdsetE, &timeout);
     }
     if (rc > 0)

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

@@ -384 +384 @@
         PCRTUTF16 pwszSrc = (PCRTUTF16)pDir->Data.cAlternateFileName;
         PRTUTF16  pwszDst = pDirEntry->wszShortName;
-        while (*pwszSrc)
-            *pwszDst++ = *pwszSrc++;
-        pDirEntry->cwcShortName = pwszDst - &pDirEntry->wszShortName[0];
+        uint32_t  off = 0;
+        while (pwszSrc[off] && off < RT_ELEMENTS(pDirEntry->wszShortName) - 1U)
+        {
+            pwszDst[off] = pwszSrc[off];
+            off++;
+        }
+        pDirEntry->cwcShortName = (uint16_t)off;
+
         /* zero the rest */
-        const PRTUTF16 pwszEnd = &pDirEntry->wszShortName[RT_ELEMENTS(pDirEntry->wszShortName)];
-        while (pwszDst < pwszEnd)
-            *pwszDst++ = '\0';
+        do
+            pwszDst[off++] = '\0';
+        while (off < RT_ELEMENTS(pDirEntry->wszShortName));
     }
     else

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

@@ -196 +196 @@
 {
     Assert((DWORD_PTR)u64Mask == u64Mask || u64Mask == ~(uint64_t)0);
-    DWORD dwRet = SetThreadAffinityMask(GetCurrentThread(), (DWORD_PTR)u64Mask);
+    DWORD_PTR dwRet = SetThreadAffinityMask(GetCurrentThread(), (DWORD_PTR)u64Mask);
     if (dwRet)
         return VINF_SUCCESS;
@@ -216 +216 @@
     {
         HANDLE hThread = GetCurrentThread();
-        DWORD dwRet = SetThreadAffinityMask(hThread, dwProcAff);
+        DWORD_PTR dwRet = SetThreadAffinityMask(hThread, dwProcAff);
         if (dwRet)
         {
-            DWORD dwSet = SetThreadAffinityMask(hThread, dwRet);
+            DWORD_PTR dwSet = SetThreadAffinityMask(hThread, dwRet);
             Assert(dwSet == dwProcAff); NOREF(dwRet);
             return dwRet;

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

@@ -69 +69 @@
     if (iTls == NIL_RTTLS)
         return VINF_SUCCESS;
-    if (TlsFree(iTls))
+    if (TlsFree((DWORD)iTls))
         return VINF_SUCCESS;
     return RTErrConvertFromWin32(GetLastError());
-
 }
 
@@ -78 +77 @@
 RTR3DECL(void *) RTTlsGet(RTTLS iTls)
 {
-    return TlsGetValue(iTls);
+    return TlsGetValue((DWORD)iTls);
 }
 
@@ -84 +83 @@
 RTR3DECL(int) RTTlsGetEx(RTTLS iTls, void **ppvValue)
 {
-    void *pv = TlsGetValue(iTls);
+    void *pv = TlsGetValue((DWORD)iTls);
     if (pv)
     {
@@ -99 +98 @@
 RTR3DECL(int) RTTlsSet(RTTLS iTls, void *pvValue)
 {
-    if (TlsSetValue(iTls, pvValue))
+    if (TlsSetValue((DWORD)iTls, pvValue))
         return VINF_SUCCESS;
     return RTErrConvertFromWin32(GetLastError());