wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Jacek Caban : jscript: Use separated jsexcept_t instance for each external call.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 63683b42f7bfee16c1609815fbe56f281c4c216c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63683b42f7bfee16c1609815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:15 2020 +0100 jscript: Use separated jsexcept_t instance for each external call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 17 ++++++----- dlls/jscript/engine.c | 24 +++++---------- dlls/jscript/engine.h | 9 ++++++ dlls/jscript/error.c | 5 ++-- dlls/jscript/jscript.c | 79 ++++++++++++++++++++++++++++++++++--------------- dlls/jscript/jscript.h | 9 ++---- dlls/jscript/jsregexp.c | 4 +-- dlls/jscript/jsutils.c | 5 +++- 8 files changed, 91 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63683b42f7bfee16c160…

1 0

Jacek Caban : jscript: Support DISP_E_EXCEPTION InvokeEx result.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 274503c839de2a30aef22eab4b9dc879d254a813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274503c839de2a30aef22eab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:06 2020 +0100 jscript: Support DISP_E_EXCEPTION InvokeEx result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 184 +++++++++++++++++++------------------------------- 1 file changed, 69 insertions(+), 115 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index cd610e4e88..265e84aee8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1941,11 +1941,51 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, unsigned return invoke_prop_func(disp, to_disp(disp), prop, flags, argc, argv, r, NULL); } -HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, unsigned argc, jsval_t *argv, jsval_t *ret) +static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *params, VARIANT *r) { IDispatchEx *dispex; - jsdisp_t *jsdisp; + EXCEPINFO ei; + HRESULT hres; + + memset(&ei, 0, sizeof(ei)); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, params, r, &ei, &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { + UINT err = 0; + + if(flags == DISPATCH_CONSTRUCT) { + WARN("IDispatch cannot be constructor\n"); + return DISP_E_MEMBERNOTFOUND; + } + + if(params->cNamedArgs == 1 && params->rgdispidNamedArgs[0] == DISPID_THIS) { + params->cNamedArgs = 0; + params->rgdispidNamedArgs = NULL; + params->cArgs--; + params->rgvarg++; + } + + TRACE("using IDispatch\n"); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, params, r, &ei, &err); + } + + if(hres == DISP_E_EXCEPTION) { + TRACE("DISP_E_EXCEPTION: %08x %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription)); + hres = SUCCEEDED(ei.scode) ? E_FAIL : ei.scode; + SysFreeString(ei.bstrSource); + SysFreeString(ei.bstrDescription); + SysFreeString(ei.bstrHelpFile); + } + + return hres; +} + +HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, unsigned argc, jsval_t *argv, jsval_t *ret) +{ VARIANT buf[6], retv; + jsdisp_t *jsdisp; DISPPARAMS dp; unsigned i; HRESULT hres; @@ -1980,7 +2020,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns dp.rgdispidNamedArgs = NULL; } - if(argc > 6) { + if(dp.cArgs > ARRAY_SIZE(buf)) { dp.rgvarg = heap_alloc(argc*sizeof(VARIANT)); if(!dp.rgvarg) return E_OUTOFMEMORY; @@ -2000,48 +2040,29 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns } V_VT(&retv) = VT_EMPTY; - clear_ei(ctx); - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, &dp, ret ? &retv : NULL, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - UINT err = 0; - - if(flags == DISPATCH_CONSTRUCT) { - WARN("IDispatch cannot be constructor\n"); - return DISP_E_MEMBERNOTFOUND; - } - - TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, &dp, ret ? &retv : NULL, &ctx->ei.ei, &err); - } + hres = disp_invoke(ctx, disp, id, flags, &dp, ret ? &retv : NULL); for(i=0; i<argc; i++) VariantClear(dp.rgvarg+argc-i-1); if(dp.rgvarg != buf) heap_free(dp.rgvarg); - if(FAILED(hres)) - return hres; - if(ret) { + if(SUCCEEDED(hres) && ret) hres = variant_to_jsval(&retv, ret); - VariantClear(&retv); - } - + VariantClear(&retv); return hres; } HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + VARIANT buf[6], retv, *args = buf; jsdisp_t *jsdisp; - IDispatchEx *dispex; - VARIANT buf[6], retv; DISPPARAMS dp; unsigned i; - HRESULT hres; + HRESULT hres = S_OK; + + static DISPID this_id = DISPID_THIS; assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); @@ -2058,17 +2079,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W if(r && argc && flags == DISPATCH_METHOD) flags |= DISPATCH_PROPERTYGET; - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { - TRACE("using IDispatch\n"); - dispex = NULL; - jsthis = NULL; - } - if(jsthis) { - static DISPID this_id = DISPID_THIS; - - dp.cArgs = argc+1; + dp.cArgs = argc + 1; dp.cNamedArgs = 1; dp.rgdispidNamedArgs = &this_id; }else { @@ -2077,57 +2089,25 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(dp.cArgs > ARRAY_SIZE(buf)) { - dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); - if(!dp.rgvarg) { - if(dispex) - IDispatchEx_Release(dispex); - return E_OUTOFMEMORY; - } - }else { - dp.rgvarg = buf; - } - - for(i=0; i<argc; i++) { - hres = jsval_to_variant(argv[i], dp.rgvarg+dp.cArgs-i-1); - if(FAILED(hres)) { - while(i--) - VariantClear(dp.rgvarg+dp.cArgs-i-1); - if(dp.rgvarg != buf) - heap_free(dp.rgvarg); - if(dispex) - IDispatchEx_Release(dispex); - return hres; - } - } - if(jsthis) { - V_VT(dp.rgvarg) = VT_DISPATCH; - V_DISPATCH(dp.rgvarg) = jsthis; - } + if(argc > ARRAY_SIZE(buf) && !(args = heap_alloc(argc * sizeof(VARIANT)))) + return E_OUTOFMEMORY; + dp.rgvarg = args; - V_VT(&retv) = VT_EMPTY; - clear_ei(ctx); - if(dispex) { - hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, ctx->lcid, flags, &dp, r ? &retv : NULL, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - UINT err = 0; + V_VT(dp.rgvarg) = VT_DISPATCH; + V_DISPATCH(dp.rgvarg) = jsthis; - if(flags == DISPATCH_CONSTRUCT) { - WARN("IDispatch cannot be constructor\n"); - return DISP_E_MEMBERNOTFOUND; - } + for(i=0; SUCCEEDED(hres) && i < argc; i++) + hres = jsval_to_variant(argv[i], dp.rgvarg+dp.cArgs-i-1); - hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, ctx->lcid, flags, &dp, r ? &retv : NULL, &ctx->ei.ei, &err); + if(SUCCEEDED(hres)) { + V_VT(&retv) = VT_EMPTY; + hres = disp_invoke(ctx, disp, DISPID_VALUE, flags, &dp, r ? &retv : NULL); } - for(i=0; i<argc; i++) - VariantClear(dp.rgvarg+dp.cArgs-i-1); - if(dp.rgvarg != buf) - heap_free(dp.rgvarg); - if(FAILED(hres)) - return hres; + for(i = 0; i < argc&&0; i++) + VariantClear(dp.rgvarg + dp.cArgs - i - 1); + if(args != buf) + heap_free(args); if(!r) return S_OK; @@ -2185,7 +2165,6 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) DWORD flags = DISPATCH_PROPERTYPUT; VARIANT var; DISPPARAMS dp = {&var, &dispid, 1, 1}; - IDispatchEx *dispex; hres = jsval_to_variant(val, &var); if(FAILED(hres)) @@ -2194,19 +2173,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) if(V_VT(&var) == VT_DISPATCH) flags |= DISPATCH_PROPERTYPUTREF; - clear_ei(ctx); - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, &dp, NULL, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - ULONG err = 0; - - TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, &dp, NULL, &ctx->ei.ei, &err); - } - + hres = disp_invoke(ctx, disp, id, flags, &dp, NULL); VariantClear(&var); } @@ -2266,7 +2233,6 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val) HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val) { DISPPARAMS dp = {NULL,NULL,0,0}; - IDispatchEx *dispex; jsdisp_t *jsdisp; VARIANT var; HRESULT hres; @@ -2279,23 +2245,11 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val } V_VT(&var) = VT_EMPTY; - clear_ei(ctx); - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = disp_invoke(ctx, disp, id, INVOKE_PROPERTYGET, &dp, &var); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, &var, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - ULONG err = 0; - - TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, &var, &ctx->ei.ei, &err); + hres = variant_to_jsval(&var, val); + VariantClear(&var); } - if(FAILED(hres)) - return hres; - - hres = variant_to_jsval(&var, val); - VariantClear(&var); return hres; }

1 0

Jacek Caban : jscript: Store source context and starting line in bytecode_t.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: ba500a6a9ef59d1410ad8d1c01147a3022e8ddd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba500a6a9ef59d1410ad8d1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:49:58 2020 +0100 jscript: Store source context and starting line in bytecode_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 10 ++++++---- dlls/jscript/engine.h | 4 +++- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 7 ++++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a96adb235c..f1e005a6d3 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2258,7 +2258,7 @@ void release_bytecode(bytecode_t *code) heap_free(code); } -static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) +static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 source_context, unsigned start_line) { size_t len = source ? lstrlenW(source) : 0; @@ -2270,6 +2270,8 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) return E_OUTOFMEMORY; compiler->code->ref = 1; + compiler->code->source_context = source_context; + compiler->code->start_line = start_line; heap_pool_init(&compiler->code->heap); compiler->code->source = heap_alloc((len + 1) * sizeof(WCHAR)); @@ -2482,13 +2484,13 @@ static HRESULT compile_arguments(compiler_ctx_t *ctx, const WCHAR *args) return parse_arguments(ctx, args, ctx->code->global_code.params, NULL); } -HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *args, const WCHAR *delimiter, - BOOL from_eval, BOOL use_decode, bytecode_t **ret) +HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_context, unsigned start_line, + const WCHAR *args, const WCHAR *delimiter, BOOL from_eval, BOOL use_decode, bytecode_t **ret) { compiler_ctx_t compiler = {0}; HRESULT hres; - hres = init_code(&compiler, code); + hres = init_code(&compiler, code, source_context, start_line); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d158a8b51a..c5ed3c7690 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -182,6 +182,8 @@ struct _bytecode_t { function_code_t global_code; WCHAR *source; + UINT64 source_context; + unsigned start_line; BSTR *bstr_pool; unsigned bstr_pool_size; @@ -194,7 +196,7 @@ struct _bytecode_t { struct list entry; }; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; static inline bytecode_t *bytecode_addref(bytecode_t *code) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 52c12676dc..e5701835b0 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -984,7 +984,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg if(FAILED(hres)) return hres; - hres = compile_script(ctx, str, NULL, NULL, FALSE, FALSE, &code); + hres = compile_script(ctx, str, 0, 0, NULL, NULL, FALSE, FALSE, &code); heap_free(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2f7dbcd53f..bd1f45b940 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -204,7 +204,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return E_OUTOFMEMORY; TRACE("parsing %s\n", debugstr_jsval(argv[0])); - hres = compile_script(ctx, src, NULL, NULL, TRUE, FALSE, &code); + hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, &code); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres); return throw_syntax_error(ctx, hres, NULL); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5b6fe3ecca..f9c2430a2b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -774,8 +774,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, - This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLine, NULL, pstrDelimiter, + (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, This->is_encode, &code); if(FAILED(hres)) return hres; @@ -871,7 +871,8 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, pstrFormalParams, pstrDelimiter, FALSE, This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, + pstrDelimiter, FALSE, This->is_encode, &code); if(FAILED(hres)) { WARN("Parse failed %08x\n", hres); return hres;

1 0

Jacek Caban : jscript: Use internal jsdisp calls only within the same script context.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 614ea7e6243ead003bcfe4624895154972f3445f URL: https://source.winehq.org/git/wine.git/?a=commit;h=614ea7e6243ead003bcfe462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:49:53 2020 +0100 jscript: Use internal jsdisp calls only within the same script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6f9a0eb7f3..cd610e4e88 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1951,7 +1951,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns HRESULT hres; jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { if(flags & DISPATCH_PROPERTYPUT) { FIXME("disp_call(propput) on builtin object\n"); return E_FAIL; @@ -2046,7 +2046,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { if(ctx != jsdisp->ctx) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); @@ -2170,7 +2170,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) HRESULT hres; jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { dispex_prop_t *prop; prop = get_prop(jsdisp, id); @@ -2272,7 +2272,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val HRESULT hres; jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { hres = jsdisp_propget(jsdisp, id, val); jsdisp_release(jsdisp); return hres;

1 0

Giovanni Mascellani : d2d1: Ensure that hollow figures do not impact geometry bounds.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 722469254daec2093f3dc8bacb6474a20dc10dfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=722469254daec2093f3dc8ba… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:42 2020 +0330 d2d1: Ensure that hollow figures do not impact geometry bounds. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 25 ++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 8 ++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6e1c648707..e7bb809359 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3097,10 +3097,22 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * if (!transform) { - if (geometry->u.path.bounds.left > geometry->u.path.bounds.right) + if (geometry->u.path.bounds.left > geometry->u.path.bounds.right + && !isinf(geometry->u.path.bounds.left)) { for (i = 0; i < geometry->u.path.figure_count; ++i) + { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; d2d_rect_union(&geometry->u.path.bounds, &geometry->u.path.figures[i].bounds); + } + if (geometry->u.path.bounds.left > geometry->u.path.bounds.right) + { + geometry->u.path.bounds.left = INFINITY; + geometry->u.path.bounds.right = FLT_MAX; + geometry->u.path.bounds.top = INFINITY; + geometry->u.path.bounds.bottom = FLT_MAX; + } } *bounds = geometry->u.path.bounds; @@ -3115,6 +3127,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * D2D1_POINT_2F p, p1, p2; size_t j, bezier_idx; + if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) + continue; + /* Single vertex figures are reduced by CloseFigure(). */ if (figure->vertex_count == 0) { @@ -3181,6 +3196,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * } } + if (bounds->left > bounds->right) + { + bounds->left = INFINITY; + bounds->right = FLT_MAX; + bounds->top = INFINITY; + bounds->bottom = FLT_MAX; + } + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 65233c26df..319246a0bc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3114,7 +3114,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, 5.0f, 472.0f, 75.0f, 752.0f, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); set_matrix_identity(&matrix); @@ -3124,7 +3124,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, 90.0f, 876.0f, 230.0f, 1016.0f, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); ID2D1PathGeometry_Release(geometry); @@ -3143,7 +3143,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); set_matrix_identity(&matrix); @@ -3153,7 +3153,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); ID2D1PathGeometry_Release(geometry);

1 0

Giovanni Mascellani : d2d1/tests: Test that hollow figures do not impact geometry bounds.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: fdd7604d72577a482955a343e3b3422310b1bf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd7604d72577a482955a343… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:41 2020 +0330 d2d1/tests: Test that hollow figures do not impact geometry bounds. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 107 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd7604d72577a482955…

1 0

Giovanni Mascellani : d2d1: Do not fill hollow figures.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: b728b2ff5f0870bc4ae0023dc79f13855f41cff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b728b2ff5f0870bc4ae0023d… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:40 2020 +0330 d2d1: Do not fill hollow figures. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 + dlls/d2d1/geometry.c | 14 ++++++++++---- dlls/d2d1/tests/d2d1.c | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 64b3041b2c..0d10ac3e13 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -942,6 +942,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (geometry->fill.bezier_vertex_count) { buffer_desc.ByteWidth = geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices); + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.bezier_vertices; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 2a1fbf5f7c..6e1c648707 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1548,6 +1548,9 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge { figure = &geometry->u.path.figures[i]; + if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) + continue; + /* Degenerate figure. */ if (figure->vertex_count < 2) continue; @@ -2011,6 +2014,8 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) for (i = 0, vertex_count = 0; i < geometry->u.path.figure_count; ++i) { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; vertex_count += geometry->u.path.figures[i].vertex_count; } @@ -2025,6 +2030,8 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; memcpy(&vertices[j], geometry->u.path.figures[i].vertices, geometry->u.path.figures[i].vertex_count * sizeof(*vertices)); j += geometry->u.path.figures[i].vertex_count; @@ -2455,9 +2462,6 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i return; } - if (figure_begin != D2D1_FIGURE_BEGIN_FILLED) - FIXME("Ignoring figure_begin %#x.\n", figure_begin); - if (!d2d_path_geometry_add_figure(geometry)) { ERR("Failed to add figure.\n"); @@ -2620,7 +2624,7 @@ static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, s { struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; - if (!figure->bezier_control_count) + if (!figure->bezier_control_count || figure->flags & D2D_FIGURE_FLAG_HOLLOW) continue; for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) @@ -2816,6 +2820,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) for (i = 0; i < geometry->u.path.figure_count; ++i) { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 52618858d2..b15ac4f25b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7480,13 +7480,13 @@ static void test_fill_geometry(void) ID2D1TransformedGeometry_Release(transformed_geometry[0]); match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, "gMgB"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 0, 320, 160, 0xff652e89, 0, "gJAD"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 320, 0xff652e89, 0, "gJAD"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 160, 320, 320, 0xff652e89, 0, "gKAG"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt);

1 0

Giovanni Mascellani : d2d1/tests: Check that hollow figures are not filled.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 7065819956a00e799764b29d24975b6759c7672f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7065819956a00e799764b29d… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:39 2020 +0330 d2d1/tests: Check that hollow figures are not filled. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d07c8a4eb9..52618858d2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7410,6 +7410,84 @@ static void test_fill_geometry(void) "sQIMswILtQIIhs4B"); ok(match, "Figure does not match.\n"); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + + set_point(&point, -0.402914f, 0.915514f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); + quadratic_to(sink, -0.310379f, 0.882571f, -0.116057f, 0.824000f); + quadratic_to(sink, 0.008350f, 0.693614f, -0.052343f, 0.448886f); + quadratic_to(sink, -0.154236f, 0.246072f, -0.279229f, 0.025343f); + quadratic_to(sink, -0.370064f, -0.588586f, -0.383029f, -0.924114f); + quadratic_to(sink, -0.295479f, -0.958764f, -0.017086f, -0.988400f); + quadratic_to(sink, 0.208836f, -0.954157f, 0.272200f, -0.924114f); + quadratic_to(sink, 0.295614f, -0.569071f, 0.230143f, 0.022886f); + quadratic_to(sink, 0.101664f, 0.220643f, 0.012057f, 0.451571f); + quadratic_to(sink, -0.028764f, 0.709014f, 0.104029f, 0.833943f); + quadratic_to(sink, 0.319414f, 0.913057f, 0.403229f, 0.942628f); + quadratic_to(sink, 0.317721f, 1.023450f, -0.017086f, 1.021771f); + quadratic_to(sink, -0.310843f, 1.007472f, -0.402914f, 0.915514f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 160.0f); + scale_matrix(&matrix, 20.0f, 80.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 160.0f, 640.0f); + scale_matrix(&matrix, 40.0f, 160.0f); + rotate_matrix(&matrix, M_PI / -5.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 1.0f); + translate_matrix(&matrix, -80.0f, 0.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_matrix_identity(&matrix); + rotate_matrix(&matrix, M_PI / 2.0f); + translate_matrix(&matrix, 80.0f, -320.0f); + scale_matrix(&matrix, 2.0f, 0.25f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[0], (ID2D1Brush *)brush, NULL); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[1], (ID2D1Brush *)brush, NULL); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, NULL); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[3], (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ID2D1TransformedGeometry_Release(transformed_geometry[3]); + ID2D1TransformedGeometry_Release(transformed_geometry[2]); + ID2D1TransformedGeometry_Release(transformed_geometry[1]); + ID2D1TransformedGeometry_Release(transformed_geometry[0]); + + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, "gMgB"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 0, 320, 160, 0xff652e89, 0, "gJAD"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 0, 160, 160, 320, 0xff652e89, 0, "gJAD"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 160, 320, 320, 0xff652e89, 0, "gKAG"); + todo_wine ok(match, "Figure does not match.\n"); + ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt); refcount = ID2D1Factory_Release(factory);

1 0

Giovanni Mascellani : d2d1/tests: Add geometry filling tests.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: cf94f774048a449d69720a035c425a3211ea405c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf94f774048a449d69720a03… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:38 2020 +0330 d2d1/tests: Add geometry filling tests. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 737 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 737 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf94f774048a449d6972…

1 0

Giovanni Mascellani : d2d1/tests: Add tests for rounded rectangle drawing.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 66290bdc30addab14bb6031c64fd8a5f35de92c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66290bdc30addab14bb6031c… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:37 2020 +0330 d2d1/tests: Add tests for rounded rectangle drawing. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66290bdc30addab14bb6…

1 0

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 January 2020