Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
078b0219
Commit
078b0219
authored
May 20, 2023
by
Jinoh Kang
Committed by
Alexandre Julliard
Jun 02, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Update parent window region when exposing previously invisible window.
Fixes:
33617af8
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=54949
parent
c368dfeb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
msg.c
dlls/user32/tests/msg.c
+1
-7
window.c
server/window.c
+3
-2
No files found.
dlls/user32/tests/msg.c
View file @
078b0219
...
...
@@ -5793,7 +5793,7 @@ static void test_messages(void)
test_WM_SETREDRAW
(
hchild
);
ShowWindow
(
hchild
,
SW_SHOW
);
ok_sequence
(
WmShowChildSeq
,
"ShowWindow(SW_SHOW):child"
,
TRU
E
);
ok_sequence
(
WmShowChildSeq
,
"ShowWindow(SW_SHOW):child"
,
FALS
E
);
/* check parent messages too */
log_all_parent_messages
++
;
...
...
@@ -9467,12 +9467,10 @@ static void test_swp_paint_region_on_show(void)
"GetUpdateRgn on child shall succeed
\n
"
);
result
=
GetRgnBox
(
hrgn_actual
,
&
rect_actual
);
todo_wine_if
(
result
==
NULLREGION
)
ok
(
result
==
SIMPLEREGION
,
"GetRgnBox (on parent) returned %d
\n
"
,
result
);
if
(
result
==
COMPLEXREGION
)
dump_region
(
hrgn_actual
);
rect_expect
=
rect_1
;
todo_wine_if
(
IsRectEmpty
(
&
rect_actual
))
ok
(
EqualRect
(
&
rect_actual
,
&
rect_expect
),
"parent update region: got %s, expected %s
\n
"
,
wine_dbgstr_rect
(
&
rect_actual
),
wine_dbgstr_rect
(
&
rect_expect
)
);
...
...
@@ -9506,12 +9504,10 @@ static void test_swp_paint_region_on_show(void)
"GetUpdateRgn on child shall succeed
\n
"
);
result
=
GetRgnBox
(
hrgn_actual
,
&
rect_actual
);
todo_wine_if
(
result
==
NULLREGION
)
ok
(
result
==
SIMPLEREGION
,
"GetRgnBox (on parent) returned %d
\n
"
,
result
);
if
(
result
==
COMPLEXREGION
)
dump_region
(
hrgn_actual
);
rect_expect
=
rect_2
;
todo_wine_if
(
IsRectEmpty
(
&
rect_actual
))
ok
(
EqualRect
(
&
rect_actual
,
&
rect_expect
),
"parent update region: got %s, expected %s
\n
"
,
wine_dbgstr_rect
(
&
rect_actual
),
wine_dbgstr_rect
(
&
rect_expect
)
);
...
...
@@ -9565,12 +9561,10 @@ static void test_swp_paint_region_on_extend_zerosize(void)
"GetUpdateRgn on child shall succeed
\n
"
);
result
=
GetRgnBox
(
hrgn_actual
,
&
rect_actual
);
todo_wine_if
(
result
==
NULLREGION
)
ok
(
result
==
SIMPLEREGION
,
"GetRgnBox (on parent) returned %d
\n
"
,
result
);
if
(
result
==
COMPLEXREGION
)
dump_region
(
hrgn_actual
);
rect_expect
=
rect_1
;
todo_wine_if
(
IsRectEmpty
(
&
rect_actual
))
ok
(
EqualRect
(
&
rect_actual
,
&
rect_expect
),
"parent update region: got %s, expected %s
\n
"
,
wine_dbgstr_rect
(
&
rect_actual
),
wine_dbgstr_rect
(
&
rect_expect
)
);
...
...
server/window.c
View file @
078b0219
...
...
@@ -1766,8 +1766,9 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_
offset_region
(
new_vis_rgn
,
win
->
window_rect
.
left
-
old_window_rect
->
left
,
win
->
window_rect
.
top
-
old_window_rect
->
top
);
if
(
is_composited
?
union_region
(
new_vis_rgn
,
old_vis_rgn
,
new_vis_rgn
)
:
subtract_region
(
new_vis_rgn
,
old_vis_rgn
,
new_vis_rgn
))
if
(
is_region_empty
(
old_vis_rgn
)
||
(
is_composited
?
union_region
(
new_vis_rgn
,
old_vis_rgn
,
new_vis_rgn
)
:
subtract_region
(
new_vis_rgn
,
old_vis_rgn
,
new_vis_rgn
)))
{
if
(
!
is_region_empty
(
new_vis_rgn
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment