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

Timestamp:

May 8, 2017 4:52:03 PM (8 years ago)

Author:

vboxsync

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

115271

Message:

include/iprt: Adjustments for Visual C++ v12 / Visual Studio 2013. Mostly new int to pointer cast warning.

Location:

trunk/src/VBox/Runtime

Files:

• r3/nt/RTProcQueryParent-r3-nt.cpp (modified) (1 diff)
• testcase/tstLdrLoad.cpp (modified) (1 diff)
• testcase/tstRTAvl.cpp (modified) (2 diffs)
• testcase/tstRTInlineAsm.cpp (modified) (1 diff)
• testcase/tstRTStrFormat.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/nt/RTProcQueryParent-r3-nt.cpp

@@ -54 +54 @@
     {
         CLIENT_ID ClientId;
-        ClientId.UniqueProcess = (HANDLE)hProcess;
+        ClientId.UniqueProcess = (HANDLE)(uintptr_t)hProcess;
         ClientId.UniqueThread  = NULL;
 

trunk/src/VBox/Runtime/testcase/tstLdrLoad.cpp

@@ -50 +50 @@
     for (int i = 1; i < argc; i++)
     {
-        RTLDRMOD hLdrMod = (RTLDRMOD)0xbaadffaa;
+        RTLDRMOD hLdrMod = (RTLDRMOD)(uintptr_t)0xbaadffaa;
         int rc = RTLdrLoad(argv[i], &hLdrMod);
         if (RT_SUCCESS(rc))

trunk/src/VBox/Runtime/testcase/tstRTAvl.cpp

@@ -963 +963 @@
             return 1;
         }
-        pNode->pLeft     = (PAVLULNODECORE)0xaaaaaaaa;
-        pNode->pRight    = (PAVLULNODECORE)0xbbbbbbbb;
+        pNode->pLeft     = (PAVLULNODECORE)(uintptr_t)0xaaaaaaaa;
+        pNode->pRight    = (PAVLULNODECORE)(uintptr_t)0xbbbbbbbb;
         pNode->uchHeight = 'e';
         RTMemFree(pNode);
@@ -1013 +1013 @@
                 return 1;
             }
-            pNode->pLeft     = (PAVLULNODECORE)0xdddddddd;
-            pNode->pRight    = (PAVLULNODECORE)0xcccccccc;
+            pNode->pLeft     = (PAVLULNODECORE)(uintptr_t)0xdddddddd;
+            pNode->pRight    = (PAVLULNODECORE)(uintptr_t)0xcccccccc;
             pNode->uchHeight = 'E';
             RTMemFree(pNode);

trunk/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp

@@ -737 +737 @@
     CHECKVAL(*ppv, (void *)(~(uintptr_t)0), "%p");
 
-    CHECKOP(ASMAtomicXchgPtr(ppv, (void *)0x87654321), (void *)(~(uintptr_t)0), "%p", void *);
-    CHECKVAL(*ppv, (void *)0x87654321, "%p");
-
-    CHECKOP(ASMAtomicXchgPtr(ppv, NULL), (void *)0x87654321, "%p", void *);
+    CHECKOP(ASMAtomicXchgPtr(ppv, (void *)(uintptr_t)0x87654321), (void *)(~(uintptr_t)0), "%p", void *);
+    CHECKVAL(*ppv, (void *)(uintptr_t)0x87654321, "%p");
+
+    CHECKOP(ASMAtomicXchgPtr(ppv, NULL), (void *)(uintptr_t)0x87654321, "%p", void *);
     CHECKVAL(*ppv, NULL, "%p");
 }

trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp

@@ -547 +547 @@
     {
         CHECK42("%RTsem", (RTSEMEVENT)0, "0000000000000000");
-        CHECK42("%RTsem", (RTSEMEVENT)0x23484342134ULL, "0000023484342134");
+        CHECK42("%RTsem", (RTSEMEVENT)(uintptr_t)0x23484342134ULL, "0000023484342134");
     }
     else
     {
         CHECK42("%RTsem", (RTSEMEVENT)0, "00000000");
-        CHECK42("%RTsem", (RTSEMEVENT)0x84342134, "84342134");
-    }
-
-    CHECK42("%RTsock", (RTSOCKET)12234, "12234");
-    CHECK42("%RTsock", (RTSOCKET)584854543, "584854543");
+        CHECK42("%RTsem", (RTSEMEVENT)(uintptr_t)0x84342134, "84342134");
+    }
+
+    CHECK42("%RTsock", (RTSOCKET)(uintptr_t)12234, "12234");
+    CHECK42("%RTsock", (RTSOCKET)(uintptr_t)584854543, "584854543");
 
     if (sizeof(RTTHREAD) == 8)
@@ -562 +562 @@
         CHECK42("%RTthrd", (RTTHREAD)0, "0000000000000000");
         CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffffffffffff");
-        CHECK42("%RTthrd", (RTTHREAD)0x63484342134ULL, "0000063484342134");
+        CHECK42("%RTthrd", (RTTHREAD)(uintptr_t)0x63484342134ULL, "0000063484342134");
     }
     else
@@ -568 +568 @@
         CHECK42("%RTthrd", (RTTHREAD)0, "00000000");
         CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffff");
-        CHECK42("%RTthrd", (RTTHREAD)0x54342134, "54342134");
+        CHECK42("%RTthrd", (RTTHREAD)(uintptr_t)0x54342134, "54342134");
     }