September 2008 - Wine-commits

Jacek Caban : jscript: Added script types tests.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: beba0f711d0059b186dd205b0fcd09c253eac4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beba0f711d0059b186dd205b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:12:19 2008 +0200 jscript: Added script types tests. --- dlls/jscript/tests/lang.js | 8 +++++++ dlls/jscript/tests/run.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7096401..b58e0f8 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -153,4 +153,12 @@ ok(blockVar === 2, "blockVar !== 2"); ok((true ? 1 : 2) === 1, "conditional expression true is not 1"); ok((0 === 2 ? 1 : 2) === 2, "conditional expression true is not 2"); +ok(getVT(undefined) === "VT_EMPTY", "getVT(undefined) is not VT_EMPTY"); +ok(getVT(null) === "VT_NULL", "getVT(null) is not VT_NULL"); +ok(getVT(0) === "VT_I4", "getVT(0) is not VT_I4"); +ok(getVT(0.5) === "VT_R8", "getVT(1.5) is not VT_R8"); +ok(getVT("test") === "VT_BSTR", "getVT(\"test\") is not VT_BSTR"); +ok(getVT(Math) === "VT_DISPATCH", "getVT(Math) is not VT_DISPATCH"); +ok(getVT(false) === "VT_BOOL", "getVT(false) is not VT_BOOL"); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 46e3387..bb8b47f 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -69,6 +69,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_REPORTSUCCESS 0x1002 #define DISPID_GLOBAL_TRACE 0x1003 #define DISPID_GLOBAL_OK 0x1004 +#define DISPID_GLOBAL_GETVT 0x1005 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -224,6 +225,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTPROPPUT; return S_OK; } + if(!strcmp_wa(bstrName, "getVT")) { + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_GLOBAL_GETVT; + return S_OK; + } if(strict_dispid_check) ok(0, "unexpected call %s\n", debugstr_w(bstrName)); @@ -312,6 +318,46 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, 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; + + case DISPID_GLOBAL_GETVT: + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "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_BSTR; + switch(V_VT(pdp->rgvarg)) { + case VT_EMPTY: + V_BSTR(pvarRes) = a2bstr("VT_EMPTY"); + break; + case VT_NULL: + V_BSTR(pvarRes) = a2bstr("VT_NULL"); + break; + case VT_I4: + V_BSTR(pvarRes) = a2bstr("VT_I4"); + break; + case VT_R8: + V_BSTR(pvarRes) = a2bstr("VT_R8"); + break; + case VT_BSTR: + V_BSTR(pvarRes) = a2bstr("VT_BSTR"); + break; + case VT_DISPATCH: + V_BSTR(pvarRes) = a2bstr("VT_DISPATCH"); + break; + case VT_BOOL: + V_BSTR(pvarRes) = a2bstr("VT_BOOL"); + break; + default: + ok(0, "unknown vt %d\n", V_VT(pdp->rgvarg)); + return E_FAIL; + } + + return S_OK; } ok(0, "unexpected call %x\n", id);

1 0

Jacek Caban : jscript: Added object initialiser expression implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: e7786d1d4588934d3ba9ccf1f457adfa1c16d89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7786d1d4588934d3ba9ccf1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:10:23 2008 +0200 jscript: Added object initialiser expression implementation. --- dlls/jscript/engine.c | 53 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 4 +++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 90aa300..6f77eb4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1050,10 +1050,57 @@ HRESULT array_literal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD return E_NOTIMPL; } -HRESULT property_value_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.1.5 */ +HRESULT property_value_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + property_value_expression_t *expr = (property_value_expression_t*)_expr; + VARIANT val, tmp; + DispatchEx *obj; + prop_val_t *iter; + exprval_t exprval; + BSTR name; + HRESULT hres; + + TRACE("\n"); + + hres = create_object(ctx->parser->script, NULL, &obj); + if(FAILED(hres)) + return hres; + + for(iter = expr->property_list; iter; iter = iter->next) { + hres = literal_to_var(iter->name, &tmp); + if(FAILED(hres)) + break; + + hres = to_string(ctx->parser->script, &tmp, ei, &name); + VariantClear(&tmp); + if(FAILED(hres)) + break; + + hres = expr_eval(ctx, iter->value, 0, ei, &exprval); + if(SUCCEEDED(hres)) { + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(SUCCEEDED(hres)) { + hres = jsdisp_propput_name(obj, name, ctx->parser->script->lcid, &val, ei, NULL/*FIXME*/); + VariantClear(&val); + } + } + + SysFreeString(name); + if(FAILED(hres)) + break; + } + + if(FAILED(hres)) { + jsdisp_release(obj); + return hres; + } + + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_DISPATCH; + V_DISPATCH(&ret->u.var) = (IDispatch*)_IDispatchEx_(obj); + return S_OK; } HRESULT comma_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 c6742f5..f709015 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -140,4 +140,8 @@ if(true) tmp = 1; ok(tmp === 1, "tmp !== 1, if(true) not evaluated?"); +var obj3 = { prop1: 1, prop2: typeof(false) }; +ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); +ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); + reportSuccess();

1 0

Jacek Caban : jscript: Added block statement implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 026bbea6726ad396500bc45f380e3cb18ed506e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026bbea6726ad396500bc45f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:10:41 2008 +0200 jscript: Added block statement implementation. --- dlls/jscript/engine.c | 31 ++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 6 ++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6f77eb4..e19a0bb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -478,10 +478,35 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex return E_FAIL; } -HRESULT block_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.1 */ +HRESULT block_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + block_statement_t *stat = (block_statement_t*)_stat; + VARIANT val, tmp; + statement_t *iter; + HRESULT hres = S_OK; + + TRACE("\n"); + + V_VT(&val) = VT_EMPTY; + for(iter = stat->stat_list; iter; iter = iter->next) { + hres = stat_eval(ctx, iter, rt, &tmp); + if(FAILED(hres)) + break; + + VariantClear(&val); + val = tmp; + if(rt->type != RT_NORMAL) + break; + } + + if(FAILED(hres)) { + VariantClear(&val); + return hres; + } + + *ret = val; + return S_OK; } /* ECMA-262 3rd Edition 12.2 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f709015..76cacee 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -144,4 +144,10 @@ var obj3 = { prop1: 1, prop2: typeof(false) }; ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); +{ + var blockVar = 1; + blockVar = 2; +} +ok(blockVar === 2, "blockVar !== 2"); + reportSuccess();

1 0

Jacek Caban : jscript: Added conditional expression implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 23ccc9a293c6261e035a29f211970bf7c4a37fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ccc9a293c6261e035a29f21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:11:15 2008 +0200 jscript: Added conditional expression implementation. --- dlls/jscript/engine.c | 22 +++++++++++++++++++--- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e19a0bb..ba3f9b0 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -781,10 +781,26 @@ HRESULT function_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fla return S_OK; } -HRESULT conditional_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.12 */ +HRESULT conditional_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + conditional_expression_t *expr = (conditional_expression_t*)_expr; + exprval_t exprval; + VARIANT_BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_boolean(ctx->parser->script, &exprval, ei, &b); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + return expr_eval(ctx, b ? expr->true_expression : expr->false_expression, flags, ei, ret); } /* ECMA-262 3rd Edition 11.2.1 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 76cacee..7096401 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -150,4 +150,7 @@ ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); } ok(blockVar === 2, "blockVar !== 2"); +ok((true ? 1 : 2) === 1, "conditional expression true is not 1"); +ok((0 === 2 ? 1 : 2) === 2, "conditional expression true is not 2"); + reportSuccess();

1 0

Jacek Caban : jscript: Added initial prototype of functions.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 0c6b804e6302a05cd29cead8df12af6ca2f954fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6b804e6302a05cd29cead8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:09:04 2008 +0200 jscript: Added initial prototype of functions. --- dlls/jscript/function.c | 8 +++++++- dlls/jscript/tests/lang.js | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index d4a3b62..4c07cb3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -424,11 +424,17 @@ HRESULT create_source_function(parser_ctx_t *ctx, parameter_t *parameters, sourc scope_chain_t *scope_chain, DispatchEx **ret) { FunctionInstance *function; + DispatchEx *prototype; parameter_t *iter; DWORD length = 0; HRESULT hres; - hres = create_function(ctx->script, PROPF_CONSTR, NULL, &function); + hres = create_object(ctx->script, NULL, &prototype); + if(FAILED(hres)) + return hres; + + hres = create_function(ctx->script, PROPF_CONSTR, prototype, &function); + jsdisp_release(prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1914a05..4a42b9d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -93,4 +93,27 @@ obj1.func = function () { ok(obj1.func(true) === "test", "obj1.func(true) is not \"test\""); +function testConstr1() { + this.var1 = 1; + + ok(this !== undefined, "this is undefined"); + ok(arguments.length === 1, "arguments.length is not 1"); + ok(arguments["0"] === true, "arguments[0] is not 1"); + + return false; +} + +testConstr1.prototype.pvar = 1; + +var obj2 = new testConstr1(true); +ok(typeof(obj2) === "object", "typeof(obj2) is not object"); +ok(obj2.pvar === 1, "obj2.pvar is not 1"); + +testConstr1.prototype.pvar = 2; +ok(obj2.pvar === 2, "obj2.pvar is not 2"); + +obj2.pvar = 3; +testConstr1.prototype.pvar = 1; +ok(obj2.pvar === 3, "obj2.pvar is not 3"); + reportSuccess();

1 0

Jacek Caban : jscript: Release named items in IActiveScript::Close.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 44333104ced7668f10345f4053a2f1d62a0cf43d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44333104ced7668f10345f405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:09:29 2008 +0200 jscript: Release named items in IActiveScript::Close. --- dlls/jscript/jscript.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5646cb8..e1dde43 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -305,6 +305,21 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) clear_script_queue(This); + if(This->ctx->named_items) { + named_item_t *iter, *iter2; + + iter = This->ctx->named_items; + while(iter) { + iter2 = iter->next; + + IDispatch_Release(iter->disp); + heap_free(iter); + iter = iter2; + } + + This->ctx->named_items = NULL; + } + if(This->ctx) { change_state(This, SCRIPTSTATE_CLOSED);

1 0

Jacek Caban : jscript: Added IActiveScriptParseProcedure2:: ParseProcedureText implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: eedc6dc715096488be5576c987860e6ad8986164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedc6dc715096488be5576c98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:09:48 2008 +0200 jscript: Added IActiveScriptParseProcedure2::ParseProcedureText implementation. --- dlls/jscript/jscript.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index e1dde43..899f59d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -576,7 +576,7 @@ static const IActiveScriptParseVtbl JScriptParseVtbl = { JScriptParse_ParseScriptText }; -#define ASPARSEPROC_THIS(iface) DEFINE_THIS(JScript, IActiveScriptParse, iface) +#define ASPARSEPROC_THIS(iface) DEFINE_THIS(JScript, IActiveScriptParseProcedure2, iface) static HRESULT WINAPI JScriptParseProcedure_QueryInterface(IActiveScriptParseProcedure2 *iface, REFIID riid, void **ppv) { @@ -602,8 +602,30 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { JScript *This = ASPARSEPROC_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + parser_ctx_t *parser_ctx; + DispatchEx *dispex; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %p %s %x %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), + dwSourceContextCookie, ulStartingLineNumber, dwFlags, ppdisp); + + if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + hres = script_parse(This->ctx, pstrCode, &parser_ctx); + if(FAILED(hres)) { + WARN("Parse failed %08x\n", hres); + return hres; + } + + hres = create_source_function(parser_ctx, NULL, parser_ctx->source, NULL, &dispex); + parser_release(parser_ctx); + if(FAILED(hres)) + return hres; + + *ppdisp = (IDispatch*)_IDispatchEx_(dispex); + return S_OK; } #undef ASPARSEPROC_THIS

1 0

Jacek Caban : jscript: Added if statement implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 1edd64ef8b453ed44ab3f234d8b3d7be6d62e389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edd64ef8b453ed44ab3f234d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:10:06 2008 +0200 jscript: Added if statement implementation. --- dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 24 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e594c69..90aa300 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -566,10 +566,33 @@ HRESULT expression_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_ty return S_OK; } -HRESULT if_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.5 */ +HRESULT if_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + if_statement_t *stat = (if_statement_t*)_stat; + exprval_t exprval; + VARIANT_BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_boolean(ctx->parser->script, &exprval, &rt->ei, &b); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + if(b) + hres = stat_eval(ctx, stat->if_stat, rt, ret); + else if(stat->else_stat) + hres = stat_eval(ctx, stat->else_stat, rt, ret); + else + V_VT(ret) = VT_EMPTY; + + return hres; } HRESULT dowhile_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4a42b9d..c6742f5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +var tmp; + ok(true, "true is not true?"); ok(!false, "!false is not true"); ok(!undefined, "!undefined is not true"); @@ -116,4 +118,26 @@ obj2.pvar = 3; testConstr1.prototype.pvar = 1; ok(obj2.pvar === 3, "obj2.pvar is not 3"); +tmp = 0; +if(true) + tmp = 1; +else + ok(false, "else evaluated"); +ok(tmp === 1, "tmp !== 1, if not evaluated?"); + +tmp = 0; +if(1 === 0) + ok(false, "if evaluated"); +else + tmp = 1; +ok(tmp === 1, "tmp !== 1, if not evaluated?"); + +if(false) + ok(false, "if(false) evaluated"); + +tmp = 0; +if(true) + tmp = 1; +ok(tmp === 1, "tmp !== 1, if(true) not evaluated?"); + reportSuccess();

1 0

Jacek Caban : jscript: Added constructor invokation from Function object support.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: e4e47c01498ae4c1d4e96da5ede061e2b7bc2000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e47c01498ae4c1d4e96da5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:08:26 2008 +0200 jscript: Added constructor invokation from Function object support. --- dlls/jscript/function.c | 28 ++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 615e7ce..d4a3b62 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -185,6 +185,28 @@ static HRESULT invoke_function(FunctionInstance *function, LCID lcid, DISPPARAMS return invoke_source(function, this_obj, lcid, dp, retv, ei, caller); } +static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DispatchEx *this_obj; + VARIANT var; + HRESULT hres; + + hres = create_object(function->dispex.ctx, &function->dispex, &this_obj); + if(FAILED(hres)) + return hres; + + hres = invoke_source(function, (IDispatch*)_IDispatchEx_(this_obj), lcid, dp, retv, ei, caller); + jsdisp_release(this_obj); + if(FAILED(hres)) + return hres; + + VariantClear(&var); + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(this_obj); + return S_OK; +} + static HRESULT invoke_value_proc(FunctionInstance *function, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -301,6 +323,12 @@ static HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return invoke_function(function, lcid, dp, retv, ei, caller); + case DISPATCH_CONSTRUCT: + if(function->value_proc) + return invoke_value_proc(function, lcid, flags, dp, retv, ei, caller); + + return invoke_constructor(function, lcid, dp, retv, ei, caller); + default: FIXME("not implemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index dca0771..4e76b21 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -79,4 +79,7 @@ ok(typeof(this) === "object", "typeof(this) is not object"); ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); +var obj1 = new Object(); +ok(typeof(obj1) === "object", "typeof(obj1) is not object"); + reportSuccess();

1 0

Jacek Caban : jscript: Added function expression implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: b2a93fe3c3f3bf820744cbeb21b8ea5c31d8608f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a93fe3c3f3bf820744cbeb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:08:46 2008 +0200 jscript: Added function expression implementation. --- dlls/jscript/engine.c | 30 +++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 11 +++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d1dc0a7..e594c69 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -703,10 +703,34 @@ static HRESULT get_binary_expr_values(exec_ctx_t *ctx, binary_expression_t *expr return S_OK; } -HRESULT function_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 13 */ +HRESULT function_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + function_expression_t *expr = (function_expression_t*)_expr; + DispatchEx *dispex; + VARIANT var; + HRESULT hres; + + TRACE("\n"); + + hres = create_source_function(ctx->parser, expr->parameter_list, expr->source_elements, ctx->scope_chain, &dispex); + if(FAILED(hres)) + return hres; + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(dispex); + + if(expr->identifier) { + hres = jsdisp_propput_name(ctx->var_disp, expr->identifier, ctx->parser->script->lcid, &var, ei, NULL/*FIXME*/); + if(FAILED(hres)) { + jsdisp_release(dispex); + return hres; + } + } + + ret->type = EXPRVAL_VARIANT; + ret->u.var = var; + return S_OK; } HRESULT conditional_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 4e76b21..1914a05 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -81,5 +81,16 @@ ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); +obj1.test = true; +obj1.func = function () { + ok(this === obj1, "this is not obj1"); + ok(this.test === true, "this.test is not true"); + ok(arguments.length === 1, "arguments.length is not 1"); + ok(arguments["0"] === true, "arguments[0] is not true"); + + return "test"; +}; + +ok(obj1.func(true) === "test", "obj1.func(true) is not \"test\""); reportSuccess();

1 0