wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Jacek Caban : jscript: Moved constructor return logic to interpreter.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: d66b5bf4cb7b8e9b3d5ac80ff754f40b1dba2d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66b5bf4cb7b8e9b3d5ac80ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:49:53 2016 +0200 jscript: Moved constructor return logic to interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 6 ++++++ dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 52 ++++++++++++++++++------------------------------- 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8dab026..4d7c175 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2331,6 +2331,12 @@ static HRESULT interp_ret(script_ctx_t *ctx) if(clear_ret) jsval_release(steal_ret(frame)); + if((frame->flags & EXEC_CONSTRUCTOR) && !is_object_instance(frame->ret)) { + jsval_release(frame->ret); + IDispatch_AddRef(frame->this_obj); + frame->ret = jsval_disp(frame->this_obj); + } + jmp_abs(ctx, -1); return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7044858..4915b60 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -212,6 +212,7 @@ typedef struct _call_frame_t { } call_frame_t; #define EXEC_GLOBAL 0x0001 +#define EXEC_CONSTRUCTOR 0x0002 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c677d94..bd85fda 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -203,7 +203,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, - jsval_t *r) + BOOL is_constructor, jsval_t *r) { jsdisp_t *var_disp, *arg_disp; scope_chain_t *scope; @@ -238,11 +238,14 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { + DWORD exec_flags = 0; jsdisp_t *prev_args; + if(is_constructor) + exec_flags |= EXEC_CONSTRUCTOR; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(ctx, 0, function->code, function->func_code, scope, this_obj, var_disp, r); + hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, var_disp, r); function->arguments = prev_args; scope_release(scope); @@ -257,33 +260,6 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return hres; } -static HRESULT invoke_constructor(script_ctx_t *ctx, FunctionInstance *function, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - jsdisp_t *this_obj; - jsval_t var; - HRESULT hres; - - hres = create_object(ctx, &function->dispex, &this_obj); - if(FAILED(hres)) - return hres; - - hres = invoke_source(ctx, function, to_disp(this_obj), argc, argv, &var); - if(FAILED(hres)) { - jsdisp_release(this_obj); - return hres; - } - - if(is_object_instance(var)) { - jsdisp_release(this_obj); - *r = var; - }else { - jsval_release(var); - *r = jsval_obj(this_obj); - } - return S_OK; -} - static HRESULT invoke_value_proc(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_disp, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -309,7 +285,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, r); + return invoke_source(ctx, function, this_obj, argc, argv, FALSE, r); } static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) @@ -354,11 +330,21 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi if(function->value_proc) return invoke_value_proc(function->dispex.ctx, function, jsthis, flags, argc, argv, r); - if(flags == DISPATCH_CONSTRUCT) - return invoke_constructor(function->dispex.ctx, function, argc, argv, r); + if(flags == DISPATCH_CONSTRUCT) { + jsdisp_t *this_obj; + HRESULT hres; + + hres = create_object(function->dispex.ctx, &function->dispex, &this_obj); + if(FAILED(hres)) + return hres; + + hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, r); + jsdisp_release(this_obj); + return hres; + } assert(flags == DISPATCH_METHOD); - return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, r); + return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, FALSE, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)

1 0

Jacek Caban : jscript: Sore is_global as a flag.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 2bb824b7c9b37fff6b7a6929b2a8a4d55f6136af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb824b7c9b37fff6b7a6929b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:49:33 2016 +0200 jscript: Sore is_global as a flag. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 14 +++++++------- dlls/jscript/engine.h | 6 ++++-- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 7 +++++-- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d214f08..8dab026 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2520,8 +2520,8 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(script_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj) +static HRESULT setup_call_frame(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, + IDispatch *this_obj, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2558,7 +2558,7 @@ static HRESULT setup_call_frame(script_ctx_t *ctx, bytecode_t *bytecode, functio frame->this_obj = to_disp(ctx->global); IDispatch_AddRef(frame->this_obj); - frame->is_global = is_global; + frame->flags = flags; frame->variable_obj = jsdisp_addref(variable_obj); frame->prev_frame = ctx->call_ctx; @@ -2566,8 +2566,8 @@ static HRESULT setup_call_frame(script_ctx_t *ctx, bytecode_t *bytecode, functio return S_OK; } -HRESULT exec_source(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, - IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj, jsval_t *ret) +HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *code, function_code_t *func, scope_chain_t *scope, + IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; unsigned i; @@ -2593,7 +2593,7 @@ HRESULT exec_source(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, } for(i=0; i < func->var_cnt; i++) { - if(!is_global || !lookup_global_members(ctx, func->variables[i], NULL)) { + if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, func->variables[i], NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); @@ -2602,7 +2602,7 @@ HRESULT exec_source(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, } } - hres = setup_call_frame(ctx, code, func, scope, this_obj, is_global, variable_obj); + hres = setup_call_frame(ctx, flags, code, func, scope, this_obj, variable_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7c26667..7044858 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -203,7 +203,7 @@ typedef struct _call_frame_t { IDispatch *this_obj; jsdisp_t *variable_obj; - BOOL is_global; + DWORD flags; bytecode_t *bytecode; function_code_t *function; @@ -211,5 +211,7 @@ typedef struct _call_frame_t { struct _call_frame_t *prev_frame; } call_frame_t; -HRESULT exec_source(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +#define EXEC_GLOBAL 0x0001 + +HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 0a531a5..c677d94 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -242,7 +242,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); + hres = exec_source(ctx, 0, function->code, function->func_code, scope, this_obj, var_disp, r); function->arguments = prev_args; scope_release(scope); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 60a7332..33d1f3c 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -189,6 +189,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns jsval_t *r) { call_frame_t *frame; + DWORD exec_flags = 0; bytecode_t *code; const WCHAR *src; HRESULT hres; @@ -223,8 +224,10 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx, code, &code->global_code, frame->scope, - frame->this_obj, frame->is_global, frame->variable_obj, r); + if(frame->flags & EXEC_GLOBAL) + exec_flags |= EXEC_GLOBAL; + hres = exec_source(ctx, exec_flags, code, &code->global_code, frame->scope, + frame->this_obj, frame->variable_obj, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index ef176db..eb336fc 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -107,7 +107,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(This->ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); IActiveScriptSite_OnLeaveScript(This->site); return hres; @@ -773,7 +773,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(This->ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Jacek Caban : jscript: Clear stack outside OP_call* handlers.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 4bef35fd484af7a3a487a012abb06e6f0c472265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bef35fd484af7a3a487a012a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:49:24 2016 +0200 jscript: Clear stack outside OP_call* handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 11 +++++++++-- dlls/jscript/engine.c | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 03a9bdc..0c40d1f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -571,7 +571,7 @@ static HRESULT compile_new_expression(compiler_ctx_t *ctx, call_expression_t *ex static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *expr, BOOL emit_ret) { - unsigned arg_cnt = 0; + unsigned arg_cnt = 0, extra_args; argument_t *arg; unsigned instr; jsop_t op; @@ -579,9 +579,11 @@ static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *e if(is_memberid_expr(expr->expression->type)) { op = OP_call_member; + extra_args = 2; hres = compile_memberid_expression(ctx, expr->expression, 0); }else { op = OP_call; + extra_args = 1; hres = compile_expression(ctx, expr->expression, TRUE); } @@ -601,7 +603,12 @@ static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *e instr_ptr(ctx, instr)->u.arg[0].uint = arg_cnt; instr_ptr(ctx, instr)->u.arg[1].lng = emit_ret; - return S_OK; + + hres = push_instr_uint(ctx, OP_pop, arg_cnt + extra_args); + if(FAILED(hres)) + return hres; + + return !emit_ret || push_instr(ctx, OP_push_ret) ? S_OK : E_OUTOFMEMORY; } static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t *expr) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 314a35b..d214f08 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -972,8 +972,8 @@ static HRESULT interp_call(script_ctx_t *ctx) { const unsigned argn = get_op_uint(ctx, 0); const int do_ret = get_op_int(ctx, 1); - jsval_t r, obj; - HRESULT hres; + call_frame_t *frame = ctx->call_ctx; + jsval_t obj; TRACE("%d %d\n", argn, do_ret); @@ -981,13 +981,9 @@ static HRESULT interp_call(script_ctx_t *ctx) if(!is_object_instance(obj)) return throw_type_error(ctx, JS_E_INVALID_PROPERTY, NULL); - hres = disp_call_value(ctx, get_object(obj), NULL, DISPATCH_METHOD, argn, stack_args(ctx, argn), - do_ret ? &r : NULL); - if(FAILED(hres)) - return hres; - - stack_popn(ctx, argn+1); - return do_ret ? stack_push(ctx, r) : S_OK; + clear_ret(frame); + return disp_call_value(ctx, get_object(obj), NULL, DISPATCH_METHOD, + argn, stack_args(ctx, argn), do_ret ? &frame->ret : NULL); } /* ECMA-262 3rd Edition 11.2.3 */ @@ -995,10 +991,9 @@ static HRESULT interp_call_member(script_ctx_t *ctx) { const unsigned argn = get_op_uint(ctx, 0); const int do_ret = get_op_int(ctx, 1); + call_frame_t *frame = ctx->call_ctx; IDispatch *obj; - jsval_t r; DISPID id; - HRESULT hres; TRACE("%d %d\n", argn, do_ret); @@ -1006,13 +1001,9 @@ static HRESULT interp_call_member(script_ctx_t *ctx) if(!obj) return throw_type_error(ctx, id, NULL); - hres = disp_call(ctx, obj, id, DISPATCH_METHOD, argn, stack_args(ctx, argn), do_ret ? &r : NULL); - if(FAILED(hres)) - return hres; - - stack_popn(ctx, argn+2); - return do_ret ? stack_push(ctx, r) : S_OK; - + clear_ret(frame); + return disp_call(ctx, obj, id, DISPATCH_METHOD, + argn, stack_args(ctx, argn), do_ret ? &frame->ret : NULL); } /* ECMA-262 3rd Edition 11.1.1 */

1 0

Jacek Caban : jscript: Clear stack outside OP_new handler.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 51f65ec974a9b80c35b5ca8e54ce7c76bd53db2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f65ec974a9b80c35b5ca8e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:49:10 2016 +0200 jscript: Clear stack outside OP_new handler. 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.c | 31 +++++++++++++++++++++++-------- dlls/jscript/engine.h | 1 + 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9d135f8..03a9bdc 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -558,7 +558,15 @@ static HRESULT compile_new_expression(compiler_ctx_t *ctx, call_expression_t *ex arg_cnt++; } - return push_instr_uint(ctx, OP_new, arg_cnt); + hres = push_instr_uint(ctx, OP_new, arg_cnt); + if(FAILED(hres)) + return hres; + + hres = push_instr_uint(ctx, OP_pop, arg_cnt+1); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, OP_push_ret) ? S_OK : E_OUTOFMEMORY; } static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *expr, BOOL emit_ret) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a4e8de6..314a35b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -201,6 +201,11 @@ static inline jsval_t steal_ret(call_frame_t *frame) return r; } +static inline void clear_ret(call_frame_t *frame) +{ + jsval_release(steal_ret(frame)); +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -941,8 +946,8 @@ static HRESULT interp_refval(script_ctx_t *ctx) static HRESULT interp_new(script_ctx_t *ctx) { const unsigned argc = get_op_uint(ctx, 0); - jsval_t r, constr; - HRESULT hres; + call_frame_t *frame = ctx->call_ctx; + jsval_t constr; TRACE("%d\n", argc); @@ -957,12 +962,9 @@ static HRESULT interp_new(script_ctx_t *ctx) else if(!get_object(constr)) return throw_type_error(ctx, JS_E_INVALID_PROPERTY, NULL); - hres = disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT, argc, stack_args(ctx, argc), &r); - if(FAILED(hres)) - return hres; - - stack_popn(ctx, argc+1); - return stack_push(ctx, r); + clear_ret(frame); + return disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT, + argc, stack_args(ctx, argc), &frame->ret); } /* ECMA-262 3rd Edition 11.2.3 */ @@ -2353,6 +2355,19 @@ static HRESULT interp_setret(script_ctx_t *ctx) return S_OK; } +static HRESULT interp_push_ret(script_ctx_t *ctx) +{ + call_frame_t *frame = ctx->call_ctx; + HRESULT hres; + + TRACE("\n"); + + hres = stack_push(ctx, frame->ret); + if(SUCCEEDED(hres)) + frame->ret = jsval_undefined(); + return hres; +} + typedef HRESULT (*op_func_t)(script_ctx_t*); static const op_func_t op_funcs[] = { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3af3eac..7c26667 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -70,6 +70,7 @@ X(postinc, 1, ARG_INT, 0) \ X(preinc, 1, ARG_INT, 0) \ X(push_except,1, ARG_ADDR, ARG_BSTR) \ + X(push_ret, 1, 0,0) \ X(push_scope, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_UINT) \ X(rshift, 1, 0,0) \

1 0

Jacek Caban : jscript: Don't assume that ret value is cleared when it' s not set explicitly.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: d08036120a4b5d4e04187444b2472046475ee5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08036120a4b5d4e04187444b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:48:57 2016 +0200 jscript: Don't assume that ret value is cleared when it's not set explicitly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 7 ++++--- dlls/jscript/engine.c | 19 +++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 52e6b66..9d135f8 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1479,7 +1479,7 @@ static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statemen if(FAILED(hres)) return hres; - return push_instr(ctx, OP_ret) ? S_OK : E_OUTOFMEMORY; + return push_instr_uint(ctx, OP_ret, !stat->expr); } /* ECMA-262 3rd Edition 12.10 */ @@ -1857,8 +1857,9 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, resolve_labels(ctx, off); - if(!push_instr(ctx, OP_ret)) - return E_OUTOFMEMORY; + hres = push_instr_uint(ctx, OP_ret, !from_eval); + if(FAILED(hres)) + return hres; if(TRACE_ON(jscript_disas)) dump_code(ctx, off); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f6ade36..a4e8de6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -194,6 +194,13 @@ static inline IDispatch *stack_topn_objid(script_ctx_t *ctx, unsigned n, DISPID return get_object(stack_topn(ctx, n+1)); } +static inline jsval_t steal_ret(call_frame_t *frame) +{ + jsval_t r = frame->ret; + frame->ret = jsval_undefined(); + return r; +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -2323,8 +2330,14 @@ static HRESULT interp_pop(script_ctx_t *ctx) static HRESULT interp_ret(script_ctx_t *ctx) { + const unsigned clear_ret = get_op_uint(ctx, 0); + call_frame_t *frame = ctx->call_ctx; + TRACE("\n"); + if(clear_ret) + jsval_release(steal_ret(frame)); + jmp_abs(ctx, -1); return S_OK; } @@ -2457,10 +2470,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; - if(SUCCEEDED(hres)) { - *ret = frame->ret; - frame->ret = jsval_undefined(); - } + if(SUCCEEDED(hres)) + *ret = steal_ret(frame); release_call_frame(frame); return hres;

1 0

Jacek Caban : secur32: Use %LATEST_RECORD_VERSION gnutls priority.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: f198b5a45a52aa0bcf79f1909c8f6dc4e56c4143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f198b5a45a52aa0bcf79f1909… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 12:42:05 2016 +0200 secur32: Use %LATEST_RECORD_VERSION gnutls priority. It's based on [1], where it's reported to fix issues with older gnutls. I tested what client hello packages Windows reports for different sets of used protocol versions, and it always uses newest possible version. There may be a concern about not using SSL3 client hello, which still may negotiate newer protocol and was recommended for compatibility reasons, but it's known to be problematic the other way those days and recent gnutls won't use it by default anyway [2]. [1] http://us.battle.net/wow/en/forum/topic/20742995286?page=11 [2] https://gitlab.com/gnutls/gnutls/commit/25ed2750438178ff65d555a49212dc7b5a3… Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 95c9bda..b10b629 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -160,7 +160,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[64] = "NORMAL", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT);

1 0

Stefan Dösinger : wined3d: Store sub-resource locations in the sub-resource structure.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 5e27e6b5d8584431bd96702220f83607dca23d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e27e6b5d8584431bd9670222… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 28 18:58:01 2016 +0200 wined3d: Store sub-resource locations in the sub-resource structure. 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 | 5 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 114 +++++++++++++++++++++----------------- dlls/wined3d/swapchain.c | 14 +++-- dlls/wined3d/texture.c | 31 ++++++----- dlls/wined3d/volume.c | 62 +++++++++++---------- dlls/wined3d/wined3d_private.h | 15 ++++- 8 files changed, 138 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e27e6b5d8584431bd967…

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_load_location().
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 8e117a51f750e1a975ac0b6f112bea5fd13ff060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e117a51f750e1a975ac0b6f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:58:00 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cb27ad8..f23a385 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -263,10 +263,10 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return TRUE; } - if ((volume->resource.access_flags & required_access) != required_access) + if ((texture->resource.access_flags & required_access) != required_access) { ERR("Operation requires %#x access, but volume only has %#x.\n", - required_access, volume->resource.access_flags); + required_access, texture->resource.access_flags); return FALSE; }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_download_data().
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 9736c861a28f7680159b9ef0ee990dbc65b53dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736c861a28f7680159b9ef0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:59 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a4d3eb2..cb27ad8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -152,8 +152,8 @@ void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD loc static void wined3d_volume_download_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) { + const struct wined3d_format *format = volume->container->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = volume->resource.format; if (format->convert) {

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_upload_data().
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 2d4080f25d093d20123a40b3ed92b84c282a119b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4080f25d093d20123a40b3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:58 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index c846ec4..a4d3eb2 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -77,7 +77,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine const struct wined3d_const_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = volume->resource.format; + struct wined3d_texture *texture = volume->container; + const struct wined3d_format *format = texture->resource.format; UINT width = volume->resource.width; UINT height = volume->resource.height; UINT depth = volume->resource.depth; @@ -95,13 +96,13 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine if (data->buffer_object) ERR("Loading a converted volume from a PBO.\n"); - if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, volume->texture_level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016