Changeset 83842 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVModes.cpp

Timestamp:

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

Author:

vboxsync

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

137371

Message:

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

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVModes.cpp (modified) (4 diffs)

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);