From 8f6ed5cd8737a4faab8b3fcb1dcb202ffc77bf99 Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Fri, 13 Mar 2020 21:02:37 +1100 Subject: [PATCH] UI: Support Unicode for Windows fullscreen projectors --- UI/window-basic-main.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 55f493d5b..3bb07b57c 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4137,11 +4137,15 @@ void OBSBasic::AddProjectorMenuMonitors(QMenu *parent, QObject *target, QRect screenGeometry = screen->geometry(); QString name = ""; #ifdef _WIN32 - DISPLAY_DEVICEA ddev; + DISPLAY_DEVICE ddev; ddev.cb = sizeof(ddev); - EnumDisplayDevicesA(screen->name().toStdString().c_str(), 0, - &ddev, 1); - name = ddev.DeviceString; + BPtr wideName; + os_utf8_to_wcs_ptr(screen->name().toStdString().c_str(), 0, + &wideName); + EnumDisplayDevices(wideName, 0, &ddev, 1); + BPtr newName; + os_wcs_to_utf8_ptr(ddev.DeviceString, 0, &newName); + name = newName; #elif defined(__APPLE__) name = screen->name(); #elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)