Changeset 63062 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 5, 2016 8:59:29 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Graphics: warnings

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• disp/xpdm/VBoxDispDDrawVHWA.cpp (modified) (2 diffs)
• mp/wddm/VBoxMPCr.cpp (modified) (7 diffs)
• mp/wddm/VBoxMPMisc.cpp (modified) (2 diffs)
• mp/wddm/VBoxMPShgsmi.cpp (modified) (4 diffs)
• mp/wddm/VBoxMPVbva.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDDrawVHWA.cpp

@@ -237 +237 @@
             pBody->u.in.hSrcSurf = pSrcDesc->hHostHandle;
             VBoxDispVHWAFromRECTL(&pBody->u.in.srcRect, &lpBlt->rSrc);
-            pBody->DstGuestSurfInfo = (uint64_t)pDstDesc;
-            pBody->SrcGuestSurfInfo = (uint64_t)pSrcDesc;
+            pBody->DstGuestSurfInfo = (uintptr_t)pDstDesc;
+            pBody->SrcGuestSurfInfo = (uintptr_t)pSrcDesc;
 
             pBody->u.in.flags = VBoxDispVHWAFromDDBLTs(lpBlt->dwFlags);
@@ -315 +315 @@
             pBody->u.in.hTargSurf = pTargDesc->hHostHandle;
             pBody->u.in.hCurrSurf = pCurrDesc->hHostHandle;
-            pBody->TargGuestSurfInfo = (uint64_t)pTargDesc;
-            pBody->CurrGuestSurfInfo = (uint64_t)pCurrDesc;
+            pBody->TargGuestSurfInfo = (uintptr_t)pTargDesc;
+            pBody->CurrGuestSurfInfo = (uintptr_t)pCurrDesc;
 
             pTargDesc->bVisible = pCurrDesc->bVisible;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp

@@ -395 +395 @@
     pBufCmd->cbBuffer = sizeof (*pCmd);
     pBufCmd->u32GuestData = 0;
-    pBufCmd->u64GuestData = (uint64_t)pfnCompletion;
+    pBufCmd->u64GuestData = (uintptr_t)pfnCompletion;
 
     pBufCmd = &pBody->aBuffers[1];
@@ -401 +401 @@
     pBufCmd->cbBuffer = pWbDr->cbBuf;
     pBufCmd->u32GuestData = 0;
-    pBufCmd->u64GuestData = (uint64_t)pWbDr;
+    pBufCmd->u64GuestData = (uintptr_t)pWbDr;
 
     return VBOXMP_CRSHGSMICON_DR_GET_CMDCTX(pHdr, cBuffers, sizeof (VBOXMP_CRHGSMICMD_READ), void);
@@ -625 +625 @@
     pBufCmd->cbBuffer = sizeof (*pCmd);
     pBufCmd->u32GuestData = 0;
-    pBufCmd->u64GuestData = (uint64_t)pfnCompletion;
+    pBufCmd->u64GuestData = (uintptr_t)pfnCompletion;
 
     pBufCmd = &pBody->aBuffers[1];
@@ -637 +637 @@
     pBufCmd->cbBuffer = pWbDr->cbBuf;
     pBufCmd->u32GuestData = 0;
-    pBufCmd->u64GuestData = (uint64_t)pWbDr;
+    pBufCmd->u64GuestData = (uintptr_t)pWbDr;
 
     return VBOXMP_CRSHGSMICON_DR_GET_CMDCTX(pHdr, cBuffers, sizeof (VBOXMP_CRHGSMICMD_WRITEREAD), void);
@@ -676 +676 @@
 
     uint64_t*pu64Completion = VBOXMP_CRSHGSMICON_CMD_GET_CMDCTX(pCmd, cBuffers, sizeof (VBOXMP_CRHGSMICMD_WRITE), uint64_t);
-    *pu64Completion = (uint64_t)pfnCompletion;
-    return (void*)(pu64Completion+1);
+    *pu64Completion = (uintptr_t)pfnCompletion;
+    return pu64Completion + 1;
 }
 
@@ -719 +719 @@
     pBufCmd->cbBuffer = sizeof (*pCmd);
     pBufCmd->u32GuestData = 0;
-    pBufCmd->u64GuestData = (uint64_t)pfnCompletion;
+    pBufCmd->u64GuestData = (uintptr_t)pfnCompletion;
 
     pBufCmd = &pBody->aBuffers[1];
@@ -954 +954 @@
 
     parms.u64PID.type     = VMMDevHGCMParmType_64bit;
-    parms.u64PID.u.value64 = (uint64_t)PsGetCurrentProcessId();
+    parms.u64PID.u.value64 = (uintptr_t)PsGetCurrentProcessId();
 
     Assert(parms.u64PID.u.value64);

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -1223 +1223 @@
                         pUmAlloc->hAlloc = pAllocRef->hSessionHandle;
                         pUmAlloc->cbData = pAlloc->cbData;
-                        pUmAlloc->pvData = (uint64_t)pvUm;
+                        pUmAlloc->pvData = (uintptr_t)pvUm;
                         return STATUS_SUCCESS;
                     }
@@ -1417 +1417 @@
                 pBufCmd->cbBuffer = pBufInfo->Info.cbData;
                 pBufCmd->u32GuestData = 0;
-                pBufCmd->u64GuestData = (uint64_t)pRef;
+                pBufCmd->u64GuestData = (uintptr_t)pRef;
             }
             else

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.cpp

@@ -75 +75 @@
     PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader(pvBuff);
     pHeader->u64Info1 = (uint64_t)vboxSHGSMICompletionSetEvent;
-    pHeader->u64Info2 = (uint64_t)hEventSem;
+    pHeader->u64Info2 = (uintptr_t)hEventSem;
     pHeader->fFlags   = VBOXSHGSMI_FLAG_GH_ASYNCH_IRQ;
 
@@ -126 +126 @@
     fFlags &= ~VBOXSHGSMI_FLAG_GH_ASYNCH_CALLBACK_IRQ;
     PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader (pvBuff);
-    pHeader->u64Info1 = (uint64_t)pfnCompletion;
-    pHeader->u64Info2 = (uint64_t)pvCompletion;
+    pHeader->u64Info1 = (uintptr_t)pfnCompletion;
+    pHeader->u64Info2 = (uintptr_t)pvCompletion;
     pHeader->fFlags = fFlags;
 
@@ -139 +139 @@
     fFlags |= VBOXSHGSMI_FLAG_GH_ASYNCH_CALLBACK_IRQ | VBOXSHGSMI_FLAG_GH_ASYNCH_IRQ;
     PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader (pvBuff);
-    pHeader->u64Info1 = (uint64_t)pfnCompletion;
-    pHeader->u64Info2 = (uint64_t)pvCompletion;
+    pHeader->u64Info1 = (uintptr_t)pfnCompletion;
+    pHeader->u64Info2 = (uintptr_t)pvCompletion;
     /* we must assign rather than or because flags field does not get zeroed on command creation */
     pHeader->fFlags = fFlags;
@@ -244 +244 @@
             if (pfnCompletion)
             {
-                pCur->u64Info1 = (uint64_t)pfnCompletion;
-                pCur->u64Info2 = (uint64_t)pvCompletion;
+                pCur->u64Info1 = (uintptr_t)pfnCompletion;
+                pCur->u64Info2 = (uintptr_t)pvCompletion;
                 pCur->fFlags &= ~VBOXSHGSMI_FLAG_GH_ASYNCH_CALLBACK_IRQ;
             }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp

@@ -1254 +1254 @@
     pConnect->Connect.u32MajorVersion = crVersionMajor;
     pConnect->Connect.u32MinorVersion = crVersionMinor;
-    pConnect->Connect.u64Pid = (uint64_t)PsGetCurrentProcessId();
+    pConnect->Connect.u64Pid = (uintptr_t)PsGetCurrentProcessId();
 
     int rc = vboxCmdVbvaCtlSubmitSync(pHGSMICtx, &pConnect->Hdr);