mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32: Fix message pump filtering during init

Browse Source 
Fixes #886.
This commit is contained in:
Camilla Löwy 2019-03-21 02:05:49 +01:00
parent 8d4fd40b64
commit 5292914ce1
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/win32_init.c
View File

@ -329,10 +329,12 @@ static void createKeyTables(void)
// Creates a dummy window for behind-the-scenes work // Creates a dummy window for behind-the-scenes work
// //
static HWND createHelperWindow(void) static GLFWbool createHelperWindow(void)
{ {
MSG msg; MSG msg;
HWND window = CreateWindowExW(WS_EX_OVERLAPPEDWINDOW,
_glfw.win32.helperWindowHandle =
CreateWindowExW(WS_EX_OVERLAPPEDWINDOW,
_GLFW_WNDCLASSNAME, _GLFW_WNDCLASSNAME,
L"GLFW message window", L"GLFW message window",
WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
@ -340,16 +342,17 @@ static HWND createHelperWindow(void)
NULL, NULL, NULL, NULL,
GetModuleHandleW(NULL), GetModuleHandleW(NULL),
NULL); NULL);
if (!window)
if (!_glfw.win32.helperWindowHandle)
{ {
_glfwInputErrorWin32(GLFW_PLATFORM_ERROR, _glfwInputErrorWin32(GLFW_PLATFORM_ERROR,
"Win32: Failed to create helper window"); "Win32: Failed to create helper window");
return NULL; return GLFW_FALSE;
} }
// HACK: The command to the first ShowWindow call is ignored if the parent // HACK: The command to the first ShowWindow call is ignored if the parent
// process passed along a STARTUPINFO, so clear that with a no-op call // process passed along a STARTUPINFO, so clear that with a no-op call
ShowWindow(window, SW_HIDE); ShowWindow(_glfw.win32.helperWindowHandle, SW_HIDE);
// Register for HID device notifications // Register for HID device notifications
{ {
@ -360,7 +363,7 @@ static HWND createHelperWindow(void)
dbi.dbcc_classguid = GUID_DEVINTERFACE_HID; dbi.dbcc_classguid = GUID_DEVINTERFACE_HID;
_glfw.win32.deviceNotificationHandle = _glfw.win32.deviceNotificationHandle =
RegisterDeviceNotificationW(window, RegisterDeviceNotificationW(_glfw.win32.helperWindowHandle,
(DEV_BROADCAST_HDR*) &dbi, (DEV_BROADCAST_HDR*) &dbi,
DEVICE_NOTIFY_WINDOW_HANDLE); DEVICE_NOTIFY_WINDOW_HANDLE);
} }
@ -371,7 +374,7 @@ static HWND createHelperWindow(void)
DispatchMessageW(&msg); DispatchMessageW(&msg);
} }
return window; return GLFW_TRUE;
} }
@ -571,8 +574,7 @@ int _glfwPlatformInit(void)
if (!_glfwRegisterWindowClassWin32()) if (!_glfwRegisterWindowClassWin32())
return GLFW_FALSE; return GLFW_FALSE;
_glfw.win32.helperWindowHandle = createHelperWindow(); if (!createHelperWindow())
if (!_glfw.win32.helperWindowHandle)
return GLFW_FALSE; return GLFW_FALSE;
_glfwInitTimerWin32(); _glfwInitTimerWin32();