June 2020 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnWidth property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 22836b0fa74f1b4227dc072d0704df1f473f6fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22836b0fa74f1b4227dc072d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:16:00 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnWidth property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c327faa0a2..3c2f533111 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -553,6 +553,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNCOUNT, DISPID_UNKNOWN }, + { + L"column-gap", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP, + DISPID_UNKNOWN + }, { L"column-width", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH, @@ -8832,15 +8837,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnWidth(IHTMLCSSStyleDecl static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnGap(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_COLUMN_GAP, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnGap(IHTMLCSSStyleDeclaration2 *iface, VARIANT *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property_var(This, STYLEID_COLUMN_GAP, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnFill(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 09b044c84c..bcc4afc7fa 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -82,6 +82,7 @@ typedef enum { STYLEID_CLIP, STYLEID_COLOR, STYLEID_COLUMN_COUNT, + STYLEID_COLUMN_GAP, STYLEID_COLUMN_WIDTH, STYLEID_CURSOR, STYLEID_DIRECTION, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 6746cd048a..d63e5da748 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -951,6 +951,36 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"20px"), "columnWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v); + ok(hres == S_OK, "get_columnGap failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnGap = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 20; + hres = IHTMLCSSStyleDeclaration2_put_columnGap(css_style, v); + ok(hres == S_OK, "put_columnGap failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v); + ok(hres == S_OK, "get_columnGap failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnGap = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"20px"); + hres = IHTMLCSSStyleDeclaration2_put_columnGap(css_style, v); + ok(hres == S_OK, "put_columnGap failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v); + ok(hres == S_OK, "get_columnGap failed: %08x\n", hres); + todo_wine + ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"20px"), "columnGap = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnRule property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: dbc5dc893bfd81132758986ef480403d44cf7f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbc5dc893bfd81132758986e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:16:43 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnRule property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 388d200fa3..022d49993f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -563,6 +563,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP, DISPID_UNKNOWN }, + { + L"column-rule", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULE, + DISPID_UNKNOWN + }, { L"column-rule-color", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR, @@ -8918,15 +8923,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columns(IHTMLCSSStyleDeclarat static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRule(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + WARN("(%p)->(%s) semi-stub\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_COLUMN_RULE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRule(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + WARN("(%p)->(%p) semi-stub\n", This, p); + return get_style_property(This, STYLEID_COLUMN_RULE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleColor(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index c85e2be9e6..f6154c9214 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -84,6 +84,7 @@ typedef enum { STYLEID_COLUMN_COUNT, STYLEID_COLUMN_FILL, STYLEID_COLUMN_GAP, + STYLEID_COLUMN_RULE, STYLEID_COLUMN_RULE_COLOR, STYLEID_COLUMN_RULE_STYLE, STYLEID_COLUMN_RULE_WIDTH, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index f56b68d2b2..2ed6ef2e22 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1073,6 +1073,21 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"10px"), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnRule(css_style, &str); + ok(hres == S_OK, "get_columnRule failed: %08x\n", hres); + todo_wine + ok(str && !lstrcmpW(str, L"10px solid red"), "columnRule = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration2_put_columnRule(css_style, NULL); + ok(hres == S_OK, "put_columnRule failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_columnRule(css_style, &str); + ok(hres == S_OK, "get_columnRule failed: %08x\n", hres); + ok(!str, "columnRule = %s\n", wine_dbgstr_w(str)); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Use proper compat mode in IHTMLWindow7::getComputedStyle.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 77b24d25dbc71712ee2024301e1de090d51825ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=77b24d25dbc71712ee202430… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:17:13 2020 +0200 mshtml: Use proper compat mode in IHTMLWindow7::getComputedStyle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0971b22375..6df930e19a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10331,14 +10331,14 @@ static dispex_static_data_t HTMLW3CComputedStyle_dispex = { CSSStyle_init_dispex_info }; -HRESULT create_computed_style(nsIDOMCSSStyleDeclaration *nsstyle, IHTMLCSSStyleDeclaration **p) +HRESULT create_computed_style(nsIDOMCSSStyleDeclaration *nsstyle, compat_mode_t compat_mode, IHTMLCSSStyleDeclaration **p) { CSSStyle *style; if(!(style = heap_alloc_zero(sizeof(*style)))) return E_OUTOFMEMORY; - init_css_style(style, nsstyle, NULL, &HTMLW3CComputedStyle_dispex, COMPAT_MODE_IE11); + init_css_style(style, nsstyle, NULL, &HTMLW3CComputedStyle_dispex, compat_mode); *p = &style->IHTMLCSSStyleDeclaration_iface; return S_OK; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index f6154c9214..8746558fde 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -149,7 +149,7 @@ typedef enum { } styleid_t; HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; -HRESULT create_computed_style(nsIDOMCSSStyleDeclaration*,IHTMLCSSStyleDeclaration**) DECLSPEC_HIDDEN; +HRESULT create_computed_style(nsIDOMCSSStyleDeclaration*,compat_mode_t,IHTMLCSSStyleDeclaration**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c6ec26de55..a49cd4bd59 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2332,7 +2332,7 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM TRACE("(%p)->(%p %s %p)\n", This, node, debugstr_w(pseudo_elt), p); - if(!This->outer_window) + if(!This->outer_window || !This->inner_window) return E_UNEXPECTED; hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)&elem); @@ -2356,7 +2356,7 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM return E_FAIL; } - hres = create_computed_style(nsstyle, p); + hres = create_computed_style(nsstyle, dispex_compat_mode(&This->inner_window->event_target.dispex), p); nsIDOMCSSStyleDeclaration_Release(nsstyle); return hres; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 82b163a13d..4b788c970b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -184,6 +184,7 @@ function test_style_props() { test_exposed("setProperty", v >= 9); test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + test_exposed("transform", v >= 10); } next_test();

1 0

Rémi Bernon : dinput: Stop sending WM_WINE_NOTIFY_ACTIVITY on every input.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 9463684d550a05289c1a6d1e9a603fa28c7bccad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9463684d550a05289c1a6d1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 8 09:47:07 2020 +0200 dinput: Stop sending WM_WINE_NOTIFY_ACTIVITY on every input. This message triggers screensaver notification in the user drivers, but it is not useful to send it on every input message, and it even hurts performance when high polling mouse is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33643 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46976 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8c5aa31883..51ae349f34 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -931,13 +931,19 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq) { + static ULONGLONG notify_ms = 0; IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); int next_pos, ofs = id_to_offset(&This->data_format, inst_id); + ULONGLONG time_ms = GetTickCount64(); /* Event is being set regardless of the queue state */ if (This->hEvent) SetEvent(This->hEvent); - PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + if (time_ms - notify_ms > 1000) + { + PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + notify_ms = time_ms; + } if (!This->queue_len || This->overflow || ofs < 0) return;

1 0

Derek Lesho : server: Partially implement JobObjectBasicAccountingInformation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: d8d6a6b2e639d2e29e166a3faf988b81388ae191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d6a6b2e639d2e29e166a3f… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon May 18 08:20:37 2020 -0500 server: Partially implement JobObjectBasicAccountingInformation. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 9 +++++++++ dlls/ntdll/sync.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 15 +++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 7 +++++++ server/trace.c | 14 ++++++++++++++ 7 files changed, 89 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8d6a6b2e639d2e29e16…

1 0

Gabriel Ivăncescu : gdi32: Skip scan conversion on overflow.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 7bb5b074b5b6a13e13a21accc35947fc927ca33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb5b074b5b6a13e13a21acc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jun 9 10:54:49 2020 +0100 gdi32: Skip scan conversion on overflow. Fixes a regression introduced by 9bc6f004ceccf3963584a4f7f4681b5c0578c214, which broke when REGION_CreateEdgeTable overflowed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 2 +- dlls/gdi32/tests/clipping.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 893b6d6f4d..878b73f8c9 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2742,7 +2742,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if ((obj = alloc_region( nb_points / 2 ))) { - scan_convert( obj, &ET, mode, clip_rect ); + if (nb_points) scan_convert( obj, &ET, mode, clip_rect ); if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 015157522d..484430b0cb 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -513,8 +513,10 @@ static void test_CreatePolyPolygonRgn(void) POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + POINT points_overflow[] = { {0, 0}, {1, 0}, {0, 0x80000000} }; INT counts_single_poly[] = { 3 }; INT counts_two_poly[] = { 3, 3 }; + INT counts_overflow[] = { ARRAY_SIZE(points_overflow) }; int ret; RECT rect; @@ -543,6 +545,13 @@ static void test_CreatePolyPolygonRgn(void) ret = GetRgnBox(region, &rect); ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); DeleteObject(region); + + /* Test with points that overflow the edge table */ + region = CreatePolyPolygonRgn(points_overflow, counts_overflow, ARRAY_SIZE(counts_overflow), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); } START_TEST(clipping)

1 0

Zhiyi Zhang : winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 1b33e0f72e87e3c3af905df27c339887f4cb5a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b33e0f72e87e3c3af905df2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 3 22:28:32 2020 +0800 winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings. Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 3 ++- dlls/winex11.drv/settings.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b37af4d420..6750325a29 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3319,7 +3319,8 @@ static void test_EnumDisplaySettings(void) } else { - todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", + todo_wine_if(mode != ENUM_REGISTRY_SETTINGS) + ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", mode_fields, dm.dmFields); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 70ce35361b..bc9f7aa1dc 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -210,7 +210,9 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); + dm->dmFields |= DM_POSITION; query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); + dm->dmFields |= DM_DISPLAYORIENTATION; query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); #undef query_value

1 0

Rémi Bernon : dinput: Use a single list for all acquired devices.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 26c1131201f8fd9918a01231a7eb6f1989400858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c1131201f8fd9918a01231… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 8 09:47:08 2020 +0200 dinput: Use a single list for all acquired devices. Instead of going through devices list of dinputs list, and checking their acquired field, which is not CPU friendly. This also removes the now unused IDirectInputImpl critical section and devices list. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 16 +++---- dlls/dinput/device_private.h | 2 +- dlls/dinput/dinput_main.c | 88 +++++++++++++++++---------------------- dlls/dinput/dinput_private.h | 5 ++- dlls/dinput/joystick_linux.c | 4 -- dlls/dinput/joystick_linuxinput.c | 4 -- dlls/dinput/joystick_osx.c | 4 -- dlls/dinput/keyboard.c | 4 -- dlls/dinput/mouse.c | 4 -- 9 files changed, 51 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26c1131201f8fd9918a0…

1 0

Jacek Caban : ntdll: Reimplement _allmul using 32-bit arithmetic.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 04117dc8d44dde789d64f717c5d293a81316ad3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=04117dc8d44dde789d64f717… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:12:37 2020 +0200 ntdll: Reimplement _allmul using 32-bit arithmetic. Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 7114b8c2d9..cf8a3df093 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -759,7 +759,29 @@ LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) */ LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) { - return a * b; + LARGE_INTEGER x = { .QuadPart = a }; + LARGE_INTEGER y = { .QuadPart = b }; + LARGE_INTEGER r; + unsigned int t; + + const int bits_in_word_2 = 16; + const unsigned int lower_mask = ~0u >> bits_in_word_2; + + r.u.LowPart = (x.u.LowPart & lower_mask) * (y.u.LowPart & lower_mask); + t = r.u.LowPart >> bits_in_word_2; + r.u.LowPart &= lower_mask; + t += (x.u.LowPart >> bits_in_word_2) * (y.u.LowPart & lower_mask); + r.u.LowPart += (t & lower_mask) << bits_in_word_2; + r.u.HighPart = t >> bits_in_word_2; + t = r.u.LowPart >> bits_in_word_2; + r.u.LowPart &= lower_mask; + t += (y.u.LowPart >> bits_in_word_2) * (x.u.LowPart & lower_mask); + r.u.LowPart += (t & lower_mask) << bits_in_word_2; + r.u.HighPart += t >> bits_in_word_2; + r.u.HighPart += (x.u.LowPart >> bits_in_word_2) * (y.u.LowPart >> bits_in_word_2); + + r.u.HighPart += x.u.HighPart * y.u.LowPart + x.u.LowPart * y.u.HighPart; + return r.QuadPart; }

1 0

Jacek Caban : ntdll/tests: Add long long builtins tests.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: a8f02f0091d7b251a9902fdbd400e5bdce4ac674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8f02f0091d7b251a9902fdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:13:00 2020 +0200 ntdll/tests: Add long long builtins tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index c980aebe5d..00316fe65e 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -34,6 +34,11 @@ static NTSTATUS (WINAPI *pRtlInt64ToUnicodeString)(ULONGLONG, ULONG, UNICODE_STR static NTSTATUS (WINAPI *pRtlLargeIntegerToChar)(ULONGLONG *, ULONG, ULONG, PCHAR); static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_STRING *, BOOLEAN); +static LONGLONG (WINAPI *p_alldiv)( LONGLONG a, LONGLONG b ); +static LONGLONG (WINAPI *p_allrem)( LONGLONG a, LONGLONG b ); +static LONGLONG (WINAPI *p_allmul)( LONGLONG a, LONGLONG b ); +static ULONGLONG (WINAPI *p_aulldiv)( ULONGLONG a, ULONGLONG b ); +static ULONGLONG (WINAPI *p_aullrem)( ULONGLONG a, ULONGLONG b ); static void InitFunctionPtrs(void) { @@ -45,6 +50,12 @@ static void InitFunctionPtrs(void) pRtlInt64ToUnicodeString = (void *)GetProcAddress(hntdll, "RtlInt64ToUnicodeString"); pRtlLargeIntegerToChar = (void *)GetProcAddress(hntdll, "RtlLargeIntegerToChar"); pRtlUnicodeStringToAnsiString = (void *)GetProcAddress(hntdll, "RtlUnicodeStringToAnsiString"); + + p_alldiv = (void *)GetProcAddress(hntdll, "_alldiv"); + p_allrem = (void *)GetProcAddress(hntdll, "_allrem"); + p_allmul = (void *)GetProcAddress(hntdll, "_allmul"); + p_aulldiv = (void *)GetProcAddress(hntdll, "_aulldiv"); + p_aullrem = (void *)GetProcAddress(hntdll, "_aullrem"); } /* if */ } @@ -432,6 +443,55 @@ static void test_RtlLargeIntegerToChar(void) largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } +static void test_builtins(void) +{ +#ifdef __i386__ + ULONGLONG u; + LONGLONG l; + + l = p_alldiv(100, 7); + ok(l == 14, "_alldiv returned %s\n", wine_dbgstr_longlong(l)); + + l = p_alldiv(-100, 7); + ok(l == -14, "_alldiv returned %s\n", wine_dbgstr_longlong(l)); + + l = p_alldiv(0x2000000040ll, 0x100000007ll); + ok(l == 0x1f, "_alldiv returned %s\n", wine_dbgstr_longlong(l)); + + u = p_aulldiv(100, 7); + ok(u == 14, "_aulldiv returned %s\n", wine_dbgstr_longlong(u)); + + u = p_aulldiv(-100, 7); + ok(u == 0x2492492492492484ull, "_alldiv returned %s\n", wine_dbgstr_longlong(u)); + + u = p_aulldiv(0x2000000040ull, 0x100000007ull); + ok(u == 0x1f, "_aulldiv returned %s\n", wine_dbgstr_longlong(u)); + + l = p_allrem(100, 7); + ok(l == 2, "_allrem returned %s\n", wine_dbgstr_longlong(l)); + + l = p_allrem(-100, 7); + ok(l == -2, "_allrem returned %s\n", wine_dbgstr_longlong(l)); + + l = p_allrem(0x2000000040ll, 0x100000007ll); + ok(l == 0xffffff67, "_allrem returned %s\n", wine_dbgstr_longlong(l)); + + u = p_aullrem(100, 7); + ok(u == 2, "_aullrem returned %s\n", wine_dbgstr_longlong(u)); + + u = p_aullrem(-100, 7); + ok(u == 0, "_allrem returned %s\n", wine_dbgstr_longlong(u)); + + u = p_aullrem(0x2000000040ull, 0x100000007ull); + ok(u == 0xffffff67, "_aullrem returned %s\n", wine_dbgstr_longlong(u)); + + l = p_allmul(3, 4); + ok(l == 12, "_allmul = %s\n", wine_dbgstr_longlong(l)); + + l = p_allmul(0x300000001ll, 4); + ok(l == 0xc00000004, "_allmul = %s\n", wine_dbgstr_longlong(l)); +#endif /* __i386__ */ +} START_TEST(large_int) { @@ -443,4 +503,5 @@ START_TEST(large_int) test_RtlInt64ToUnicodeString(); if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); + test_builtins(); }

1 0