win32u: Use get_dc_obj() in GetDCHook() and SetDCHook().

Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

win32u: Use get_dc_obj() in GetDCHook() and SetDCHook().
14204de9 · Paul Gofman · Alexandre Julliard · 5a6c1753 · 14204de9
Commit 14204de9 authored Jan 21, 2022 by Paul Gofman Committed by Alexandre Julliard Feb 01, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

dc.c dlls/win32u/dc.c +14 -4

No files found.
--- a/dlls/win32u/dc.c
+++ b/dlls/win32u/dc.c
@@ -1026,13 +1026,18 @@ BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform )
 */
 BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData )
 {
-    DC *dc = get_dc_ptr( hdc );
+    DC *dc = get_dc_obj( hdc );
    if (!dc) return FALSE;
+    if (dc->attr->disabled)
+    {
+        GDI_ReleaseObj( hdc );
+        return 0;
+    }
    dc->dwHookData = dwHookData;
    dc->hookProc = hookProc;
-    release_dc_ptr( dc );
+    GDI_ReleaseObj( hdc );
    return TRUE;
 }
@@ -1044,13 +1049,18 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData )
 */
 DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc )
 {
-    DC *dc = get_dc_ptr( hdc );
+    DC *dc = get_dc_obj( hdc );
    DWORD_PTR ret;
    if (!dc) return 0;
+    if (dc->attr->disabled)
+    {
+        GDI_ReleaseObj( hdc );
+        return 0;
+    }
    if (proc) *proc = dc->hookProc;
    ret = dc->dwHookData;
-    release_dc_ptr( dc );
+    GDI_ReleaseObj( hdc );
    return ret;
 }