Module: wine Branch: master Commit: 898cb6fcd43fc8038c74c45552b69ef29a19e0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=898cb6fcd43fc8038c74c45552...
Author: Jacek Caban jacek@codeweavers.com Date: Sun Sep 21 15:40:22 2008 +0200
jscript: Added Array default value implementation.
---
dlls/jscript/array.c | 13 +++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4dd59be..11c8b95 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -621,8 +621,17 @@ static HRESULT Array_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DI static HRESULT Array_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case INVOKE_PROPERTYGET: + return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; }
static void Array_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f04eb55..4872263 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,11 @@ ok(arr["2"] === "test", "arr[2] is not "test""); arr["7"] = true; ok((arr.length === 8), "arr.length is not 8");
+tmp = "" + []; +ok(tmp === "", "'' + [] = " + tmp); +tmp = "" + [1,true]; +ok(tmp === "1,true", "'' + [1,true] = " + tmp); + var arr = new Array(6); ok(typeof(arr) === "object", "arr (6) is not object"); ok((arr.length === 6), "arr.length is not 6");