September 2008 - Wine-Commits

James Hawkins : msi: Fix a few file access discrepancies between platforms.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: d11968cade91e05b294bb84ea6a01fee6dc009e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11968cade91e05b294bb84ea… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 21:53:09 2008 -0500 msi: Fix a few file access discrepancies between platforms. --- dlls/msi/tests/package.c | 98 ++++++++++++++++++++++++---------------------- 1 files changed, 51 insertions(+), 47 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3775cbd..2ef86d9 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7726,65 +7726,66 @@ struct access_res { BOOL gothandle; DWORD lasterr; + BOOL ignore; }; static const struct access_res create[16] = { - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS } + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } }; static const struct access_res create_commit[16] = { - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS } + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } }; static const struct access_res create_close[16] = { - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, { TRUE, ERROR_SUCCESS } }; @@ -7804,6 +7805,9 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD for (j = 0; j < 4; j++) { + if (ares[idx].ignore) + continue; + if (j == 0) share = 0; if (j == 1) share = FILE_SHARE_READ; if (j == 2) share = FILE_SHARE_WRITE;

1 0

Jacek Caban : jscript: Add static functions to variable objects.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 5c05e6c8692c930525d2f61c01228a579b4b4e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c05e6c8692c930525d2f61c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:27:57 2008 +0200 jscript: Add static functions to variable objects. --- dlls/jscript/engine.c | 17 +++++++++++++++++ dlls/jscript/engine.h | 2 ++ dlls/jscript/function.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 6 ++++++ 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 183eca4..42db70a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -326,6 +326,7 @@ static HRESULT literal_to_var(literal_t *literal, VARIANT *v) 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; + function_declaration_t *func; parser_ctx_t *prev_parser; VARIANT val, tmp; statement_t *stat; @@ -333,6 +334,22 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so return_type_t rt; HRESULT hres = S_OK; + for(func = source->functions; func; func = func->next) { + DispatchEx *func_obj; + VARIANT var; + + hres = create_source_function(parser, func->parameter_list, func->source_elements, ctx->scope_chain, &func_obj); + if(FAILED(hres)) + return hres; + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(func_obj); + hres = jsdisp_propput_name(ctx->var_disp, func->identifier, script->lcid, &var, ei, NULL); + IDispatchEx_Release(_IDispatchEx_(func_obj)); + if(FAILED(hres)) + return hres; + } + prev_ctx = script->exec_ctx; script->exec_ctx = ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ce9253d..c8f41b0 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -91,6 +91,8 @@ typedef struct _statement_t statement_t; typedef struct _expression_t expression_t; typedef struct _parameter_t parameter_t; +HRESULT create_source_function(parser_ctx_t*,parameter_t*,source_elements_t*,scope_chain_t*,DispatchEx**); + typedef struct { VARTYPE vt; union { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 56895a1..96fbf78 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -17,6 +17,7 @@ */ #include "jscript.h" +#include "engine.h" #include "wine/debug.h" @@ -26,6 +27,10 @@ typedef struct { DispatchEx dispex; builtin_invoke_t value_proc; DWORD flags; + source_elements_t *source; + parameter_t *parameters; + scope_chain_t *scope_chain; + parser_ctx_t *parser; DWORD length; } FunctionInstance; @@ -126,6 +131,10 @@ static void Function_destructor(DispatchEx *dispex) { FunctionInstance *This = (FunctionInstance*)dispex; + if(This->parser) + parser_release(This->parser); + if(This->scope_chain) + scope_release(This->scope_chain); heap_free(This); } @@ -193,3 +202,34 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, *ret = &function->dispex; return S_OK; } + +HRESULT create_source_function(parser_ctx_t *ctx, parameter_t *parameters, source_elements_t *source, + scope_chain_t *scope_chain, DispatchEx **ret) +{ + FunctionInstance *function; + parameter_t *iter; + DWORD length = 0; + HRESULT hres; + + hres = create_function(ctx->script, PROPF_CONSTR, NULL, &function); + if(FAILED(hres)) + return hres; + + function->source = source; + function->parameters = parameters; + + if(scope_chain) { + scope_addref(scope_chain); + function->scope_chain = scope_chain; + } + + parser_addref(ctx); + function->parser = ctx; + + for(iter = parameters; iter; iter = iter->next) + length++; + function->length = length; + + *ret = &function->dispex; + return S_OK; +} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index dd76691..67ed686 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -40,4 +40,10 @@ ok(trueVar, "trueVar is not true"); ok(ScriptEngine.length === 0, "ScriptEngine.length is not 0"); +function testFunc1(x, y) { + return true; +} + +ok(testFunc1.length === 2, "testFunc1.length is not 2"); + reportSuccess();

1 0

Jacek Caban : jscript: Added Function.length implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: a0170ad7f9719ad60a8c80629b9a1e8f982ea95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0170ad7f9719ad60a8c80629… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:27:38 2008 +0200 jscript: Added Function.length implementation. --- dlls/jscript/function.c | 17 +++++++++++++++-- dlls/jscript/global.c | 2 +- dlls/jscript/tests/lang.js | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 13a6711..56895a1 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -42,8 +42,21 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT Function_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + FunctionInstance *This = (FunctionInstance*)dispex; + + TRACE("%p %d\n", This, This->length); + + switch(flags) { + case DISPATCH_PROPERTYGET: + V_VT(retv) = VT_I4; + V_I4(retv) = This->length; + break; + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT Function_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2032df5..b16ca8c 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -256,10 +256,10 @@ static const builtin_prop_t JSGlobal_props[] = { {NumberW, JSGlobal_Number, PROPF_CONSTR}, {ObjectW, JSGlobal_Object, PROPF_CONSTR}, {RegExpW, JSGlobal_RegExp, PROPF_CONSTR}, + {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, - {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {StringW, JSGlobal_String, PROPF_CONSTR}, {VBArrayW, JSGlobal_VBArray, PROPF_METHOD}, {escapeW, JSGlobal_escape, PROPF_METHOD}, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 92bf779..dd76691 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -38,4 +38,6 @@ ok(null !== undefined, "null !== undefined is false"); var trueVar = true; ok(trueVar, "trueVar is not true"); +ok(ScriptEngine.length === 0, "ScriptEngine.length is not 0"); + reportSuccess();

1 0

Jacek Caban : jscript: Added member expression implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 99b4bc2347b4eac6103cc73880188d6463cb4aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b4bc2347b4eac6103cc7388… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:27:18 2008 +0200 jscript: Added member expression implementation. --- dlls/jscript/engine.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 16 ++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2a98643..183eca4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -104,6 +104,12 @@ static HRESULT exprval_to_boolean(script_ctx_t *ctx, exprval_t *exprval, jsexcep return to_boolean(&exprval->u.var, b); } +static void exprval_init(exprval_t *val) +{ + val->type = EXPRVAL_VARIANT; + V_VT(&val->u.var) = VT_EMPTY; +} + static void exprval_set_idref(exprval_t *val, IDispatch *disp, DISPID id) { val->type = EXPRVAL_IDREF; @@ -647,10 +653,52 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, return E_NOTIMPL; } -HRESULT member_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 member_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + member_expression_t *expr = (member_expression_t*)_expr; + IDispatch *obj = NULL; + exprval_t exprval; + VARIANT member; + DISPID id; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, 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 = to_object(ctx, &member, &obj); + VariantClear(&member); + if(FAILED(hres)) + return hres; + + str = SysAllocString(expr->identifier); + 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_NEW ? fdexNameEnsure : 0, &id); + SysFreeString(str); + 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; } static void free_dp(DISPPARAMS *dp) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a8fc379..0144dbf 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -98,6 +98,7 @@ HRESULT jsdisp_set_prototype(DispatchEx*,DispatchEx*); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); +HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**); typedef struct named_item_t { IDispatch *disp; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c29f673..de04dfb 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -163,3 +163,19 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) return S_OK; } + +/* ECMA-262 3rd Edition 9.9 */ +HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) +{ + switch(V_VT(v)) { + case VT_DISPATCH: + IDispatch_AddRef(V_DISPATCH(v)); + *disp = V_DISPATCH(v); + break; + default: + FIXME("unsupported vt %d\n", V_VT(v)); + return E_NOTIMPL; + } + + return S_OK; +}

1 0

Jacek Caban : jscript: Added function object stub implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 7c6bf428b5a7883de2ed0813f746e5c3704e2683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6bf428b5a7883de2ed0813f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:27:01 2008 +0200 jscript: Added function object stub implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/dispex.c | 18 +++- dlls/jscript/function.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 5 + 4 files changed, 201 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index ac64b7f..0288b4c 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ RC_SRCS = rsrc.rc C_SRCS = \ dispex.c \ engine.c \ + function.c \ global.c \ jscript.c \ jscript_main.c \ diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 7d24699..ae32f1a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -292,8 +292,16 @@ static HRESULT prop_get(DispatchEx *This, dispex_prop_t *prop, LCID lcid, DISPPA switch(prop->type) { case PROP_BUILTIN: if(prop->u.p->flags & PROPF_METHOD) { - FIXME("function objects not supported\n"); - return E_NOTIMPL; + DispatchEx *obj; + hres = create_builtin_function(This->ctx, prop->u.p->invoke, prop->u.p->flags, NULL, &obj); + if(FAILED(hres)) + break; + + prop->type = PROP_VARIANT; + V_VT(&prop->u.var) = VT_DISPATCH; + V_DISPATCH(&prop->u.var) = (IDispatch*)_IDispatchEx_(obj); + + hres = VariantCopy(retv, &prop->u.var); }else { hres = prop->u.p->invoke(This, lcid, DISPATCH_PROPERTYGET, dp, retv, ei, caller); } @@ -688,7 +696,7 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -static HRESULT jsdisp_set_prot_prop(DispatchEx *dispex, DispatchEx *prototype) +HRESULT jsdisp_set_prototype(DispatchEx *dispex, DispatchEx *prototype) { VARIANT *var; @@ -705,7 +713,7 @@ static HRESULT jsdisp_set_prot_prop(DispatchEx *dispex, DispatchEx *prototype) return S_OK; } -static HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, DispatchEx *prototype) +HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, DispatchEx *prototype) { static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; @@ -740,7 +748,7 @@ static HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx, const builtin_ if(prototype) { HRESULT hres; - hres = jsdisp_set_prot_prop(dispex, prototype); + hres = jsdisp_set_prototype(dispex, prototype); if(FAILED(hres)) { IDispatchEx_Release(_IDispatchEx_(dispex)); return hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c new file mode 100644 index 0000000..13a6711 --- /dev/null +++ b/dlls/jscript/function.c @@ -0,0 +1,182 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + DispatchEx dispex; + builtin_invoke_t value_proc; + DWORD flags; + DWORD length; +} FunctionInstance; + +static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; +static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; +static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; +static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; +static const WCHAR applyW[] = {'a','p','p','l','y',0}; +static const WCHAR callW[] = {'c','a','l','l',0}; +static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; +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 HRESULT Function_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_call(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static void Function_destructor(DispatchEx *dispex) +{ + FunctionInstance *This = (FunctionInstance*)dispex; + + heap_free(This); +} + +static const builtin_prop_t Function_props[] = { + {applyW, Function_apply, PROPF_METHOD}, + {callW, Function_call, PROPF_METHOD}, + {hasOwnPropertyW, Function_hasOwnProperty, PROPF_METHOD}, + {isPrototypeOfW, Function_isPrototypeOf, PROPF_METHOD}, + {lengthW, Function_length, 0}, + {propertyIsEnumerableW, Function_propertyIsEnumerable, PROPF_METHOD}, + {toLocaleStringW, Function_toLocaleString, PROPF_METHOD}, + {toStringW, Function_toString, PROPF_METHOD}, + {valueOfW, Function_valueOf, PROPF_METHOD} +}; + +static const builtin_info_t Function_info = { + JSCLASS_FUNCTION, + {NULL, Function_value, 0}, + sizeof(Function_props)/sizeof(*Function_props), + Function_props, + Function_destructor, + NULL +}; + +static HRESULT create_function(script_ctx_t *ctx, DWORD flags, DispatchEx *prototype, FunctionInstance **ret) +{ + FunctionInstance *function; + HRESULT hres; + + function = heap_alloc_zero(sizeof(FunctionInstance)); + if(!function) + return E_OUTOFMEMORY; + + hres = init_dispex(&function->dispex, ctx, &Function_info, NULL); + if(FAILED(hres)) + return hres; + + function->flags = flags; + function->length = flags & PROPF_ARGMASK; + + if(prototype) { + hres = jsdisp_set_prototype(&function->dispex, prototype); + if(FAILED(hres)) { + IDispatchEx_Release(_IDispatchEx_(&function->dispex)); + return hres; + } + } + + *ret = function; + return S_OK; +} + +HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, DWORD flags, + DispatchEx *prototype, DispatchEx **ret) +{ + FunctionInstance *function; + HRESULT hres; + + hres = create_function(ctx, flags, prototype, &function); + if(FAILED(hres)) + return hres; + + function->value_proc = value_proc; + + *ret = &function->dispex; + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 31812bf..a8fc379 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -49,6 +49,7 @@ typedef struct DispatchEx DispatchEx; typedef enum { JSCLASS_NONE, + JSCLASS_FUNCTION, JSCLASS_GLOBAL } jsclass_t; @@ -87,10 +88,14 @@ struct DispatchEx { #define _IDispatchEx_(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,DispatchEx*,DispatchEx**); +HRESULT init_dispex(DispatchEx*,script_ctx_t*,const builtin_info_t*,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*); HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_set_prototype(DispatchEx*,DispatchEx*); + +HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*);

1 0

Jacek Caban : jscript: Added '!==' expression implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

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 call expression implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: a16f205382994d39a0a10cafac9857a3682321d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16f205382994d39a0a10cafa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:25:05 2008 +0200 jscript: Added call expression implementation. --- dlls/jscript/engine.c | 90 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/run.c | 28 ++++++++++++++ 2 files changed, 115 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b3ae71f..b74ca47 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -464,16 +464,100 @@ HRESULT member_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, return E_NOTIMPL; } +static void free_dp(DISPPARAMS *dp) +{ + DWORD i; + + for(i=0; i < dp->cArgs; i++) + VariantClear(dp->rgvarg+i); + heap_free(dp->rgvarg); +} + +static HRESULT args_to_param(exec_ctx_t *ctx, argument_t *args, jsexcept_t *ei, DISPPARAMS *dp) +{ + VARIANTARG *vargs; + exprval_t exprval; + argument_t *iter; + DWORD cnt = 0, i; + HRESULT hres = S_OK; + + memset(dp, 0, sizeof(*dp)); + + for(iter = args; iter; iter = iter->next) + cnt++; + if(!cnt) + return S_OK; + + vargs = heap_alloc_zero(cnt * sizeof(*vargs)); + if(!vargs) + return E_OUTOFMEMORY; + + for(i = cnt, iter = args; iter; iter = iter->next) { + hres = expr_eval(ctx, iter->expr, 0, ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, vargs + (--i)); + exprval_release(&exprval); + if(FAILED(hres)) + break; + } + + if(FAILED(hres)) { + free_dp(dp); + return hres; + } + + dp->rgvarg = vargs; + dp->cArgs = cnt; + return S_OK; +} + 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; } -HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT call_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; + VARIANT func, var; + exprval_t exprval; + 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)) { + switch(exprval.type) { + case EXPRVAL_IDREF: + hres = disp_call(exprval.u.idref.disp, exprval.u.idref.id, ctx->parser->script->lcid, DISPATCH_METHOD, + &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); + if(flags & EXPR_NOVAL) + V_VT(&var) = VT_EMPTY; + break; + default: + FIXME("unimplemented type %d\n", V_VT(&func)); + hres = E_NOTIMPL; + } + + free_dp(&dp); + } + + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + TRACE("= %s\n", debugstr_variant(&var)); + ret->type = EXPRVAL_VARIANT; + ret->u.var = var; + return S_OK; } HRESULT this_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index cb71fa8..10c97cd 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -61,9 +61,12 @@ DEFINE_EXPECT(global_propget_d); DEFINE_EXPECT(global_propget_i); DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); +DEFINE_EXPECT(global_success_d); +DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 +#define DISPID_GLOBAL_REPORTSUCCESS 0x1002 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -188,6 +191,12 @@ 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, "reportSuccess")) { + CHECK_EXPECT(global_success_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_GLOBAL_REPORTSUCCESS; + return S_OK; + } if(!strcmp_wa(bstrName, "testPropGet")) { CHECK_EXPECT(global_propget_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); @@ -209,6 +218,19 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_GLOBAL_REPORTSUCCESS: + CHECK_EXPECT(global_success_i); + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + return S_OK; + case DISPID_GLOBAL_TESTPROPGET: CHECK_EXPECT(global_propget_i); @@ -427,6 +449,12 @@ static void run_tests(void) parse_script_a("testPropPut = 1;"); CHECK_CALLED(global_propput_d); CHECK_CALLED(global_propput_i); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("reportSuccess();"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); } START_TEST(run)

1 0

Jacek Caban : jscript: Added var statement implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 326cf6e0cf39203571ccfa33373184c79c17dc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=326cf6e0cf39203571ccfa333… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:25:59 2008 +0200 jscript: Added var statement implementation. --- dlls/jscript/dispex.c | 14 ++++++++++++ dlls/jscript/engine.c | 49 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 1 + dlls/jscript/tests/lang.js | 3 ++ 4 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5286b61..7d24699 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -838,6 +838,20 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS return hres; } +HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +{ + DISPID named_arg = DISPID_PROPERTYPUT; + DISPPARAMS dp = {val, &named_arg, 1, 1}; + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(obj, name, TRUE, &prop); + if(FAILED(hres)) + return hres; + + return prop_put(obj, prop, lcid, &dp, 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/engine.c b/dlls/jscript/engine.c index f37a8ac..f9f9cd6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -341,10 +341,53 @@ HRESULT block_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t * return E_NOTIMPL; } -HRESULT var_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.2 */ +static HRESULT variable_list_eval(exec_ctx_t *ctx, variable_declaration_t *var_list, jsexcept_t *ei) { - FIXME("\n"); - return E_NOTIMPL; + variable_declaration_t *iter; + HRESULT hres; + + for(iter = var_list; iter; iter = iter->next) { + VARIANT val; + + if(iter->expr) { + exprval_t exprval; + + hres = expr_eval(ctx, iter->expr, 0, ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + break; + }else { + V_VT(&val) = VT_EMPTY; + } + + hres = jsdisp_propput_name(ctx->var_disp, iter->identifier, ctx->parser->script->lcid, &val, ei, NULL/*FIXME*/); + VariantClear(&val); + if(FAILED(hres)) + break; + } + + return hres; +} + +/* ECMA-262 3rd Edition 12.2 */ +HRESULT var_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) +{ + var_statement_t *stat = (var_statement_t*)_stat; + HRESULT hres; + + TRACE("\n"); + + hres = variable_list_eval(ctx, stat->variable_list, &rt->ei); + if(FAILED(hres)) + return hres; + + V_VT(ret) = VT_EMPTY; + return S_OK; } /* ECMA-262 3rd Edition 12.3 */ diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 52768a4..31812bf 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -90,6 +90,7 @@ 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*); +HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d1ef849..3ea4933 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -23,4 +23,7 @@ ok(!null, "!null is not true"); ok(!0, "!0 is not true"); ok(!0.0, "!0.0 is not true"); +var trueVar = true; +ok(trueVar, "trueVar is not true"); + reportSuccess();

1 0

Jacek Caban : jscript: Added logical negation implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 11153d0e0542d623d25dc46a14dfff846efbb867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11153d0e0542d623d25dc46a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:25:40 2008 +0200 jscript: Added logical negation implementation. --- dlls/jscript/engine.c | 49 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 2 + dlls/jscript/jsutils.c | 31 +++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 5 ++++ 4 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b74ca47..f37a8ac 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -86,6 +86,24 @@ static HRESULT exprval_to_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *e return exprval_value(ctx, val, ei, ret); } +static HRESULT exprval_to_boolean(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t *ei, VARIANT_BOOL *b) +{ + if(exprval->type != EXPRVAL_VARIANT) { + VARIANT val; + HRESULT hres; + + hres = exprval_to_value(ctx, exprval, ei, &val); + if(FAILED(hres)) + return hres; + + hres = to_boolean(&val, b); + VariantClear(&val); + return hres; + } + + return to_boolean(&exprval->u.var, b); +} + static void exprval_set_idref(exprval_t *val, IDispatch *disp, DISPID id) { val->type = EXPRVAL_IDREF; @@ -440,6 +458,15 @@ HRESULT try_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt return E_NOTIMPL; } +static HRESULT return_bool(exprval_t *ret, DWORD b) +{ + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_BOOL; + V_BOOL(&ret->u.var) = b ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; +} + HRESULT function_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { FIXME("\n"); @@ -808,10 +835,26 @@ HRESULT binary_negation_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWO return E_NOTIMPL; } -HRESULT logical_negation_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.9 */ +HRESULT logical_negation_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + exprval_t exprval; + VARIANT_BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, 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 return_bool(ret, !b); } HRESULT left_shift_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 45d7bca..52768a4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -91,6 +91,8 @@ HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,I HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); + typedef struct named_item_t { IDispatch *disp; DWORD flags; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 00aa58c..c29f673 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -132,3 +132,34 @@ void jsheap_free(jsheap_t *heap) jsheap_init(heap); } + +/* ECMA-262 3rd Edition 9.2 */ +HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) +{ + switch(V_VT(v)) { + case VT_EMPTY: + case VT_NULL: + *b = VARIANT_FALSE; + break; + case VT_I4: + *b = V_I4(v) ? VARIANT_TRUE : VARIANT_FALSE; + break; + case VT_R8: + *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; + break; + case VT_BSTR: + *b = V_BSTR(v) && *V_BSTR(v) ? VARIANT_TRUE : VARIANT_FALSE; + break; + case VT_DISPATCH: + *b = V_DISPATCH(v) ? VARIANT_TRUE : VARIANT_FALSE; + break; + case VT_BOOL: + *b = V_BOOL(v); + break; + default: + FIXME("unimplemented for vt %d\n", V_VT(v)); + return E_NOTIMPL; + } + + return S_OK; +} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f70bb16..d1ef849 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -17,5 +17,10 @@ */ ok(true, "true is not true?"); +ok(!false, "!false is not true"); +ok(!undefined, "!undefined is not true"); +ok(!null, "!null is not true"); +ok(!0, "!0 is not true"); +ok(!0.0, "!0.0 is not true"); reportSuccess();

1 0

Jacek Caban : jscript: Added '===' expression implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: c3938073dad90bcbd762768b2731bb8fa11b5456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3938073dad90bcbd762768b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:26:20 2008 +0200 jscript: Added '===' expression implementation. --- dlls/jscript/engine.c | 140 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/lang.js | 9 +++ 2 files changed, 146 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f9f9cd6..8f66b3d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -194,6 +194,97 @@ 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 disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) +{ + IObjectIdentity *identity; + IUnknown *unk1, *unk2; + HRESULT hres; + + if(disp1 == disp2) { + *ret = TRUE; + return S_OK; + } + + hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); + if(FAILED(hres)) + return hres; + + hres = IDispatch_QueryInterface(disp2, &IID_IUnknown, (void**)&unk2); + if(FAILED(hres)) { + IUnknown_Release(unk1); + return hres; + } + + if(unk1 == unk2) { + *ret = TRUE; + }else { + hres = IUnknown_QueryInterface(unk1, &IID_IObjectIdentity, (void**)&identity); + if(SUCCEEDED(hres)) { + hres = IObjectIdentity_IsEqualObject(identity, unk2); + IObjectIdentity_Release(identity); + *ret = hres == S_OK; + }else { + *ret = FALSE; + } + } + + IUnknown_Release(unk1); + IUnknown_Release(unk2); + return S_OK; +} + +static inline BOOL is_num_vt(enum VARENUM vt) +{ + return vt == VT_I4 || vt == VT_R8; +} + +static inline DOUBLE num_val(const VARIANT *v) +{ + return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); +} + +/* ECMA-262 3rd Edition 11.9.6 */ +HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) +{ + TRACE("\n"); + + if(V_VT(lval) != V_VT(rval)) { + if(is_num_vt(V_VT(lval)) && is_num_vt(V_VT(rval))) { + *ret = num_val(lval) == num_val(rval); + return S_OK; + } + + *ret = FALSE; + return S_OK; + } + + switch(V_VT(lval)) { + case VT_EMPTY: + case VT_NULL: + *ret = VARIANT_TRUE; + break; + case VT_I4: + *ret = V_I4(lval) == V_I4(rval); + break; + case VT_R8: + *ret = V_R8(lval) == V_R8(rval); + break; + case VT_BSTR: + *ret = !strcmpW(V_BSTR(lval), V_BSTR(rval)); + break; + case VT_DISPATCH: + return disp_cmp(V_DISPATCH(lval), V_DISPATCH(rval), ret); + case VT_BOOL: + *ret = !V_BOOL(lval) == !V_BOOL(rval); + break; + default: + FIXME("unimplemented vt %d\n", V_VT(lval)); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT literal_to_var(literal_t *literal, VARIANT *v) { V_VT(v) = literal->vt; @@ -510,6 +601,34 @@ static HRESULT return_bool(exprval_t *ret, DWORD b) return S_OK; } +static HRESULT get_binary_expr_values(exec_ctx_t *ctx, binary_expression_t *expr, jsexcept_t *ei, VARIANT *lval, VARIANT *rval) +{ + exprval_t exprval; + HRESULT hres; + + hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, lval); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); + if(SUCCEEDED(hres)) { + hres = exprval_to_value(ctx->parser->script, &exprval, ei, rval); + exprval_release(&exprval); + } + + if(FAILED(hres)) { + VariantClear(lval); + return hres; + } + + return S_OK; +} + HRESULT function_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { FIXME("\n"); @@ -829,10 +948,25 @@ HRESULT equal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, return E_NOTIMPL; } -HRESULT equal2_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.9.4 */ +HRESULT 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 not_equal_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 3ea4933..61d108f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -23,6 +23,15 @@ ok(!null, "!null is not true"); ok(!0, "!0 is not true"); ok(!0.0, "!0.0 is not true"); +ok(1 === 1, "1 === 1 is false"); +ok(!(1 === 2), "!(1 === 2) is false"); +ok(1.0 === 1, "1.0 === 1 is false"); +ok("abc" === "abc", "\"abc\" === \"abc\" is false"); +ok(true === true, "true === true is false"); +ok(null === null, "null === null is false"); +ok(undefined === undefined, "undefined === undefined is false"); +ok(!(undefined === null), "!(undefined === null) is false"); + var trueVar = true; ok(trueVar, "trueVar is not true");

1 0