diff --git a/README.md b/README.md index 5ea88f98..f847b020 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,7 @@ information on what to include when reporting a bug. (#1315,#1316) - [Win32] Bugfix: A title bar would be drawn over undecorated windows in some circumstances (#1383) +- [Win32] Bugfix: Standard cursors were not per-monitor DPI aware (#1431) - [X11] Moved to XI2 `XI_RawMotion` for disable cursor mode motion input (#125) - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading - [X11] Bugfix: `glfwGetVideoMode` would segfault on Cygwin/X @@ -439,6 +440,7 @@ skills. - przemekmirek - Philip Rideout - Eddie Ringle + - Max Risuhin - Jorge Rodriguez - Ed Ropple - Aleksey Rybalkin diff --git a/src/win32_platform.h b/src/win32_platform.h index 0c71ae49..f08fee63 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -61,7 +61,7 @@ // GLFW uses DirectInput8 interfaces #define DIRECTINPUT_VERSION 0x0800 -// Enable standard cursors images defines +// GLFW uses OEM cursor resources #define OEMRESOURCE #include diff --git a/src/win32_window.c b/src/win32_window.c index a73aae8d..77338468 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -2016,8 +2016,9 @@ int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape) else return GLFW_FALSE; - cursor->win32.handle = - (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED); + cursor->win32.handle = LoadImageW(NULL, + MAKEINTRESOURCEW(id), IMAGE_CURSOR, 0, 0, + LR_DEFAULTSIZE | LR_SHARED); if (!cursor->win32.handle) { _glfwInputErrorWin32(GLFW_PLATFORM_ERROR,