Skip to content

Use proper hInstance when registering window class #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiKom merged 1 commit into from
Oct 17, 2025
Merged

Use proper hInstance when registering window class #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/KDFoundation/platform/win32/win32_platform_event_loop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ namespace {
auto s_msgWindowClassName = L"Win32PlatformEventLoop_msgWindow";

constexpr UINT WM_KD_SOCKETEVENT = WM_USER;

HMODULE GetCurrentModule()
{
HMODULE hModule = nullptr;
GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCWSTR>(&GetCurrentModule), &hModule);
return hModule;
}

} // namespace

LRESULT CALLBACK Win32PlatformEventLoop::messageWindowProc(HWND hwnd, UINT msgId, WPARAM wp, LPARAM lp)
Expand All @@ -49,6 +58,7 @@ Win32PlatformEventLoop::Win32PlatformEventLoop()
WNDCLASS wc = {};
wc.lpfnWndProc = messageWindowProc;
wc.lpszClassName = s_msgWindowClassName;
wc.hInstance = GetCurrentModule();

const ATOM atom = RegisterClass(&wc);
if (!atom)
Expand All @@ -62,7 +72,7 @@ Win32PlatformEventLoop::Win32PlatformEventLoop()
nullptr, 0, 0, 0, 0, 0,
HWND_MESSAGE,
nullptr,
GetModuleHandle(nullptr),
GetCurrentModule(),
nullptr);

if (!m_msgWindow)
Expand All @@ -76,7 +86,7 @@ Win32PlatformEventLoop::~Win32PlatformEventLoop()
CloseHandle(m_wakeUpEvent);
if (m_msgWindow)
DestroyWindow(m_msgWindow);
if (!UnregisterClass(s_msgWindowClassName, GetModuleHandle(nullptr)))
if (!UnregisterClass(s_msgWindowClassName, GetCurrentModule()))
SPDLOG_WARN("Failed to unregister message window class");
}

Expand Down