VirtualBox

Ignore:
Timestamp:
May 17, 2023 1:48:57 PM (23 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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDrawCmd.cpp

    r98103 r99828  
    158158}
    159159
    160 void VBoxDispDumpPSO(SURFOBJ *pso, char *s)
     160void VBoxDispDumpPSO(SURFOBJ *pso, const char *s)
    161161{
    162162    RT_NOREF(pso, s);

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispInternal.h

    r98103 r99828  
    163163
    164164BOOL VBoxDispIsScreenSurface(SURFOBJ *pso);
    165 void VBoxDispDumpPSO(SURFOBJ *pso, char *s);
     165void VBoxDispDumpPSO(SURFOBJ *pso, const char *s);
    166166
    167167BOOL vrdpDrvRealizeBrush(BRUSHOBJ *pbo, SURFOBJ *psoTarget, SURFOBJ *psoPattern, SURFOBJ *psoMask,

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h

    r98103 r99828  
    6161VP_STATUS VBoxMPCmnRegInit(IN PVBOXMP_DEVEXT pExt, OUT VBOXMPCMNREGISTRY *pReg);
    6262VP_STATUS VBoxMPCmnRegFini(IN VBOXMPCMNREGISTRY Reg);
    63 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t Val);
    64 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t *pVal);
     63VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val);
     64VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal);
    6565
    6666/* Pointer related */

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

    r98103 r99828  
    405405}
    406406
    407 NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PWCHAR pName, IN ACCESS_MASK fAccess)
     407NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess)
    408408{
    409409    OBJECT_ATTRIBUTES ObjAttr;
    … …  
    416416}
    417417
    418 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PWCHAR pName, IN ACCESS_MASK fAccess)
     418NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess)
    419419{
    420420    return vboxWddmRegOpenKeyEx(phKey, NULL, pName, fAccess);
    … …  
    562562}
    563563
    564 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PWCHAR pName, OUT PDWORD pDword)
     564NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PCWCHAR pName, OUT PDWORD pDword)
    565565{
    566566    struct
    … …  
    591591}
    592592
    593 NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN PWCHAR pName, IN DWORD val)
     593NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN PCWCHAR pName, IN DWORD val)
    594594{
    595595    UNICODE_STRING RtlStr;

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

    r98103 r99828  
    9393NTSTATUS vboxWddmRegQueryDrvKeyName(PVBOXMP_DEVEXT pDevExt, ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult);
    9494
    95 NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PWCHAR pName, IN ACCESS_MASK fAccess);
    96 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PWCHAR pName, IN ACCESS_MASK fAccess);
    97 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PWCHAR pName, OUT PDWORD pDword);
    98 NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN PWCHAR pName, IN DWORD val);
     95NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess);
     96NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess);
     97NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PCWCHAR pName, OUT PDWORD pDword);
     98NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN PCWCHAR pName, IN DWORD val);
    9999
    100100NTSTATUS vboxWddmRegDrvFlagsSet(PVBOXMP_DEVEXT pDevExt, DWORD fVal);

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

    r98103 r99828  
    5252{
    5353    if (!Reg)
    54     {
    5554        return ERROR_INVALID_PARAMETER;
    56     }
    5755
    5856    NTSTATUS Status = ZwClose(Reg);
    … …  
    6058}
    6159
    62 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t *pVal)
     60VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal)
    6361{
    6462    /* seems like the new code assumes the Reg functions zeroes up the value on failure */
    … …  
    6664
    6765    if (!Reg)
    68     {
    6966        return ERROR_INVALID_PARAMETER;
    70     }
    7167
    7268    NTSTATUS Status = vboxWddmRegQueryValueDword(Reg, pName, (PDWORD)pVal);
    … …  
    7470}
    7571
    76 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t Val)
     72VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val)
    7773{
    7874    if (!Reg)

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

    r98103 r99828  
    108108
    109109    /* Write hw information to registry, so that it's visible in windows property dialog */
    110     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.ChipType",
     110    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.ChipType",
    111111                                        g_wszVBoxChipType, sizeof(g_wszVBoxChipType));
    112112    VBOXMP_WARN_VPS(rc);
    113     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.DacType",
     113    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.DacType",
    114114                                        g_wszVBoxDACType, sizeof(g_wszVBoxDACType));
    115115    VBOXMP_WARN_VPS(rc);
    116     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.MemorySize",
     116    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.MemorySize",
    117117                                        &cbVRAM, sizeof(ULONG));
    118118    VBOXMP_WARN_VPS(rc);
    119     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.AdapterString",
     119    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.AdapterString",
    120120                                        g_wszVBoxAdapterString, sizeof(g_wszVBoxAdapterString));
    121121    VBOXMP_WARN_VPS(rc);
    122     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.BiosString",
     122    rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.BiosString",
    123123                                        g_wszVBoxBiosString, sizeof(g_wszVBoxBiosString));
    124124    VBOXMP_WARN_VPS(rc);

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

    r98103 r99828  
    5858}
    5959
    60 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t Val)
     60VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val)
    6161{
    62     return VideoPortSetRegistryParameters(Reg, pName, &Val, sizeof(Val));
     62    return VideoPortSetRegistryParameters(Reg, (PWSTR)pName, &Val, sizeof(Val));
    6363}
    6464
    65 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PWSTR pName, uint32_t *pVal)
     65VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal)
    6666{
    67     VP_STATUS rc;
    68 
    69     rc = VideoPortGetRegistryParameters(Reg, pName, FALSE, VBoxMPQueryNamedValueCB, pVal);
    70     if (rc!=NO_ERROR && pVal)
    71     {
     67    VP_STATUS rc = VideoPortGetRegistryParameters(Reg, (PWSTR)pName, FALSE, VBoxMPQueryNamedValueCB, pVal);
     68    if (rc != NO_ERROR && pVal)
    7269        *pVal = 0;
    73     }
    7470    return rc;
    7571}
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette