niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

win32u: Allow an out-of-order RECT in RedrawWindow().

Browse source 
Signed-off-by: Pedro Perdigão <pperdigao@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Pedro Perdigão 2022-05-06 18:07:28 +01:00 • committed by Alexandre Julliard
parent 06b3471605
commit 1146bde39e
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/user32/tests/msg.c
View file

@ -8174,9 +8174,8 @@ void dump_region(HRGN hrgn)
HeapFree( GetProcessHeap(), 0, data ); HeapFree( GetProcessHeap(), 0, data );
} }
#define todo_check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, TRUE, hwnd, hrgn ) #define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, hwnd, hrgn )
#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, FALSE, hwnd, hrgn ) static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn )
static void check_update_rgn_( int line, BOOL todo, HWND hwnd, HRGN hrgn )
{ {
INT ret; INT ret;
RECT r1, r2; RECT r1, r2;
@ -8187,10 +8186,7 @@ static void check_update_rgn_( int line, BOOL todo, HWND hwnd, HRGN hrgn )
ok( ret != ERROR, "GetUpdateRgn failed\n" ); ok( ret != ERROR, "GetUpdateRgn failed\n" );
if (ret == NULLREGION) if (ret == NULLREGION)
{ {
if(todo) ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" );
todo_wine ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" );
else
ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" );
} }
else else
{ {
@ -8434,7 +8430,7 @@ static void test_paint_messages(void)
ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE );
ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret);
SetRectRgn( hrgn, 7, 12, 21, 30 ); SetRectRgn( hrgn, 7, 12, 21, 30 );
todo_check_update_rgn( hwnd, hrgn ); check_update_rgn( hwnd, hrgn );
/* Top and bottom are swapped */ /* Top and bottom are swapped */
RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE );
@ -8442,7 +8438,7 @@ static void test_paint_messages(void)
ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE );
ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret);
SetRectRgn( hrgn, 7, 12, 21, 30 ); SetRectRgn( hrgn, 7, 12, 21, 30 );
todo_check_update_rgn( hwnd, hrgn ); check_update_rgn( hwnd, hrgn );
/* both reference points are swapped */ /* both reference points are swapped */
RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); RedrawWindow( hwnd, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE );
@ -8450,7 +8446,7 @@ static void test_paint_messages(void)
ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE );
ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret);
SetRectRgn( hrgn, 7, 12, 21, 30 ); SetRectRgn( hrgn, 7, 12, 21, 30 );
todo_check_update_rgn( hwnd, hrgn ); check_update_rgn( hwnd, hrgn );
/* flush pending messages */ /* flush pending messages */
flush_events(); flush_events();

7
dlls/win32u/dce.c
View file

@ -1457,8 +1457,11 @@ BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT fla
if (rect && !hrgn) if (rect && !hrgn)
{ {
if (IsRectEmpty( rect )) rect = &empty; RECT ordered = *rect;
ret = redraw_window_rects( hwnd, flags, rect, 1 );
order_rect( &ordered );
if (IsRectEmpty( &ordered )) ordered = empty;
ret = redraw_window_rects( hwnd, flags, &ordered, 1 );
} }
else if (!hrgn) else if (!hrgn)
{ {