September 2008 - Wine-commits

Jacek Caban : jscript: Added '!==' expression implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: d7c8c2544d82d550459ff28cad2b1b64cf39227b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c8c2544d82d550459ff28ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:26:37 2008 +0200 jscript: Added '!==' expression implementation. --- dlls/jscript/engine.c | 21 ++++++++++++++++++--- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8f66b3d..2a98643 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -976,10 +976,25 @@ HRESULT not_equal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl return E_NOTIMPL; } -HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.9.5 */ +HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &rval, &lval); + if(FAILED(hres)) + return hres; + + hres = equal2_values(&rval, &lval, &b); + if(FAILED(hres)) + return hres; + + return return_bool(ret, !b); } HRESULT less_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 61d108f..92bf779 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -32,6 +32,9 @@ ok(null === null, "null === null is false"); ok(undefined === undefined, "undefined === undefined is false"); ok(!(undefined === null), "!(undefined === null) is false"); +ok(1 !== 2, "1 !== 2 is false"); +ok(null !== undefined, "null !== undefined is false"); + var trueVar = true; ok(trueVar, "trueVar is not true");

1 0

Jacek Caban : jscript: Added variable object handling.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 652a0121a9cf55d47bce176bcbb7e55c6927ec04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=652a0121a9cf55d47bce176bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:24:49 2008 +0200 jscript: Added variable object handling. --- dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 3 ++- dlls/jscript/jscript.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index db13aef..b3ae71f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -108,7 +108,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(scope_chain_t *scope, exec_ctx_t **ret) +HRESULT create_exec_ctx(DispatchEx *var_disp, scope_chain_t *scope, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -116,6 +116,9 @@ HRESULT create_exec_ctx(scope_chain_t *scope, exec_ctx_t **ret) if(!ctx) return E_OUTOFMEMORY; + IDispatchEx_AddRef(_IDispatchEx_(var_disp)); + ctx->var_disp = var_disp; + if(scope) { scope_addref(scope); ctx->scope_chain = scope; @@ -132,6 +135,8 @@ void exec_release(exec_ctx_t *ctx) if(ctx->scope_chain) scope_release(ctx->scope_chain); + if(ctx->var_disp) + IDispatchEx_Release(_IDispatchEx_(ctx->var_disp)); heap_free(ctx); } @@ -300,8 +305,12 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex } if(flags & EXPR_NEWREF) { - FIXME("create ref\n"); - return E_NOTIMPL; + hres = dispex_get_id(_IDispatchEx_(ctx->var_disp), identifier, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + + exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->var_disp), id); + return S_OK; } WARN("Could not find identifier %s\n", debugstr_w(identifier)); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 964e2b7..ce9253d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -75,6 +75,7 @@ struct _exec_ctx_t { parser_ctx_t *parser; scope_chain_t *scope_chain; + DispatchEx *var_disp; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -83,7 +84,7 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*); -HRESULT create_exec_ctx(scope_chain_t*,exec_ctx_t**); +HRESULT create_exec_ctx(DispatchEx*,scope_chain_t*,exec_ctx_t**); HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,jsexcept_t*,VARIANT*); typedef struct _statement_t statement_t; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 50ba18c..a104aa9 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -80,7 +80,7 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) VARIANT var; HRESULT hres; - hres = create_exec_ctx(NULL, &exec_ctx); + hres = create_exec_ctx(This->ctx->script_disp, NULL, &exec_ctx); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Added scope chain implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: fc5a8836e9e41c97536c372bf4c5c945701f21be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5a8836e9e41c97536c372bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:24:22 2008 +0200 jscript: Added scope chain implementation. --- dlls/jscript/engine.c | 33 +++++++++++++++++++++++++++++++-- dlls/jscript/engine.h | 17 ++++++++++++++++- dlls/jscript/jscript.c | 2 +- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 614c1a4..db13aef 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -96,7 +96,19 @@ static void exprval_set_idref(exprval_t *val, IDispatch *disp, DISPID id) IDispatch_AddRef(disp); } -HRESULT create_exec_ctx(exec_ctx_t **ret) +void scope_release(scope_chain_t *scope) +{ + if(--scope->ref) + return; + + if(scope->next) + scope_release(scope->next); + + IDispatchEx_Release(_IDispatchEx_(scope->obj)); + heap_free(scope); +} + +HRESULT create_exec_ctx(scope_chain_t *scope, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -104,6 +116,11 @@ HRESULT create_exec_ctx(exec_ctx_t **ret) if(!ctx) return E_OUTOFMEMORY; + if(scope) { + scope_addref(scope); + ctx->scope_chain = scope; + } + *ret = ctx; return S_OK; } @@ -113,6 +130,8 @@ void exec_release(exec_ctx_t *ctx) if(--ctx->ref) return; + if(ctx->scope_chain) + scope_release(ctx->scope_chain); heap_free(ctx); } @@ -239,13 +258,23 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, exprval_t *ret) { + scope_chain_t *scope; named_item_t *item; DISPID id = 0; HRESULT hres; TRACE("%s\n", debugstr_w(identifier)); - /* FIXME: scope chain */ + for(scope = ctx->scope_chain; scope; scope = scope->next) { + hres = dispex_get_id(_IDispatchEx_(scope->obj), identifier, 0, &id); + if(SUCCEEDED(hres)) + break; + } + + if(scope) { + exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(scope->obj), id); + return S_OK; + } hres = dispex_get_id(_IDispatchEx_(ctx->parser->script->global), identifier, 0, &id); if(SUCCEEDED(hres)) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c8dcfba..964e2b7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -56,10 +56,25 @@ static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) return jsheap_alloc(&ctx->tmp_heap, size); } +typedef struct _scope_chain_t { + LONG ref; + DispatchEx *obj; + struct _scope_chain_t *next; +} scope_chain_t; + +HRESULT scope_push(scope_chain_t*,DispatchEx*,scope_chain_t**); +void scope_release(scope_chain_t*); + +static inline void scope_addref(scope_chain_t *scope) +{ + scope->ref++; +} + struct _exec_ctx_t { LONG ref; parser_ctx_t *parser; + scope_chain_t *scope_chain; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -68,7 +83,7 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*); -HRESULT create_exec_ctx(exec_ctx_t**); +HRESULT create_exec_ctx(scope_chain_t*,exec_ctx_t**); HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,jsexcept_t*,VARIANT*); typedef struct _statement_t statement_t; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index a9c0bb3..50ba18c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -80,7 +80,7 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) VARIANT var; HRESULT hres; - hres = create_exec_ctx(&exec_ctx); + hres = create_exec_ctx(NULL, &exec_ctx); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Added literal expression implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 3c05ffe09487b66da4d377aaf0e76f24bd45449c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c05ffe09487b66da4d377aaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:23:41 2008 +0200 jscript: Added literal expression implementation. --- dlls/jscript/engine.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3f3d331..614c1a4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -152,6 +152,38 @@ static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept return disp_propput(ref->u.idref.disp, ref->u.idref.id, ctx->lcid, v, ei, NULL/*FIXME*/); } +static HRESULT literal_to_var(literal_t *literal, VARIANT *v) +{ + V_VT(v) = literal->vt; + + switch(V_VT(v)) { + case VT_EMPTY: + case VT_NULL: + break; + case VT_I4: + V_I4(v) = literal->u.lval; + break; + case VT_R8: + V_R8(v) = literal->u.dval; + break; + case VT_BSTR: + V_BSTR(v) = SysAllocString(literal->u.wstr); + break; + case VT_BOOL: + V_BOOL(v) = literal->u.bval; + break; + case VT_DISPATCH: + IDispatch_AddRef(literal->u.disp); + V_DISPATCH(v) = literal->u.disp; + break; + default: + ERR("wrong type %d\n", V_VT(v)); + return E_NOTIMPL; + } + + return S_OK; +} + HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -431,10 +463,22 @@ HRESULT identifier_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return hres; } -HRESULT literal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 7.8 */ +HRESULT literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + literal_expression_t *expr = (literal_expression_t*)_expr; + VARIANT var; + HRESULT hres; + + TRACE("\n"); + + hres = literal_to_var(expr->literal, &var); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = var; + return S_OK; } HRESULT array_literal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)

1 0

Jacek Caban : jscript: Added assignment test.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 86a787bbc9a62bbd3d192ae953848bc7201864f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a787bbc9a62bbd3d192ae95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:24:02 2008 +0200 jscript: Added assignment test. --- dlls/jscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1213b34..cb71fa8 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -59,8 +59,11 @@ static const CLSID CLSID_JScript = DEFINE_EXPECT(global_propget_d); DEFINE_EXPECT(global_propget_i); +DEFINE_EXPECT(global_propput_d); +DEFINE_EXPECT(global_propput_i); #define DISPID_GLOBAL_TESTPROPGET 0x1000 +#define DISPID_GLOBAL_TESTPROPPUT 0x1001 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -191,6 +194,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTPROPGET; return S_OK; } + if(!strcmp_wa(bstrName, "testPropPut")) { + CHECK_EXPECT(global_propput_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_GLOBAL_TESTPROPPUT; + return S_OK; + } ok(0, "unexpected call %s\n", debugstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -217,6 +226,22 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_I4(pvarRes) = 1; return S_OK; + + case DISPID_GLOBAL_TESTPROPPUT: + CHECK_EXPECT(global_propput_i); + + ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(pdp->rgvarg)=%d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg) == 1, "V_I4(pdp->rgvarg)=%d\n", V_I4(pdp->rgvarg)); + return S_OK; } ok(0, "unexpected call %x\n", id); @@ -396,6 +421,12 @@ static void run_tests(void) parse_script_a("testPropGet;"); CHECK_CALLED(global_propget_d); CHECK_CALLED(global_propget_i); + + SET_EXPECT(global_propput_d); + SET_EXPECT(global_propput_i); + parse_script_a("testPropPut = 1;"); + CHECK_CALLED(global_propput_d); + CHECK_CALLED(global_propput_i); } START_TEST(run)

1 0

Jacek Caban : jscript: Added global object implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: ca2b797f6a7e5fa2f320fed0c4aaab70c0d44068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2b797f6a7e5fa2f320fed0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:22:54 2008 +0200 jscript: Added global object implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/engine.c | 7 +- dlls/jscript/global.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.c | 13 ++- dlls/jscript/jscript.h | 6 +- 5 files changed, 313 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2b797f6a7e5fa2f320f…

1 0

Jacek Caban : jscript: Added assign expression implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 512505f9085781521c2e6693dde5e3d4bfbfee0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=512505f9085781521c2e6693d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:23:21 2008 +0200 jscript: Added assign expression implementation. --- dlls/jscript/dispex.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/jscript.h | 1 + 3 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f279655..5286b61 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -838,6 +838,42 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS return hres; } +HRESULT disp_propput(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +{ + DISPID dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {val, &dispid, 1, 1}; + IDispatchEx *dispex; + DispatchEx *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + prop = get_prop(jsdisp, id); + if(prop) + hres = prop_put(jsdisp, prop, lcid, &dp, ei, caller); + else + hres = DISP_E_MEMBERNOTFOUND; + + IDispatchEx_Release(_IDispatchEx_(jsdisp)); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + ULONG err = 0; + + TRACE("using IDispatch\n"); + return IDispatch_Invoke(disp, id, &IID_NULL, DISPATCH_PROPERTYPUT, lcid, &dp, NULL, &ei->ei, &err); + } + + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, caller); + + IDispatchEx_Release(dispex); + return hres; +} + HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { DISPPARAMS dp = {NULL,NULL,0,0}; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e77993e..3f3d331 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -141,6 +141,17 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) return hres; } +/* ECMA-262 3rd Edition 8.7.2 */ +static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept_t *ei) +{ + if(ref->type != EXPRVAL_IDREF) { + FIXME("throw ReferemceError\n"); + return E_FAIL; + } + + return disp_propput(ref->u.idref.disp, ref->u.idref.id, ctx->lcid, v, ei, NULL/*FIXME*/); +} + HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -655,10 +666,38 @@ HRESULT right2_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD return E_NOTIMPL; } -HRESULT assign_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.1 */ +HRESULT assign_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + exprval_t exprval, exprvalr; + VARIANT rval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression1, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = expr_eval(ctx, expr->expression2, 0, ei, &exprvalr); + if(SUCCEEDED(hres)) { + hres = exprval_to_value(ctx->parser->script, &exprvalr, ei, &rval); + exprval_release(&exprvalr); + } + + if(SUCCEEDED(hres)) + hres = put_value(ctx->parser->script, &exprval, &rval, ei); + + exprval_release(&exprval); + if(FAILED(hres)) { + VariantClear(&rval); + return hres; + } + + ret->type = EXPRVAL_VARIANT; + ret->u.var = rval; + return S_OK; } HRESULT assign_lshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d1bfa9d..45d7bca 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -89,6 +89,7 @@ struct DispatchEx { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,DispatchEx*,DispatchEx**); HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); typedef struct named_item_t { IDispatch *disp;

1 0

Jacek Caban : jscript: Added AddNamedItem implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 2bbd9d410509a426b22f59c156daa15a35b78809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbd9d410509a426b22f59c15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:22:31 2008 +0200 jscript: Added AddNamedItem implementation. --- dlls/jscript/engine.c | 31 ++++++++++++++++++++++++++++- dlls/jscript/jscript.c | 37 +++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 8 +++++++ dlls/jscript/tests/run.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3633939..422ac7d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -123,6 +123,24 @@ static HRESULT dispex_get_id(IDispatchEx *dispex, BSTR name, DWORD flags, DISPID return IDispatchEx_GetDispID(dispex, name, flags|fdexNameCaseSensitive, id); } +static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) +{ + IDispatchEx *dispex; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + TRACE("unsing IDispatch\n"); + + *id = 0; + return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); + } + + hres = dispex_get_id(dispex, name, flags, id); + IDispatchEx_Release(dispex); + return hres; +} + HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -178,6 +196,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, exprval_t *ret) { + named_item_t *item; DISPID id = 0; HRESULT hres; @@ -185,7 +204,17 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex /* FIXME: scope chain */ /* FIXME: global */ - /* FIXME: named items */ + + for(item = ctx->parser->script->named_items; item; item = item->next) { + hres = disp_get_id(item->disp, identifier, 0, &id); + if(SUCCEEDED(hres)) + break; + } + + if(item) { + exprval_set_idref(ret, (IDispatch*)item->disp, id); + return S_OK; + } hres = dispex_get_id(_IDispatchEx_(ctx->parser->script->script_disp), identifier, 0, &id); if(SUCCEEDED(hres)) { diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index f8b95c5..ee5dcdf 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -320,8 +320,41 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags) { JScript *This = ACTSCRIPT_THIS(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); - return E_NOTIMPL; + named_item_t *item; + IDispatch *disp; + IUnknown *unk; + HRESULT hres; + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + + if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->ctx->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + return hres; + } + + item = heap_alloc(sizeof(*item)); + if(!item) { + IDispatch_Release(disp); + return E_OUTOFMEMORY; + } + + item->disp = disp; + item->flags = dwFlags; + item->next = This->ctx->named_items; + This->ctx->named_items = item; + + return S_OK; } static HRESULT WINAPI JScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTypeLib, diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a8cfad2..3a29a8f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -89,11 +89,19 @@ HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,DispatchEx*,DispatchEx HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +typedef struct named_item_t { + IDispatch *disp; + DWORD flags; + + struct named_item_t *next; +} named_item_t; + struct _script_ctx_t { LONG ref; SCRIPTSTATE state; exec_ctx_t *exec_ctx; + named_item_t *named_items; LCID lcid; DispatchEx *script_disp; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index b9daee4..1213b34 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -57,6 +57,11 @@ static const CLSID CLSID_JScript = expect_ ## func = called_ ## func = FALSE; \ }while(0) +DEFINE_EXPECT(global_propget_d); +DEFINE_EXPECT(global_propget_i); + +#define DISPID_GLOBAL_TESTPROPGET 0x1000 + static const WCHAR testW[] = {'t','e','s','t',0}; static const char *debugstr_w(LPCWSTR str) @@ -82,6 +87,13 @@ static BSTR a2bstr(const char *str) return ret; } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -173,12 +185,41 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { + if(!strcmp_wa(bstrName, "testPropGet")) { + CHECK_EXPECT(global_propget_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_GLOBAL_TESTPROPGET; + return S_OK; + } + + ok(0, "unexpected call %s\n", debugstr_w(bstrName)); return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { + switch(id) { + case DISPID_GLOBAL_TESTPROPGET: + CHECK_EXPECT(global_propget_i); + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = 1; + + return S_OK; + } + + ok(0, "unexpected call %x\n", id); return DISP_E_MEMBERNOTFOUND; } @@ -326,7 +367,6 @@ static void parse_script(BSTR script_str) hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); - todo_wine ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); @@ -350,6 +390,12 @@ static void run_tests(void) { parse_script_a(""); parse_script_a("/* empty */ ;"); + + SET_EXPECT(global_propget_d); + SET_EXPECT(global_propget_i); + parse_script_a("testPropGet;"); + CHECK_CALLED(global_propget_d); + CHECK_CALLED(global_propget_i); } START_TEST(run)

1 0

Jacek Caban : jscript: Added GetMemberName implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 3612bae30c0496d13d076358ab41478e337deee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3612bae30c0496d13d076358a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:21:38 2008 +0200 jscript: Added GetMemberName implementation. --- dlls/jscript/dispex.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0d8bbe1..270e172 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -614,8 +614,19 @@ static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); - return E_NOTIMPL; + dispex_prop_t *prop; + + TRACE("(%p)->(%x %p)\n", This, id, pbstrName); + + prop = get_prop(This, id); + if(!prop || !prop->name || prop->type == PROP_DELETED) + return DISP_E_MEMBERNOTFOUND; + + *pbstrName = SysAllocString(prop->name); + if(!*pbstrName) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)

1 0

Jacek Caban : jscript: Added expression statement implementation.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: eb0bb55de28c5aa3183a3696d8e2823f0828de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0bb55de28c5aa3183a3696d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:21:55 2008 +0200 jscript: Added expression statement implementation. --- dlls/jscript/dispex.c | 35 ++++++++++++++++++++ dlls/jscript/engine.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/engine.h | 19 ++++++++++- dlls/jscript/jscript.h | 1 + 4 files changed, 134 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 270e172..f279655 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -837,3 +837,38 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS return hres; } + +HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +{ + DISPPARAMS dp = {NULL,NULL,0,0}; + IDispatchEx *dispex; + DispatchEx *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + prop = get_prop(jsdisp, id); + if(prop) + hres = prop_get(jsdisp, prop, lcid, &dp, val, ei, caller); + else + hres = DISP_E_MEMBERNOTFOUND; + + IDispatchEx_Release(_IDispatchEx_(jsdisp)); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + ULONG err = 0; + + TRACE("uding IDispatch\n"); + return IDispatchEx_Invoke(dispex, id, &IID_NULL, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); + } + + hres = IDispatchEx_InvokeEx(dispex, id, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, caller); + IDispatchEx_Release(dispex); + + return hres; +} diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ef66c97..72f723d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -23,11 +23,69 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define EXPR_NOVAL 0x0001 +#define EXPR_NEWREF 0x0002 +#define EXPR_STRREF 0x0004 + static inline HRESULT stat_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { return stat->eval(ctx, stat, rt, ret); } +static inline HRESULT expr_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + return _expr->eval(ctx, _expr, flags, ei, ret); +} + +static void exprval_release(exprval_t *val) +{ + switch(val->type) { + case EXPRVAL_VARIANT: + VariantClear(&val->u.var); + return; + case EXPRVAL_IDREF: + if(val->u.idref.disp) + IDispatch_Release(val->u.idref.disp); + return; + case EXPRVAL_NAMEREF: + if(val->u.nameref.disp) + IDispatch_Release(val->u.nameref.disp); + SysFreeString(val->u.nameref.name); + } +} + +/* ECMA-262 3rd Edition 8.7.1 */ +static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, VARIANT *ret) +{ + V_VT(ret) = VT_EMPTY; + + switch(val->type) { + case EXPRVAL_VARIANT: + return VariantCopy(ret, &val->u.var); + case EXPRVAL_IDREF: + if(!val->u.idref.disp) { + FIXME("throw ReferenceError\n"); + return E_FAIL; + } + + return disp_propget(val->u.idref.disp, val->u.idref.id, ctx->lcid, ret, ei, NULL/*FIXME*/); + default: + ERR("type %d\n", val->type); + return E_FAIL; + } +} + +static HRESULT exprval_to_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, VARIANT *ret) +{ + if(val->type == EXPRVAL_VARIANT) { + *ret = val->u.var; + V_VT(&val->u.var) = VT_EMPTY; + return S_OK; + } + + return exprval_value(ctx, val, ei, ret); +} + HRESULT create_exec_ctx(exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -112,6 +170,7 @@ HRESULT var_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt return E_NOTIMPL; } +/* ECMA-262 3rd Edition 12.3 */ HRESULT empty_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { TRACE("\n"); @@ -120,10 +179,28 @@ HRESULT empty_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t * return S_OK; } -HRESULT expression_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.4 */ +HRESULT expression_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + expression_statement_t *stat = (expression_statement_t*)_stat; + exprval_t exprval; + VARIANT val; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, stat->expr, EXPR_NOVAL, &rt->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + *ret = val; + TRACE("= %s\n", debugstr_variant(ret)); + return S_OK; } HRESULT if_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6e91178..c8dcfba 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -215,7 +215,24 @@ HRESULT switch_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT throw_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT try_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); -typedef struct exprval_t exprval_t; +typedef struct { + enum { + EXPRVAL_VARIANT, + EXPRVAL_IDREF, + EXPRVAL_NAMEREF + } type; + union { + VARIANT var; + struct { + IDispatch *disp; + DISPID id; + } idref; + struct { + IDispatch *disp; + BSTR name; + } nameref; + } u; +} exprval_t; typedef HRESULT (*expression_eval_t)(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b676198..a8cfad2 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -87,6 +87,7 @@ struct DispatchEx { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,DispatchEx*,DispatchEx**); HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); struct _script_ctx_t { LONG ref;

1 0