mirror of
https://github.com/glfw/glfw.git
synced 2025-09-03 12:31:48 +00:00
Fix windowProc when SetPropW() fails silently
**Issue** In some cases, on Windows, `SetPropW` returns `FALSE`. glfw currently silently ignores the result. This means that the message pump `windowProc` fails to work (does not receive keyboard events for example). Drawing is fine though as it's a different GLFW mechanism. I had this failure frequently infrequently and it was frustrating to deal with (just have to rerun the program a few times and hope `SetPropW` doesn't return `FALSE`). So sending this fix in case others are facing the issue on Windows. **Fix** On Windows+GLFW, `windowProc` will fallback to looking up the GLFW window list (just like `PollEvents` does). Also added the error code to `_glfwInputError` message to aid debugging in the future. My suggestion is to get rid of `SetPropW`/`GetPropW` as it is a string-based Windows API (slow/fragile) - we already have the lightweight linked list, might as well just use it always - also it's usually just the one or two windows we deal with. - [x] Verified on Windows - message pump is stable with this fix (once I was able to repro this issue).
This commit is contained in:
parent
ac10768495
commit
2fded1aab2
@ -493,18 +493,19 @@ void _glfwInputErrorWin32(int error, const char* description)
|
|||||||
WCHAR buffer[_GLFW_MESSAGE_SIZE] = L"";
|
WCHAR buffer[_GLFW_MESSAGE_SIZE] = L"";
|
||||||
char message[_GLFW_MESSAGE_SIZE] = "";
|
char message[_GLFW_MESSAGE_SIZE] = "";
|
||||||
|
|
||||||
|
DWORD lastError = GetLastError();
|
||||||
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
|
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
|
||||||
FORMAT_MESSAGE_IGNORE_INSERTS |
|
FORMAT_MESSAGE_IGNORE_INSERTS |
|
||||||
FORMAT_MESSAGE_MAX_WIDTH_MASK,
|
FORMAT_MESSAGE_MAX_WIDTH_MASK,
|
||||||
NULL,
|
NULL,
|
||||||
GetLastError() & 0xffff,
|
lastError & 0xffff,
|
||||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||||
buffer,
|
buffer,
|
||||||
sizeof(buffer) / sizeof(WCHAR),
|
sizeof(buffer) / sizeof(WCHAR),
|
||||||
NULL);
|
NULL);
|
||||||
WideCharToMultiByte(CP_UTF8, 0, buffer, -1, message, sizeof(message), NULL, NULL);
|
WideCharToMultiByte(CP_UTF8, 0, buffer, -1, message, sizeof(message), NULL, NULL);
|
||||||
|
|
||||||
_glfwInputError(error, "%s: %s", description, message);
|
_glfwInputError(error, "%s (0x%lx / %lu): %s", description, lastError, lastError, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Updates key names according to the current keyboard layout
|
// Updates key names according to the current keyboard layout
|
||||||
|
@ -548,8 +548,23 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
|
|||||||
EnableNonClientDpiScaling(hWnd);
|
EnableNonClientDpiScaling(hWnd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// HACK: SetPropW returns FALSE in some instances (GetLastError() = 0x8 Insufficient resources).
|
||||||
|
// We already have the global list of windows, check against it. It's not many, and we are already
|
||||||
|
// doing this in the (one of the callers) PollEvents below.
|
||||||
|
window = _glfw.windowListHead;
|
||||||
|
while (window)
|
||||||
|
{
|
||||||
|
if (window->win32.handle == hWnd) { break; }
|
||||||
|
window = window->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
|
if (!window)
|
||||||
|
{
|
||||||
|
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (uMsg)
|
switch (uMsg)
|
||||||
@ -1401,7 +1416,13 @@ static int createNativeWindow(_GLFWwindow* window,
|
|||||||
return GLFW_FALSE;
|
return GLFW_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPropW(window->win32.handle, L"GLFW", window);
|
if (!SetPropW(window->win32.handle, L"GLFW", window))
|
||||||
|
{
|
||||||
|
// In some cases, SetPropW returns FALSE: GetLastError() returns 0x8 (Insufficient resources).
|
||||||
|
// The message pump fails to work because windowProc cannot look up the GLFW property.
|
||||||
|
// Instead of failing the program completely by raising an error instead, windowProc looks up
|
||||||
|
// the global window list to find the hWnd under consideration.
|
||||||
|
}
|
||||||
|
|
||||||
ChangeWindowMessageFilterEx(window->win32.handle, WM_DROPFILES, MSGFLT_ALLOW, NULL);
|
ChangeWindowMessageFilterEx(window->win32.handle, WM_DROPFILES, MSGFLT_ALLOW, NULL);
|
||||||
ChangeWindowMessageFilterEx(window->win32.handle, WM_COPYDATA, MSGFLT_ALLOW, NULL);
|
ChangeWindowMessageFilterEx(window->win32.handle, WM_COPYDATA, MSGFLT_ALLOW, NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user