Changeset 83827 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Apr 19, 2020 2:02:30 AM (5 years ago)

Author:

vboxsync

Message:

Add/NT/Graphics: VC++ 14.1 warnings. bugref:8489

Location:

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

Files:

• common/VBoxMPVidModes.cpp (modified) (2 diffs)
• wddm/VBoxMPMisc.cpp (modified) (3 diffs)
• wddm/VBoxMPWddm.cpp (modified) (2 diffs)
• wddm/gallium/VBoxMPGaWddm.cpp (modified) (1 diff)
• xpdm/VBoxMPIOCTL.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

@@ -18 +18 @@
 #include "VBoxMPCommon.h"
 
-#if _MSC_VER >= 1400 /* bird: MS fixed swprintf to be standard-conforming... */
+#if _MSC_VER >= 1400 && _MSC_VER <= 1410 /* bird: MS fixed swprintf to be standard-conforming... */
 #define _INC_SWPRINTF_INL_
 extern "C" int __cdecl swprintf(wchar_t *, const wchar_t *, ...);
@@ -802 +802 @@
          * regardless of conditions always add 2 entries to the table.
          */
-        BOOLEAN bAlternativeIndex = FALSE;
+        bAlternativeIndex = FALSE;
 
         BOOLEAN bChanged = (pExt->Prev_xres!=specialMode.VisScreenWidth

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

@@ -1091 +1091 @@
 static void vboxUmdDumpDword(DWORD *pvData, DWORD cData)
 {
-    char aBuf[16*4];
     DWORD dw1, dw2, dw3, dw4;
     for (UINT i = 0; i < (cData & (~3)); i+=4)
@@ -1099 +1098 @@
         dw3 = *pvData++;
         dw4 = *pvData++;
-        sprintf(aBuf, "0x%08x, 0x%08x, 0x%08x, 0x%08x,\n", dw1, dw2, dw3, dw4);
-        LOGREL(("%s", aBuf));
+        LOGREL(("0x%08x, 0x%08x, 0x%08x, 0x%08x,\n", dw1, dw2, dw3, dw4));
     }
 
@@ -1110 +1108 @@
             dw2 = *pvData++;
             dw3 = *pvData++;
-            sprintf(aBuf, "0x%08x, 0x%08x, 0x%08x\n", dw1, dw2, dw3);
-            LOGREL(("%s", aBuf));
+            LOGREL(("0x%08x, 0x%08x, 0x%08x\n", dw1, dw2, dw3));
             break;
         case 2:
             dw1 = *pvData++;
             dw2 = *pvData++;
-            sprintf(aBuf, "0x%08x, 0x%08x\n", dw1, dw2);
-            LOGREL(("%s", aBuf));
+            LOGREL(("0x%08x, 0x%08x\n", dw1, dw2));
             break;
         case 1:
             dw1 = *pvData++;
-            sprintf(aBuf, "0x%8x\n", dw1);
-            LOGREL(("%s", aBuf));
+            LOGREL(("0x%8x\n", dw1));
             break;
         default:

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

@@ -3316 +3316 @@
                 if (pAlloc->bAssigned)
                 {
-                    PVBOXMP_DEVEXT pDevExt = pDevice->pAdapter;
-                    Assert(pAlloc->AllocData.SurfDesc.VidPnSourceId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)VBoxCommonFromDeviceExt(pDevExt)->cDisplays);
-                    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pAlloc->AllocData.SurfDesc.VidPnSourceId];
+                    PVBOXMP_DEVEXT pDevExt2 = pDevice->pAdapter;
+                    Assert(pAlloc->AllocData.SurfDesc.VidPnSourceId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)VBoxCommonFromDeviceExt(pDevExt2)->cDisplays);
+                    PVBOXWDDM_SOURCE pSource = &pDevExt2->aSources[pAlloc->AllocData.SurfDesc.VidPnSourceId];
                     if (pSource->AllocData.hostID != pAlloc->AllocData.hostID)
                     {
@@ -3324 +3324 @@
                         pSource->u8SyncState &= ~VBOXWDDM_HGSYNC_F_SYNCED_LOCATION;
 
-                        vboxWddmGhDisplayCheckSetInfo(pDevExt);
+                        vboxWddmGhDisplayCheckSetInfo(pDevExt2);
                     }
                 }

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

@@ -1476 +1476 @@
     gaFenceObjectsLock(pGaDevExt);
 
-    GAFENCEOBJECT *pIter, *pNext;
-    RTListForEachSafe(&pGaDevExt->fenceObjects.list, pIter, pNext, GAFENCEOBJECT, node)
-    {
-        if (pIter->u32FenceState == GAFENCE_STATE_SUBMITTED)
-        {
-            if (gaFenceCmp(pIter->u32SubmissionFenceId, u32LastCompletedFenceId) <= 0)
-            {
-                GALOG(("u32SubmissionFenceId %u -> SIGNALED %RU64 ns\n",
-                       pIter->u32SubmissionFenceId, RTTimeNanoTS() - pIter->u64SubmittedTS));
-
-                ASMAtomicWriteU32(&pGaDevExt->u32LastCompletedSeqNo, pIter->u32SeqNo);
-                pIter->u32FenceState = GAFENCE_STATE_SIGNALED;
-                if (RT_BOOL(pIter->fu32FenceFlags & GAFENCE_F_WAITED))
+    {
+        GAFENCEOBJECT *pIter, *pNext;
+        RTListForEachSafe(&pGaDevExt->fenceObjects.list, pIter, pNext, GAFENCEOBJECT, node)
+        {
+            if (pIter->u32FenceState == GAFENCE_STATE_SUBMITTED)
+            {
+                if (gaFenceCmp(pIter->u32SubmissionFenceId, u32LastCompletedFenceId) <= 0)
                 {
-                    KeSetEvent(&pIter->event, 0, FALSE);
+                    GALOG(("u32SubmissionFenceId %u -> SIGNALED %RU64 ns\n",
+                           pIter->u32SubmissionFenceId, RTTimeNanoTS() - pIter->u64SubmittedTS));
+
+                    ASMAtomicWriteU32(&pGaDevExt->u32LastCompletedSeqNo, pIter->u32SeqNo);
+                    pIter->u32FenceState = GAFENCE_STATE_SIGNALED;
+                    if (RT_BOOL(pIter->fu32FenceFlags & GAFENCE_F_WAITED))
+                    {
+                        KeSetEvent(&pIter->event, 0, FALSE);
+                    }
+
+                    GaFenceUnrefLocked(pGaDevExt, pIter);
                 }
-
-                GaFenceUnrefLocked(pGaDevExt, pIter);
             }
         }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

@@ -34 +34 @@
     }
 
+#ifndef DOXYGEN_RUNNING
+# if RT_MSC_PREREQ(RT_MSC_VER_VC141)
+/* VBoxMPIOCTL.cpp(80): warning C4457: declaration of 'pRequestedAddress' hides function parameter (caused by VBOXMPIOCTL_HIDE) */
+#  pragma warning(disable:4457 )
+# endif
+#endif
+
 /* Called for IOCTL_VIDEO_RESET_DEVICE.
  * Reset device to a state it comes at system boot time.
@@ -88 +95 @@
         pMapInfo->FrameBufferBase = (PUCHAR)pMapInfo->VideoRamBase;
         pMapInfo->FrameBufferLength =
-            VBoxMPXpdmCurrentVideoMode(pExt)->VisScreenHeight*
+            VBoxMPXpdmCurrentVideoMode(pExt)->VisScreenHeight *
             VBoxMPXpdmCurrentVideoMode(pExt)->ScreenStride;