Changeset 63018 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp

Timestamp:

Aug 4, 2016 11:14:14 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Graphics: warnings

Location:

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

Files:

• VBoxD3DIf.cpp (modified) (6 diffs)
• VBoxD3DIf.h (modified) (1 diff)
• VBoxDispD3DIf.cpp (modified) (2 diffs)
• VBoxUhgsmiBase.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp

@@ -221 +221 @@
     if (!pRect)
     {
-        if (pAlloc->SurfDesc.pitch == pLockInfo->Pitch)
+        if (pAlloc->SurfDesc.pitch == (UINT)pLockInfo->Pitch)
         {
             Assert(pAlloc->SurfDesc.cbSize);
@@ -282 +282 @@
         }
 
-        if (pRect->right - pRect->left == pAlloc->SurfDesc.width && srcPitch == dstPitch)
+        if (pRect->right - pRect->left == (LONG)pAlloc->SurfDesc.width && srcPitch == dstPitch)
         {
             uint32_t cbSize = vboxWddmCalcSize(pAlloc->SurfDesc.pitch, pRect->bottom - pRect->top, pAlloc->SurfDesc.format);
@@ -291 +291 @@
             uint32_t pitch = RT_MIN(srcPitch, dstPitch);
             uint32_t cbCopyLine = vboxWddmCalcRowSize(pRect->left, pRect->right, pAlloc->SurfDesc.format);
-            Assert(pitch);
+            Assert(pitch); NOREF(pitch);
             uint32_t cRows = vboxWddmCalcNumRows(pRect->top, pRect->bottom, pAlloc->SurfDesc.format);
             for (UINT j = 0; j < cRows; ++j)
@@ -431 +431 @@
     {
         PVBOXWDDMDISP_ALLOCATION pAllocation = &pRc->aAllocations[0];
-        IDirect3DBaseTexture9 *pD3DIfTex;
+        IDirect3DBaseTexture9 *pD3DIfTex = NULL; /* Shut up MSC. */
         HANDLE hSharedHandle = pAllocation->hSharedHandle;
         void **pavClientMem = NULL;
@@ -570 +570 @@
             PVBOXWDDMDISP_ALLOCATION pAllocation = &pRc->aAllocations[i];
             HANDLE hSharedHandle = pAllocation->hSharedHandle;
-            IDirect3DSurface9* pD3D9Surf;
+            IDirect3DSurface9 *pD3D9Surf = NULL; /* Shut up MSC. */
             if (
 #ifdef VBOX_WITH_CROGL
@@ -644 +644 @@
                 hr = S_OK;
                 continue;
-
+#if 0 /* unreachable */
                 /* fail branch */
                 pD3D9Surf->Release();
+#endif
             }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.h

@@ -131 +131 @@
 
     HRESULT hr = VBoxD3DIfDeviceCreateDummy(pDevice);
-    Assert(hr == S_OK);
+    Assert(hr == S_OK); NOREF(hr);
     Assert(pDevice->pDevice9If);
     return pDevice->pDevice9If;

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.cpp

@@ -61 +61 @@
     if (!pD3D->hD3DLib)
     {
-        DWORD winErr = GetLastError(); NOREF(winErr)
+        DWORD winErr = GetLastError(); NOREF(winErr);
         WARN((__FUNCTION__": LoadLibrary failed, winErr = (%d)", winErr));
         return E_FAIL;
@@ -1278 +1278 @@
 void VBoxDispD3DGlobalClose(PVBOXWDDMDISP_D3D pD3D, PVBOXWDDMDISP_FORMATS pFormats)
 {
+    RT_NOREF(pD3D, pFormats);
     vboxDispD3DGlobalLock();
     --g_cVBoxDispD3DGlobalOpens;
     if (!g_cVBoxDispD3DGlobalOpens)
-    {
         vboxDispD3DGlobalDoClose(&g_VBoxDispD3DGlobalD3D);
-    }
     vboxDispD3DGlobalUnlock();
 }

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h

@@ -101 +101 @@
     else
     {
-        if (!cbLock)
-        {
-            Assert(0);
-            return VERR_INVALID_PARAMETER;
-        }
-        if (offLock + cbLock > pBuf->cbBuffer)
-        {
-            Assert(0);
-            return VERR_INVALID_PARAMETER;
-        }
+        AssertReturn(cbLock, VERR_INVALID_PARAMETER);
+        AssertReturn(offLock + cbLock <= pBuf->cbBuffer, VERR_INVALID_PARAMETER);
 
         uint32_t iFirstPage = offLock >> 12;
@@ -160 +152 @@
 {
     const uint32_t cbDmaCmd = RT_OFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[cBuffers]);
-    if (*pCommandBufferSize < cbDmaCmd)
-    {
-        Assert(0);
-        return VERR_GENERAL_FAILURE;
-    }
-    if (AllocationListSize < cBuffers)
-    {
-        Assert(0);
-        return VERR_GENERAL_FAILURE;
-    }
+    RT_NOREF(pPatchLocationList, PatchLocationListSize);
+
+    AssertReturn(*pCommandBufferSize >= cbDmaCmd, VERR_GENERAL_FAILURE);
+    AssertReturn(AllocationListSize >= cBuffers, VERR_GENERAL_FAILURE);
 
     *pCommandBufferSize = cbDmaCmd;