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

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnRule property semi-stub implementation.
by Alexandre Julliard 09 Jun '20

09 Jun '20

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: Expose IHTMLCSSStyleDeclaration2 to scripts.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 276accf534b17025ad2ea51a2cdbd25c06706e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=276accf534b17025ad2ea51a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:17:00 2020 +0200 mshtml: Expose IHTMLCSSStyleDeclaration2 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 62 +++++++++++++++++++++++++++------------ dlls/mshtml/tests/documentmode.js | 3 ++ 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 022d49993f..0971b22375 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -328,6 +328,7 @@ static const WCHAR *overflow_values[] = { #define ATTR_HEX_INT 0x0008 #define ATTR_REMOVE_COMMA 0x0010 #define ATTR_NO_NULL 0x0020 +#define ATTR_COMPAT_IE10 0x0040 static const WCHAR pxW[] = {'p','x',0}; @@ -343,7 +344,8 @@ static const style_tbl_entry_t style_tbl[] = { { L"animation-name", DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { backgroundW, @@ -551,47 +553,56 @@ static const style_tbl_entry_t style_tbl[] = { { L"column-count", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNCOUNT, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-fill", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNFILL, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-gap", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULE, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule-color", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule-style", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule-width", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULEWIDTH, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-span", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-width", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { cursorW, @@ -846,12 +857,14 @@ static const style_tbl_entry_t style_tbl[] = { { L"transform", DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"transition", DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { vertical_alignW, @@ -898,7 +911,7 @@ C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE); static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; -static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) +static const style_tbl_entry_t *lookup_style_tbl(CSSStyle *style, const WCHAR *name) { int c, i, min = 0, max = ARRAY_SIZE(style_tbl)-1; @@ -906,8 +919,11 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) i = (min+max)/2; c = wcscmp(style_tbl[i].name, name); - if(!c) + if(!c) { + if((style_tbl[i].flags & ATTR_COMPAT_IE10) && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE10) + return NULL; return style_tbl+i; + } if(c > 0) max = i-1; @@ -3175,7 +3191,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); - style_entry = lookup_style_tbl(strAttributeName); + style_entry = lookup_style_tbl(&This->css_style, strAttributeName); if(!style_entry) { compat_mode_t compat_mode = dispex_compat_mode(&This->css_style.dispex); DISPID dispid; @@ -5037,7 +5053,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyValue(IHTMLCSSStyleDecl TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); - style_entry = lookup_style_tbl(name); + style_entry = lookup_style_tbl(This, name); nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); nsAString_InitDepend(&value_str, NULL); nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &name_str, &value_str); @@ -5061,7 +5077,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclar TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); - style_entry = lookup_style_tbl(bstrPropertyName); + style_entry = lookup_style_tbl(This, bstrPropertyName); nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName); nsAString_Init(&ret_str, NULL); nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); @@ -5079,7 +5095,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(name), debugstr_variant(value), debugstr_variant(priority)); - style_entry = lookup_style_tbl(name); + style_entry = lookup_style_tbl(This, name); hres = var_to_styleval(This, value, style_entry, &value_str); if(FAILED(hres)) return hres; @@ -10166,11 +10182,17 @@ static const IHTMLCSSStyleDeclaration2Vtbl HTMLCSSStyleDeclaration2Vtbl = { HTMLCSSStyleDeclaration2_get_animationFillMode }; +static inline CSSStyle *impl_from_DispatchEx(DispatchEx *dispex) +{ + return CONTAINING_RECORD(dispex, CSSStyle, dispex); +} + static HRESULT CSSStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { + CSSStyle *This = impl_from_DispatchEx(dispex); const style_tbl_entry_t *style_entry; - style_entry = lookup_style_tbl(name); + style_entry = lookup_style_tbl(This, name); if(style_entry) { DISPID id = dispex_compat_mode(dispex) >= COMPAT_MODE_IE9 ? style_entry->dispid : style_entry->compat_dispid; @@ -10188,6 +10210,8 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, NULL); + if(mode >= COMPAT_MODE_IE10) + dispex_info_add_interface(info, IHTMLCSSStyleDeclaration2_tid, NULL); } const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index aa60cd4f8e..82b163a13d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -154,6 +154,8 @@ function test_style_props() { test_exposed("setProperty", v >= 9); test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + test_exposed("msTransform", v >= 9); + test_exposed("transform", v >= 10); style = document.body.currentStyle; @@ -167,6 +169,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); if(window.getComputedStyle) { style = window.getComputedStyle(document.body);

1 0

Jacek Caban : mshtml: Use proper compat mode in IHTMLWindow7::getComputedStyle.
by Alexandre Julliard 09 Jun '20

09 Jun '20

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

Jacek Caban : ntdll: Reimplement _allmul using 32-bit arithmetic.
by Alexandre Julliard 09 Jun '20

09 Jun '20

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 09 Jun '20

09 Jun '20

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

Jacek Caban : ntdll: Export builtin functions as cdecl.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: f2e886a0068e8662c239b5a7e412216e51e5c191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e886a0068e8662c239b5a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:13:44 2020 +0200 ntdll: Export builtin functions as cdecl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 101 ++++++++++++++++++++---------------- dlls/ntdll/ntdll.spec | 16 +++--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 +++--- 3 files changed, 71 insertions(+), 62 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index cf8a3df093..748d17adb9 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -545,6 +545,15 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ +/* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ +#if defined(__MINGW32__) || defined(_MSC_VER) +LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm("_alldiv"); +LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm("_allmul"); +LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm("_allrem"); +ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) asm("_aulldiv"); +ULONGLONG WINAPI _aullrem( ULONGLONG a, ULONGLONG b ) asm("_aullrem"); +#endif + static ULONGLONG udivmod(ULONGLONG a, ULONGLONG b, ULONGLONG *rem) { const ULARGE_INTEGER n = { .QuadPart = a }; @@ -873,29 +882,29 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) * Returns the quotient of a and b in edx:eax. * Returns the remainder of a and b in ebx:ecx. */ -__ASM_STDCALL_FUNC( _alldvrm, 16, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_allrem") "\n\t" - "movl %edx,%ebx\n\t" - "pushl %eax\n\t" - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_alldiv") "\n\t" - "popl %ecx\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret $16" ) +__ASM_GLOBAL_FUNC( _alldvrm, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_allrem") "\n\t" + "movl %edx,%ebx\n\t" + "pushl %eax\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_alldiv") "\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) /****************************************************************************** * _aullrem (NTDLL.@) @@ -946,28 +955,28 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) * Returns the quotient of a and b in edx:eax. * Returns the remainder of a and b in ebx:ecx. */ -__ASM_STDCALL_FUNC( _aulldvrm, 16, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_aullrem") "\n\t" - "movl %edx,%ebx\n\t" - "pushl %eax\n\t" - "pushl 20(%ebp)\n\t" - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("_aulldiv") "\n\t" - "popl %ecx\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret $16" ) +__ASM_GLOBAL_FUNC( _aulldvrm, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_aullrem") "\n\t" + "movl %edx,%ebx\n\t" + "pushl %eax\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_aulldiv") "\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce5c580bd5..e054eabba3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1427,17 +1427,17 @@ @ cdecl __iscsym(long) NTDLL___iscsym @ cdecl __iscsymf(long) NTDLL___iscsymf @ cdecl __toascii(long) NTDLL___toascii -@ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _allmul(int64 int64) -@ stdcall -arch=i386 -norelay _alloca_probe() -@ stdcall -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay _alldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay _alloca_probe() +@ cdecl -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 902609b071..6acdec5dc5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1514,16 +1514,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _allmul(int64 int64) -@ stdcall -arch=i386 -norelay _alloca_probe() -@ stdcall -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay _alldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay _alloca_probe() +@ cdecl -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) -@ stdcall -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) +@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)

1 0

Rémi Bernon : dinput: Stop sending WM_WINE_NOTIFY_ACTIVITY on every input.
by Alexandre Julliard 09 Jun '20

09 Jun '20

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

Rémi Bernon : dinput: Use a single list for all acquired devices.
by Alexandre Julliard 09 Jun '20

09 Jun '20

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

Rémi Bernon : dinput: Use dedicated list for mouse and keyboard.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 306c40e67319cae8e4c448ec8fc8d3996f87943f URL: https://source.winehq.org/git/wine.git/?a=commit;h=306c40e67319cae8e4c448ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 8 09:47:09 2020 +0200 dinput: Use dedicated list for mouse and keyboard. Instead of using function pointer, which is also not very CPU friendly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 1 - dlls/dinput/dinput_main.c | 54 ++++++++++++++++++++++++++++---------------- dlls/dinput/dinput_private.h | 3 ++- dlls/dinput/keyboard.c | 3 +-- dlls/dinput/mouse.c | 5 +--- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 5879409c1d..fe5644f21c 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -68,7 +68,6 @@ struct IDirectInputDeviceImpl DWORD dwCoopLevel; HWND win; int acquired; - DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ int queue_len; /* valid size of the queue */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 4986e5857b..2e56150240 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -100,6 +100,8 @@ HINSTANCE DINPUT_instance; static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; static struct list direct_input_list = LIST_INIT( direct_input_list ); +static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); +static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwVersion); @@ -110,7 +112,12 @@ void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface); EnterCriticalSection( &dinput_hook_crit ); - list_add_tail( &acquired_device_list, &dev->entry ); + if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) + list_add_tail( &acquired_mouse_list, &dev->entry ); + else if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) + list_add_tail( &acquired_keyboard_list, &dev->entry ); + else + list_add_tail( &acquired_device_list, &dev->entry ); LeaveCriticalSection( &dinput_hook_crit ); } @@ -1659,13 +1666,15 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( dev, &acquired_device_list, IDirectInputDeviceImpl, entry ) + LIST_FOR_EACH_ENTRY( dev, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) { - if (dev->event_proc) - { - TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam); - skip |= dev->event_proc( &dev->IDirectInputDevice8A_iface, wparam, lparam ); - } + TRACE("calling dinput_mouse_hook (%p %lx %lx)\n", dev, wparam, lparam); + skip |= dinput_mouse_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam ); + } + LIST_FOR_EACH_ENTRY( dev, &acquired_keyboard_list, IDirectInputDeviceImpl, entry ) + { + TRACE("calling dinput_keyboard_hook (%p %lx %lx)\n", dev, wparam, lparam); + skip |= dinput_keyboard_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam ); } LeaveCriticalSection( &dinput_hook_crit ); @@ -1693,6 +1702,22 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); } } + LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) + { + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); + } + } + LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_keyboard_list, IDirectInputDeviceImpl, entry ) + { + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); + } + } LeaveCriticalSection( &dinput_hook_crit ); return CallNextHookEx( 0, code, wparam, lparam ); @@ -1713,7 +1738,6 @@ static DWORD WINAPI hook_thread_proc(void *param) if (msg.message == WM_USER+0x10) { - IDirectInputDeviceImpl *dev; HANDLE finished_event = (HANDLE)msg.lParam; TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); @@ -1727,18 +1751,8 @@ static DWORD WINAPI hook_thread_proc(void *param) } EnterCriticalSection( &dinput_hook_crit ); - - /* Count acquired keyboards and mice*/ - LIST_FOR_EACH_ENTRY( dev, &acquired_device_list, IDirectInputDeviceImpl, entry ) - { - if (!dev->event_proc) continue; - - if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) - kbd_cnt++; - else - if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) - mice_cnt++; - } + kbd_cnt = list_count( &acquired_keyboard_list ); + mice_cnt = list_count( &acquired_mouse_list ); LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 121c487c2d..06a439d6a4 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -71,10 +71,11 @@ extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; extern void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface); extern void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface); +extern int dinput_mouse_hook(LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam); +extern int dinput_keyboard_hook(LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam); extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W, BOOL) DECLSPEC_HIDDEN; extern void check_dinput_events(void) DECLSPEC_HIDDEN; -typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _copy_diactionformatAtoW(LPDIACTIONFORMATW, LPDIACTIONFORMATA) DECLSPEC_HIDDEN; extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 6675a79f84..9981372d95 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -103,7 +103,7 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers return scanCode; } -static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +int dinput_keyboard_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; @@ -264,7 +264,6 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.ref = 1; memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); newDevice->base.dinput = dinput; - newDevice->base.event_proc = KeyboardCallback; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); newDevice->subtype = get_keyboard_subtype(); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index abf6fb9599..5e6f34f0ec 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -92,8 +92,6 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl return &This->base.IDirectInputDevice8W_iface; } -static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); - static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i; @@ -213,7 +211,6 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); newDevice->base.dinput = dinput; - newDevice->base.event_proc = dinput_mouse_hook; get_app_key(&hkey, &appkey); if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) @@ -310,7 +307,7 @@ const struct dinput_device mouse_device = { */ /* low-level mouse hook */ -static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface);

1 0

Daniel Lehman : server: Fail if non-empty directory marked for deletion.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: a302ab44acaf72ecc9b0307c82a7d11f759e6a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a302ab44acaf72ecc9b0307c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu May 28 20:28:09 2020 -0700 server: Fail if non-empty directory marked for deletion. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 3 -- server/fd.c | 74 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0..1d0682a633 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3185,17 +3185,14 @@ todo_wine CloseHandle( handle2 ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); fileDeleted = DeleteFileA( buffer ); ok( fileDeleted, "File should have been deleted\n" ); buffer[dirpos] = '\0'; CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); fileDeleted = RemoveDirectoryA( buffer ); -todo_wine ok( fileDeleted, "Directory should have been deleted\n" ); } diff --git a/server/fd.c b/server/fd.c index 06d1d81bdb..7ea8ac273e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <assert.h> +#include <dirent.h> #include <errno.h> #include <fcntl.h> #include <limits.h> @@ -2364,6 +2365,31 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl return fd; } +static int is_dir_empty( int fd ) +{ + DIR *dir; + int empty; + struct dirent *de; + + if ((fd = dup( fd )) == -1) + return -1; + + if (!(dir = fdopendir( fd ))) + { + close( fd ); + return -1; + } + + empty = 1; + while (empty && (de = readdir( dir ))) + { + if (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." )) continue; + empty = 0; + } + closedir( dir ); + return empty; +} + /* set disposition for the fd */ static void set_fd_disposition( struct fd *fd, int unlink ) { @@ -2381,24 +2407,38 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - if (fstat( fd->unix_fd, &st ) == -1) + if (unlink) { - file_set_error(); - return; - } - - /* can't unlink special files */ - if (unlink && !S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - /* can't unlink files we don't have permission to write */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) - { - set_error( STATUS_CANNOT_DELETE ); - return; + if (fstat( fd->unix_fd, &st ) == -1) + { + file_set_error(); + return; + } + if (S_ISREG( st.st_mode )) /* can't unlink files we don't have permission to write */ + { + if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + { + set_error( STATUS_CANNOT_DELETE ); + return; + } + } + else if (S_ISDIR( st.st_mode )) /* can't remove non-empty directories */ + { + switch (is_dir_empty( fd->unix_fd )) + { + case -1: + file_set_error(); + return; + case 0: + set_error( STATUS_DIRECTORY_NOT_EMPTY ); + return; + } + } + else /* can't unlink special files */ + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } } fd->closed->unlink = unlink ? 1 : 0;

1 0