python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-28 02:04:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Windows Screengrab DPI fix improvements (#2)

Browse Source 
* Load User32 after possible return

* Removed unused setting of variable
This commit is contained in:
Andrew Murray 2019-08-03 21:52:05 +10:00 committed by Andrew Murray
parent cacbdc680c
commit d46f81afba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/display.c
View File

@ -332,7 +332,7 @@ PyImaging_GrabScreenWin32(PyObject* self, PyObject* args)
DWORD rop; DWORD rop;
PyObject* buffer; PyObject* buffer;
HANDLE dpiAwareness; HANDLE dpiAwareness;
HMODULE user32 = LoadLibraryA("User32.dll"); HMODULE user32;
Func_SetThreadDpiAwarenessContext SetThreadDpiAwarenessContext_function; Func_SetThreadDpiAwarenessContext SetThreadDpiAwarenessContext_function;
if (!PyArg_ParseTuple(args, "|i", &includeLayeredWindows)) if (!PyArg_ParseTuple(args, "|i", &includeLayeredWindows))
@ -346,6 +346,7 @@ PyImaging_GrabScreenWin32(PyObject* self, PyObject* args)
// added in Windows 10 (1607) // added in Windows 10 (1607)
// loaded dynamically to avoid link errors // loaded dynamically to avoid link errors
user32 = LoadLibraryA("User32.dll");
SetThreadDpiAwarenessContext_function = SetThreadDpiAwarenessContext_function =
(Func_SetThreadDpiAwarenessContext) (Func_SetThreadDpiAwarenessContext)
GetProcAddress(user32, "SetThreadDpiAwarenessContext"); GetProcAddress(user32, "SetThreadDpiAwarenessContext");
@ -358,7 +359,7 @@ PyImaging_GrabScreenWin32(PyObject* self, PyObject* args)
height = GetDeviceCaps(screen, VERTRES); height = GetDeviceCaps(screen, VERTRES);
if (SetThreadDpiAwarenessContext_function != NULL) { if (SetThreadDpiAwarenessContext_function != NULL) {
dpiAwareness = SetThreadDpiAwarenessContext_function(dpiAwareness); SetThreadDpiAwarenessContext_function(dpiAwareness);
} }
FreeLibrary(user32); FreeLibrary(user32);