wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Dmitry Timoshkov : schedsvc: In case it's an old Wine prefix create c: \windows\tasks automatically.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 4d44bc3715e2f4a5f9c027c023f6d83d58e0626a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d44bc3715e2f4a5f9c027c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 27 20:18:08 2018 +0800 schedsvc: In case it's an old Wine prefix create c:\windows\tasks automatically. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8830d59..a7af96e 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -74,14 +74,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); + /* Just in case it's an old Wine prefix with missing c:\windows\tasks */ + CreateDirectoryW(path, NULL); + htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); if (htasks == INVALID_HANDLE_VALUE) { ERR("Couldn't start monitoring %s for tasks, error %u\n", debugstr_w(path), GetLastError()); - /* Probably this is an old prefix with disabled updates */ - if (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND) - ERR("Please create the directory manually\n"); return -1; }

1 0

Jacek Caban : mshtml: Pass style id instead of flags to var_to_styleval.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: a471f648ca3297e4a4f98438d7f24c24fb47f4d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a471f648ca3297e4a4f98438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:50:16 2018 +0200 mshtml: Pass style id instead of flags to var_to_styleval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2437b75..272b644 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -437,7 +437,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return S_OK; } -static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const WCHAR **ret) +static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) { switch(V_VT(v)) { case VT_NULL: @@ -453,6 +453,7 @@ static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const return S_OK; case VT_I4: { + unsigned flags = style_tbl[sid].flags; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; @@ -481,7 +482,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * HRESULT hres; flags = style_tbl[sid].flags; - hres = var_to_styleval(value, buf, flags, &val); + hres = var_to_styleval(value, sid, buf, &val); if(FAILED(hres)) return hres; @@ -1152,7 +1153,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); + hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_X, buf, &val); if(FAILED(hres)) return hres; @@ -1245,7 +1246,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, buf, ATTR_FIX_PX, &val); + hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_Y, buf, &val); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Get rid of no longer needed argument in get_nsstyle_* implementation.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 9f75fb0cef48fae58829ce5dcfab6d1191cbcad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f75fb0cef48fae58829ce5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:47:19 2018 +0200 mshtml: Get rid of no longer needed argument in get_nsstyle_* implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 118 ++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.c | 19 +++++--- dlls/mshtml/htmlstyle.h | 12 +---- 3 files changed, 74 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f75fb0cef48fae58829…

1 0

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

27 Aug '18

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

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

27 Aug '18

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: Rename get_style_attr to get_style_property.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 815370a8415b4629ebd84ad707ca4327bf1d314b URL: https://source.winehq.org/git/wine.git/?a=commit;h=815370a8415b4629ebd84ad7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:46:25 2018 +0200 mshtml: Rename get_style_attr to get_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 72 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=815370a8415b4629ebd8…

1 0

Jacek Caban : mshtml: Refactor setting style property value implementation.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 5ea4f318612c22e6225044a006b0f0fb3c9eff56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea4f318612c22e6225044a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:45:22 2018 +0200 mshtml: Refactor setting style property value implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 133 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ea4f318612c22e62250…

1 0

Jacek Caban : mshtml: Clean up set_style_property_var prototype.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: d7e1b9c085070cd910c1af5ee03272dd0b799fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e1b9c085070cd910c1af5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 13:44:56 2018 +0200 mshtml: Clean up set_style_property_var prototype. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 76 +++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e1b9c085070cd910c1…

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 27 Aug '18

27 Aug '18

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 : server: Use screen coordinates in the update_window_zorder request.
by Alexandre Julliard 27 Aug '18

27 Aug '18

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

← Newer
1
...
15
16
17
18
19
20
21
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018