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

Timestamp:

Apr 20, 2020 9:24:40 AM (5 years ago)

Author:

vboxsync

Message:

Additions/NT/Graphics: Use RTUtf16Printf rather than swprintf (dependency issues). bugref:8489

Location:

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

Files:

• common/VBoxMPVidModes.cpp (modified) (4 diffs)
• wddm/VBoxMPMisc.cpp (modified) (3 diffs)
• wddm/VBoxMPVModes.cpp (modified) (4 diffs)
• wddm/VBoxMPWddm.cpp (modified) (6 diffs)

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

@@ -18 +18 @@
 #include "VBoxMPCommon.h"
 
-#ifndef DOXYGEN_RUNNING
-#if RT_MSC_PREREQ(RT_MSC_VER_VS2005) && !RT_MSC_PREREQ(RT_MSC_VER_VS2017) /* bird: MS fixed swprintf to be standard-conforming... */
-#  define _INC_SWPRINTF_INL_
-extern "C" int __cdecl swprintf(wchar_t *, const wchar_t *, ...);
-# endif
-#endif
-#include <wchar.h>
 #include <VBoxVideoVBE.h>
+#include <iprt/utf16.h>
 
 #ifdef VBOX_WITH_WDDM
@@ -163 +157 @@
         else
         {
-            wchar_t keyname[32];
-            swprintf(keyname, L"CustomXRes%d", iMode);
-            rc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomXRes);
+            wchar_t wszKeyName[32];
+            RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomXRes%d", iMode);
+            rc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomXRes);
             VBOXMP_WARN_VPS_NOBP(rc);
-            swprintf(keyname, L"CustomYRes%d", iMode);
-            rc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomYRes);
+            RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomYRes%d", iMode);
+            rc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomYRes);
             VBOXMP_WARN_VPS_NOBP(rc);
-            swprintf(keyname, L"CustomBPP%d", iMode);
-            rc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomBPP);
+            RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomBPP%d", iMode);
+            rc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomBPP);
             VBOXMP_WARN_VPS_NOBP(rc);
         }
@@ -407 +401 @@
         }
 
-        wchar_t keyname[24];
+        wchar_t wszKeyName[24];
         uint32_t xres, yres, bpp = 0;
 
-        swprintf(keyname, L"CustomMode%dWidth", curKey);
-        rc = VBoxMPCmnRegQueryDword(Registry, keyname, &xres);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomMode%dWidth", curKey);
+        rc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &xres);
         VBOXMP_CHECK_VPS_BREAK(rc);
 
-        swprintf(keyname, L"CustomMode%dHeight", curKey);
-        rc = VBoxMPCmnRegQueryDword(Registry, keyname, &yres);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomMode%dHeight", curKey);
+        rc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &yres);
         VBOXMP_CHECK_VPS_BREAK(rc);
 
-        swprintf(keyname, L"CustomMode%dBPP", curKey);
-        rc = VBoxMPCmnRegQueryDword(Registry, keyname, &bpp);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomMode%dBPP", curKey);
+        rc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &bpp);
         VBOXMP_CHECK_VPS_BREAK(rc);
 
@@ -704 +698 @@
     else
     {
-        wchar_t keyname[32];
-        swprintf(keyname, L"CustomXRes%d", iDisplay);
-        rc = VBoxMPCmnRegSetDword(Registry, keyname, pMode->VisScreenWidth);
+        wchar_t wszKeyName[32];
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomXRes%d", iDisplay);
+        rc = VBoxMPCmnRegSetDword(Registry, wszKeyName, pMode->VisScreenWidth);
         VBOXMP_WARN_VPS(rc);
-        swprintf(keyname, L"CustomYRes%d", iDisplay);
-        rc = VBoxMPCmnRegSetDword(Registry, keyname, pMode->VisScreenHeight);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomYRes%d", iDisplay);
+        rc = VBoxMPCmnRegSetDword(Registry, wszKeyName, pMode->VisScreenHeight);
         VBOXMP_WARN_VPS(rc);
-        swprintf(keyname, L"CustomBPP%d", iDisplay);
-        rc = VBoxMPCmnRegSetDword(Registry, keyname, pMode->BitsPerPlane);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomBPP%d", iDisplay);
+        rc = VBoxMPCmnRegSetDword(Registry, wszKeyName, pMode->BitsPerPlane);
         VBOXMP_WARN_VPS(rc);
     }

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

@@ -19 +19 @@
 #include <VBoxVideoVBE.h>
 #include <iprt/param.h>
-#include <stdio.h>
+#include <iprt/utf16.h>
 
 /* simple handle -> value table API */
@@ -216 +216 @@
 {
     NTSTATUS Status = STATUS_SUCCESS;
-    PWCHAR pSuffix;
     const WCHAR* pKeyPrefix;
     UINT cbKeyPrefix;
@@ -246 +245 @@
     if (cbBuf >= cbResult)
     {
-        wcscpy(pBuf, pKeyPrefix);
-        pSuffix = pBuf + (cbKeyPrefix-2)/2;
-        memcpy(pSuffix, pVGuid->Buffer, pVGuid->Length);
-        pSuffix += pVGuid->Length/2;
-        pSuffix[0] = L'\\';
-        pSuffix += 1;
-        swprintf(pSuffix, L"%04d", VidPnSourceId);
+        ssize_t cwcFmt = RTUtf16Printf(pBuf, cbBuf / sizeof(WCHAR), "%ls%.*ls\\%04d",
+                                       pKeyPrefix, pVGuid->Length / sizeof(WCHAR), pVGuid->Buffer, VidPnSourceId);
+        Assert((size_t)cwcFmt + 1 == cbResult / sizeof(WCHAR)); RT_NOREF(cwcFmt);
     }
     else

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

@@ -19 +19 @@
 #include "common/VBoxMPCommon.h"
 #include <iprt/param.h> /* PAGE_OFFSET_MASK */
-
-#include <stdio.h> /* for swprintf */
+#include <iprt/utf16.h>
+
 
 
@@ -189 +189 @@
     else
     {
-        wchar_t keyname[32];
-        swprintf(keyname, L"CustomXRes%d", u32Target);
-        rc = VBoxMPCmnRegSetDword(Registry, keyname, pResolution->cx);
+        wchar_t wszKeyName[32];
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomXRes%d", u32Target);
+        rc = VBoxMPCmnRegSetDword(Registry, wszKeyName, pResolution->cx);
         VBOXMP_WARN_VPS(rc);
-        swprintf(keyname, L"CustomYRes%d", u32Target);
-        rc = VBoxMPCmnRegSetDword(Registry, keyname, pResolution->cy);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomYRes%d", u32Target);
+        rc = VBoxMPCmnRegSetDword(Registry, wszKeyName, pResolution->cy);
         VBOXMP_WARN_VPS(rc);
-        swprintf(keyname, L"CustomBPP%d", u32Target);
-        rc = VBoxMPCmnRegSetDword(Registry, keyname, 32); /* <- just in case for older driver usage */
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomBPP%d", u32Target);
+        rc = VBoxMPCmnRegSetDword(Registry, wszKeyName, 32); /* <- just in case for older driver usage */
         VBOXMP_WARN_VPS(rc);
     }
@@ -337 +337 @@
     else
     {
-        wchar_t keyname[32];
-        swprintf(keyname, L"CustomXRes%d", u32Target);
-        vpRc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomXRes);
+        wchar_t wszKeyName[32];
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomXRes%d", u32Target);
+        vpRc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomXRes);
         VBOXMP_WARN_VPS_NOBP(vpRc);
-        swprintf(keyname, L"CustomYRes%d", u32Target);
-        vpRc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomYRes);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomYRes%d", u32Target);
+        vpRc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomYRes);
         VBOXMP_WARN_VPS_NOBP(vpRc);
     }
@@ -362 +362 @@
     for (int curKey=0; curKey<128; curKey++)
     {
-        wchar_t keyname[24];
-
-        swprintf(keyname, L"CustomMode%dWidth", curKey);
-        vpRc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomXRes);
+        wchar_t wszKeyName[24];
+
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomMode%dWidth", curKey);
+        vpRc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomXRes);
         VBOXMP_CHECK_VPS_BREAK(vpRc);
 
-        swprintf(keyname, L"CustomMode%dHeight", curKey);
-        vpRc = VBoxMPCmnRegQueryDword(Registry, keyname, &CustomYRes);
+        RTUtf16Printf(wszKeyName, RT_ELEMENTS(wszKeyName), "CustomMode%dHeight", curKey);
+        vpRc = VBoxMPCmnRegQueryDword(Registry, wszKeyName, &CustomYRes);
         VBOXMP_CHECK_VPS_BREAK(vpRc);
 

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

@@ -29 +29 @@
 #include <iprt/param.h>
 #include <iprt/initterm.h>
+#include <iprt/utf16.h>
 
 #include <VBox/VBoxGuestLib.h>
@@ -41 +42 @@
 #include "gallium/VBoxMPGaWddm.h"
 #endif
-
-#include <stdio.h>
 
 #ifdef DEBUG
@@ -1093 +1092 @@
                     DWORD dwVal = VBOXWDDM_CFG_DRV_DEFAULT;
                     HANDLE hKey = NULL;
-                    WCHAR aNameBuf[100];
 
                     Status = IoOpenDeviceRegistryKey(pDevExt->pPDO, PLUGPLAY_REGKEY_DRIVER, GENERIC_READ, &hKey);
@@ -1125 +1123 @@
                         else if (hKey)
                         {
-                            swprintf(aNameBuf, L"%s%d", VBOXWDDM_REG_DRV_DISPFLAGS_PREFIX, i);
-                            Status = vboxWddmRegQueryValueDword(hKey, aNameBuf, &dwVal);
+                            WCHAR wszNameBuf[sizeof(VBOXWDDM_REG_DRV_DISPFLAGS_PREFIX) / sizeof(WCHAR) + 32];
+                            RTUtf16Printf(wszNameBuf, RT_ELEMENTS(wszNameBuf), "%ls%u", VBOXWDDM_REG_DRV_DISPFLAGS_PREFIX, i);
+                            Status = vboxWddmRegQueryValueDword(hKey, wszNameBuf, &dwVal);
                             if (NT_SUCCESS(Status))
                             {
@@ -3218 +3217 @@
 
                 HANDLE hKey = NULL;
-                WCHAR aNameBuf[100];
                 uint32_t cAdjusted = 0;
 
@@ -3251 +3249 @@
                     Assert(hKey);
 
-                    swprintf(aNameBuf, L"%s%d", VBOXWDDM_REG_DRV_DISPFLAGS_PREFIX, i);
-                    Status = vboxWddmRegSetValueDword(hKey, aNameBuf, VBOXWDDM_CFG_DRVTARGET_CONNECTED);
+                    WCHAR wszNameBuf[sizeof(VBOXWDDM_REG_DRV_DISPFLAGS_PREFIX) / sizeof(WCHAR) + 32];
+                    RTUtf16Printf(wszNameBuf, RT_ELEMENTS(wszNameBuf), "%ls%d", VBOXWDDM_REG_DRV_DISPFLAGS_PREFIX, i);
+                    Status = vboxWddmRegSetValueDword(hKey, wszNameBuf, VBOXWDDM_CFG_DRVTARGET_CONNECTED);
                     if (!NT_SUCCESS(Status))
-                        WARN(("VBOXESC_CONFIGURETARGETS vboxWddmRegSetValueDword (%d) failed Status 0x%x\n", aNameBuf, Status));
+                        WARN(("VBOXESC_CONFIGURETARGETS vboxWddmRegSetValueDword (%ls) failed Status 0x%x\n", wszNameBuf, Status));
 
                 }