Rebase against 9f6e44fd9ca7d39258f2772c3f44013142702ca4.

This commit is contained in:
Alistair Leslie-Hughes
2024-06-07 10:12:09 +10:00
parent 2f712afe77
commit 87cf242f01
3 changed files with 15 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
From 6d96e152773789f92da783e40969bf94624b7d61 Mon Sep 17 00:00:00 2001
From 76d256b461af14a89c54da1cf6c2002118372d1f Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 12 Dec 2014 05:06:31 +0100
Subject: [PATCH] win32u: Fix return value of ScrollWindowEx for invisible
@@ -9,25 +9,25 @@ Subject: [PATCH] win32u: Fix return value of ScrollWindowEx for invisible
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c
index 872112e4a24..4d56b23433e 100644
index cfa3510c60b..2315a16d1b4 100644
--- a/dlls/win32u/dce.c
+++ b/dlls/win32u/dce.c
@@ -1672,10 +1672,13 @@ INT WINAPI NtUserScrollWindowEx( HWND hwnd, INT dx, INT dy, const RECT *rect,
@@ -1631,10 +1631,13 @@ INT WINAPI NtUserScrollWindowEx( HWND hwnd, INT dx, INT dy, const RECT *rect,
rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ?
RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE;
- if (!is_window_drawable( hwnd, TRUE )) return ERROR;
hwnd = get_full_window_handle( hwnd );
- get_client_rect( hwnd, &rc );
- get_client_rect( hwnd, &rc, get_thread_dpi() );
+ if (!is_window_drawable( hwnd, TRUE ))
+ SetRectEmpty( &rc );
+ else
+ get_client_rect( hwnd, &rc );
+
+ get_client_rect( hwnd, &rc, get_thread_dpi() );
+
if (clip_rect) intersect_rect( &cliprc, &rc, clip_rect );
else cliprc = rc;
--
2.36.1
2.43.0