Changeset 93299 in vbox for trunk/src

Timestamp:

Jan 18, 2022 11:23:59 AM (3 years ago)

Author:

vboxsync

Message:

Add/win: VC++ 19.2 update 11 build adjustments. bugref:8489

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/disp/wddm/gallium/GaDxva.cpp (modified) (1 diff)
• Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp (modified) (1 diff)
• Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp (modified) (1 diff)
• Graphics/Video/mp/common/VBoxMPVidModes.cpp (modified) (1 diff)
• Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (1 diff)
• VBoxCredProv/VBoxCredentialProvider.h (modified) (1 diff)
• VBoxTray/VBoxDispIf.cpp (modified) (1 diff)
• VBoxTray/VBoxDisplay.cpp (modified) (1 diff)
• VBoxTray/VBoxDnD.cpp (modified) (2 diffs)

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

@@ -597 +597 @@
     AssertReturn(pSrcRect->bottom > pSrcRect->top, S_OK);
 
-    float const cSrcWidth = pVideoProcessDevice->VideoDesc.SampleWidth;
+    float const cSrcWidth  = pVideoProcessDevice->VideoDesc.SampleWidth;
     float const cSrcHeight = pVideoProcessDevice->VideoDesc.SampleHeight;
 
-    float const uSrcLeft   = pSrcRect->left/cSrcWidth;
-    float const uSrcRight  = pSrcRect->right/cSrcWidth;
-    float const vSrcTop    = pSrcRect->top/cSrcHeight;
-    float const vSrcBottom = pSrcRect->bottom/cSrcHeight;
+    float const uSrcLeft   = (float)pSrcRect->left   / cSrcWidth;
+    float const uSrcRight  = (float)pSrcRect->right  / cSrcWidth;
+    float const vSrcTop    = (float)pSrcRect->top    / cSrcHeight;
+    float const vSrcBottom = (float)pSrcRect->bottom / cSrcHeight;
 
     /* Subtract 0.5 to line up the pixel centers with texels
      * https://docs.microsoft.com/en-us/windows/win32/direct3d9/directly-mapping-texels-to-pixels
      */
-    float const xDstLeft   = pDstRect->left - 0.5f;
-    float const xDstRight  = pDstRect->right - 0.5f;
-    float const yDstTop    = pDstRect->top - 0.5f;
-    float const yDstBottom = pDstRect->bottom - 0.5f;
+    float const xDstLeft   = (float)pDstRect->left   - 0.5f;
+    float const xDstRight  = (float)pDstRect->right  - 0.5f;
+    float const yDstTop    = (float)pDstRect->top    - 0.5f;
+    float const yDstBottom = (float)pDstRect->bottom - 0.5f;
 
     Vertex const aVertices[] =

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

@@ -272 +272 @@
             if (f || EnumAdapters.Adapters[i].NumOfSources)
             {
-                D3DKMT_OPENADAPTERFROMLUID OpenAdapterData = {0};
+                D3DKMT_OPENADAPTERFROMLUID OpenAdapterData = {{0}};
                 OpenAdapterData.AdapterLuid = EnumAdapters.Adapters[i].AdapterLuid;
                 Status = pCallbacks->pfnD3DKMTOpenAdapterFromLuid(&OpenAdapterData);
-    #ifdef DEBUG_misha
+#ifdef DEBUG_misha
                 Assert(!Status);
-    #endif
+#endif
                 if (NT_SUCCESS(Status))
                 {

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

@@ -52 +52 @@
 } VBOXDISPMPLOGGER, *PVBOXDISPMPLOGGER;
 
-static VBOXDISPMPLOGGER g_VBoxDispMpLogger = {0};
+static VBOXDISPMPLOGGER g_VBoxDispMpLogger = { {0}, VBOXDISPMPLOGGER_STATE_UNINITIALIZED };
 
 static PVBOXDISPMPLOGGER vboxDispMpLoggerGet()

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

@@ -26 +26 @@
 
 /* Custom video modes which are being read from registry at driver startup. */
-static VIDEO_MODE_INFORMATION g_CustomVideoModes[VBOX_VIDEO_MAX_SCREENS] = { 0 };
+static VIDEO_MODE_INFORMATION g_CustomVideoModes[VBOX_VIDEO_MAX_SCREENS] = { {0} };
 
 static BOOLEAN

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

@@ -34 +34 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-/* Resource list */
+/** Legacy VGA resource list. */
 static VIDEO_ACCESS_RANGE  g_aVBoxLegacyVGAResources[] =
 {
-    { 0x000003B0, 0x00000000, 0x0000000C, 1, 1, 1, 0 }, /* VGA regs (0x3B0-0x3BB) */
-    { 0x000003C0, 0x00000000, 0x00000020, 1, 1, 1, 0 }, /* VGA regs (0x3C0-0x3DF) */
-    { 0x000A0000, 0x00000000, 0x00020000, 0, 0, 1, 0 }, /* Frame buffer (0xA0000-0xBFFFF) */
+    /* RangeStart               Length      I  V  S  P
+                                            n  i  h  a
+                                            I  s  a  s
+                                            o  i  r  s
+                                            S  b  a  i
+                                            p  l  b  v
+                                            a  e  l  e
+                                            c     e
+                                            e          */
+    { {0x000003B0, 0x00000000}, 0x0000000C, 1, 1, 1, 0 }, /* VGA regs (0x3B0-0x3BB) */
+    { {0x000003C0, 0x00000000}, 0x00000020, 1, 1, 1, 0 }, /* VGA regs (0x3C0-0x3DF) */
+    { {0x000A0000, 0x00000000}, 0x00020000, 0, 0, 1, 0 }, /* Frame buffer (0xA0000-0xBFFFF) */
 };
 

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.h

@@ -81 +81 @@
 {
     /** The user's profile image (tile). */
-    { { VBOXCREDPROV_FIELDID_TILEIMAGE,      CPFT_TILE_IMAGE,    L"Tile Image",     0,                             }, CPFS_DISPLAY_IN_BOTH,            CPFIS_NONE    },
+    { { VBOXCREDPROV_FIELDID_TILEIMAGE,      CPFT_TILE_IMAGE,    L"Tile Image",     {0}                            }, CPFS_DISPLAY_IN_BOTH,            CPFIS_NONE    },
     { { VBOXCREDPROV_FIELDID_USERNAME,       CPFT_LARGE_TEXT,    L"Username",       CPFG_LOGON_USERNAME            }, CPFS_DISPLAY_IN_BOTH,            CPFIS_NONE    },
     { { VBOXCREDPROV_FIELDID_PASSWORD,       CPFT_PASSWORD_TEXT, L"Password",       CPFG_LOGON_PASSWORD            }, CPFS_DISPLAY_IN_SELECTED_TILE,   CPFIS_FOCUSED },
-    { { VBOXCREDPROV_FIELDID_DOMAINNAME,     CPFT_LARGE_TEXT,    L"",               0                              }, CPFS_DISPLAY_IN_SELECTED_TILE,   CPFIS_FOCUSED },
-    { { VBOXCREDPROV_FIELDID_SUBMIT_BUTTON,  CPFT_SUBMIT_BUTTON, L"Submit",         0                              }, CPFS_DISPLAY_IN_SELECTED_TILE,   CPFIS_FOCUSED },
+    { { VBOXCREDPROV_FIELDID_DOMAINNAME,     CPFT_LARGE_TEXT,    L"",               {0}                            }, CPFS_DISPLAY_IN_SELECTED_TILE,   CPFIS_FOCUSED },
+    { { VBOXCREDPROV_FIELDID_SUBMIT_BUTTON,  CPFT_SUBMIT_BUTTON, L"Submit",         {0}                            }, CPFS_DISPLAY_IN_SELECTED_TILE,   CPFIS_FOCUSED },
     /** New since Windows 8: The image used to represent a credential provider on the logon page. */
     { { VBOXCREDPROV_FIELDID_PROVIDER_LOGO,  CPFT_TILE_IMAGE,    L"Provider Logo",  CPFG_CREDENTIAL_PROVIDER_LOGO  }, CPFS_HIDDEN /* Not used yet. */, CPFIS_NONE },

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -1423 +1423 @@
 {
     DWORD winEr = ERROR_SUCCESS;
-    VBOXDISPIFESCAPE_UPDATEMODES EscData = {0};
+    VBOXDISPIFESCAPE_UPDATEMODES EscData = {{0}};
     EscData.EscapeHdr.escapeCode = VBOXESC_UPDATEMODES;
     EscData.u32TargetId = u32TargetId;

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -152 +152 @@
     if (RT_SUCCESS(rc))
     {
-        VBOXDISPIFESCAPE_ISANYX IsAnyX = { 0 };
+        VBOXDISPIFESCAPE_ISANYX IsAnyX = { {0} };
         IsAnyX.EscapeHdr.escapeCode = VBOXESC_ISANYX;
         DWORD err = VBoxDispIfEscapeInOut(&pEnv->dispIf, &IsAnyX.EscapeHdr, sizeof(uint32_t));

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -1553 +1553 @@
     int iScreenY = GetSystemMetrics(SM_CYSCREEN) - 1;
 
-    INPUT Input[1] = { 0 };
+    INPUT Input[1] = { {0} };
     Input[0].type       = INPUT_MOUSE;
     Input[0].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE
@@ -1599 +1599 @@
     /* Release mouse button in the guest to start the "drop"
      * action at the current mouse cursor position. */
-    INPUT Input[1] = { 0 };
+    INPUT Input[1] = { {0} };
     Input[0].type       = INPUT_MOUSE;
     Input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP;