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

Timestamp:

May 17, 2023 1:48:57 PM (21 months ago)

Author:

vboxsync

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

157464

Message:

*: A bunch of adjustments that allows using /permissive- with Visual C++ (qt 6.x necessity).

Location:

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

Files:

• VBoxMPDriver.cpp (modified) (1 diff)
• VBoxMPRegistry.cpp (modified) (1 diff)

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

@@ -108 +108 @@
 
     /* Write hw information to registry, so that it's visible in windows property dialog */
-    rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.ChipType",
+    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.ChipType",
                                         g_wszVBoxChipType, sizeof(g_wszVBoxChipType));
     VBOXMP_WARN_VPS(rc);
-    rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.DacType",
+    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.DacType",
                                         g_wszVBoxDACType, sizeof(g_wszVBoxDACType));
     VBOXMP_WARN_VPS(rc);
-    rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.MemorySize",
+    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.MemorySize",
                                         &cbVRAM, sizeof(ULONG));
     VBOXMP_WARN_VPS(rc);
-    rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.AdapterString",
+    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.AdapterString",
                                         g_wszVBoxAdapterString, sizeof(g_wszVBoxAdapterString));
     VBOXMP_WARN_VPS(rc);
-    rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.BiosString",
+    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.BiosString",
                                         g_wszVBoxBiosString, sizeof(g_wszVBoxBiosString));
     VBOXMP_WARN_VPS(rc);

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

@@ -58 +58 @@
 }
 
-VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t Val)
+VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val)
 {
-    return VideoPortSetRegistryParameters(Reg, pName, &Val, sizeof(Val));
+    return VideoPortSetRegistryParameters(Reg, (PWSTR)pName, &Val, sizeof(Val));
 }
 
-VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t *pVal)
+VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal)
 {
-    VP_STATUS rc;
-
-    rc = VideoPortGetRegistryParameters(Reg, pName, FALSE, VBoxMPQueryNamedValueCB, pVal);
-    if (rc!=NO_ERROR && pVal)
-    {
+    VP_STATUS rc = VideoPortGetRegistryParameters(Reg, (PWSTR)pName, FALSE, VBoxMPQueryNamedValueCB, pVal);
+    if (rc != NO_ERROR && pVal)
         *pVal = 0;
-    }
     return rc;
 }