Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 21:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround for #1335 (glfwCreateWindow crash)

Browse Source 
GetDpiForWindow() doesn't exist prior to Win10, so this
falls back on the previous behavior (USER_DEFAULT_SCREEN_DPI)
if GetDpiForWindow isn't available & avoids the crash.

Feel free to edit/replace with a proper fix!
This commit is contained in:
Cort 2018-10-20 22:46:12 -07:00
parent 5afcd0981b
commit 308a8cd5d3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/win32_window.c
View File

@ -210,10 +210,12 @@ static void applyAspectRatio(_GLFWwindow* window, int edge, RECT* area)
{ {
int xoff, yoff; int xoff, yoff;
const float ratio = (float) window->numer / (float) window->denom; const float ratio = (float) window->numer / (float) window->denom;
UINT dpi = _glfwIsWindows10AnniversaryUpdateOrGreaterWin32()
? GetDpiForWindow(window->win32.handle)
: USER_DEFAULT_SCREEN_DPI;
getFullWindowSize(getWindowStyle(window), getWindowExStyle(window), getFullWindowSize(getWindowStyle(window), getWindowExStyle(window),
0, 0, &xoff, &yoff, 0, 0, &xoff, &yoff, dpi);
GetDpiForWindow(window->win32.handle));
if (edge == WMSZ_LEFT || edge == WMSZ_BOTTOMLEFT || if (edge == WMSZ_LEFT || edge == WMSZ_BOTTOMLEFT ||
edge == WMSZ_RIGHT || edge == WMSZ_BOTTOMRIGHT) edge == WMSZ_RIGHT || edge == WMSZ_BOTTOMRIGHT)
@ -1002,13 +1004,15 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
{ {
int xoff, yoff; int xoff, yoff;
MINMAXINFO* mmi = (MINMAXINFO*) lParam; MINMAXINFO* mmi = (MINMAXINFO*) lParam;
UINT dpi = _glfwIsWindows10AnniversaryUpdateOrGreaterWin32()
? GetDpiForWindow(window->win32.handle)
: USER_DEFAULT_SCREEN_DPI;
if (window->monitor) if (window->monitor)
break; break;
getFullWindowSize(getWindowStyle(window), getWindowExStyle(window), getFullWindowSize(getWindowStyle(window), getWindowExStyle(window),
0, 0, &xoff, &yoff, 0, 0, &xoff, &yoff, dpi);
GetDpiForWindow(window->win32.handle));
if (window->minwidth != GLFW_DONT_CARE && if (window->minwidth != GLFW_DONT_CARE &&
window->minheight != GLFW_DONT_CARE) window->minheight != GLFW_DONT_CARE)
@ -2186,3 +2190,4 @@ GLFWAPI HWND glfwGetWin32Window(GLFWwindow* handle)
return window->win32.handle; return window->win32.handle;
} }