From 150124038bbe405f3da6aeb0eaeb3a2f7f935fc0 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Mon, 2 Jan 2023 01:30:34 +0100 Subject: [PATCH] libobs-d3d11: Convert monitor name to UTF-8 for logging --- libobs-d3d11/d3d11-subsystem.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index 5e62c7e47..bcaa922bb 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -1287,9 +1287,14 @@ static inline void LogAdapterMonitors(IDXGIAdapter1 *adapter) const RECT &rect = desc.DesktopCoordinates; const ULONG nits = GetSdrWhiteNits(desc.Monitor); + + char *friendly_name; + os_wcs_to_utf8_ptr(target.monitorFriendlyDeviceName, 0, + &friendly_name); + blog(LOG_INFO, "\t output %u:\n" - "\t name=%ls\n" + "\t name=%s\n" "\t pos={%d, %d}\n" "\t size={%d, %d}\n" "\t attached=%s\n" @@ -1301,11 +1306,12 @@ static inline void LogAdapterMonitors(IDXGIAdapter1 *adapter) "\t dpi=%u (%u%%)\n" "\t id=%s\n" "\t alt_id=%s", - i, target.monitorFriendlyDeviceName, rect.left, rect.top, + i, friendly_name, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, desc.AttachedToDesktop ? "true" : "false", refresh, bits_per_color, space, nits, min_luminance, max_luminance, max_full_frame_luminance, dpiX, scaling, id, alt_id); + bfree(friendly_name); } }