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

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/r3

Files:

• socket.cpp (modified) (6 diffs)
• win/dir-win.cpp (modified) (1 diff)
• win/thread-win.cpp (modified) (2 diffs)
• win/tls-win.cpp (modified) (4 diffs)

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());