August 2018 - Wine-commits - list.winehq.org

Alex Henrie : shell32: Add optical disc icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 4fc740c0188226c54399bf723e03eb4cfe649381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc740c0188226c54399bf72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:48 2018 -0600 shell32: Add optical disc icon. Adapted from media-optical in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/optical_disc.ico | Bin 0 -> 50691 bytes dlls/shell32/resources/optical_disc.svg | 1102 +++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1107 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fc740c0188226c54399…

1 0

Alex Henrie : shell32: Add music CD icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: cb4181b0e4a504ab2e53e0cfe9d836d0711bbd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4181b0e4a504ab2e53e0cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:49 2018 -0600 shell32: Add music CD icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 867e7c7..5b23a8c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -541,6 +541,10 @@ IDI_SHELL_FONTS_FOLDER ICON resources/folder.ico /* @makedep: resources/menu.ico */ IDI_SHELL_START_MENU ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 9fda9e1..a51a42e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -209,6 +209,7 @@ #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 +#define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add tree icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 1594905e8bb189255188ec1a03b150b010f3392c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1594905e8bb189255188ec1a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:50 2018 -0600 shell32: Add tree icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5b23a8c..6b1a793 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -545,6 +545,10 @@ IDI_SHELL_START_MENU ICON resources/menu.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREE ICON resources/menu.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a51a42e..7ab141a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -210,6 +210,7 @@ #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 #define IDI_SHELL_MUSIC_CD 41 +#define IDI_SHELL_TREE 42 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add remote folder icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 10296553bd06ca5516d9dd8f5660bef9fa3c91b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10296553bd06ca5516d9dd8f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:51 2018 -0600 shell32: Add remote folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6b1a793..2333e39 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -549,6 +549,10 @@ IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico /* @makedep: resources/menu.ico */ IDI_SHELL_TREE ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_REMOTE_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7ab141a..651d52e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -211,6 +211,7 @@ #define IDI_SHELL_START_MENU 40 #define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_TREE 42 +#define IDI_SHELL_REMOTE_FOLDER 43 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alexandre Julliard : user32: Scale coordinates in WIN_GetRectangles() based on DPI awareness.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: c5a692567698b07d9237071cea2bffe6a19ac65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5a692567698b07d9237071c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:06:45 2018 +0200 user32: Scale coordinates in WIN_GetRectangles() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 ++++++++++ dlls/user32/win.c | 6 ++++-- dlls/user32/win.h | 1 + include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + server/user.h | 14 ++++++++++++++ server/window.c | 11 +++++++++++ 9 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b6679c5..2dc5cb2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3237,6 +3237,16 @@ RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) } /********************************************************************** + * rect_win_to_thread_dpi + */ +RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_rect( rect, GetDpiForWindow( hwnd ), dpi ); +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c7a3b06..d9ef151 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -844,6 +844,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind { rect.right = 100; rect.bottom = 100; + rect = rect_win_to_thread_dpi( hwnd, rect ); } else { @@ -921,8 +922,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } break; } - if (rectWindow) *rectWindow = window_rect; - if (rectClient) *rectClient = client_rect; + if (rectWindow) *rectWindow = rect_win_to_thread_dpi( hwnd, window_rect ); + if (rectClient) *rectClient = rect_win_to_thread_dpi( hwnd, client_rect ); WIN_ReleasePtr( win ); return TRUE; } @@ -932,6 +933,7 @@ other_process: { req->handle = wine_server_user_handle( hwnd ); req->relative = relative; + req->dpi = get_thread_dpi(); if ((ret = !wine_server_call_err( req ))) { if (rectWindow) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 226e3e9..3fff0fc 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -132,6 +132,7 @@ extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; +extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c636bac..9c5deca 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3692,7 +3692,7 @@ struct get_window_rectangles_request struct request_header __header; user_handle_t handle; int relative; - char __pad_20[4]; + int dpi; }; struct get_window_rectangles_reply { @@ -6533,6 +6533,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 556 +#define SERVER_PROTOCOL_VERSION 557 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c8bb3b1..43f5f01 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2651,6 +2651,7 @@ enum message_type @REQ(get_window_rectangles) user_handle_t handle; /* handle to the window */ int relative; /* coords relative to (see below) */ + int dpi; /* DPI to map to, or zero for per-monitor DPI */ @REPLY rectangle_t window; /* window rectangle */ rectangle_t client; /* client rectangle */ diff --git a/server/request.h b/server/request.h index d3028f0..c3aed96 100644 --- a/server/request.h +++ b/server/request.h @@ -1773,6 +1773,7 @@ C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, needs_update) == 20 ); C_ASSERT( sizeof(struct set_window_pos_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, dpi) == 20 ); C_ASSERT( sizeof(struct get_window_rectangles_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, window) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 24 ); diff --git a/server/trace.c b/server/trace.c index 68e47d4..1d773fb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3229,6 +3229,7 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl { fprintf( stderr, " handle=%08x", req->handle ); fprintf( stderr, ", relative=%d", req->relative ); + fprintf( stderr, ", dpi=%d", req->dpi ); } static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req ) diff --git a/server/user.h b/server/user.h index 1236b0e..fe3aa09 100644 --- a/server/user.h +++ b/server/user.h @@ -198,6 +198,20 @@ static inline int point_in_rect( const rectangle_t *rect, int x, int y ) return (x >= rect->left && x < rect->right && y >= rect->top && y < rect->bottom); } +static inline int scale_dpi( int val, unsigned int dpi_from, unsigned int dpi_to ) +{ + if (val >= 0) return (val * dpi_to + (dpi_from / 2)) / dpi_from; + return (val * dpi_to - (dpi_from / 2)) / dpi_from; +} + +static inline void scale_dpi_rect( rectangle_t *rect, unsigned int dpi_from, unsigned int dpi_to ) +{ + rect->left = scale_dpi( rect->left, dpi_from, dpi_to ); + rect->top = scale_dpi( rect->top, dpi_from, dpi_to ); + rect->right = scale_dpi( rect->right, dpi_from, dpi_to ); + rect->bottom = scale_dpi( rect->bottom, dpi_from, dpi_to ); +} + /* offset the coordinates of a rectangle */ static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) { diff --git a/server/window.c b/server/window.c index e58d7e4..c286a0a 100644 --- a/server/window.c +++ b/server/window.c @@ -630,6 +630,15 @@ static inline void inc_window_paint_count( struct window *win, int incr ) if (win->thread) inc_queue_paint_count( win->thread, incr ); } +/* map a window rectangle between different DPI scaling levels */ +static void map_dpi_rect( struct window *win, rectangle_t *rect, unsigned int from, unsigned int to ) +{ + if (!from) from = get_monitor_dpi( win ); + if (!to) to = get_monitor_dpi( win ); + if (from == to) return; + scale_dpi_rect( rect, from, to ); +} + /* check if window and all its ancestors are visible */ static int is_visible( const struct window *win ) { @@ -2349,6 +2358,8 @@ DECL_HANDLER(get_window_rectangles) set_error( STATUS_INVALID_PARAMETER ); break; } + map_dpi_rect( win, &reply->window, win->dpi, req->dpi ); + map_dpi_rect( win, &reply->client, win->dpi, req->dpi ); }

1 0

Alexandre Julliard : user32: Scale coordinates in MapWindowPoints() based on DPI awareness.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 8de1b2c2ceda0a69257f4390540e2239ec592272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de1b2c2ceda0a69257f4390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:12:44 2018 +0200 user32: Scale coordinates in MapWindowPoints() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 23 ++++++++++++++++++++ dlls/user32/win.h | 2 ++ dlls/user32/winpos.c | 12 ++++++++--- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + server/window.c | 48 ++++++++++++++++++++++-------------------- 8 files changed, 64 insertions(+), 28 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2dc5cb2..a971062 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3222,6 +3222,29 @@ UINT get_thread_dpi(void) } /********************************************************************** + * map_dpi_point + */ +POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) +{ + if (dpi_from && dpi_to && dpi_from != dpi_to) + { + pt.x = MulDiv( pt.x, dpi_to, dpi_from ); + pt.y = MulDiv( pt.y, dpi_to, dpi_from ); + } + return pt; +} + +/********************************************************************** + * point_win_to_thread_dpi + */ +POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_point( pt, GetDpiForWindow( hwnd ), dpi ); +} + +/********************************************************************** * map_dpi_rect */ RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 3fff0fc..b912ef8 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -131,6 +131,8 @@ extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDE extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; +extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; +extern POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e26dc6e..1dd9c12 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -446,6 +446,7 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI } } if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); + offset = point_win_to_thread_dpi( hwndFrom, offset ); } } @@ -460,15 +461,16 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { + POINT pt = { 0, 0 }; if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) { mirror_to = TRUE; - offset.x -= wndPtr->client_rect.right - wndPtr->client_rect.left; + pt.x += wndPtr->client_rect.right - wndPtr->client_rect.left; } while (wndPtr->parent) { - offset.x -= wndPtr->client_rect.left; - offset.y -= wndPtr->client_rect.top; + pt.x += wndPtr->client_rect.left; + pt.y += wndPtr->client_rect.top; hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; @@ -481,6 +483,9 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI } } if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); + pt = point_win_to_thread_dpi( hwndTo, pt ); + offset.x -= pt.x; + offset.y -= pt.y; } } @@ -494,6 +499,7 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI { req->from = wine_server_user_handle( hwndFrom ); req->to = wine_server_user_handle( hwndTo ); + req->dpi = get_thread_dpi(); if ((ret = !wine_server_call_err( req ))) { ret_offset->x = reply->x; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c5deca..a888a63 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3743,7 +3743,7 @@ struct get_windows_offset_request struct request_header __header; user_handle_t from; user_handle_t to; - char __pad_20[4]; + int dpi; }; struct get_windows_offset_reply { @@ -6533,6 +6533,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 557 +#define SERVER_PROTOCOL_VERSION 558 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 43f5f01..f1f4709 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2685,6 +2685,7 @@ enum coords_relative @REQ(get_windows_offset) user_handle_t from; /* handle to the first window */ user_handle_t to; /* handle to the second window */ + int dpi; /* DPI to map to, or zero for per-monitor DPI */ @REPLY int x; /* x coordinate offset */ int y; /* y coordinate offset */ diff --git a/server/request.h b/server/request.h index c3aed96..ddf8a68 100644 --- a/server/request.h +++ b/server/request.h @@ -1786,6 +1786,7 @@ C_ASSERT( FIELD_OFFSET(struct set_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct set_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, from) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, to) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, dpi) == 20 ); C_ASSERT( sizeof(struct get_windows_offset_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_reply, x) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_reply, y) == 12 ); diff --git a/server/trace.c b/server/trace.c index 1d773fb..6886688 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3259,6 +3259,7 @@ static void dump_get_windows_offset_request( const struct get_windows_offset_req { fprintf( stderr, " from=%08x", req->from ); fprintf( stderr, ", to=%08x", req->to ); + fprintf( stderr, ", dpi=%d", req->dpi ); } static void dump_get_windows_offset_reply( const struct get_windows_offset_reply *req ) diff --git a/server/window.c b/server/window.c index c286a0a..e45cf38 100644 --- a/server/window.c +++ b/server/window.c @@ -630,6 +630,16 @@ static inline void inc_window_paint_count( struct window *win, int incr ) if (win->thread) inc_queue_paint_count( win->thread, incr ); } +/* map a point between different DPI scaling levels */ +static void map_dpi_point( struct window *win, int *x, int *y, unsigned int from, unsigned int to ) +{ + if (!from) from = get_monitor_dpi( win ); + if (!to) to = get_monitor_dpi( win ); + if (from == to) return; + *x = scale_dpi( *x, from, to ); + *y = scale_dpi( *y, from, to ); +} + /* map a window rectangle between different DPI scaling levels */ static void map_dpi_rect( struct window *win, rectangle_t *rect, unsigned int from, unsigned int to ) { @@ -2401,38 +2411,30 @@ DECL_HANDLER(set_window_text) DECL_HANDLER(get_windows_offset) { struct window *win; - int mirror_from = 0, mirror_to = 0; + int x, y, mirror_from = 0, mirror_to = 0; reply->x = reply->y = 0; if (req->from) { if (!(win = get_window( req->from ))) return; - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_from = 1; - reply->x += win->client_rect.right - win->client_rect.left; - } - while (win && !is_desktop_window(win)) - { - reply->x += win->client_rect.left; - reply->y += win->client_rect.top; - win = win->parent; - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_from = 1; + x = mirror_from ? win->client_rect.right - win->client_rect.left : 0; + y = 0; + client_to_screen( win, &x, &y ); + map_dpi_point( win, &x, &y, win->dpi, req->dpi ); + reply->x += x; + reply->y += y; } if (req->to) { if (!(win = get_window( req->to ))) return; - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_to = 1; - reply->x -= win->client_rect.right - win->client_rect.left; - } - while (win && !is_desktop_window(win)) - { - reply->x -= win->client_rect.left; - reply->y -= win->client_rect.top; - win = win->parent; - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_to = 1; + x = mirror_to ? win->client_rect.right - win->client_rect.left : 0; + y = 0; + client_to_screen( win, &x, &y ); + map_dpi_point( win, &x, &y, win->dpi, req->dpi ); + reply->x -= x; + reply->y -= y; } if (mirror_from) reply->x = -reply->x; reply->mirror = mirror_from ^ mirror_to;

1 0

Alexandre Julliard : user32: Scale coordinates in Get/SetWindowPlacement() based on DPI awareness.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 87e49000a1206635d4acba52703525bd81a2df09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e49000a1206635d4acba52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:23:28 2018 +0200 user32: Scale coordinates in Get/SetWindowPlacement() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 20 ++++++++++++++++++++ dlls/user32/win.h | 3 +++ dlls/user32/winpos.c | 12 ++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a971062..9d7c256 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3245,6 +3245,16 @@ POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) } /********************************************************************** + * point_thread_to_win_dpi + */ +POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_point( pt, dpi, GetDpiForWindow( hwnd )); +} + +/********************************************************************** * map_dpi_rect */ RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) @@ -3270,6 +3280,16 @@ RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) } /********************************************************************** + * rect_thread_to_win_dpi + */ +RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_rect( rect, dpi, GetDpiForWindow( hwnd ) ); +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index b912ef8..f30b004 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -133,8 +133,11 @@ extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; +extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; + extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1dd9c12..98eec62 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1342,9 +1342,9 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) wndpl->flags = WPF_RESTORETOMAXIMIZED; else wndpl->flags = 0; - wndpl->ptMinPosition = pWnd->min_pos; - wndpl->ptMaxPosition = pWnd->max_pos; - wndpl->rcNormalPosition = pWnd->normal_rect; + wndpl->ptMinPosition = EMPTYPOINT(pWnd->min_pos) ? pWnd->min_pos : point_win_to_thread_dpi( hwnd, pWnd->min_pos ); + wndpl->ptMaxPosition = EMPTYPOINT(pWnd->max_pos) ? pWnd->max_pos : point_win_to_thread_dpi( hwnd, pWnd->max_pos ); + wndpl->rcNormalPosition = rect_win_to_thread_dpi( hwnd, pWnd->normal_rect ); WIN_ReleasePtr( pWnd ); TRACE( "%p: returning min %d,%d max %d,%d normal %s\n", @@ -1419,9 +1419,9 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; - if( flags & PLACE_MIN ) pWnd->min_pos = wp.ptMinPosition; - if( flags & PLACE_MAX ) pWnd->max_pos = wp.ptMaxPosition; - if( flags & PLACE_RECT) pWnd->normal_rect = wp.rcNormalPosition; + if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); + if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle;

1 0

Alexandre Julliard : server: Map region to the window DPI in redraw_region ().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 8698b600c64931b6fe3ed759227e0d902b6531d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8698b600c64931b6fe3ed759… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:45:43 2018 +0200 server: Map region to the window DPI in redraw_region(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/region.c | 12 ++++++++++++ server/user.h | 1 + server/window.c | 27 ++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/server/region.c b/server/region.c index 0e52f2f..9f377ee 100644 --- a/server/region.c +++ b/server/region.c @@ -724,6 +724,18 @@ void mirror_region( const rectangle_t *client_rect, struct region *region ) } +/* scale a region for a given dpi factor */ +void scale_region( struct region *region, unsigned int dpi_from, unsigned int dpi_to ) +{ + rectangle_t *rect, *end; + + if (!region->num_rects) return; + for (rect = region->rects, end = rect + region->num_rects; rect < end; rect++) + scale_dpi_rect( rect, dpi_from, dpi_to ); + scale_dpi_rect( &region->extents, dpi_from, dpi_to ); +} + + /* make a copy of a region; returns dst or NULL on error */ struct region *copy_region( struct region *dst, const struct region *src ) { diff --git a/server/user.h b/server/user.h index fe3aa09..eb1b7ce 100644 --- a/server/user.h +++ b/server/user.h @@ -135,6 +135,7 @@ extern int is_region_empty( const struct region *region ); extern void get_region_extents( const struct region *region, rectangle_t *rect ); extern void offset_region( struct region *region, int x, int y ); extern void mirror_region( const rectangle_t *client_rect, struct region *region ); +extern void scale_region( struct region *region, unsigned int dpi_from, unsigned int dpi_to ); extern struct region *copy_region( struct region *dst, const struct region *src ); extern struct region *intersect_region( struct region *dst, const struct region *src1, const struct region *src2 ); diff --git a/server/window.c b/server/window.c index e45cf38..8d056a2 100644 --- a/server/window.c +++ b/server/window.c @@ -649,6 +649,15 @@ static void map_dpi_rect( struct window *win, rectangle_t *rect, unsigned int fr scale_dpi_rect( rect, from, to ); } +/* map a region between different DPI scaling levels */ +static void map_dpi_region( struct window *win, struct region *region, unsigned int from, unsigned int to ) +{ + if (!from) from = get_monitor_dpi( win ); + if (!to) to = get_monitor_dpi( win ); + if (from == to) return; + scale_region( region, from, to ); +} + /* check if window and all its ancestors are visible */ static int is_visible( const struct window *win ) { @@ -1388,7 +1397,7 @@ static void validate_parents( struct window *child ) /* add/subtract a region (in client coordinates) to the update region of the window */ static void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ) { - struct region *tmp; + struct region *child_rgn, *tmp; struct window *child; if (flags & RDW_INVALIDATE) @@ -1450,11 +1459,19 @@ static void redraw_window( struct window *win, struct region *region, int frame, LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) { if (!(child->style & WS_VISIBLE)) continue; - if (!rect_in_region( tmp, &child->window_rect )) continue; - offset_region( tmp, -child->client_rect.left, -child->client_rect.top ); - redraw_window( child, tmp, 1, flags ); - offset_region( tmp, child->client_rect.left, child->client_rect.top ); + if (!(child_rgn = create_empty_region())) continue; + if (copy_region( child_rgn, tmp )) + { + map_dpi_region( child, child_rgn, win->dpi, child->dpi ); + if (rect_in_region( child_rgn, &child->window_rect )) + { + offset_region( child_rgn, -child->client_rect.left, -child->client_rect.top ); + redraw_window( child, child_rgn, 1, flags ); + } + } + free_region( child_rgn ); } + free_region( tmp ); }

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness for non-client painting.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 700b6182a48f1ee066392dc5bba14d7dcf9cf22b URL: https://source.winehq.org/git/wine.git/?a=commit;h=700b6182a48f1ee066392dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:27:26 2018 +0200 user32: Switch to the window DPI awareness for non-client painting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 66e69f4..313c5fa 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -421,11 +421,14 @@ static void make_dc_dirty( struct dce *dce ) */ void invalidate_dce( WND *win, const RECT *extra_rect ) { + DPI_AWARENESS_CONTEXT context; RECT window_rect; struct dce *dce; if (!win->parent) return; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( win->obj.handle )); + GetWindowRect( win->obj.handle, &window_rect ); TRACE("%p parent %p %s (%s)\n", @@ -460,6 +463,7 @@ void invalidate_dce( WND *win, const RECT *extra_rect ) make_dc_dirty( dce ); } } + SetThreadDpiAwarenessContext( context ); } /*********************************************************************** @@ -652,9 +656,12 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) { + DPI_AWARENESS_CONTEXT context; RECT client, window, update; INT type; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + /* check if update rgn overlaps with nonclient area */ type = GetRgnBox( whole_rgn, &update ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &window, &client ); @@ -684,6 +691,7 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (*flags & UPDATE_NONCLIENT) SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); if (whole_rgn > (HRGN)1) DeleteObject( whole_rgn ); } + SetThreadDpiAwarenessContext( context ); } return client_rgn; } @@ -1364,10 +1372,13 @@ BOOL WINAPI ValidateRect( HWND hwnd, const RECT *rect ) */ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) { + DPI_AWARENESS_CONTEXT context; INT retval = ERROR; UINT flags = UPDATE_NOCHILDREN; HRGN update_rgn; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + if (erase) flags |= UPDATE_NONCLIENT | UPDATE_ERASE; if ((update_rgn = send_ncpaint( hwnd, NULL, &flags ))) @@ -1381,6 +1392,7 @@ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) /* map region to client coordinates */ map_window_region( 0, hwnd, hrgn ); } + SetThreadDpiAwarenessContext( context ); return retval; } @@ -1390,6 +1402,7 @@ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) */ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase ) { + DPI_AWARENESS_CONTEXT context; UINT flags = UPDATE_NOCHILDREN; HRGN update_rgn; BOOL need_erase; @@ -1404,7 +1417,10 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase ) { HDC hdc = GetDCEx( hwnd, 0, DCX_USESTYLE ); DWORD layout = SetLayout( hdc, 0 ); /* MapWindowPoints mirrors already */ + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); MapWindowPoints( 0, hwnd, (LPPOINT)rect, 2 ); + SetThreadDpiAwarenessContext( context ); + *rect = rect_win_to_thread_dpi( hwnd, *rect ); DPtoLP( hdc, (LPPOINT)rect, 2 ); SetLayout( hdc, layout ); ReleaseDC( hwnd, hdc ); @@ -1429,12 +1445,15 @@ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd ) if (ret != ERROR) { + DPI_AWARENESS_CONTEXT context; POINT pt; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); GetDCOrgEx( hdc, &pt ); MapWindowPoints( 0, hwnd, &pt, 1 ); OffsetRgn( update_rgn, -pt.x, -pt.y ); ret = ExtSelectClipRgn( hdc, update_rgn, RGN_DIFF ); + SetThreadDpiAwarenessContext( context ); } DeleteObject( update_rgn ); return ret;

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness in SetParent().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 3bf279e7dabf80e2116bfd0956b390824d47394d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf279e7dabf80e2116bfd09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:28:44 2018 +0200 user32: Switch to the window DPI awareness in SetParent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d9ef151..e3edbf6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3121,6 +3121,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) BOOL was_visible; WND *wndPtr; BOOL ret; + DPI_AWARENESS_CONTEXT context; RECT window_rect, old_screen_rect, new_screen_rect; TRACE("(%p %p)\n", hwnd, parent); @@ -3164,8 +3165,11 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, NULL ); + SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &old_screen_rect, NULL ); + SetThreadDpiAwarenessContext( context ); SERVER_START_REQ( set_parent ) { @@ -3184,6 +3188,10 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) WIN_ReleasePtr( wndPtr ); if (!ret) return 0; + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &new_screen_rect, NULL ); + SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + USER_Driver->pSetParent( full_handle, parent, old_parent ); winpos.hwnd = hwnd; @@ -3194,12 +3202,12 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) winpos.cy = 0; winpos.flags = SWP_NOSIZE; - WIN_GetRectangles( hwnd, COORDS_SCREEN, &new_screen_rect, NULL ); USER_SetWindowPos( &winpos, new_screen_rect.left - old_screen_rect.left, new_screen_rect.top - old_screen_rect.top ); if (was_visible) ShowWindow( hwnd, SW_SHOW ); + SetThreadDpiAwarenessContext( context ); return old_parent; }

1 0