December 2011 - Wine-Commits

Francois Gouget : inetcpl: Don't pad group box labels with spaces.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

1 0

André Hentschel : d3drm: Add IDirect3DRM3 interface.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 723ae056b90bfc5fbdb0c2a116cd7bb39c59633d URL: http://source.winehq.org/git/wine.git/?a=commit;h=723ae056b90bfc5fbdb0c2a11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 02:26:40 2011 +0100 d3drm: Add IDirect3DRM3 interface. --- dlls/d3drm/d3drm.c | 491 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 491 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=723ae056b90bfc5fbdb0c…

1 0

Francois Gouget : comdlg32: Use sentence capitalization for group box labels.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

1 0

Francois Gouget : cryptui: Don't assign access keys to group box labels.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

1 0

Jacek Caban : jscript: No longer support per-statement compilation.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: b3907c40f74f4b25ed9c7a34004ddac051eb43e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3907c40f74f4b25ed9c7a340… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:09:09 2011 +0100 jscript: No longer support per-statement compilation. --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/engine.c | 14 ++++---------- dlls/jscript/engine.h | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5d63dbe..05d1ccc 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1637,7 +1637,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *re return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; } -HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL compile_block, unsigned *ret_off) +HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off) { HRESULT hres; @@ -1648,7 +1648,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL com return hres; *ret_off = parser->compiler->code_off; - if(compile_block && stat->next) + if(stat->next) hres = compile_block_statement(parser->compiler, stat); else hres = compile_statement(parser->compiler, NULL, stat); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c792a66..1cd96a7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2589,7 +2589,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) return hres; } -HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, VARIANT *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; except_frame_t *prev_except_frame; @@ -2602,19 +2602,13 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ TRACE("\n"); - if(stat->instr_off == -1) { - hres = compile_subscript_stat(exec_ctx->parser, stat, FALSE, &stat->instr_off); - if(FAILED(hres)) - return hres; - } - prev_rt = exec_ctx->rt; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; prev_ei = exec_ctx->ei; - exec_ctx->ip = stat->instr_off; + exec_ctx->ip = ip; exec_ctx->rt = rt; exec_ctx->ei = &rt->ei; exec_ctx->except_frame = NULL; @@ -2762,9 +2756,9 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so if(source->statement) { if(source->statement->instr_off == -1) - hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); + hres = compile_subscript_stat(ctx->parser, source->statement, &source->statement->instr_off); if(SUCCEEDED(hres)) - hres = compiled_statement_eval(script, source->statement, &rt, &val); + hres = enter_bytecode(script, source->statement->instr_off, &rt, &val); } script->exec_ctx = prev_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b42a2ba..c984ade 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -591,4 +591,4 @@ typedef struct { } property_value_expression_t; HRESULT compile_subscript(parser_ctx_t*,expression_t*,unsigned*) DECLSPEC_HIDDEN; -HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN; +HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,unsigned*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added bytecode dumper implementation.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 59619073a89cc6add5eda979ac234ed8e2d0266e URL: http://source.winehq.org/git/wine.git/?a=commit;h=59619073a89cc6add5eda979a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:09:51 2011 +0100 jscript: Added bytecode dumper implementation. --- dlls/jscript/compile.c | 55 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 05d1ccc..62dadea 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -25,6 +25,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DECLARE_DEBUG_CHANNEL(jscript_disas); typedef struct _statement_ctx_t { unsigned stack_use; @@ -61,6 +62,46 @@ OP_LIST #undef X }; +static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) +{ + switch(type) { + case ARG_STR: + TRACE_(jscript_disas)("\t%s", debugstr_w(arg->str)); + break; + case ARG_BSTR: + TRACE_(jscript_disas)("\t%s", debugstr_wn(arg->bstr, SysStringLen(arg->bstr))); + break; + case ARG_INT: + TRACE_(jscript_disas)("\t%d", arg->uint); + break; + case ARG_UINT: + case ARG_ADDR: + TRACE_(jscript_disas)("\t%u", arg->uint); + break; + case ARG_DBL: + TRACE_(jscript_disas)("\t%lf", *arg->dbl); + break; + case ARG_STAT: + case ARG_FUNC: + case ARG_NONE: + break; + default: + assert(0); + } +} + +static void dump_code(compiler_ctx_t *ctx, unsigned off) +{ + instr_t *instr; + + for(instr = ctx->code->instrs+off; instr < ctx->code->instrs+ctx->code_off; instr++) { + TRACE_(jscript_disas)("%d:\t%s", (int)(instr-ctx->code->instrs), instr_info[instr->op].op_str); + dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); + dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2); + TRACE_(jscript_disas)("\n"); + } +} + static HRESULT compile_expression(compiler_ctx_t*,expression_t*); static HRESULT compile_statement(compiler_ctx_t*,statement_ctx_t*,statement_t*); @@ -1639,6 +1680,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *re HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off) { + unsigned off; HRESULT hres; TRACE("\n"); @@ -1647,7 +1689,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned if(FAILED(hres)) return hres; - *ret_off = parser->compiler->code_off; + off = parser->compiler->code_off; if(stat->next) hres = compile_block_statement(parser->compiler, stat); else @@ -1655,7 +1697,14 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned if(FAILED(hres)) return hres; - resolve_labels(parser->compiler, *ret_off); + resolve_labels(parser->compiler, off); - return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; + if(push_instr(parser->compiler, OP_ret) == -1) + return E_OUTOFMEMORY; + + if(TRACE_ON(jscript_disas)) + dump_code(parser->compiler, off); + + *ret_off = off; + return S_OK; }

1 0

Nikolay Sivov : wshom.ocx: Added IDispatch support for IWshShell3.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 322887635599ebae4bd13f838fb427face085c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322887635599ebae4bd13f838… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 29 12:16:22 2011 +0300 wshom.ocx: Added IDispatch support for IWshShell3. --- dlls/wshom.ocx/Makefile.in | 1 + dlls/wshom.ocx/shell.c | 37 +++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 6 +++- dlls/wshom.ocx/wshom_main.c | 70 +++++++++++++++++++++++++++++++++++++++- dlls/wshom.ocx/wshom_private.h | 9 +++++ 5 files changed, 115 insertions(+), 8 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 879cc70..385fe73 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = wshom.ocx +IMPORTS = uuid oleaut32 C_SRCS = \ shell.c \ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 9392ff5..68f14b8 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -23,6 +23,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static IWshShell3 WshShell3; + static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { @@ -66,23 +68,46 @@ static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinf static HRESULT WINAPI WshShell3_GetTypeInfo(IWshShell3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("(%u %u %p)\n", iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("(%u %u %p)\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshShell3_tid, ppTInfo); } static HRESULT WINAPI WshShell3_GetIDsOfNames(IWshShell3 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshShell3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo(IWshShell3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &WshShell3, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **out_Folders) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index f9768b9..36081aa 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -31,6 +31,7 @@ DEFINE_GUID(IID_IWshShell3, 0x41904400, 0xbe18, 0x11d3, 0xa2,0x8b, 0x00,0x10,0x4 static void test_wshshell(void) { + IDispatchEx *dispex; IDispatch *disp; IUnknown *shell; HRESULT hres; @@ -43,9 +44,12 @@ static void test_wshshell(void) } hres = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); - IDispatch_Release(disp); ok(hres == S_OK, "Could not get IWshShell3 iface: %08x\n", hres); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == E_NOINTERFACE, "got %08x\n", hres); + + IDispatch_Release(disp); IUnknown_Release(shell); } diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index b05eb86..c750592 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "initguid.h" #include "wshom_private.h" + +#include "initguid.h" #include "wshom.h" #include "rpcproxy.h" @@ -27,6 +28,70 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); static HINSTANCE wshom_instance; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IWshShell3 +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_IWshRuntimeLibrary, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -91,6 +156,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wshom_instance = hInstDLL; DisableThreadLibraryCalls(wshom_instance); break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; } return TRUE; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 50b84b3..42be641 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -24,4 +24,13 @@ #include "winbase.h" #include "ole2.h" +/* typelibs */ +typedef enum tid_t { + NULL_tid, + IWshShell3_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); + HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Always use bytecode for switch statement.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 985c6a1943a96128b284c0032f717e7015496af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985c6a1943a96128b284c0032… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:07:08 2011 +0100 jscript: Always use bytecode for switch statement. --- dlls/jscript/compile.c | 8 ----- dlls/jscript/engine.c | 68 ------------------------------------------------ dlls/jscript/engine.h | 1 - 3 files changed, 0 insertions(+), 77 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e4c5332..076b768 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1327,11 +1327,8 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t BOOL have_default = FALSE; statement_t *stat_iter; case_clausule_t *iter; - unsigned off_backup; HRESULT hres; - off_backup = ctx->code_off; - hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) return hres; @@ -1394,11 +1391,6 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); stat_iter = stat_iter->next) { hres = compile_statement(ctx, &stat_ctx, stat_iter); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = switch_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) break; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6e8ae3c..746002f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -916,74 +916,6 @@ static HRESULT interp_case(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.13 */ -HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - switch_statement_t *stat = (switch_statement_t*)_stat; - case_clausule_t *iter, *default_clausule = NULL; - statement_t *stat_iter; - VARIANT val, cval; - BOOL b; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, stat->expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - for(iter = stat->case_list; iter; iter = iter->next) { - if(!iter->expr) { - default_clausule = iter; - continue; - } - - hres = expr_eval(ctx, iter->expr, &rt->ei, &cval); - if(FAILED(hres)) - break; - - hres = equal2_values(&val, &cval, &b); - VariantClear(&cval); - if(FAILED(hres) || b) - break; - } - - VariantClear(&val); - if(FAILED(hres)) - return hres; - - if(!iter) - iter = default_clausule; - - V_VT(&val) = VT_EMPTY; - if(iter) { - VARIANT tmp; - - for(stat_iter = iter->stat; stat_iter; stat_iter = stat_iter->next) { - hres = stat_eval(ctx, stat_iter, rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&val); - val = tmp; - - if(rt->type != RT_NORMAL) - break; - } - } - - if(FAILED(hres)) { - VariantClear(&val); - return hres; - } - - if(rt->type == RT_BREAK) - rt->type = RT_NORMAL; - - *ret = val; - return S_OK; -} - -/* ECMA-262 3rd Edition 12.13 */ static HRESULT interp_throw(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f4f06c1..385778e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -417,7 +417,6 @@ HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT switch_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; typedef struct {

1 0

Jacek Caban : jscript: Moved exec_source to the bottom of the file.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: f08fcff4fde3c1949d2563c17575aeab3b48cbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08fcff4fde3c1949d2563c17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:08:07 2011 +0100 jscript: Moved exec_source to the bottom of the file. --- dlls/jscript/engine.c | 162 ++++++++++++++++++++++++------------------------ 1 files changed, 81 insertions(+), 81 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 781814a..c792a66 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -499,87 +499,6 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, - jsexcept_t *ei, VARIANT *retv) -{ - script_ctx_t *script = parser->script; - function_declaration_t *func; - parser_ctx_t *prev_parser; - var_list_t *var; - VARIANT val; - exec_ctx_t *prev_ctx; - return_type_t rt; - HRESULT hres = S_OK; - - for(func = source->functions; func; func = func->next) { - jsdisp_t *func_obj; - VARIANT var; - - hres = create_source_function(parser, func->expr->parameter_list, func->expr->source_elements, - ctx->scope_chain, func->expr->src_str, func->expr->src_len, &func_obj); - if(FAILED(hres)) - return hres; - - var_set_jsdisp(&var, func_obj); - hres = jsdisp_propput_name(ctx->var_disp, func->expr->identifier, &var, ei, NULL); - jsdisp_release(func_obj); - if(FAILED(hres)) - return hres; - } - - for(var = source->variables; var; var = var->next) { - DISPID id = 0; - BSTR name; - - name = SysAllocString(var->identifier); - if(!name) - return E_OUTOFMEMORY; - - if(!ctx->is_global || !lookup_global_members(parser->script, name, NULL)) - hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); - SysFreeString(name); - if(FAILED(hres)) - return hres; - } - - prev_ctx = script->exec_ctx; - script->exec_ctx = ctx; - - prev_parser = ctx->parser; - ctx->parser = parser; - - V_VT(&val) = VT_EMPTY; - memset(&rt, 0, sizeof(rt)); - rt.type = RT_NORMAL; - - if(source->statement) { - if(source->statement->instr_off == -1) - hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); - if(SUCCEEDED(hres)) - hres = compiled_statement_eval(script, source->statement, &rt, &val); - } - - script->exec_ctx = prev_ctx; - ctx->parser = prev_parser; - - if(rt.type != RT_NORMAL && rt.type != RT_RETURN) { - FIXME("wrong rt %d\n", rt.type); - hres = E_FAIL; - } - - *ei = rt.ei; - if(FAILED(hres)) { - VariantClear(&val); - return hres; - } - - if(!retv || (!from_eval && rt.type != RT_RETURN)) - VariantClear(&val); - if(retv) - *retv = val; - return S_OK; -} - /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -2787,3 +2706,84 @@ static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, jsexcept_t *ei, *ret = *stack_pop(exec_ctx); return S_OK; } + +HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, + jsexcept_t *ei, VARIANT *retv) +{ + script_ctx_t *script = parser->script; + function_declaration_t *func; + parser_ctx_t *prev_parser; + var_list_t *var; + VARIANT val; + exec_ctx_t *prev_ctx; + return_type_t rt; + HRESULT hres = S_OK; + + for(func = source->functions; func; func = func->next) { + jsdisp_t *func_obj; + VARIANT var; + + hres = create_source_function(parser, func->expr->parameter_list, func->expr->source_elements, + ctx->scope_chain, func->expr->src_str, func->expr->src_len, &func_obj); + if(FAILED(hres)) + return hres; + + var_set_jsdisp(&var, func_obj); + hres = jsdisp_propput_name(ctx->var_disp, func->expr->identifier, &var, ei, NULL); + jsdisp_release(func_obj); + if(FAILED(hres)) + return hres; + } + + for(var = source->variables; var; var = var->next) { + DISPID id = 0; + BSTR name; + + name = SysAllocString(var->identifier); + if(!name) + return E_OUTOFMEMORY; + + if(!ctx->is_global || !lookup_global_members(parser->script, name, NULL)) + hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); + SysFreeString(name); + if(FAILED(hres)) + return hres; + } + + prev_ctx = script->exec_ctx; + script->exec_ctx = ctx; + + prev_parser = ctx->parser; + ctx->parser = parser; + + V_VT(&val) = VT_EMPTY; + memset(&rt, 0, sizeof(rt)); + rt.type = RT_NORMAL; + + if(source->statement) { + if(source->statement->instr_off == -1) + hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); + if(SUCCEEDED(hres)) + hres = compiled_statement_eval(script, source->statement, &rt, &val); + } + + script->exec_ctx = prev_ctx; + ctx->parser = prev_parser; + + if(rt.type != RT_NORMAL && rt.type != RT_RETURN) { + FIXME("wrong rt %d\n", rt.type); + hres = E_FAIL; + } + + *ei = rt.ei; + if(FAILED(hres)) { + VariantClear(&val); + return hres; + } + + if(!retv || (!from_eval && rt.type != RT_RETURN)) + VariantClear(&val); + if(retv) + *retv = val; + return S_OK; +}

1 0

Jacek Caban : jscript: Get rid of stat_eval_table.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 6710e7ec6fbc4c68dbffabb02b7f78339d391b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6710e7ec6fbc4c68dbffabb02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:08:34 2011 +0100 jscript: Get rid of stat_eval_table. --- dlls/jscript/compile.c | 10 ++++++++++ dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 21 +-------------------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 127d967..5d63dbe 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1289,6 +1289,13 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * return push_instr_uint(ctx, OP_jmp, pop_ctx->break_label); } +/* ECMA-262 3rd Edition 12.9 */ +static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statement_t *stat) +{ + stat->stat.eval = return_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); +} + /* ECMA-262 3rd Edition 12.10 */ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { @@ -1527,6 +1534,9 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_LABEL: hres = push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ break; + case STAT_RETURN: + hres = compile_return_statement(ctx, (expression_statement_t*)stat); + break; case STAT_SWITCH: hres = compile_switch_statement(ctx, (switch_statement_t*)stat); break; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4ac5e6a..b42a2ba 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -412,7 +412,6 @@ typedef struct { statement_t *finally_statement; } try_statement_t; -HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5cf0412..a3fe42a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -835,25 +835,6 @@ static BOOL allow_auto_semicolon(parser_ctx_t *ctx) return ctx->nl || ctx->ptr == ctx->end || *(ctx->ptr-1) == '}'; } -static const statement_eval_t stat_eval_table[] = { - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - return_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval -}; - static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size) { statement_t *stat; @@ -863,7 +844,7 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return NULL; stat->type = type; - stat->eval = stat_eval_table[type]; + stat->eval = NULL; stat->instr_off = -1; stat->next = NULL;

1 0