From 4b8867069b3b49cfabe2a7ef6275a7c0d85406af Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Thu, 7 Nov 2024 22:06:28 +0100
Subject: [PATCH] Fix GetWindowDpiAwarenessContext NULL check

---
 src/display.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/display.c b/src/display.c
index 89fec2c28..5babd4f2a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -329,7 +329,7 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) {
     HWND wnd;
     DWORD rop;
     PyObject *buffer;
-    HANDLE dpiAwareness;
+    HANDLE dpiAwareness = NULL;
     HMODULE user32;
     Func_GetWindowDpiAwarenessContext GetWindowDpiAwarenessContext_function;
     Func_SetThreadDpiAwarenessContext SetThreadDpiAwarenessContext_function;
@@ -359,23 +359,15 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) {
     user32 = LoadLibraryA("User32.dll");
     SetThreadDpiAwarenessContext_function = (Func_SetThreadDpiAwarenessContext
     )GetProcAddress(user32, "SetThreadDpiAwarenessContext");
+    GetWindowDpiAwarenessContext_function = (Func_GetWindowDpiAwarenessContext
+    )GetProcAddress(user32, "GetWindowDpiAwarenessContext");
     if (SetThreadDpiAwarenessContext_function != NULL) {
-        if (screens == -1) {
-            GetWindowDpiAwarenessContext_function = (Func_GetWindowDpiAwarenessContext
-            )GetProcAddress(user32, "GetWindowDpiAwarenessContext");
-            DPI_AWARENESS_CONTEXT dpiAwarenessContext =
+        if (screens == -1 && GetWindowDpiAwarenessContext_function != NULL) {
+            dpiAwareness =
                 GetWindowDpiAwarenessContext_function(wnd);
-            if (GetWindowDpiAwarenessContext_function != NULL &&
-                dpiAwarenessContext != NULL) {
-                dpiAwareness =
-                    SetThreadDpiAwarenessContext_function(dpiAwarenessContext);
-            } else {
-                dpiAwareness = SetThreadDpiAwarenessContext_function((HANDLE)-3);
-            }
-        } else {
-            // DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE = ((DPI_CONTEXT_HANDLE)-3)
-            dpiAwareness = SetThreadDpiAwarenessContext_function((HANDLE)-3);
         }
+        // DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE = ((DPI_CONTEXT_HANDLE)-3)
+        dpiAwareness = SetThreadDpiAwarenessContext_function(dpiAwareness == NULL ? (HANDLE)-3 : dpiAwareness);
     }
 
     if (screens == 1) {