From 655fb94e61f9edcb30d0370c801f7aee79a8811e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 18 Apr 2022 03:01:36 -0700 Subject: [PATCH] ci/win32: give the wndclass a unique name other things (like SDL) may try to use "Message" --- Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp index a9c28efdc0..42aa12a141 100644 --- a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp @@ -73,11 +73,13 @@ void ciface::Win32::Init(void* hwnd) } Common::ScopeGuard uninit([] { CoUninitialize(); }); + const auto window_name = TEXT("DolphinWin32ControllerInterface"); + WNDCLASSEX window_class_info{}; window_class_info.cbSize = sizeof(window_class_info); window_class_info.lpfnWndProc = WindowProc; window_class_info.hInstance = GetModuleHandle(nullptr); - window_class_info.lpszClassName = L"Message"; + window_class_info.lpszClassName = window_name; ATOM window_class = RegisterClassEx(&window_class_info); if (!window_class) @@ -92,7 +94,7 @@ void ciface::Win32::Init(void* hwnd) Common::HRWrap(GetLastError())); }); - message_window = CreateWindowEx(0, L"Message", nullptr, 0, 0, 0, 0, 0, HWND_MESSAGE, nullptr, + message_window = CreateWindowEx(0, window_name, nullptr, 0, 0, 0, 0, 0, HWND_MESSAGE, nullptr, nullptr, nullptr); promise_guard.Exit(); if (!message_window)