renun/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-08-10 00:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(audio-info): crash when device name contains special characters

Browse Source
This commit is contained in:
ReenigneArcher
2025-07-17 20:08:05 -04:00
parent a19312bbf1
commit 29d3bb8e77
11 changed files with 605 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/dxgi.cpp
View File

@@ -3,10 +3,12 @@
* @brief Displays information about connected displays and GPUs
*/
#define WINVER 0x0A00
#include "src/platform/windows/tools/helper.h"
#include "src/utility.h"
#include <d3dcommon.h>
#include <dxgi.h>
#include <format>
#include <iostream>
using namespace std::literals;
@@ -20,17 +22,14 @@ namespace dxgi {
using factory1_t = util::safe_ptr<IDXGIFactory1, Release<IDXGIFactory1>>;
using adapter_t = util::safe_ptr<IDXGIAdapter1, Release<IDXGIAdapter1>>;
using output_t = util::safe_ptr<IDXGIOutput, Release<IDXGIOutput>>;
} // namespace dxgi
int main(int argc, char *argv[]) {
HRESULT status;
// Set ourselves as per-monitor DPI aware for accurate resolution values on High DPI systems
SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
dxgi::factory1_t::pointer factory_p {};
status = CreateDXGIFactory1(IID_IDXGIFactory1, (void **) &factory_p);
const HRESULT status = CreateDXGIFactory1(IID_IDXGIFactory1, static_cast<void **>(static_cast<void *>(&factory_p)));
dxgi::factory1_t factory {factory_p};
if (FAILED(status)) {
std::cout << "Failed to create DXGIFactory1 [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
@@ -44,21 +43,24 @@ int main(int argc, char *argv[]) {
DXGI_ADAPTER_DESC1 adapter_desc;
adapter->GetDesc1(&adapter_desc);
std::cout
<< "====== ADAPTER ====="sv << std::endl;
std::wcout
<< L"Device Name : "sv << adapter_desc.Description << std::endl;
std::cout
<< "Device Vendor ID : 0x"sv << util::hex(adapter_desc.VendorId).to_string_view() << std::endl
<< "Device Device ID : 0x"sv << util::hex(adapter_desc.DeviceId).to_string_view() << std::endl
<< "Device Video Mem : "sv << adapter_desc.DedicatedVideoMemory / 1048576 << " MiB"sv << std::endl
<< "Device Sys Mem : "sv << adapter_desc.DedicatedSystemMemory / 1048576 << " MiB"sv << std::endl
<< "Share Sys Mem : "sv << adapter_desc.SharedSystemMemory / 1048576 << " MiB"sv << std::endl
<< std::endl
<< " ====== OUTPUT ======"sv << std::endl;
std::cout << "====== ADAPTER =====" << std::endl;
output::output_field("Device Name ", adapter_desc.Description);
output::output_field("Device Vendor ID ", "0x" + util::hex(adapter_desc.VendorId).to_string());
output::output_field("Device Device ID ", "0x" + util::hex(adapter_desc.DeviceId).to_string());
output::output_field("Device Video Mem ", std::format("{} MiB", adapter_desc.DedicatedVideoMemory / 1048576));
output::output_field("Device Sys Mem ", std::format("{} MiB", adapter_desc.DedicatedSystemMemory / 1048576));
output::output_field("Share Sys Mem ", std::format("{} MiB", adapter_desc.SharedSystemMemory / 1048576));
dxgi::output_t::pointer output_p {};
bool has_outputs = false;
for (int y = 0; adapter->EnumOutputs(y, &output_p) != DXGI_ERROR_NOT_FOUND; ++y) {
// Print the header only when we find the first output
if (!has_outputs) {
std::cout << std::endl
<< " ====== OUTPUT ======" << std::endl;
has_outputs = true;
}
dxgi::output_t output {output_p};
DXGI_OUTPUT_DESC desc;
@@ -67,13 +69,11 @@ int main(int argc, char *argv[]) {
auto width = desc.DesktopCoordinates.right - desc.DesktopCoordinates.left;
auto height = desc.DesktopCoordinates.bottom - desc.DesktopCoordinates.top;
std::wcout
<< L" Output Name : "sv << desc.DeviceName << std::endl;
std::cout
<< " AttachedToDesktop : "sv << (desc.AttachedToDesktop ? "yes"sv : "no"sv) << std::endl
<< " Resolution : "sv << width << 'x' << height << std::endl
<< std::endl;
output::output_field(" Output Name ", desc.DeviceName);
output::output_field(" AttachedToDesktop ", desc.AttachedToDesktop ? "yes" : "no");
output::output_field(" Resolution ", std::format("{}x{}", width, height));
}
std::cout << std::endl;
}
return 0;