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

Jacek Caban : mshtml: Introduce get_style_property_var helper and use it instead of get_nsstyle_attr_var in HTMLStyle implementation.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 45e2ae4b74d53ecd9a57cccbf1f6d47cc2848ff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45e2ae4b74d53ecd9a57cccb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:47:03 2018 +0200 mshtml: Introduce get_style_property_var helper and use it instead of get_nsstyle_attr_var in HTMLStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 75 ++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45e2ae4b74d53ecd9a57…

1 0

Alexandre Julliard : user32: Support the MOUSEEVENTF_VIRTUALDESK flag in SendInput().
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: ac3e887e5d0bcfef13546ed0441b8179ec4430f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3e887e5d0bcfef13546ed0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:17:19 2018 +0200 user32: Support the MOUSEEVENTF_VIRTUALDESK flag in SendInput(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 9d87393..72a68dd 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -141,8 +141,17 @@ static void update_mouse_coords( INPUT *input ) if (input->u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) { - input->u.mi.dx = (input->u.mi.dx * GetSystemMetrics( SM_CXSCREEN )) >> 16; - input->u.mi.dy = (input->u.mi.dy * GetSystemMetrics( SM_CYSCREEN )) >> 16; + if (input->u.mi.dwFlags & MOUSEEVENTF_VIRTUALDESK) + { + RECT rc = get_virtual_screen_rect(); + input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); + input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); + } + else + { + input->u.mi.dx = (input->u.mi.dx * GetSystemMetrics( SM_CXSCREEN )) >> 16; + input->u.mi.dy = (input->u.mi.dy * GetSystemMetrics( SM_CYSCREEN )) >> 16; + } } else {

1 0

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

Aug. 27, 2018

Module: wine Branch: master Commit: 8bca1b29cd5358a63e10532ac85f456e1b145fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bca1b29cd5358a63e10532a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:20:01 2018 +0200 user32: Scale coordinates in ClipCursor() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 99337ab..f11f5e4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2116,12 +2116,22 @@ HCURSOR WINAPI GetCursor(void) */ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) { + UINT dpi; BOOL ret; RECT new_rect; TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); - if (rect && (rect->left > rect->right || rect->top > rect->bottom)) return FALSE; + if (rect) + { + if (rect->left > rect->right || rect->top > rect->bottom) return FALSE; + if ((dpi = get_thread_dpi())) + { + new_rect = map_dpi_rect( *rect, dpi, + get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY ))); + rect = &new_rect; + } + } SERVER_START_REQ( set_cursor ) { @@ -2155,6 +2165,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { + DPI_AWARENESS_CONTEXT context; + UINT dpi; BOOL ret; if (!rect) return FALSE; @@ -2171,6 +2183,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) } } SERVER_END_REQ; + + if (ret && (dpi = get_thread_dpi())) + { + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + *rect = map_dpi_rect( *rect, get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY )), dpi ); + SetThreadDpiAwarenessContext( context ); + } return ret; }

1 0

Alex Henrie : shell32: Add file overwrite icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: fb706ed7f871ce632210cf9356c8e43789f032aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb706ed7f871ce632210cf93… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:06 2018 -0600 shell32: Add file overwrite 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 cf4d0f5..2af0205 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -628,6 +628,10 @@ IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 86770af..c6b1400 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -236,6 +236,7 @@ #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_TRASH_MIXED 144 +#define IDI_SHELL_FILE_OVERWRITE 145 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alexandre Julliard : user32: Scale coordinates in Get/SetCursorPos() based on DPI awareness.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 910f3ed4daaac96842159cfeef0b64ed2e533ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=910f3ed4daaac96842159cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:19:13 2018 +0200 user32: Scale coordinates in Get/SetCursorPos() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ab9b70f..9d87393 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -240,6 +240,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { BOOL ret; DWORD last_change; + UINT dpi; if (!pt) return FALSE; @@ -256,6 +257,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) /* query new position from graphics driver if we haven't updated recently */ if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); + if (ret && (dpi = get_thread_dpi())) + { + DPI_AWARENESS_CONTEXT context; + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + *pt = map_dpi_point( *pt, get_monitor_dpi( MonitorFromPoint( *pt, MONITOR_DEFAULTTOPRIMARY )), dpi ); + SetThreadDpiAwarenessContext( context ); + } return ret; } @@ -289,14 +297,19 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) { + POINT pt = { x, y }; BOOL ret; INT prev_x, prev_y, new_x, new_y; + UINT dpi; + + if ((dpi = get_thread_dpi())) + pt = map_dpi_point( pt, dpi, get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ))); SERVER_START_REQ( set_cursor ) { req->flags = SET_CURSOR_POS; - req->x = x; - req->y = y; + req->x = pt.x; + req->y = pt.y; if ((ret = !wine_server_call( req ))) { prev_x = reply->prev_x;

1 0

Alexandre Julliard : user32: Map mouse events to physical coordinates in SendInput.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: c33615dcf313179eba03e196407dd0eacb6ff455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c33615dcf313179eba03e196… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:18:24 2018 +0200 user32: Map mouse events to physical coordinates in SendInput. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 72a68dd..8b2ae80 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -141,6 +141,7 @@ static void update_mouse_coords( INPUT *input ) if (input->u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) { + DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); if (input->u.mi.dwFlags & MOUSEEVENTF_VIRTUALDESK) { RECT rc = get_virtual_screen_rect(); @@ -152,6 +153,7 @@ static void update_mouse_coords( INPUT *input ) input->u.mi.dx = (input->u.mi.dx * GetSystemMetrics( SM_CXSCREEN )) >> 16; input->u.mi.dy = (input->u.mi.dy * GetSystemMetrics( SM_CYSCREEN )) >> 16; } + SetThreadDpiAwarenessContext( context ); } else {

1 0

Jacek Caban : mshtml: Use get_style_property instead of get_nsstyle_attr in HTMLStyle object.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: c49d9d021fe098c851cb7e2b423f1d4d143cb829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49d9d021fe098c851cb7e2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:46:47 2018 +0200 mshtml: Use get_style_property instead of get_nsstyle_attr in HTMLStyle object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f00b38c..c961bff 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -619,7 +619,7 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p) { - return get_nsstyle_attr(This->nsstyle, sid, p, 0); + return get_nsstyle_attr(This->nsstyle, sid, p, style_tbl[sid].flags); } static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR exval, VARIANT_BOOL *p) @@ -2291,7 +2291,7 @@ static HRESULT WINAPI HTMLStyle_get_whiteSpace(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_WHITE_SPACE, p, 0); + return get_style_property(This, STYLEID_WHITE_SPACE, p); } static HRESULT WINAPI HTMLStyle_put_top(IHTMLStyle *iface, VARIANT v) @@ -2403,7 +2403,7 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakBefore(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_BEFORE, p, 0); + return get_style_property(This, STYLEID_PAGE_BREAK_BEFORE, p); } static HRESULT WINAPI HTMLStyle_put_pageBreakAfter(IHTMLStyle *iface, BSTR v) @@ -2421,7 +2421,7 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakAfter(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_AFTER, p, 0); + return get_style_property(This, STYLEID_PAGE_BREAK_AFTER, p); } static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) @@ -2663,7 +2663,7 @@ static HRESULT WINAPI HTMLStyle_get_clip(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_CLIP, p, ATTR_REMOVE_COMMA); + return get_style_property(This, STYLEID_CLIP, p); } static void set_opacity(HTMLStyle *This, const WCHAR *val) @@ -3221,7 +3221,7 @@ static HRESULT WINAPI HTMLStyle2_get_tableLayout(IHTMLStyle2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_TABLE_LAYOUT, p, 0); + return get_style_property(This, STYLEID_TABLE_LAYOUT, p); } static HRESULT WINAPI HTMLStyle2_put_borderCollapse(IHTMLStyle2 *iface, BSTR v) @@ -3253,7 +3253,7 @@ static HRESULT WINAPI HTMLStyle2_get_direction(IHTMLStyle2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_DIRECTION, p, 0); + return get_style_property(This, STYLEID_DIRECTION, p); } static HRESULT WINAPI HTMLStyle2_put_behavior(IHTMLStyle2 *iface, BSTR v) @@ -3306,7 +3306,7 @@ static HRESULT WINAPI HTMLStyle2_get_position(IHTMLStyle2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_POSITION, p, 0); + return get_style_property(This, STYLEID_POSITION, p); } static HRESULT WINAPI HTMLStyle2_put_unicodeBidi(IHTMLStyle2 *iface, BSTR v) @@ -3640,7 +3640,7 @@ static HRESULT WINAPI HTMLStyle2_get_overflowX(IHTMLStyle2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, p, 0); + return get_style_property(This, STYLEID_OVERFLOW_X, p); } static HRESULT WINAPI HTMLStyle2_put_overflowY(IHTMLStyle2 *iface, BSTR v) @@ -3658,7 +3658,7 @@ static HRESULT WINAPI HTMLStyle2_get_overflowY(IHTMLStyle2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, p, 0); + return get_style_property(This, STYLEID_OVERFLOW_Y, p); } static HRESULT WINAPI HTMLStyle2_put_accelerator(IHTMLStyle2 *iface, BSTR v) @@ -3876,7 +3876,7 @@ static HRESULT WINAPI HTMLStyle3_get_wordWrap(IHTMLStyle3 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_WORD_WRAP, p, 0); + return get_style_property(This, STYLEID_WORD_WRAP, p); } static HRESULT WINAPI HTMLStyle3_put_textUnderlinePosition(IHTMLStyle3 *iface, BSTR v) @@ -4462,7 +4462,7 @@ static HRESULT WINAPI HTMLStyle6_get_outline(IHTMLStyle6 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, p, ATTR_NO_NULL); + return get_style_property(This, STYLEID_OUTLINE, p); } static HRESULT WINAPI HTMLStyle6_put_outlineWidth(IHTMLStyle6 *iface, VARIANT v) @@ -4522,7 +4522,7 @@ static HRESULT WINAPI HTMLStyle6_get_boxSizing(IHTMLStyle6 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_nsstyle_attr(This->nsstyle, STYLEID_BOX_SIZING, p, 0); + return get_style_property(This, STYLEID_BOX_SIZING, p); } static HRESULT WINAPI HTMLStyle6_put_boxSpacing(IHTMLStyle6 *iface, BSTR v)

1 0

Jacek Caban : mshtml: Store style property flags in an array and use it in set_nsstyle_attr and get_nsstyle_attr_var.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: c5e54a1ea17339e20a983bf4b9e22510268d541b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5e54a1ea17339e20a983bf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:44:38 2018 +0200 mshtml: Store style property flags in an array and use it in set_nsstyle_attr and get_nsstyle_attr_var. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 343 ++++++++++++++++++++++++------------------------ 1 file changed, 173 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5e54a1ea17339e20a98…

1 0

Alexandre Julliard : user32: Process hardware messages in physical coordinates.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 2068b73db5e19e1ce3b54b2a8ecb5a5b99ea19b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2068b73db5e19e1ce3b54b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:02:43 2018 +0200 user32: Process hardware messages in physical coordinates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 31 +++++++++++++++++++++---------- dlls/user32/sysparams.c | 38 ++++++++++++++++++++++++++------------ dlls/user32/win.h | 2 ++ 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 79ea577..1554fbf 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2388,6 +2388,7 @@ static BOOL process_rawinput_message( MSG *msg, const struct hardware_msg_data * } msg->lParam = (LPARAM)rawinput; + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } @@ -2463,6 +2464,7 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, return FALSE; } accept_hardware_message( hw_id, remove ); + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); if ( remove && msg->message == WM_KEYDOWN ) if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) @@ -2520,6 +2522,9 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H return FALSE; } + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); + SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( msg->hwnd )); + /* FIXME: is this really the right place for this hook? */ event.message = msg->message; event.time = msg->time; @@ -2693,17 +2698,22 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data, HWND hwnd_filter, UINT first, UINT last, BOOL remove ) { - if (msg->message == WM_INPUT) - return process_rawinput_message( msg, msg_data ); + DPI_AWARENESS_CONTEXT context; + BOOL ret = FALSE; - if (is_keyboard_message( msg->message )) - return process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); + /* hardware messages are always in physical coords */ + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - if (is_mouse_message( msg->message )) - return process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove ); - - ERR( "unknown message type %x\n", msg->message ); - return FALSE; + if (msg->message == WM_INPUT) + ret = process_rawinput_message( msg, msg_data ); + else if (is_keyboard_message( msg->message )) + ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); + else if (is_mouse_message( msg->message )) + ret = process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove ); + else + ERR( "unknown message type %x\n", msg->message ); + SetThreadDpiAwarenessContext( context ); + return ret; } @@ -2938,7 +2948,8 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags continue; /* ignore it */ } *msg = info.msg; - thread_info->GetMessagePosVal = MAKELONG( info.msg.pt.x, info.msg.pt.y ); + msg->pt = point_phys_to_win_dpi( info.msg.hwnd, info.msg.pt ); + thread_info->GetMessagePosVal = MAKELONG( msg->pt.x, msg->pt.y ); thread_info->GetMessageTimeVal = info.msg.time; thread_info->GetMessageExtraInfoVal = 0; HeapFree( GetProcessHeap(), 0, buffer ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9d7c256..028a0a9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3235,6 +3235,22 @@ POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) } /********************************************************************** + * point_win_to_phys_dpi + */ +POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) +{ + return map_dpi_point( pt, GetDpiForWindow( hwnd ), get_win_monitor_dpi( hwnd ) ); +} + +/********************************************************************** + * point_phys_to_win_dpi + */ +POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) +{ + return map_dpi_point( pt, get_win_monitor_dpi( hwnd ), GetDpiForWindow( hwnd )); +} + +/********************************************************************** * point_win_to_thread_dpi */ POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) @@ -3475,13 +3491,11 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT */ BOOL WINAPI LogicalToPhysicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) { - UINT dpi = GetDpiForWindow( hwnd ); RECT rect; - GetWindowRect( hwnd, &rect ); + if (!GetWindowRect( hwnd, &rect )) return FALSE; if (pt->x < rect.left || pt->y < rect.top || pt->x > rect.right || pt->y > rect.bottom) return FALSE; - pt->x = MulDiv( pt->x, system_dpi, dpi ); - pt->y = MulDiv( pt->y, system_dpi, dpi ); + *pt = point_win_to_phys_dpi( hwnd, *pt ); return TRUE; } @@ -3491,18 +3505,18 @@ BOOL WINAPI LogicalToPhysicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) { DPI_AWARENESS_CONTEXT context; - UINT dpi = GetDpiForWindow( hwnd ); RECT rect; + BOOL ret = FALSE; - /* get window rect in physical coords */ context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - GetWindowRect( hwnd, &rect ); + if (GetWindowRect( hwnd, &rect ) && + pt->x >= rect.left && pt->y >= rect.top && pt->x <= rect.right && pt->y <= rect.bottom) + { + *pt = point_phys_to_win_dpi( hwnd, *pt ); + ret = TRUE; + } SetThreadDpiAwarenessContext( context ); - - if (pt->x < rect.left || pt->y < rect.top || pt->x > rect.right || pt->y > rect.bottom) return FALSE; - pt->x = MulDiv( pt->x, dpi, system_dpi ); - pt->y = MulDiv( pt->y, dpi, system_dpi ); - return TRUE; + return ret; } struct monitor_enum_info diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f30b004..f3bdfd3 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -132,6 +132,8 @@ 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_phys_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) 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;

1 0

Alexandre Julliard : server: Use screen coordinates in the update_window_zorder request.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: dc6f39ac29bdac0d1be836bbd8d4e720ed2ab88c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6f39ac29bdac0d1be836bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:24:15 2018 +0200 server: Use screen coordinates in the update_window_zorder request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 3 --- dlls/winemac.drv/mouse.c | 13 ++++--------- dlls/winex11.drv/event.c | 12 +++++++----- dlls/winex11.drv/mouse.c | 1 - server/window.c | 7 +++---- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 61c11ce..aebe4c5 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -491,7 +491,6 @@ static int process_events( DWORD mask ) { HWND capture = get_capture_window(); - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN|MOUSEEVENTF_MIDDLEDOWN)) TRACE( "BUTTONDOWN pos %d,%d hwnd %p flags %x\n", event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, @@ -509,7 +508,6 @@ static int process_events( DWORD mask ) RECT rect; SetRect( &rect, event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, event->data.motion.input.u.mi.dx + 1, event->data.motion.input.u.mi.dy + 1 ); - MapWindowPoints( 0, event->data.motion.hwnd, (POINT *)&rect, 2 ); SERVER_START_REQ( update_window_zorder ) { @@ -523,7 +521,6 @@ static int process_events( DWORD mask ) SERVER_END_REQ; } __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input ); - SetThreadDpiAwarenessContext( context ); } break; diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index a6369c6..dd6443f 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -144,19 +144,14 @@ static void send_mouse_input(HWND hwnd, macdrv_window cocoa_window, UINT flags, if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE) && !drag && cocoa_window != macdrv_thread_data()->capture_window) { - RECT rect; - /* update the wine server Z-order */ - SetRect(&rect, x, y, x + 1, y + 1); - MapWindowPoints(0, top_level_hwnd, (POINT *)&rect, 2); - SERVER_START_REQ(update_window_zorder) { req->window = wine_server_user_handle(top_level_hwnd); - req->rect.left = rect.left; - req->rect.top = rect.top; - req->rect.right = rect.right; - req->rect.bottom = rect.bottom; + req->rect.left = x; + req->rect.top = y; + req->rect.right = x + 1; + req->rect.bottom = y + 1; wine_server_call(req); } SERVER_END_REQ; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 606fa69..b36ce6f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -858,7 +858,7 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) { XExposeEvent *event = &xev->xexpose; - RECT rect; + RECT rect, abs_rect; POINT pos; struct x11drv_win_data *data; HRGN surface_region = 0; @@ -901,14 +901,16 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) { if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); + abs_rect = rect; + MapWindowPoints( hwnd, 0, (POINT *)&abs_rect, 2 ); SERVER_START_REQ( update_window_zorder ) { req->window = wine_server_user_handle( hwnd ); - req->rect.left = rect.left; - req->rect.top = rect.top; - req->rect.right = rect.right; - req->rect.bottom = rect.bottom; + req->rect.left = abs_rect.left; + req->rect.top = abs_rect.top; + req->rect.right = abs_rect.right; + req->rect.bottom = abs_rect.bottom; wine_server_call( req ); } SERVER_END_REQ; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8b2966d..10985c1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -627,7 +627,6 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU { RECT rect; SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); - MapWindowPoints( 0, hwnd, (POINT *)&rect, 2 ); SERVER_START_REQ( update_window_zorder ) { diff --git a/server/window.c b/server/window.c index 36efb15..c9b131c 100644 --- a/server/window.c +++ b/server/window.c @@ -2652,8 +2652,6 @@ DECL_HANDLER(update_window_zorder) struct window *ptr, *win = get_window( req->window ); if (!win || !win->parent || !is_visible( win )) return; /* nothing to do */ - if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &rect ); - offset_rect( &rect, win->client_rect.left, win->client_rect.top ); LIST_FOR_EACH_ENTRY( ptr, &win->parent->children, struct window, entry ) { @@ -2661,10 +2659,11 @@ DECL_HANDLER(update_window_zorder) if (!(ptr->style & WS_VISIBLE)) continue; if (ptr->ex_style & WS_EX_TRANSPARENT) continue; if (ptr->is_layered && (ptr->layered_flags & LWA_COLORKEY)) continue; - if (!intersect_rect( &tmp, &ptr->visible_rect, &rect )) continue; + tmp = rect; + map_dpi_rect( win, &tmp, win->parent->dpi, win->dpi ); + if (!intersect_rect( &tmp, &tmp, &ptr->visible_rect )) continue; if (ptr->win_region) { - tmp = rect; offset_rect( &tmp, -ptr->window_rect.left, -ptr->window_rect.top ); if (!rect_in_region( ptr->win_region, &tmp )) continue; }

1 0