From: Rémi Bernon rbernon@codeweavers.com
--- server/protocol.def | 1 - server/window.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/server/protocol.def b/server/protocol.def index 37e7cffa748..292303c385f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2692,7 +2692,6 @@ enum message_type unsigned int new_style; /* new window style */ unsigned int new_ex_style; /* new window extended style */ user_handle_t surface_win; /* parent window that holds the surface */ - int needs_update; /* whether the surface region needs an update */ @END #define SET_WINPOS_PAINT_SURFACE 0x01 /* window has a paintable surface */ #define SET_WINPOS_PIXEL_FORMAT 0x02 /* window has a custom pixel format */ diff --git a/server/window.c b/server/window.c index a510eafbf78..9d6ce4ba169 100644 --- a/server/window.c +++ b/server/window.c @@ -134,7 +134,6 @@ static const struct object_ops window_ops = #define PAINT_NONCLIENT 0x0040 /* needs WM_NCPAINT */ #define PAINT_DELAYED_ERASE 0x0080 /* still needs erase after WM_ERASEBKGND */ #define PAINT_PIXEL_FORMAT_CHILD 0x0100 /* at least one child has a custom pixel format */ -#define PAINT_REGION_CHANGED 0x0200 /* window region has changed */
/* growable array of user handles */ struct user_handle_array @@ -2076,9 +2075,6 @@ static void set_window_region( struct window *win, struct region *region, int re
if (redraw) old_vis_rgn = get_visible_region( win, DCX_WINDOW );
- if (!region != !win->win_region || (region && !is_region_equal( region, win->win_region ))) - win->paint_flags |= PAINT_REGION_CHANGED; - if (win->win_region) free_region( win->win_region ); win->win_region = region;
@@ -2651,12 +2647,7 @@ DECL_HANDLER(set_window_pos) reply->new_ex_style = win->ex_style;
top = get_top_clipping_window( win ); - if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) - { - reply->surface_win = top->handle; - reply->needs_update = !!(top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD | PAINT_REGION_CHANGED)); - top->paint_flags &= ~PAINT_REGION_CHANGED; - } + if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) reply->surface_win = top->handle; }