September 2008 - Wine-commits

Jacek Caban : jscript: Added Object constructor implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: bea575c9163465db5a7df8da8580e9d4443cec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea575c9163465db5a7df8da8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:08:09 2008 +0200 jscript: Added Object constructor implementation. --- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f2490cb..5f15695 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -113,6 +113,7 @@ HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceP HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**); +HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 2cca6e9..2f021f7 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -105,8 +105,29 @@ static const builtin_info_t Object_info = { static HRESULT ObjectConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + DispatchEx *obj; + + hres = create_object(dispex->ctx, NULL, &obj); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(obj); + break; + } + + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } HRESULT create_object_constr(script_ctx_t *ctx, DispatchEx **ret) @@ -123,3 +144,22 @@ HRESULT create_object_constr(script_ctx_t *ctx, DispatchEx **ret) jsdisp_release(object); return hres; } + +HRESULT create_object(script_ctx_t *ctx, DispatchEx *constr, DispatchEx **ret) +{ + DispatchEx *object; + HRESULT hres; + + object = heap_alloc_zero(sizeof(DispatchEx)); + if(!object) + return E_OUTOFMEMORY; + + hres = init_dispex_from_constr(object, ctx, &Object_info, constr ? constr : ctx->object_constr); + if(FAILED(hres)) { + heap_free(object); + return hres; + } + + *ret = object; + return S_OK; +}

1 0

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

11 Sep '08

Module: wine Branch: master Commit: 152b3e48c119f2bfe8325471ecca8ca52ca1d8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b3e48c119f2bfe8325471e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:07:35 2008 +0200 jscript: Added 'new' expression implementation. --- dlls/jscript/engine.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 831dcba..d1dc0a7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -869,10 +869,43 @@ static HRESULT args_to_param(exec_ctx_t *ctx, argument_t *args, jsexcept_t *ei, return S_OK; } -HRESULT member_new_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.2.2 */ +HRESULT member_new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + call_expression_t *expr = (call_expression_t*)_expr; + exprval_t exprval; + VARIANT constr, var; + DISPPARAMS dp; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = args_to_param(ctx, expr->argument_list, ei, &dp); + if(SUCCEEDED(hres)) + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &constr); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + if(V_VT(&constr) != VT_DISPATCH) { + FIXME("throw TypeError\n"); + VariantClear(&constr); + return E_FAIL; + } + + hres = disp_call(V_DISPATCH(&constr), DISPID_VALUE, ctx->parser->script->lcid, + DISPATCH_CONSTRUCT, &dp, &var, ei, NULL/*FIXME*/); + IDispatch_Release(V_DISPATCH(&constr)); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = var; + return S_OK; } HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)

1 0

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

11 Sep '08

Module: wine Branch: master Commit: 8ef7038ba512a337c85b10bb981c3cf8b958d2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef7038ba512a337c85b10bb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:07:06 2008 +0200 jscript: Added array expression implementation. --- dlls/jscript/engine.c | 57 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 15 +++++++++++ dlls/jscript/tests/lang.js | 2 + 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 275943a..831dcba 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -715,10 +715,61 @@ HRESULT conditional_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD f return E_NOTIMPL; } -HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.2.1 */ +HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + array_expression_t *expr = (array_expression_t*)_expr; + exprval_t exprval; + VARIANT member, val; + DISPID id; + BSTR str; + IDispatch *obj = NULL; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->member_expr, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &member); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(SUCCEEDED(hres)) { + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + } + + if(SUCCEEDED(hres)) + hres = to_object(ctx, &member, &obj); + VariantClear(&member); + if(SUCCEEDED(hres)) { + hres = to_string(ctx->parser->script, &val, ei, &str); + if(SUCCEEDED(hres)) { + if(flags & EXPR_STRREF) { + ret->type = EXPRVAL_NAMEREF; + ret->u.nameref.disp = obj; + ret->u.nameref.name = str; + return S_OK; + } + + hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + } + + if(SUCCEEDED(hres)) { + exprval_set_idref(ret, obj, id); + }else if(!(flags & EXPR_NEWREF) && hres == DISP_E_UNKNOWNNAME) { + exprval_init(ret); + hres = S_OK; + } + + IDispatch_Release(obj); + } + + return hres; } /* ECMA-262 3rd Edition 11.2.1 */ diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f09cea7..f2490cb 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -116,6 +116,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx* HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); +HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*); HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**); typedef struct named_item_t { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index de04dfb..919bcca 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -164,6 +164,21 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) return S_OK; } +/* ECMA-262 3rd Edition 9.8 */ +HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) +{ + switch(V_VT(v)) { + case VT_BSTR: + *str = SysAllocString(V_BSTR(v)); + return S_OK; + + default: + FIXME("unsupported vt %d\n", V_VT(v)); + } + + return E_NOTIMPL; +} + /* ECMA-262 3rd Edition 9.9 */ HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) { diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4be651b..dca0771 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -45,6 +45,8 @@ function testFunc1(x, y) { ok(x === true, "x is not 1"); ok(y === "test", "y is not \"test\""); ok(arguments.length === 2, "arguments.length is not 2"); + ok(arguments["0"] === true, "arguments[0] is not true"); + ok(arguments["1"] === "test", "arguments[1] is not \"test\""); return true; }

1 0

Jacek Caban : jscript: Set arguments object on function call.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 68d4f489f2d26bddef00eae71608e40fb2c4ab22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d4f489f2d26bddef00eae71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:06:43 2008 +0200 jscript: Set arguments object on function call. --- dlls/jscript/dispex.c | 10 ++++++++++ dlls/jscript/function.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/tests/lang.js | 1 + 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ad7b988..193a5b5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -883,6 +883,16 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, LCID lcid, VARIA return prop_put(obj, prop, lcid, &dp, ei, caller); } +HRESULT jsdisp_propput_idx(DispatchEx *obj, DWORD idx, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +{ + WCHAR buf[12]; + + static const WCHAR formatW[] = {'%','d',0}; + + sprintfW(buf, formatW, idx); + return jsdisp_propput_name(obj, buf, lcid, val, ei, caller); +} + HRESULT disp_propput(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { DISPID dispid = DISPID_PROPERTYPUT; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c58f002..615e7ce 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -88,17 +88,52 @@ static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, return S_OK; } +static HRESULT init_arguments(DispatchEx *arg_disp, FunctionInstance *function, LCID lcid, DISPPARAMS *dp, + jsexcept_t *ei, IServiceProvider *caller) +{ + VARIANT var; + DWORD i; + HRESULT hres; + + for(i=0; i < dp->cArgs-dp->cNamedArgs; i++) { + hres = jsdisp_propput_idx(arg_disp, i, lcid, dp->rgvarg+dp->cArgs-1-i, ei, caller); + if(FAILED(hres)) + return hres; + } + + V_VT(&var) = VT_I4; + V_I4(&var) = dp->cArgs - dp->cNamedArgs; + return jsdisp_propput_name(arg_disp, lengthW, lcid, &var, ei, caller); +} + static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { - DispatchEx *var_disp; + DispatchEx *var_disp, *arg_disp; HRESULT hres; + static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; + hres = create_dispex(function->dispex.ctx, NULL, NULL, &var_disp); if(FAILED(hres)) return hres; - hres = init_parameters(var_disp, function, lcid, dp, ei, caller); + hres = create_dispex(function->dispex.ctx, NULL, NULL, &arg_disp); + if(SUCCEEDED(hres)) { + hres = init_arguments(arg_disp, function, lcid, dp, ei, caller); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(arg_disp); + hres = jsdisp_propput_name(var_disp, argumentsW, lcid, &var, ei, caller); + } + + jsdisp_release(arg_disp); + } + + if(SUCCEEDED(hres)) + hres = init_parameters(var_disp, function, lcid, dp, ei, caller); if(FAILED(hres)) { jsdisp_release(var_disp); return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2869fc3..f09cea7 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -109,7 +109,7 @@ HRESULT jsdisp_call_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t* HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); -HRESULT jsdisp_set_prototype(DispatchEx*,DispatchEx*); +HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 19430fe..4be651b 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -44,6 +44,7 @@ function testFunc1(x, y) { ok(this !== undefined, "this is undefined"); ok(x === true, "x is not 1"); ok(y === "test", "y is not \"test\""); + ok(arguments.length === 2, "arguments.length is not 2"); return true; }

1 0

Jacek Caban : jscript: Set parameters on function call.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 0d33508954880b31f8b70b24ebb229195fdd05db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d33508954880b31f8b70b24e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:06:25 2008 +0200 jscript: Set parameters on function call. --- dlls/jscript/function.c | 30 ++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 3cd63f5..c58f002 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -64,6 +64,30 @@ static IDispatch *get_this(DISPPARAMS *dp) return NULL; } +static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, LCID lcid, DISPPARAMS *dp, + jsexcept_t *ei, IServiceProvider *caller) +{ + parameter_t *param; + VARIANT var_empty; + DWORD cargs, i=0; + HRESULT hres; + + V_VT(&var_empty) = VT_EMPTY; + cargs = dp->cArgs - dp->cNamedArgs; + + for(param = function->parameters; param; param = param->next) { + hres = jsdisp_propput_name(var_disp, param->identifier, lcid, + i < cargs ? dp->rgvarg + dp->cArgs-1 - i : &var_empty, + ei, caller); + if(FAILED(hres)) + return hres; + + i++; + } + + return S_OK; +} + static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { @@ -74,6 +98,12 @@ static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS if(FAILED(hres)) return hres; + hres = init_parameters(var_disp, function, lcid, dp, ei, caller); + if(FAILED(hres)) { + jsdisp_release(var_disp); + return hres; + } + *ret = var_disp; return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b21a9e8..19430fe 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -41,6 +41,10 @@ ok(trueVar, "trueVar is not true"); ok(ScriptEngine.length === 0, "ScriptEngine.length is not 0"); function testFunc1(x, y) { + ok(this !== undefined, "this is undefined"); + ok(x === true, "x is not 1"); + ok(y === "test", "y is not \"test\""); + return true; }

1 0

Jacek Caban : jscript: Added Function.[[call]] implementation.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: dd9f8f7dbc7a9010a610dee25567cee384d57cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9f8f7dbc7a9010a610dee25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:06:09 2008 +0200 jscript: Added Function.[[call]] implementation. --- dlls/jscript/engine.c | 24 +++++++++ dlls/jscript/function.c | 121 ++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/lang.js | 2 + 3 files changed, 144 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fa15b40..275943a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -120,6 +120,30 @@ static void exprval_set_idref(exprval_t *val, IDispatch *disp, DISPID id) IDispatch_AddRef(disp); } +HRESULT scope_push(scope_chain_t *scope, DispatchEx *obj, scope_chain_t **ret) +{ + scope_chain_t *new_scope; + + new_scope = heap_alloc(sizeof(scope_chain_t)); + if(!new_scope) + return E_OUTOFMEMORY; + + new_scope->ref = 1; + + IDispatchEx_AddRef(_IDispatchEx_(obj)); + new_scope->obj = obj; + + if(scope) { + scope_addref(scope); + new_scope->next = scope; + }else { + new_scope->next = NULL; + } + + *ret = new_scope; + return S_OK; +} + void scope_release(scope_chain_t *scope) { if(--scope->ref) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index a9c61e0..3cd63f5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -46,6 +46,99 @@ static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p', static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static IDispatch *get_this(DISPPARAMS *dp) +{ + DWORD i; + + for(i=0; i < dp->cNamedArgs; i++) { + if(dp->rgdispidNamedArgs[i] == DISPID_THIS) { + if(V_VT(dp->rgvarg+i) == VT_DISPATCH) + return V_DISPATCH(dp->rgvarg+i); + + WARN("This is not VT_DISPATCH\n"); + return NULL; + } + } + + TRACE("no this passed\n"); + return NULL; +} + +static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, jsexcept_t *ei, + IServiceProvider *caller, DispatchEx **ret) +{ + DispatchEx *var_disp; + HRESULT hres; + + hres = create_dispex(function->dispex.ctx, NULL, NULL, &var_disp); + if(FAILED(hres)) + return hres; + + *ret = var_disp; + return S_OK; +} + +static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, LCID lcid, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DispatchEx *var_disp; + exec_ctx_t *exec_ctx; + scope_chain_t *scope; + HRESULT hres; + + if(!function->source) { + FIXME("no source\n"); + return E_FAIL; + } + + hres = create_var_disp(function, lcid, dp, ei, caller, &var_disp); + if(FAILED(hres)) + return hres; + + hres = scope_push(function->scope_chain, var_disp, &scope); + if(SUCCEEDED(hres)) { + hres = create_exec_ctx(this_obj, var_disp, scope, &exec_ctx); + scope_release(scope); + } + if(FAILED(hres)) + return hres; + + hres = exec_source(exec_ctx, function->parser, function->source, ei, retv); + exec_release(exec_ctx); + + return hres; +} + +static HRESULT invoke_function(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + IDispatch *this_obj; + + if(!(this_obj = get_this(dp))) + this_obj = (IDispatch*)_IDispatchEx_(function->dispex.ctx->script_disp); + + return invoke_source(function, this_obj, lcid, dp, retv, ei, caller); +} + +static HRESULT invoke_value_proc(FunctionInstance *function, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DispatchEx *this_obj = NULL; + IDispatch *this_disp; + HRESULT hres; + + this_disp = get_this(dp); + if(this_disp) + this_obj = iface_to_jsdisp((IUnknown*)this_disp); + + hres = function->value_proc(this_obj ? this_obj : function->dispex.ctx->script_disp, lcid, + flags, dp, retv, ei, caller); + + if(this_obj) + jsdisp_release(this_obj); + return hres; +} + static HRESULT Function_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -123,10 +216,32 @@ static HRESULT Function_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, } static HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + FunctionInstance *function; + + TRACE("\n"); + + if(dispex->builtin_info->class != JSCLASS_FUNCTION) { + ERR("dispex is not a function\n"); + return E_FAIL; + } + + function = (FunctionInstance*)dispex; + + switch(flags) { + case DISPATCH_METHOD: + if(function->value_proc) + return invoke_value_proc(function, lcid, flags, dp, retv, ei, caller); + + return invoke_function(function, lcid, dp, retv, ei, caller); + + default: + FIXME("not implemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static void Function_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4c26c2f..b21a9e8 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -70,4 +70,6 @@ ok(typeof(String) === "function", "typeof(String) is not function"); ok(typeof(ScriptEngine) === "function", "typeof(ScriptEngine) is not function"); ok(typeof(this) === "object", "typeof(this) is not object"); +ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); + reportSuccess();

1 0

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

11 Sep '08

Module: wine Branch: master Commit: 0bd508db2f7e05d0317d3ab0e8eeb81219aa5572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd508db2f7e05d0317d3ab0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:05:14 2008 +0200 jscript: Added this expression implementation. --- dlls/jscript/engine.c | 16 +++++++++++++--- dlls/jscript/engine.h | 3 ++- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/lang.js | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c15b05b..5119bb7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -132,7 +132,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(DispatchEx *var_disp, scope_chain_t *scope, exec_ctx_t **ret) +HRESULT create_exec_ctx(IDispatch *this_obj, DispatchEx *var_disp, scope_chain_t *scope, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -140,6 +140,9 @@ HRESULT create_exec_ctx(DispatchEx *var_disp, scope_chain_t *scope, exec_ctx_t * if(!ctx) return E_OUTOFMEMORY; + IDispatch_AddRef(this_obj); + ctx->this_obj = this_obj; + IDispatchEx_AddRef(_IDispatchEx_(var_disp)); ctx->var_disp = var_disp; @@ -161,6 +164,8 @@ void exec_release(exec_ctx_t *ctx) scope_release(ctx->scope_chain); if(ctx->var_disp) IDispatchEx_Release(_IDispatchEx_(ctx->var_disp)); + if(ctx->this_obj) + IDispatch_Release(ctx->this_obj); heap_free(ctx); } @@ -816,8 +821,13 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, HRESULT this_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_DISPATCH; + V_DISPATCH(&ret->u.var) = ctx->this_obj; + IDispatch_AddRef(ctx->this_obj); + return S_OK; } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c8f41b0..57a68c2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -76,6 +76,7 @@ struct _exec_ctx_t { parser_ctx_t *parser; scope_chain_t *scope_chain; DispatchEx *var_disp; + IDispatch *this_obj; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -84,7 +85,7 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*); -HRESULT create_exec_ctx(DispatchEx*,scope_chain_t*,exec_ctx_t**); +HRESULT create_exec_ctx(IDispatch*,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 a104aa9..5646cb8 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(This->ctx->script_disp, NULL, &exec_ctx); + hres = create_exec_ctx((IDispatch*)_IDispatchEx_(This->ctx->script_disp), This->ctx->script_disp, NULL, &exec_ctx); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 088468a..4c26c2f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -68,5 +68,6 @@ ok(typeof(String.prototype) === "object", "typeof(String.prototype) is not objec ok(typeof(testFunc1) === "function", "typeof(testFunc1) is not function"); ok(typeof(String) === "function", "typeof(String) is not function"); ok(typeof(ScriptEngine) === "function", "typeof(ScriptEngine) is not function"); +ok(typeof(this) === "object", "typeof(this) is not object"); reportSuccess();

1 0

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

11 Sep '08

Module: wine Branch: master Commit: a273e35f9bd00b01c970c426d7614e3c0a80b229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a273e35f9bd00b01c970c426d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:05:37 2008 +0200 jscript: Added return statement implementation. --- dlls/jscript/engine.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5119bb7..fa15b40 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -584,10 +584,32 @@ HRESULT break_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t * return E_NOTIMPL; } -HRESULT return_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.9 */ +HRESULT return_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; + HRESULT hres; + + TRACE("\n"); + + if(stat->expr) { + exprval_t exprval; + + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, ret); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + }else { + V_VT(ret) = VT_EMPTY; + } + + TRACE("= %s\n", debugstr_variant(ret)); + rt->type = RT_RETURN; + return S_OK; } HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)

1 0

James Hawkins : setupapi: Remove a test of an undocumented function that is inconsistent across platforms .
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: e05b1d0aabada410fa009ad28f26b548424c2114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05b1d0aabada410fa009ad28… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 10 23:01:52 2008 -0500 setupapi: Remove a test of an undocumented function that is inconsistent across platforms. --- dlls/setupapi/tests/stringtable.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 1b8f2f4..6a07b18 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -159,7 +159,7 @@ static void test_StringTableLookUpString(void) static void test_StringTableStringFromId(void) { - WCHAR *string2, *string3; + WCHAR *string2; int result; /* correct */ @@ -168,13 +168,6 @@ static void test_StringTableStringFromId(void) result=lstrcmpiW(string, string2); ok(result==0,"StringID %p does not match requested StringID %p\n",string,string2); - - /* This should never work */ - string3=pStringTableStringFromId(table,0); - ok(string3!=NULL,"Failed to look up string by ID from String Table\n"); - - result=lstrcmpiW(string, string3); - ok(result!=0,"StringID %p matches requested StringID %p\n",string,string3); } START_TEST(stringtable)

1 0

Huw Davies : include: Add some more mimeole errors.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 6b24d897fd44f4a7ba754ac0d5d1d058ebb49215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b24d897fd44f4a7ba754ac0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 10:42:08 2008 +0100 include: Add some more mimeole errors. --- include/mimeole.idl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 508ca26..191a9f2 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -40,6 +40,13 @@ cpp_quote("#define MIME_E_BOUNDARY_MISMATCH 0x800cce04") cpp_quote("#define MIME_E_NOT_FOUND 0x800cce05") cpp_quote("#define MIME_E_NO_DATA 0x800cce05") cpp_quote("#define MIME_E_BUFFER_TOO_SMALL 0x800cce06") +cpp_quote("#define MIME_E_INVALID_ITEM_FLAGS 0x800cce07") +cpp_quote("#define MIME_E_ONE_LINE_ITEME 0x800cce08") +cpp_quote("#define MIME_E_INVALID_HANDLE 0x800cce09") +cpp_quote("#define MIME_E_CHARSET_TRANSLATE 0x800cce0a") +cpp_quote("#define MIME_E_NOT_INITIALIZED 0x800cce0b") + +cpp_quote("#define MIME_E_INVALID_CHARSET_TYPE 0x800cce31") cpp_quote("#define MIME_E_INVALID_TEXT_TYPE 0x800cce38")

1 0