From 1b8ab6cb687b2efd4707d20182f26985b767c396 Mon Sep 17 00:00:00 2001 From: Elizabeth Figura Date: Mon, 21 Apr 2025 17:29:53 -0500 Subject: [PATCH] Rebase against ba6adef9bfc209f1247ba88acec64b58d97100c3. --- ...n-value-of-ScrollWindowEx-for-invisi.patch | 33 ------------------- patches/user32-ScrollWindowEx/definition | 1 - staging/upstream-commit | 2 +- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 patches/user32-ScrollWindowEx/0001-user32-Fix-return-value-of-ScrollWindowEx-for-invisi.patch delete mode 100644 patches/user32-ScrollWindowEx/definition diff --git a/patches/user32-ScrollWindowEx/0001-user32-Fix-return-value-of-ScrollWindowEx-for-invisi.patch b/patches/user32-ScrollWindowEx/0001-user32-Fix-return-value-of-ScrollWindowEx-for-invisi.patch deleted file mode 100644 index 8d5f4c4b..00000000 --- a/patches/user32-ScrollWindowEx/0001-user32-Fix-return-value-of-ScrollWindowEx-for-invisi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 76d256b461af14a89c54da1cf6c2002118372d1f Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Fri, 12 Dec 2014 05:06:31 +0100 -Subject: [PATCH] win32u: Fix return value of ScrollWindowEx for invisible - windows. - ---- - dlls/win32u/dce.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c -index cfa3510c60b..2315a16d1b4 100644 ---- a/dlls/win32u/dce.c -+++ b/dlls/win32u/dce.c -@@ -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_thread_dpi() ); -+ if (!is_window_drawable( hwnd, TRUE )) -+ SetRectEmpty( &rc ); -+ else -+ get_client_rect( hwnd, &rc, get_thread_dpi() ); -+ - if (clip_rect) intersect_rect( &cliprc, &rc, clip_rect ); - else cliprc = rc; - --- -2.43.0 - diff --git a/patches/user32-ScrollWindowEx/definition b/patches/user32-ScrollWindowEx/definition deleted file mode 100644 index f5c4551e..00000000 --- a/patches/user32-ScrollWindowEx/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [37706] Fix return value of ScrollWindowEx for invisible windows diff --git a/staging/upstream-commit b/staging/upstream-commit index 1fb120b8..5cbfb54d 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -040e1333b1f4cf73d6877daec15495a8be42324a +ba6adef9bfc209f1247ba88acec64b58d97100c3