March 2016 - Wine-commits - list.winehq.org

Piotr Caban : ieframe: Add ITargetFrame stub.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: dfc60ddbc83df77c89f4d3a1978639a94d714417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc60ddbc83df77c89f4d3a19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 11:31:08 2016 +0200 ieframe: Add ITargetFrame stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/client.c | 5 ++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 149 +++++++++++++++++++++++++++++++++++++++- dlls/ieframe/tests/webbrowser.c | 6 ++ 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index d82195f..4846e28 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -668,6 +668,11 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } + if(IsEqualGUID(&IID_ITargetFrame, guidService)) { + TRACE("(%p)->(IID_ITargetFrame %s %p)\n", This, debugstr_guid(riid), ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); + } + if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { TRACE("IWebBrowserApp service\n"); return IWebBrowser2_QueryInterface(This->wb, riid, ppv); diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 371cb03..3880354 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -55,6 +55,7 @@ typedef struct { typedef struct { IHlinkFrame IHlinkFrame_iface; + ITargetFrame ITargetFrame_iface; ITargetFrame2 ITargetFrame2_iface; ITargetFramePriv2 ITargetFramePriv2_iface; IWebBrowserPriv2IE9 IWebBrowserPriv2IE9_iface; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 88bc7e6..296ed19 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1241,6 +1241,149 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { HlinkFrame_UpdateHlink }; +static inline HlinkFrame *impl_from_ITargetFrame(ITargetFrame *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame_iface); +} + +static HRESULT WINAPI TargetFrame_QueryInterface(ITargetFrame *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI TargetFrame_AddRef(ITargetFrame *iface) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI TargetFrame_Release(ITargetFrame *iface) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI TargetFrame_SetFrameName(ITargetFrame *iface, LPCWSTR pszFrameName) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameName(ITargetFrame *iface, LPWSTR *ppszFrameName) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameName); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetParentFrame(ITargetFrame *iface, IUnknown **ppunkParent) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppunkParent); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_FindFrame(ITargetFrame *iface, LPCWSTR pszTargetName, + IUnknown *ppunkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName), + ppunkContextFrame, dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameSrc(ITargetFrame *iface, LPCWSTR pszFrameSrc) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameSrc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameSrc(ITargetFrame *iface, LPWSTR *ppszFrameSrc) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameSrc); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFramesContainer(ITargetFrame *iface, IOleContainer **ppContainer) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameOptions(ITargetFrame *iface, DWORD dwFlags) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%x)\n", This, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameOptions(ITargetFrame *iface, DWORD *pdwFlags) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pdwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameMargins(ITargetFrame *iface, DWORD dwWidth, DWORD dwHeight) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%d %d)\n", This, dwWidth, dwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameMargins(ITargetFrame *iface, DWORD *pdwWidth, DWORD *pdwHeight) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p %p)\n", This, pdwWidth, pdwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_RemoteNavigate(ITargetFrame *iface, ULONG cLength, ULONG *pulData) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%u %p)\n", This, cLength, pulData); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_OnChildFrameActivate(ITargetFrame *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_OnChildFrameDeactivate(ITargetFrame *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static const ITargetFrameVtbl TargetFrameVtbl = { + TargetFrame_QueryInterface, + TargetFrame_AddRef, + TargetFrame_Release, + TargetFrame_SetFrameName, + TargetFrame_GetFrameName, + TargetFrame_GetParentFrame, + TargetFrame_FindFrame, + TargetFrame_SetFrameSrc, + TargetFrame_GetFrameSrc, + TargetFrame_GetFramesContainer, + TargetFrame_SetFrameOptions, + TargetFrame_GetFrameOptions, + TargetFrame_SetFrameMargins, + TargetFrame_GetFrameMargins, + TargetFrame_RemoteNavigate, + TargetFrame_OnChildFrameActivate, + TargetFrame_OnChildFrameDeactivate +}; + static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface) { return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface); @@ -1517,6 +1660,9 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = &This->IHlinkFrame_iface; + }else if(IsEqualGUID(&IID_ITargetFrame, riid)) { + TRACE("(%p)->(IID_ITargetFrame %p)\n", This, ppv); + *ppv = &This->ITargetFrame_iface; }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); *ppv = &This->ITargetFrame2_iface; @@ -1539,7 +1685,8 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) { - This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; + This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; + This->ITargetFrame_iface.lpVtbl = &TargetFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; This->IWebBrowserPriv2IE9_iface.lpVtbl = &WebBrowserPriv2IE9Vtbl; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index b2bbebd..4d28073 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "exdisp.h" #include "htiframe.h" +#include "htiface.h" #include "mshtmhst.h" #include "mshtmcid.h" #include "mshtml.h" @@ -3547,6 +3548,11 @@ static void test_dochost_qs(IWebBrowser2 *webbrowser) ok(iface_cmp(service, (IUnknown*)webbrowser), "service != unk\n"); IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_ITargetFrame, &IID_ITargetFrame, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + ok(iface_cmp(service, (IUnknown*)webbrowser), "service != unk\n"); + IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IShellBrowser, (void**)&service); ok(hres == S_OK, "QueryService failed: %08x\n", hres); IUnknown_Release(service);

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_validate_location().
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 5a29cc87871bc0c499c5cbd0513e7769fd60e29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a29cc87871bc0c499c5cbd05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 29 16:45:36 2016 +0200 wined3d: Introduce wined3d_texture_validate_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/device.c | 4 +-- dlls/wined3d/surface.c | 58 +++++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 18 +++++------- dlls/wined3d/texture.c | 36 ++++++++++++------------ dlls/wined3d/volume.c | 24 +++++----------- dlls/wined3d/wined3d_private.h | 5 ++-- 7 files changed, 69 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a29cc87871bc0c499c5c…

1 0

Jacek Caban : jscript: Use already running interpreter for execution of member source function.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 66632091bf31929dc50fdaf60cab819ff0088157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66632091bf31929dc50fdaf60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:01 2016 +0200 jscript: Use already running interpreter for execution of member source function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 9 +++++++-- dlls/jscript/engine.c | 36 ++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 12 ++++++++---- dlls/jscript/jscript.h | 8 ++++++++ 5 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 40e1749..5abb3a7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -377,6 +377,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) set_disp(&vthis, jsthis); else @@ -1060,7 +1061,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig { HRESULT hres; - assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT))); + assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); if(is_class(jsfunc, JSCLASS_FUNCTION)) { hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); @@ -1073,6 +1074,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig } set_disp(&vdisp, jsthis); + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsfunc->builtin_info->value_prop.invoke(jsfunc->ctx, &vdisp, flags, argc, argv, r); vdisp_release(&vdisp); } @@ -1123,6 +1125,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns return hres; } + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(ret && argc) flags |= DISPATCH_PROPERTYGET; @@ -1187,6 +1190,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns hres = variant_to_jsval(&retv, ret); VariantClear(&retv); } + return hres; } @@ -1200,7 +1204,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W unsigned i; HRESULT hres; - assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT))); + assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { @@ -1209,6 +1213,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(r && argc && flags == DISPATCH_METHOD) flags |= DISPATCH_PROPERTYGET; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e600e62..31c592c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1002,7 +1002,7 @@ static HRESULT interp_call_member(script_ctx_t *ctx) return throw_type_error(ctx, id, NULL); clear_ret(frame); - return disp_call(ctx, obj, id, DISPATCH_METHOD, + return disp_call(ctx, obj, id, DISPATCH_METHOD | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, argn, stack_args(ctx, argn), do_ret ? &frame->ret : NULL); } @@ -2403,21 +2403,25 @@ static void release_call_frame(call_frame_t *frame) static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { - call_frame_t *frame = ctx->call_ctx; except_frame_t *except_frame; + call_frame_t *frame; jsval_t except_val; BSTR ident; HRESULT hres; - if(!frame->except_frame) { + for(frame = ctx->call_ctx; !frame->except_frame; frame = ctx->call_ctx) { + DWORD flags; + while(frame->scope != frame->base_scope) scope_pop(&frame->scope); stack_popn(ctx, ctx->stack_top-frame->stack_base); ctx->call_ctx = frame->prev_frame; + flags = frame->flags; release_call_frame(frame); - return exception_hres; + if(!(flags & EXEC_RETURN_TO_INTERP)) + return exception_hres; } except_frame = frame->except_frame; @@ -2472,9 +2476,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) TRACE("\n"); - frame = ctx->call_ctx; - while(1) { + frame = ctx->call_ctx; op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](ctx); if(FAILED(hres)) { @@ -2484,14 +2487,21 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) if(FAILED(hres)) return hres; }else if(frame->ip == -1) { + const DWORD return_to_interp = frame->flags & EXEC_RETURN_TO_INTERP; + assert(ctx->stack_top == frame->stack_base); assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; - if(r) + if(return_to_interp) { + clear_ret(ctx->call_ctx); + ctx->call_ctx->ret = steal_ret(frame); + }else if(r) { *r = steal_ret(frame); + } release_call_frame(frame); - break; + if(!return_to_interp) + break; }else { frame->ip += op_move[op]; } @@ -2617,5 +2627,15 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; + if(flags & EXEC_RETURN_TO_INTERP) { + /* + * We're called directly from interpreter, so we may just setup call frame and return. + * Already running interpreter will take care of execution. + */ + if(r) + *r = jsval_undefined(); + return S_OK; + } + return enter_bytecode(ctx, r); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4c29694..4094303 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -216,6 +216,7 @@ typedef struct _call_frame_t { #define EXEC_GLOBAL 0x0001 #define EXEC_CONSTRUCTOR 0x0002 +#define EXEC_RETURN_TO_INTERP 0x0004 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, jsdisp_t*,jsdisp_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 51d1060..55a34e1 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -202,7 +202,7 @@ static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, un } static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, unsigned argc, jsval_t *argv, - BOOL is_constructor, jsval_t *r) + BOOL is_constructor, BOOL caller_execs_source, jsval_t *r) { jsdisp_t *var_disp, *arg_disp; scope_chain_t *scope; @@ -239,6 +239,8 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis if(SUCCEEDED(hres)) { DWORD exec_flags = 0; + if(caller_execs_source) + exec_flags |= EXEC_RETURN_TO_INTERP; if(is_constructor) exec_flags |= EXEC_CONSTRUCTOR; hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, @@ -277,7 +279,7 @@ static HRESULT call_function(script_ctx_t *ctx, FunctionInstance *function, IDis if(function->value_proc) return invoke_value_proc(ctx, function, this_obj, DISPATCH_METHOD, argc, argv, r); - return invoke_source(ctx, function, this_obj, argc, argv, FALSE, r); + return invoke_source(ctx, function, this_obj, argc, argv, FALSE, FALSE, r); } static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) @@ -312,6 +314,7 @@ static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const BOOL caller_execs_source = (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0; FunctionInstance *function; TRACE("func %p this %p\n", func_this, jsthis); @@ -319,6 +322,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi assert(is_class(func_this, JSCLASS_FUNCTION)); function = (FunctionInstance*)func_this; + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(function->value_proc) return invoke_value_proc(function->dispex.ctx, function, jsthis, flags, argc, argv, r); @@ -330,13 +334,13 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; - hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, r); + hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, FALSE, r); jsdisp_release(this_obj); return hres; } assert(flags == DISPATCH_METHOD); - return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, FALSE, r); + return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, FALSE, caller_execs_source, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 53272c9..cc66418 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -101,6 +101,14 @@ extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; #define PROPF_CONST 0x0800 #define PROPF_DONTDELETE 0x1000 +/* + * This is our internal dispatch flag informing calee that it's called directly from interpreter. + * If calee is executed as interpreted function, we may let already running interpreter to take + * of execution. + */ +#define DISPATCH_JSCRIPT_CALLEREXECSSOURCE 0x8000 +#define DISPATCH_JSCRIPT_INTERNAL_MASK DISPATCH_JSCRIPT_CALLEREXECSSOURCE + /* NOTE: Keep in sync with names in Object.toString implementation */ typedef enum { JSCLASS_NONE,

1 0

Jacek Caban : jscript: Use already running interpreter for execution expressions that are source functions.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 2d35954adbcb1edbb7223a61042b10c7b018b889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d35954adbcb1edbb7223a610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:08 2016 +0200 jscript: Use already running interpreter for execution expressions that are source functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 31c592c..1bbc2ba 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -982,7 +982,7 @@ static HRESULT interp_call(script_ctx_t *ctx) return throw_type_error(ctx, JS_E_INVALID_PROPERTY, NULL); clear_ret(frame); - return disp_call_value(ctx, get_object(obj), NULL, DISPATCH_METHOD, + return disp_call_value(ctx, get_object(obj), NULL, DISPATCH_METHOD | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, argn, stack_args(ctx, argn), do_ret ? &frame->ret : NULL); }

1 0

Jacek Caban : jscript: Use already running interpreter for execution new expressions.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: fa726bed4dff8c114c8393e5f45ca3022d03c224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa726bed4dff8c114c8393e5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:19 2016 +0200 jscript: Use already running interpreter for execution new expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 3 +-- dlls/jscript/function.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1bbc2ba..74cef15 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -963,7 +963,7 @@ static HRESULT interp_new(script_ctx_t *ctx) return throw_type_error(ctx, JS_E_INVALID_PROPERTY, NULL); clear_ret(frame); - return disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT, + return disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, argc, stack_args(ctx, argc), &frame->ret); } @@ -2604,7 +2604,6 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; frame->ret = jsval_undefined(); - if(scope) frame->base_scope = frame->scope = scope_addref(scope); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 55a34e1..617d835 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -334,7 +334,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; - hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, FALSE, r); + hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, caller_execs_source, r); jsdisp_release(this_obj); return hres; }

1 0

Jacek Caban : jscript: Use already running interpreter for Function.apply( ) execution.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 813609b8436b09373529652795856937e46b0e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813609b8436b0937352965279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:28 2016 +0200 jscript: Use already running interpreter for Function.apply() execution. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 ++- dlls/jscript/function.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5abb3a7..4f5a35f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -377,7 +377,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; + if(This->builtin_info->class != JSCLASS_FUNCTION) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) set_disp(&vthis, jsthis); else diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 617d835..45d5bab 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -274,12 +274,12 @@ static HRESULT invoke_value_proc(script_ctx_t *ctx, FunctionInstance *function, } static HRESULT call_function(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, - unsigned argc, jsval_t *argv, jsval_t *r) + unsigned argc, jsval_t *argv, BOOL caller_execs_source, jsval_t *r) { if(function->value_proc) return invoke_value_proc(ctx, function, this_obj, DISPATCH_METHOD, argc, argv, r); - return invoke_source(ctx, function, this_obj, argc, argv, FALSE, FALSE, r); + return invoke_source(ctx, function, this_obj, argc, argv, FALSE, caller_execs_source, r); } static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) @@ -459,7 +459,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } if(SUCCEEDED(hres)) - hres = call_function(ctx, function, this_obj, cnt, args, r); + hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); if(this_obj) IDispatch_Release(this_obj); @@ -492,7 +492,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns cnt = argc-1; } - hres = call_function(ctx, function, this_obj, cnt, argv+1, r); + hres = call_function(ctx, function, this_obj, cnt, argv+1, FALSE, r); if(this_obj) IDispatch_Release(this_obj);

1 0

Jacek Caban : jscript: Use already running interpreter for Function.call() execution.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 889f2657dd53b209b0265f9d50d6b82ce4958285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889f2657dd53b209b0265f9d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:35 2016 +0200 jscript: Use already running interpreter for Function.call() execution. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 45d5bab..1e8d563 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -492,7 +492,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns cnt = argc-1; } - hres = call_function(ctx, function, this_obj, cnt, argv+1, FALSE, r); + hres = call_function(ctx, function, this_obj, cnt, argv+1, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); if(this_obj) IDispatch_Release(this_obj);

1 0

Jacek Caban : jscript: Use already running interpreter for eval() execution.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 6a03b38f33b3f3898da505364cd58887633a98ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03b38f33b3f3898da505364… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:43 2016 +0200 jscript: Use already running interpreter for eval() execution. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/global.c | 4 +++- dlls/jscript/jscript.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4f5a35f..5efe0d5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -377,7 +377,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; - if(This->builtin_info->class != JSCLASS_FUNCTION) + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) set_disp(&vthis, jsthis); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d473dc3..58dbd95 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -185,7 +185,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.1.2.1 */ -static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { call_frame_t *frame; @@ -226,6 +226,8 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns if(frame->flags & EXEC_GLOBAL) exec_flags |= EXEC_GLOBAL; + if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) + exec_flags |= EXEC_RETURN_TO_INTERP; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame->scope, frame->this_obj, NULL, frame->variable_obj, NULL, r); release_bytecode(code); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cc66418..4331ee7 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -475,6 +475,8 @@ HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_ BOOL bool_obj_value(jsdisp_t*) DECLSPEC_HIDDEN; unsigned array_get_length(jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT JSGlobal_eval(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class) { return jsdisp->builtin_info->class == class;

1 0

Daniel Lehman : ucrtbase: Add hypot forward.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 31bc775c65814fc0fc14f3871b5291b4c885e3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bc775c65814fc0fc14f3871… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 11:38:46 2016 -0700 ucrtbase: Add hypot forward. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 2a2ed6e..1ea4f2d 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -252,7 +252,7 @@ @ cdecl fmod(double double) ucrtbase.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp -@ stub hypot +@ cdecl hypot(double double) ucrtbase.hypot @ stub ilogb @ stub ilogbf @ stub ilogbl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index eb68178..3bbab33 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2339,7 +2339,7 @@ @ stub gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar -@ stub hypot +@ cdecl hypot(double double) _hypot @ stub ilogb @ stub ilogbf @ stub ilogbl

1 0

Daniel Lehman : msvcp120: Add _Mtx_current_owns.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 2a65d21d1a873cf14c0ad03dd2b53ebd760fe5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a65d21d1a873cf14c0ad03dd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 13:12:02 2016 -0700 msvcp120: Add _Mtx_current_owns. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 87b2392..ee2d62f 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3818,7 +3818,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) @ cdecl _Mtx_destroy(ptr) @ cdecl _Mtx_getconcrtcs(ptr) @ cdecl _Mtx_init(ptr long) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8fdd4e7..ddb28c4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3763,7 +3763,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) @ cdecl _Mtx_destroy(ptr) @ cdecl _Mtx_getconcrtcs(ptr) @ cdecl _Mtx_init(ptr long) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 12a92fd..4027066 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3763,7 +3763,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) msvcp120._Mbrtowc @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) msvcp120._Mtx_current_owns @ cdecl _Mtx_destroy(ptr) msvcp120._Mtx_destroy @ cdecl _Mtx_getconcrtcs(ptr) msvcp120._Mtx_getconcrtcs @ cdecl _Mtx_init(ptr long) msvcp120._Mtx_init diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a4713d2..a41d357 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -487,6 +487,11 @@ void __cdecl _Mtx_destroy(_Mtx_t *mtx) MSVCRT_operator_delete(*mtx); } +int __cdecl _Mtx_current_owns(_Mtx_t *mtx) +{ + return (*mtx)->thread_id == GetCurrentThreadId(); +} + int __cdecl _Mtx_lock(_Mtx_t *mtx) { if((*mtx)->thread_id != GetCurrentThreadId()) {

1 0