From 14204de9fbd7f8d689802ffaababf12498517104 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Fri, 21 Jan 2022 14:36:04 +0300 Subject: [PATCH] win32u: Use get_dc_obj() in GetDCHook() and SetDCHook(). Signed-off-by: Paul Gofman Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/win32u/dc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 3aae73779e9..aed2d3684a7 100644 --- 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; }