diff options
| author | Rye <rye@lindenlab.com> | 2025-02-11 05:02:45 -0500 |
|---|---|---|
| committer | Rye <rye@lindenlab.com> | 2025-02-11 05:55:37 -0500 |
| commit | 179b29252d8bb28e11686a1852c8e8ffcd98ecc0 (patch) | |
| tree | d805c1794f15b4c67aae69fef77941e1257d87b6 /indra/llwindow/lldxhardware.cpp | |
| parent | 9b060f7fccfed39a7c24dafaa4c66da0cfc4984d (diff) | |
Rework windows to use zc:wchar_t for better c++ conformance and compatibility with modern libraries
Diffstat (limited to 'indra/llwindow/lldxhardware.cpp')
| -rw-r--r-- | indra/llwindow/lldxhardware.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp index 4bc069c5a4..fc51979eaf 100644 --- a/indra/llwindow/lldxhardware.cpp +++ b/indra/llwindow/lldxhardware.cpp @@ -477,7 +477,7 @@ std::string get_string(IDxDiagContainer *containerp, const WCHAR *wszPropName) WCHAR wszPropValue[256]; get_wstring(containerp, wszPropName, wszPropValue, 256); - return utf16str_to_utf8str(wszPropValue); + return ll_convert<std::string>(std::wstring(wszPropValue)); } @@ -784,7 +784,7 @@ bool LLDXHardware::getInfo(bool vram_only) else { get_wstring(device_containerp, L"szKeyDeviceID", deviceID, 512); - LL_WARNS() << "szDeviceID" << deviceID << LL_ENDL; + LL_WARNS() << "szDeviceID" << ll_convert<std::string>(std::wstring(deviceID)) << LL_ENDL; // '+9' to avoid ENUM\\PCI\\ prefix // Returns string like Enum\\PCI\\VEN_10DE&DEV_1F06&SUBSYS... // and since GetVideoMemoryViaWMI searches by PNPDeviceID it is sufficient @@ -1087,7 +1087,7 @@ LLSD LLDXHardware::getDisplayInfo() // print the value // windows doesn't guarantee to be null terminated release_version[RV_SIZE - 1] = NULL; - ret["DriverVersion"] = utf16str_to_utf8str(release_version); + ret["DriverVersion"] = ll_convert<std::string>(std::wstring(release_version)); } RegCloseKey(hKey); |