Fixed incorrect VRAM detection (#1589)

* Another way to find total video memory

* GetWMIVideoAdapterMemorySize var names fix

* Fix ven dev string format

* Uses a maximum of 4 GB of video memory

* Some fixes for Nvidia optimus

* Fixed uiMax value

* Removed unnecessary uiMax

* Fix typo

* Removed unnecessary include

Author: TheNormalnij

Client/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -45,7 +45,7 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9(IDirect3DDevice9* pDevice)
     ZeroMemory(&adaptIdent, sizeof(D3DADAPTER_IDENTIFIER9));
     pD3D9->GetAdapterIdentifier(iAdapter, 0, &adaptIdent);
 
-    int iVideoCardMemoryKBTotal = GetWMIVideoAdapterMemorySize(adaptIdent.DeviceName) / 1024;
+    int iVideoCardMemoryKBTotal = GetWMIVideoAdapterMemorySize(adaptIdent.VendorId, adaptIdent.DeviceId) / 1024;
 
     // Just incase, fallback to using texture memory stats
     if (iVideoCardMemoryKBTotal < 16)

Shared/sdk/SharedUtil.SysInfo.h

@@ -35,7 +35,7 @@ namespace SharedUtil
 
     bool         QueryWMI(SQueryWMIResult& outResult, const SString& strQuery, const SString& strKeys, const SString& strNamespace = "CIMV2");
     SString      GetWMIOSVersion();
-    unsigned int GetWMIVideoAdapterMemorySize(const SString& strDisplay);
+    unsigned int GetWMIVideoAdapterMemorySize(const unsigned long ulVen, const unsigned long ulDev);
     long long    GetWMITotalPhysicalMemory();
     void         GetWMIAntiVirusStatus(std::vector<SString>& outEnabledList, std::vector<SString>& outDisabledList);
     void         GetInstalledHotFixList(std::vector<SString>& outInstalledList);

Shared/sdk/SharedUtil.SysInfo.hpp

@@ -326,77 +326,34 @@ long long SharedUtil::GetWMITotalPhysicalMemory()
 //  
 //
 /////////////////////////////////////////////////////////////////////
-unsigned int SharedUtil::GetWMIVideoAdapterMemorySize(const SString& strDisplay)
+unsigned int SharedUtil::GetWMIVideoAdapterMemorySize(const unsigned long ulVen, const unsigned long ulDev)
 {
-    // This won't change after the first call
-    static unsigned int uiResult = 0;
-
-    if (uiResult == 0)
-    {
-        SString strDeviceId;
-
-        // Find a device id for the display
-        for (int i = 0; true; i++)
-        {
-            DISPLAY_DEVICE device;
-            device.cb = sizeof(device);
+    unsigned int uiResult = 0;
 
-            // Get next DISPLAY_DEVICE from the system
-            if (!EnumDisplayDevicesA(NULL, i, &device, 0))
-                break;
+    SString DevVen;
+    DevVen.Format("VEN_%04X&DEV_%04X", ulVen, ulDev);
 
-            // Calc flags
-            bool bAttachedToDesktop = (device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0;
-            bool bMirroringDriver = (device.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) != 0;
+    // Get WMI info about all video controllers
+    SQueryWMIResult result;
+    QueryWMI(result, "Win32_VideoController", "PNPDeviceID,AdapterRAM,Availability");
 
-            // Only check attached, non mirror displays
-            if (bAttachedToDesktop && !bMirroringDriver)
-            {
-                if (strDisplay.CompareI(device.DeviceName))
-                {
-                    // Found a match
-                    strDeviceId = device.DeviceID;
-                    break;
-                }
-            }
-        }
+    // Check each controller for a device id match
+    for (uint i = 0; i < result.size(); i++)
+    {
+        const SString& PNPDeviceID = result[i][0];
+        const SString& AdapterRAM = result[i][1];
+        const SString& Availability = result[i][2];
 
-        // Get WMI info about all video controllers
-        SQueryWMIResult result;
-        QueryWMI(result, "Win32_VideoController", "PNPDeviceID,AdapterRAM,Availability");
+        unsigned int uiAdapterRAM = atoi(AdapterRAM);
+        int          iAvailability = atoi(Availability);
 
-        // Check each controller for a device id match
-        for (uint i = 0; i < result.size(); i++)
+        if ((iAvailability == 8 || iAvailability == 3) && PNPDeviceID.Contains(DevVen))
         {
-            const SString& PNPDeviceID = result[i][0];
-            const SString& AdapterRAM = result[i][1];
-            const SString& Availability = result[i][2];
-
-            unsigned int uiAdapterRAM = atoi(AdapterRAM);
-            int       iAvailability = atoi(Availability);
-
-            if (uiResult == 0)
-                uiResult = uiAdapterRAM;
-
-            if (iAvailability == 3)
-                uiResult = std::max(uiResult, uiAdapterRAM);
-
-            if (uiAdapterRAM != 0)
-            {
-                // If this matches the previously found device, return the adapter RAM
-                if (!strDeviceId.empty() && PNPDeviceID.BeginsWithI(strDeviceId))
-                {
-                    uiResult = uiAdapterRAM;
-                    break;            // Found match
-                }
-            }
+            uiResult = uiAdapterRAM;
+            break;            // Found match
         }
     }
 
-    if (uiResult == 0)
-    {
-        uiResult = 2LL * 1024 * 1024 * 1024;            // 2GB
-    }
     return uiResult;
 }