From: Rémi Bernon rbernon@codeweavers.com
--- server/protocol.def | 2 +- server/window.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/server/protocol.def b/server/protocol.def index bdd3c526890..7ed53f618d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1011,7 +1011,7 @@ typedef volatile struct
typedef volatile struct { - int placeholder; + unsigned int dpi_context; /* DPI awareness context */ } window_shm_t;
typedef volatile union diff --git a/server/window.c b/server/window.c index 8975714ecbc..78245b93707 100644 --- a/server/window.c +++ b/server/window.c @@ -84,7 +84,6 @@ struct window unsigned int color_key; /* color key for a layered window */ unsigned int alpha; /* alpha value for a layered window */ unsigned int layered_flags; /* flags for a layered window */ - unsigned int dpi_context; /* DPI awareness context */ unsigned int monitor_dpi; /* DPI of the window monitor */ lparam_t user_data; /* user-specific data */ WCHAR *text; /* window caption text */ @@ -337,8 +336,8 @@ static unsigned int get_monitor_dpi( struct window *win )
static unsigned int get_window_dpi( struct window *win ) { - if (NTUSER_DPI_CONTEXT_IS_MONITOR_AWARE( win->dpi_context )) return get_monitor_dpi( win ); - return NTUSER_DPI_CONTEXT_GET_DPI( win->dpi_context ); + if (NTUSER_DPI_CONTEXT_IS_MONITOR_AWARE( win->shared->dpi_context )) return get_monitor_dpi( win ); + return NTUSER_DPI_CONTEXT_GET_DPI( win->shared->dpi_context ); }
/* link a window at the right place in the siblings list */ @@ -421,7 +420,14 @@ static int set_parent_window( struct window *win, struct window *parent ) win->parent = (struct window *)grab_object( parent ); link_window( win, WINPTR_TOP );
- if (!is_desktop_window( parent )) win->dpi_context = parent->dpi_context; + if (!is_desktop_window( parent )) + { + SHARED_WRITE_BEGIN( win->shared, window_shm_t ) + { + shared->dpi_context = parent->shared->dpi_context; + } + SHARED_WRITE_END; + }
/* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ @@ -655,7 +661,6 @@ static struct window *create_window( struct window *parent, struct window *owner win->is_linked = 0; win->is_layered = 0; win->is_orphan = 0; - win->dpi_context = NTUSER_DPI_PER_MONITOR_AWARE; win->monitor_dpi = USER_DEFAULT_SCREEN_DPI; win->user_data = 0; win->text = NULL; @@ -674,7 +679,7 @@ static struct window *create_window( struct window *parent, struct window *owner if (!(win->shared = alloc_shared_object())) goto failed; SHARED_WRITE_BEGIN( win->shared, window_shm_t ) { - shared->placeholder = 0; + shared->dpi_context = NTUSER_DPI_PER_MONITOR_AWARE; } SHARED_WRITE_END;
@@ -2176,6 +2181,7 @@ DECL_HANDLER(create_window) { struct window *win, *parent = NULL, *owner = NULL; struct unicode_str cls_name = get_req_unicode_str(); + unsigned int dpi_context; atom_t atom;
reply->handle = 0; @@ -2209,9 +2215,17 @@ DECL_HANDLER(create_window) if (!(win = create_window( parent, owner, atom, req->instance ))) return;
if (parent && !is_desktop_window( parent )) - win->dpi_context = parent->dpi_context; + dpi_context = parent->shared->dpi_context; else if (!parent || !NTUSER_DPI_CONTEXT_IS_MONITOR_AWARE( req->dpi_context )) - win->dpi_context = req->dpi_context; + dpi_context = req->dpi_context; + else + dpi_context = win->shared->dpi_context; + + SHARED_WRITE_BEGIN( win->shared, window_shm_t ) + { + shared->dpi_context = dpi_context; + } + SHARED_WRITE_END;
win->style = req->style; win->ex_style = req->ex_style; @@ -2220,7 +2234,7 @@ DECL_HANDLER(create_window) reply->parent = win->parent ? win->parent->handle : 0; reply->owner = win->owner; reply->extra = win->nb_extra_bytes; - reply->dpi_context = win->dpi_context; + reply->dpi_context = win->shared->dpi_context; reply->class_ptr = get_class_client_ptr( win->class ); }
@@ -2241,7 +2255,7 @@ DECL_HANDLER(set_parent) reply->old_parent = win->parent->handle; reply->full_parent = parent ? parent->handle : 0; set_parent_window( win, parent ); - reply->dpi_context = win->dpi_context; + reply->dpi_context = win->shared->dpi_context; }
@@ -2335,7 +2349,7 @@ DECL_HANDLER(get_window_info)
reply->last_active = win->handle; reply->is_unicode = win->is_unicode; - reply->dpi_context = win->dpi_context; + reply->dpi_context = win->shared->dpi_context;
if (get_user_object( win->last_active, NTUSER_OBJ_WINDOW )) reply->last_active = win->last_active; }