Changeset 63058 in vbox for trunk/src/VBox

Timestamp:

Aug 5, 2016 8:19:24 PM (9 years ago)

Author:

vboxsync

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

109671

Message:

GA/NT/Graphics: warnings

Location:

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

Files:

• VBoxDispDDraw.cpp (modified) (1 diff)
• VBoxDispDDrawVHWA.cpp (modified) (4 diffs)
• VBoxDispDrawCmd.cpp (modified) (5 diffs)
• VBoxDispDriver.cpp (modified) (3 diffs)
• VBoxDispDriverDDraw.cpp (modified) (1 diff)
• VBoxDispVHWA.cpp (modified) (7 diffs)

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

@@ -179 +179 @@
                 if (RT_SUCCESS(pCmd->rc))
                 {
-                    uint32_t surfSizeX = pBody->SurfInfo.sizeX;
-                    uint32_t surfSizeY = pBody->SurfInfo.sizeY;
                     pDesc->hHostHandle = pBody->SurfInfo.hSurf;
 

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox XPDM Display driver, DirectDraw callbacks VHWA related
@@ -21 +20 @@
 #include <iprt/asm.h>
 
-static DECLCALLBACK(void) VBoxDispVHWASurfBltCompletion(PVBOXDISPDEV pDev, VBOXVHWACMD * pCmd, void * pContext)
-{
+static DECLCALLBACK(void) VBoxDispVHWASurfBltCompletion(PVBOXDISPDEV pDev, VBOXVHWACMD *pCmd, void *pvContext)
+{
+    RT_NOREF(pvContext);
     VBOXVHWACMD_SURF_BLT *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_BLT);
     PVBOXVHWASURFDESC pSrcDesc = (PVBOXVHWASURFDESC)pBody->SrcGuestSurfInfo;
@@ -33 +33 @@
 }
 
-static DECLCALLBACK(void) VBoxDispVHWASurfFlipCompletion(PVBOXDISPDEV pDev, VBOXVHWACMD * pCmd, void * pContext)
-{
+static DECLCALLBACK(void) VBoxDispVHWASurfFlipCompletion(PVBOXDISPDEV pDev, VBOXVHWACMD *pCmd, void *pvContext)
+{
+    RT_NOREF(pvContext);
     VBOXVHWACMD_SURF_FLIP *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_FLIP);
     PVBOXVHWASURFDESC pCurrDesc = (PVBOXVHWASURFDESC)pBody->CurrGuestSurfInfo;
@@ -70 +71 @@
     if (VBOXVHWA_CAP(pDev, VBOXVHWA_CAPS_BLT) && VBOXVHWA_CAP(pDev, VBOXVHWA_CAPS_BLTSTRETCH))
     {
-        pHalInfo->ddCaps.dwFXCaps |= DDFXCAPS_BLTSTRETCHX|DDFXCAPS_BLTSTRETCHY|
-                                     DDFXCAPS_BLTSTRETCHXN|DDFXCAPS_BLTSTRETCHYN|
-                                     DDFXCAPS_BLTSHRINKX|DDFXCAPS_BLTSHRINKY|
-                                     DDFXCAPS_BLTSHRINKXN|DDFXCAPS_BLTSHRINKYN|
-                                     DDFXCAPS_BLTARITHSTRETCHY;
+        pHalInfo->ddCaps.dwFXCaps |= DDFXCAPS_BLTSTRETCHX  | DDFXCAPS_BLTSTRETCHY
+                                   | DDFXCAPS_BLTSTRETCHXN | DDFXCAPS_BLTSTRETCHYN
+                                   | DDFXCAPS_BLTSHRINKX   | DDFXCAPS_BLTSHRINKY
+                                   | DDFXCAPS_BLTSHRINKXN  | DDFXCAPS_BLTSHRINKYN
+                                   | DDFXCAPS_BLTARITHSTRETCHY;
     }
 
     if (VBOXVHWA_CAP(pDev, VBOXVHWA_CAPS_OVERLAY) && VBOXVHWA_CAP(pDev, VBOXVHWA_CAPS_OVERLAYSTRETCH))
     {
-        pHalInfo->ddCaps.dwFXCaps |= DDFXCAPS_OVERLAYSTRETCHX|DDFXCAPS_OVERLAYSTRETCHY|
-                                     DDFXCAPS_OVERLAYSTRETCHXN|DDFXCAPS_OVERLAYSTRETCHYN|
-                                     DDFXCAPS_OVERLAYSHRINKX|DDFXCAPS_OVERLAYSHRINKY|
-                                     DDFXCAPS_OVERLAYSHRINKXN|DDFXCAPS_OVERLAYSHRINKYN|
-                                     DDFXCAPS_OVERLAYARITHSTRETCHY;
+        pHalInfo->ddCaps.dwFXCaps |= DDFXCAPS_OVERLAYSTRETCHX  | DDFXCAPS_OVERLAYSTRETCHY
+                                   | DDFXCAPS_OVERLAYSTRETCHXN | DDFXCAPS_OVERLAYSTRETCHYN
+                                   | DDFXCAPS_OVERLAYSHRINKX   | DDFXCAPS_OVERLAYSHRINKY
+                                   | DDFXCAPS_OVERLAYSHRINKXN  | DDFXCAPS_OVERLAYSHRINKYN
+                                   | DDFXCAPS_OVERLAYARITHSTRETCHY;
     }
 

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

@@ -154 +154 @@
 void VBoxDispDumpPSO(SURFOBJ *pso, char *s)
 {
+    RT_NOREF(pso, s);
     if (pso)
     {
@@ -540 +541 @@
                     RECTL *prclDest, POINTL *pptlSrc)
 {
-    BOOL bRc;
     RECTL rclDest = *prclDest;
     POINTL ptlSrc = *pptlSrc;
-    BOOL bDo = TRUE;
     LOGF_ENTER();
     STATDRVENTRY(CopyBits, psoDest);
@@ -568 +567 @@
      *
      */
+    BOOL fDo = TRUE;
     if (   psoSrc
         && !VBoxDispIsScreenSurface(psoSrc)
@@ -585 +585 @@
 
                 /* It is possible to apply the fix. */
-                bDo = vbvaFindChangedRect(getSurfObj(psoDest), getSurfObj(psoSrc), &rclDest, &ptlSrc);
+                fDo = vbvaFindChangedRect(getSurfObj(psoDest), getSurfObj(psoSrc), &rclDest, &ptlSrc);
             }
         }
     }
 
-    if (!bDo)
+    if (!fDo)
     {
         /* The operation is a NOP. Just return success. */
@@ -598 +598 @@
 #endif /* VBOX_VBVA_ADJUST_RECT */
 
-    bRc = EngCopyBits(getSurfObj(psoDest), getSurfObj(psoSrc), pco, pxlo, &rclDest, &ptlSrc);
+    BOOL fRc = EngCopyBits(getSurfObj(psoDest), getSurfObj(psoSrc), pco, pxlo, &rclDest, &ptlSrc);
     VBVA_OPERATION(psoDest, CopyBits, (psoDest, psoSrc, pco, pxlo, &rclDest, &ptlSrc));
 
     LOGF_LEAVE();
-    return bRc;
-}
+    return fRc;
+}

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

@@ -677 +677 @@
             break;
         }
+        default:
+            AssertMsgFailedReturn(("ulBitsPerPel=%#x\n", pDev->mode.ulBitsPerPel), NULL);
     }
 
@@ -683 +685 @@
 
     pDev->surface.hBitmap = EngCreateBitmap(size, pDev->mode.lScanlineStride, iFormat,
-                                            pDev->mode.lScanlineStride>0 ? BMF_TOPDOWN:0,
+                                            pDev->mode.lScanlineStride > 0 ? BMF_TOPDOWN:0,
                                             pDev->memInfo.FrameBufferBase);
     if (!pDev->surface.hBitmap)
@@ -1046 +1048 @@
 BOOL APIENTRY VBoxDispDrvOffset(SURFOBJ* pso, LONG x, LONG y, FLONG flReserved)
 {
+    RT_NOREF(flReserved);
     PVBOXDISPDEV pDev = (PVBOXDISPDEV)pso->dhpdev;
     LOGF(("%x %x %x\n", x, y, flReserved));

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

@@ -190 +190 @@
 VOID APIENTRY VBoxDispDrvDisableDirectDraw(DHPDEV  dhpdev)
 {
+    RT_NOREF(dhpdev);
     LOGF_ENTER();
     LOGF_LEAVE();

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox XPDM Display driver
@@ -27 +26 @@
 }
 
-static void VBoxDispVHWACommandRetain(PVBOXDISPDEV pDev, VBOXVHWACMD* pCmd)
+static void VBoxDispVHWACommandRetain(VBOXVHWACMD* pCmd)
 {
     ASMAtomicIncU32(&pCmd->cRefs);
@@ -37 +36 @@
     pCmd->GuestVBVAReserved2 = 0;
     /* ensure the command is not removed until we're processing it */
-    VBoxDispVHWACommandRetain(pDev, pCmd);
+    VBoxDispVHWACommandRetain(pCmd);
 
     /* complete it asynchronously by setting event */
@@ -197 +196 @@
 static DECLCALLBACK(void) VBoxDispVHWACommandCompletionCallbackEvent(PVBOXDISPDEV pDev, VBOXVHWACMD * pCmd, void * pContext)
 {
+    RT_NOREF(pCmd);
     VBOXPEVENT pEvent = (VBOXPEVENT)pContext;
     LONG oldState = pDev->vpAPI.VideoPortProcs.pfnSetEvent(pDev->vpAPI.pContext, pEvent);
@@ -207 +207 @@
     pCmd->GuestVBVAReserved1 = (uintptr_t)pfnCompletion;
     pCmd->GuestVBVAReserved2 = (uintptr_t)pContext;
-    VBoxDispVHWACommandRetain(pDev, pCmd);
+    VBoxDispVHWACommandRetain(pCmd);
 
     VBoxHGSMIBufferSubmit(&pDev->hgsmi.ctx, pCmd);
@@ -220 +220 @@
 }
 
-static DECLCALLBACK(void) VBoxDispVHWAFreeCmdCompletion(PVBOXDISPDEV pDev, VBOXVHWACMD * pCmd, void * pContext)
-{
+static DECLCALLBACK(void) VBoxDispVHWAFreeCmdCompletion(PVBOXDISPDEV pDev, VBOXVHWACMD *pCmd, void *pvContext)
+{
+    RT_NOREF(pvContext);
     VBoxDispVHWACommandRelease(pDev, pCmd);
 }
@@ -229 +230 @@
     pCmd->GuestVBVAReserved1 = (uintptr_t)VBoxDispVHWAFreeCmdCompletion;
 
-    VBoxDispVHWACommandRetain(pDev, pCmd);
+    VBoxDispVHWACommandRetain(pCmd);
 
     pCmd->Flags |= VBOXVHWACMD_FLAG_GH_ASYNCH_NOCOMPLETION;