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

Jacek Caban : jscript: Keep reference to bytecode in call_frame_t.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 8c1526a865280be7d713b21a1cca6c8e4c95c95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1526a865280be7d713b21a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:18 2016 +0200 jscript: Keep reference to bytecode in call_frame_t. 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/engine.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 802e408..b14ec2d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2388,6 +2388,7 @@ static void release_call_frame(call_frame_t *frame) if(frame->scope) scope_release(frame->scope); jsval_release(frame->ret); + release_bytecode(frame->bytecode); heap_free(frame); } @@ -2579,7 +2580,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(!frame) return E_OUTOFMEMORY; - frame->bytecode = bytecode; + frame->bytecode = bytecode_addref(bytecode); frame->function = function; frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4915b60..4b3bba2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -168,9 +168,10 @@ typedef struct _bytecode_t { HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; -static inline void bytecode_addref(bytecode_t *code) +static inline bytecode_t *bytecode_addref(bytecode_t *code) { code->ref++; + return code; } typedef struct _scope_chain_t {

1 0

Jacek Caban : jscript: Moved more return object logic to enter_bytecode loop.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: cb317ed5b83012628a9386ecf24a2180e71c7489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb317ed5b83012628a9386ecf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:39 2016 +0200 jscript: Moved more return object logic to enter_bytecode loop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 64 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b14ec2d..4616853 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2392,7 +2392,7 @@ static void release_call_frame(call_frame_t *frame) heap_free(frame); } -static HRESULT unwind_exception(script_ctx_t *ctx) +static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { call_frame_t *frame = ctx->call_ctx; except_frame_t *except_frame; @@ -2400,6 +2400,17 @@ static HRESULT unwind_exception(script_ctx_t *ctx) BSTR ident; HRESULT hres; + if(!frame->except_frame) { + 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; + release_call_frame(frame); + return exception_hres; + } + except_frame = frame->except_frame; frame->except_frame = except_frame->next; @@ -2444,7 +2455,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) { call_frame_t *frame; jsop_t op; @@ -2454,40 +2465,30 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *ret) frame = ctx->call_ctx; - while(frame->ip != -1) { + while(1) { op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](ctx); if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); - if(!frame->except_frame) - break; - - hres = unwind_exception(ctx); + hres = unwind_exception(ctx, hres); if(FAILED(hres)) - break; + return hres; + }else if(frame->ip == -1) { + assert(ctx->stack_top == frame->stack_base); + assert(frame->scope == frame->base_scope); + + ctx->call_ctx = frame->prev_frame; + if(r) + *r = steal_ret(frame); + release_call_frame(frame); + break; }else { frame->ip += op_move[op]; } } - assert(ctx->call_ctx == frame); - - if(FAILED(hres)) { - while(frame->scope != frame->base_scope) - scope_pop(&frame->scope); - stack_popn(ctx, ctx->stack_top-frame->stack_base); - } - - assert(ctx->stack_top == frame->stack_base); - assert(frame->scope == frame->base_scope); - ctx->call_ctx = frame->prev_frame; - - if(SUCCEEDED(hres)) - *ret = steal_ret(frame); - - release_call_frame(frame); - return hres; + return S_OK; } static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdisp_t *func_obj) @@ -2528,10 +2529,9 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) + IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *r) { call_frame_t *frame; - jsval_t val; unsigned i; HRESULT hres; @@ -2603,13 +2603,5 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; - hres = enter_bytecode(ctx, &val); - if(FAILED(hres)) - return hres; - - if(ret) - *ret = val; - else - jsval_release(val); - return S_OK; + return enter_bytecode(ctx, r); }

1 0

Jacek Caban : jscript: Moved arguments object destuction to interpreter.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 42e90ca5925324815958a430324faa2d47eb2f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e90ca5925324815958a4303… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:59 2016 +0200 jscript: Moved arguments object destuction to interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 12 +++++++++++- dlls/jscript/engine.h | 4 +++- dlls/jscript/function.c | 6 +----- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4616853..5a4d76f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2381,6 +2381,13 @@ OP_LIST static void release_call_frame(call_frame_t *frame) { + if(frame->arguments_obj) { + /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have + * their own arguments property, it's impossible to use prototype's one during name lookup */ + static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; + jsdisp_propput_name(frame->variable_obj, argumentsW, jsval_undefined()); + jsdisp_release(frame->arguments_obj); + } if(frame->variable_obj) jsdisp_release(frame->variable_obj); if(frame->this_obj) @@ -2529,7 +2536,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *r) + IDispatch *this_obj, jsdisp_t *variable_obj, jsdisp_t *arguments_obj, jsval_t *r) { call_frame_t *frame; unsigned i; @@ -2597,6 +2604,9 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->this_obj = to_disp(ctx->global); IDispatch_AddRef(frame->this_obj); + if(arguments_obj) + frame->arguments_obj = jsdisp_addref(arguments_obj); + frame->flags = flags; frame->variable_obj = jsdisp_addref(variable_obj); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4b3bba2..e500ba4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -204,6 +204,7 @@ typedef struct _call_frame_t { IDispatch *this_obj; jsdisp_t *variable_obj; + jsdisp_t *arguments_obj; DWORD flags; bytecode_t *bytecode; @@ -215,5 +216,6 @@ typedef struct _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 exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, + jsdisp_t*,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 bd85fda..be1f29c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -245,16 +245,12 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis exec_flags |= EXEC_CONSTRUCTOR; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(ctx, exec_flags, 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, arg_disp, r); function->arguments = prev_args; scope_release(scope); } - /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have - * their own arguments property, it's impossible to use prototype's one during name lookup */ - jsdisp_propput_name(var_disp, argumentsW, jsval_undefined()); - jsdisp_release(arg_disp); jsdisp_release(var_disp); return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33d1f3c..24ec358 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -227,7 +227,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns 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); + frame->this_obj, frame->variable_obj, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index eb336fc..61fa400 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, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL, 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, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Jacek Caban : jscript: Find Function.arguments on the stack instead of storing it in FunctionInstance object.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 35133dbe58de3a3732e84cd4264e0c274c56fb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35133dbe58de3a3732e84cd42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:51:28 2016 +0200 jscript: Find Function.arguments on the stack instead of storing it in FunctionInstance object. 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 | 4 +++- dlls/jscript/function.c | 18 +++++++++++------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/tests/lang.js | 4 ++++ 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a4d76f..e600e62 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2388,6 +2388,8 @@ static void release_call_frame(call_frame_t *frame) jsdisp_propput_name(frame->variable_obj, argumentsW, jsval_undefined()); jsdisp_release(frame->arguments_obj); } + if(frame->function_instance) + jsdisp_release(frame->function_instance); if(frame->variable_obj) jsdisp_release(frame->variable_obj); if(frame->this_obj) @@ -2536,7 +2538,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsdisp_t *arguments_obj, jsval_t *r) + IDispatch *this_obj, jsdisp_t *function_instance, jsdisp_t *variable_obj, jsdisp_t *arguments_obj, jsval_t *r) { call_frame_t *frame; unsigned i; @@ -2604,6 +2606,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->this_obj = to_disp(ctx->global); IDispatch_AddRef(frame->this_obj); + if(function_instance) + frame->function_instance = jsdisp_addref(function_instance); if(arguments_obj) frame->arguments_obj = jsdisp_addref(arguments_obj); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e500ba4..4c29694 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -203,6 +203,7 @@ typedef struct _call_frame_t { jsval_t ret; IDispatch *this_obj; + jsdisp_t *function_instance; jsdisp_t *variable_obj; jsdisp_t *arguments_obj; DWORD flags; @@ -217,5 +218,6 @@ typedef struct _call_frame_t { #define EXEC_CONSTRUCTOR 0x0002 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, - jsdisp_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; + jsdisp_t*,jsdisp_t*,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 be1f29c..51d1060 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -34,7 +34,6 @@ typedef struct { bytecode_t *code; function_code_t *func_code; DWORD length; - jsdisp_t *arguments; } FunctionInstance; typedef struct { @@ -239,14 +238,11 @@ 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, exec_flags, function->code, function->func_code, scope, this_obj, var_disp, arg_disp, r); - function->arguments = prev_args; + hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, + &function->dispex, var_disp, arg_disp, r); scope_release(scope); } @@ -535,10 +531,18 @@ HRESULT Function_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) static HRESULT Function_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { FunctionInstance *function = function_from_jsdisp(jsthis); + call_frame_t *frame; TRACE("\n"); - *r = function->arguments ? jsval_obj(jsdisp_addref(function->arguments)) : jsval_null(); + for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { + if(frame->function_instance == &function->dispex) { + *r = jsval_obj(jsdisp_addref(frame->arguments_obj)); + return S_OK; + } + } + + *r = jsval_null(); return S_OK; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 24ec358..d473dc3 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -227,7 +227,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns 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, NULL, r); + frame->this_obj, NULL, frame->variable_obj, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 61fa400..2472c11 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, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, NULL, 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, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5b1b510..ae8e408 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -205,8 +205,12 @@ function argumentsTest() { eval('ok(arguments === save, "unexpected arguments");'); [1,2].sort(function() { ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + return 1; }); } +/* FIXME: It seems that when function is called as an expression, instance object arguments is not set. + * We currently always set it in Wine. */ +argumentsTest(); tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp);

1 0

Piotr Caban : msvcrt: Call C structured exception translator in x86_64 __CxxFrameHandler.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: bc71c7decb4d0d14a0a5d67e034557c5c3535c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc71c7decb4d0d14a0a5d67e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:11:44 2016 +0200 msvcrt: Call C structured exception translator in x86_64 __CxxFrameHandler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d31bc69..f81bb95 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -207,9 +207,19 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } else { + thread_data_t *data = msvcrt_get_thread_data(); + exc_type = NULL; TRACE("handling C exception code %x rec %p frame %lx unwind_help %d descr %p\n", rec->ExceptionCode, rec, frame, *((INT*)(frame+descr->unwind_help)), descr); + + if (data->se_translator) { + EXCEPTION_POINTERS except_ptrs; + + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } } return ExceptionContinueSearch;

1 0

Piotr Caban : msvcrt: Improve dump_function_descr helper.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 776c4a1617eae0f6a50647614881d81c00be862d URL: http://source.winehq.org/git/wine.git/?a=commit;h=776c4a1617eae0f6a50647614… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:11:50 2016 +0200 msvcrt: Improve dump_function_descr helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index f81bb95..820197d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -73,7 +73,11 @@ typedef struct UINT type_info; int offset; UINT handler; + UINT frame; } catchblock_info; +#define TYPE_FLAG_CONST 1 +#define TYPE_FLAG_VOLATILE 2 +#define TYPE_FLAG_REFERENCE 8 typedef struct { @@ -84,6 +88,12 @@ typedef struct UINT catchblock; } tryblock_info; +typedef struct +{ + int ip; + int state; +} ipmap_info; + typedef struct __cxx_function_descr { UINT magic; @@ -133,6 +143,7 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b { unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); tryblock_info *tryblock = rva_to_ptr(descr->tryblock, image_base); + ipmap_info *ipmap = rva_to_ptr(descr->ipmap, image_base); UINT i, j; TRACE("magic %x\n", descr->magic); @@ -147,18 +158,24 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b { catchblock_info *catchblock = rva_to_ptr(tryblock[i].catchblock, image_base); - TRACE(" %d: start %d end %d catchlevel %d catch%x(%p) %d\n", i, + TRACE(" %d: start %d end %d catchlevel %d catch %x(%p) %d\n", i, tryblock[i].start_level, tryblock[i].end_level, tryblock[i].catch_level, tryblock[i].catchblock, catchblock, tryblock[i].catchblock_count); for (j=0; j<tryblock[i].catchblock_count; j++) { - TRACE(" %d: flags %x offset %d handler %x(%p) type %x %s\n", - j, catchblock->flags, catchblock->offset, catchblock->handler, - rva_to_ptr(catchblock->handler, image_base), catchblock->type_info, - dbgstr_type_info(rva_to_ptr(catchblock->type_info, image_base))); + TRACE(" %d: flags %x offset %d handler %x(%p) frame %x type %x %s\n", + j, catchblock[j].flags, catchblock[j].offset, catchblock[j].handler, + rva_to_ptr(catchblock[j].handler, image_base), catchblock[j].frame, + catchblock[j].type_info, + dbgstr_type_info(rva_to_ptr(catchblock[j].type_info, image_base))); } } + TRACE("ipmap: %x(%p) %d\n", descr->ipmap, ipmap, descr->ipmap_count); + for (i=0; i<descr->ipmap_count; i++) + { + TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state); + } TRACE("unwind_help %d\n", descr->unwind_help); TRACE("expect list: %x\n", descr->expect_list); TRACE("flags: %08x\n", descr->flags);

1 0

Piotr Caban : msvcrt: Add x86_64 __CxxFrameHandler implementation.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 63aea551ca6193e62a711d7caa3a82f0f9405d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63aea551ca6193e62a711d7ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:12:10 2016 +0200 msvcrt: Add x86_64 __CxxFrameHandler implementation. Known issues: - exceptions are destroyed too late in case of rethrow - no longer used cxx_frame_info structures are freed incorrectly Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 289 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 284 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63aea551ca6193e62a711…

1 0

Piotr Caban : msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 953d6c88d1235548eaa54f1b450f5bba938c4f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953d6c88d1235548eaa54f1b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:12:18 2016 +0200 msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 018554e..0379d30 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -177,7 +177,9 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state); } TRACE("unwind_help %d\n", descr->unwind_help); + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; TRACE("expect list: %x\n", descr->expect_list); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; TRACE("flags: %08x\n", descr->flags); } @@ -444,7 +446,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, { cxx_exception_type *exc_type; - if (descr->magic != CXX_FRAME_MAGIC_VC8) + if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { FIXME("unhandled frame magic %x\n", descr->magic); return ExceptionContinueSearch;

1 0

Alexandre Julliard : makedep: Sort makefile variables.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 512c686be9b3eb952a8d6e49abae032f335bc1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512c686be9b3eb952a8d6e49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 12:27:17 2016 +0900 makedep: Sort makefile variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ad6e39..2a9782a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -413,10 +413,15 @@ static void strarray_add_uniq( struct strarray *array, const char *str ) */ static const char *strarray_get_value( const struct strarray *array, const char *name ) { - unsigned int i; + int pos, res, min = 0, max = array->count / 2 - 1; - for (i = 0; i < array->count; i += 2) - if (!strcmp( array->str[i], name )) return array->str[i + 1]; + while (min <= max) + { + pos = (min + max) / 2; + if (!(res = strcmp( array->str[pos * 2], name ))) return array->str[pos * 2 + 1]; + if (res < 0) min = pos + 1; + else max = pos - 1; + } return NULL; } @@ -428,17 +433,25 @@ static const char *strarray_get_value( const struct strarray *array, const char */ static void strarray_set_value( struct strarray *array, const char *name, const char *value ) { - unsigned int i; + int i, pos, res, min = 0, max = array->count / 2 - 1; - /* redefining a variable replaces the previous value */ - for (i = 0; i < array->count; i += 2) + while (min <= max) { - if (strcmp( array->str[i], name )) continue; - array->str[i + 1] = value; - return; + pos = (min + max) / 2; + if (!(res = strcmp( array->str[pos * 2], name ))) + { + /* redefining a variable replaces the previous value */ + array->str[pos * 2 + 1] = value; + return; + } + if (res < 0) min = pos + 1; + else max = pos - 1; } - strarray_add( array, name ); - strarray_add( array, value ); + strarray_add( array, NULL ); + strarray_add( array, NULL ); + for (i = array->count - 1; i > min * 2 + 1; i--) array->str[i] = array->str[i - 2]; + array->str[min * 2] = name; + array->str[min * 2 + 1] = value; }

1 0

Adam Buchbinder : riched20: Implement ITextRange::ScrollIntoView.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 20323e3f119e95811e773de68ca413447032b0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=20323e3f119e95811e773de68… Author: Adam Buchbinder <abuchbinder(a)google.com> Date: Thu Mar 24 14:35:09 2016 -0700 riched20: Implement ITextRange::ScrollIntoView. This only implements bStart = tomStart, but that seems like the most common use case. Signed-off-by: Adam Buchbinder <abuchbinder(a)google.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 5 ++-- dlls/riched20/editor.h | 1 + dlls/riched20/richole.c | 20 ++++++++++++-- dlls/riched20/tests/richole.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ca50f18..4b0bfcf 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -216,9 +216,8 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) } -static void -ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, + int *x, int *y, int *height) { ME_DisplayItem *row; ME_DisplayItem *run = pCursor->pRun; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a63dea6..e9d1e47 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -192,6 +192,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index be35521..1013e67 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2428,13 +2428,29 @@ static HRESULT WINAPI ITextRange_fnSetPoint(ITextRange *me, LONG x, LONG y, LONG static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_TextEditor *editor; + ME_Cursor cursor; + int x, y, height; - FIXME("(%p)->(%d): stub\n", This, value); + TRACE("(%p)->(%d)\n", This, value); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + editor = This->child.reole->editor; + + switch (value) + { + case tomStart: + ME_CursorFromCharOfs(editor, This->start, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; + default: + FIXME("bStart value %d not handled\n", value); + return E_NOTIMPL; + } + ME_ScrollAbs(editor, x, y); + return S_OK; } static HRESULT WINAPI ITextRange_fnGetEmbeddedObject(ITextRange *me, IUnknown **ppv) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7c6c5d5..6da3ce3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -53,6 +53,7 @@ static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) HWND hwnd = CreateWindowA(lpClassName, NULL, dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; } @@ -761,6 +762,65 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); } +/* Helper function for testing ITextRange_ScrollIntoView */ +static void check_range(HWND w, ITextDocument* doc, int first, int lim, + LONG bStart, int expected_nonzero) +{ + SCROLLINFO si; + ITextRange *txtRge = NULL; + HRESULT hres; + + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_POS | SIF_RANGE; + + hres = ITextDocument_Range(doc, first, lim, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextRange_ScrollIntoView(txtRge, bStart); + ok(hres == S_OK, "got 0x%08x\n", hres); + GetScrollInfo(w, SB_VERT, &si); + if (expected_nonzero) { + ok(si.nPos != 0, + "Scrollbar at 0, should be >0. (TextRange %d-%d, scroll range %d-%d.)\n", + first, lim, si.nMin, si.nMax); + } else { + ok(si.nPos == 0, + "Scrollbar at %d, should be 0. (TextRange %d-%d, scroll range %d-%d.)\n", + si.nPos, first, lim, si.nMin, si.nMax); + } +} + +static void test_ITextRange_ScrollIntoView(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + static const CHAR test_text1[] = "1\n2\n3\n4\n5\n6\n7\n8\n9\n10"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + /* Scroll to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Scroll to the bottom. */ + check_range(w, txtDoc, 19, 20, tomStart, 1); + + /* Back up to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Large range */ + check_range(w, txtDoc, 0, 20, tomStart, 0); + + hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + release_interfaces(&w, &reOle, &txtDoc, NULL); + hres = ITextRange_ScrollIntoView(txtRge, tomStart); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + ITextRange_Release(txtRge); +} + static void test_ITextSelection_GetChar(void) { HWND w; @@ -3352,6 +3412,7 @@ START_TEST(richole) test_ITextSelection_Collapse(); test_ITextDocument_Range(); test_ITextRange_GetChar(); + test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse();

1 0