Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Tolerate already registered monitor master and slave window classes

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-08-14 15:08:16 +02:00
parent 2ce0c5d259
commit b2d939011f
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/EAPBase_UI/src/Module.cpp
View File

@ -54,11 +54,16 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
_T(__FUNCTION__), // lpszClassName _T(__FUNCTION__), // lpszClassName
NULL // hIconSm NULL // hIconSm
}; };
ATOM wnd_class = RegisterClassEx(&wnd_class_desc_master); LPCTSTR wnd_class = reinterpret_cast<LPCTSTR>(RegisterClassEx(&wnd_class_desc_master));
if (!wnd_class) if (!wnd_class) {
throw win_runtime_error(__FUNCTION__ " Error registering master monitor window class."); DWORD dwResult = GetLastError();
if (dwResult == ERROR_CLASS_ALREADY_EXISTS)
wnd_class = _T(__FUNCTION__);
else
throw win_runtime_error(dwResult, __FUNCTION__ " Error registering master monitor window class.");
}
tstring_guid guid_str(guid); tstring_guid guid_str(guid);
HWND hwnd_master = FindWindowEx(HWND_MESSAGE, NULL, reinterpret_cast<LPCTSTR>(wnd_class), guid_str.c_str()); HWND hwnd_master = FindWindowEx(HWND_MESSAGE, NULL, wnd_class, guid_str.c_str());
if (hwnd_master) { if (hwnd_master) {
// Another monitor is already running. // Another monitor is already running.
m_is_master = false; m_is_master = false;
@ -78,9 +83,14 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
_T(__FUNCTION__) _T("-Slave"), // lpszClassName _T(__FUNCTION__) _T("-Slave"), // lpszClassName
NULL // hIconSm NULL // hIconSm
}; };
wnd_class = RegisterClassEx(&wnd_class_desc_slave); wnd_class = reinterpret_cast<LPCTSTR>(RegisterClassEx(&wnd_class_desc_slave));
if (!wnd_class) if (!wnd_class) {
throw win_runtime_error(__FUNCTION__ " Error registering slave monitor window class."); DWORD dwResult = GetLastError();
if (dwResult == ERROR_CLASS_ALREADY_EXISTS)
wnd_class = _T(__FUNCTION__) _T("-Slave");
else
throw win_runtime_error(dwResult, __FUNCTION__ " Error registering slave monitor window class.");
}
} else { } else {
// This is a fresh monitor. // This is a fresh monitor.
m_is_master = true; m_is_master = true;