ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci/win32: give the wndclass a unique name 

other things (like SDL) may try to use "Message"
This commit is contained in:
Shawn Hoffman 2022-04-18 03:01:36 -07:00
parent dd20c7cf78
commit 655fb94e61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp
View File

@ -73,11 +73,13 @@ void ciface::Win32::Init(void* hwnd)
} }
Common::ScopeGuard uninit([] { CoUninitialize(); }); Common::ScopeGuard uninit([] { CoUninitialize(); });
const auto window_name = TEXT("DolphinWin32ControllerInterface");
WNDCLASSEX window_class_info{}; WNDCLASSEX window_class_info{};
window_class_info.cbSize = sizeof(window_class_info); window_class_info.cbSize = sizeof(window_class_info);
window_class_info.lpfnWndProc = WindowProc; window_class_info.lpfnWndProc = WindowProc;
window_class_info.hInstance = GetModuleHandle(nullptr); 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); ATOM window_class = RegisterClassEx(&window_class_info);
if (!window_class) if (!window_class)
@ -92,7 +94,7 @@ void ciface::Win32::Init(void* hwnd)
Common::HRWrap(GetLastError())); 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); nullptr, nullptr);
promise_guard.Exit(); promise_guard.Exit();
if (!message_window) if (!message_window)