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

Alexandre Julliard : user32: Switch to the window DPI awareness in ShowWindow().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 0da23418abf63f8c2abe5e0e328d5fb4daa9dfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da23418abf63f8c2abe5e0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:29:40 2018 +0200 user32: Switch to the window DPI awareness in ShowWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 98eec62..75b1452 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1066,6 +1066,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) { WND *wndPtr; HWND parent; + DPI_AWARENESS_CONTEXT context; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; @@ -1074,10 +1075,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + switch(cmd) { case SW_HIDE: - if (!wasVisible) return FALSE; + if (!wasVisible) goto done; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1091,14 +1094,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) return TRUE; + if ((style & WS_MINIMIZE) && wasVisible) goto done; break; case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) return TRUE; + if ((style & WS_MAXIMIZE) && wasVisible) goto done; break; case SW_SHOWNA: @@ -1106,7 +1109,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (style & WS_CHILD) swp |= SWP_NOZORDER; break; case SW_SHOW: - if (wasVisible) return TRUE; + if (wasVisible) goto done; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; @@ -1126,19 +1129,19 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else { - if (wasVisible) return TRUE; + if (wasVisible) goto done; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; default: - return wasVisible; + goto done; } if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) { SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); - if (!IsWindow( hwnd )) return wasVisible; + if (!IsWindow( hwnd )) goto done; } swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); @@ -1176,12 +1179,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (parent == GetDesktopWindow()) parent = 0; SetFocus(parent); } - return wasVisible; + goto done; } if (IsIconic(hwnd)) WINPOS_ShowIconTitle( hwnd, TRUE ); - if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return wasVisible; + if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) goto done; if (wndPtr->flags & WIN_NEED_SIZE) { @@ -1209,6 +1212,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) /* if previous state was minimized Windows sets focus to the window */ if (style & WS_MINIMIZE) SetFocus( hwnd ); +done: + SetThreadDpiAwarenessContext( context ); return wasVisible; }

1 0

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

Aug. 24, 2018

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

Alex Henrie : shell32: Add remote folder icon.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

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

Alex Henrie : shell32: Add start menu icon.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: f2252757baf9720b6d762d6827362d1921a3140a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2252757baf9720b6d762d68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:47 2018 -0600 shell32: Add start menu icon. Adapted from list-remove.svg 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/menu.ico | Bin 0 -> 34002 bytes dlls/shell32/resources/menu.svg | 631 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 636 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2252757baf9720b6d76…

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 shutdown icons.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: c49c12b2cdcfffc9b825c0b2190e9a7425cec949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49c12b2cdcfffc9b825c0b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:46 2018 -0600 shell32: Scale SVG properly to create 48x48 shutdown icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/shut_down.ico | Bin 38405 -> 38405 bytes dlls/shell32/resources/shut_down.svg | 94 ++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/resources/shut_down.ico b/dlls/shell32/resources/shut_down.ico index cb6aa9c..c8b9f43 100644 Binary files a/dlls/shell32/resources/shut_down.ico and b/dlls/shell32/resources/shut_down.ico differ diff --git a/dlls/shell32/resources/shut_down.svg b/dlls/shell32/resources/shut_down.svg index e637059..c1c2fd3 100644 --- a/dlls/shell32/resources/shut_down.svg +++ b/dlls/shell32/resources/shut_down.svg @@ -634,29 +634,30 @@ height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-8" x="328" @@ -666,29 +667,30 @@ aWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-4" x="384"

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 sleep icons.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 13d2264e731a7e63e7b9e8fa2b03b1a02027f923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d2264e731a7e63e7b9e8fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:45 2018 -0600 shell32: Scale SVG properly to create 48x48 sleep icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/sleep.ico | Bin 65140 -> 65140 bytes dlls/shell32/resources/sleep.svg | 244 ++++++++++++++++++--------------------- 2 files changed, 112 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13d2264e731a7e63e7b9…

1 0

Dmitry Timoshkov : oleaut32: Move rendering a bitmap to a separate helper.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 293a6790767d158ab36ac339fa5a45bd04e440ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=293a6790767d158ab36ac339… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:06 2018 +0800 oleaut32: Move rendering a bitmap to a separate helper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 103 ++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bd..aa82b05 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL);

1 0

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

Aug. 24, 2018

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

Alex Henrie : shell32: Add optical disc icon.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

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

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

Aug. 24, 2018

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