Jacek Caban : jscript: Make Array.slice generic.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f39d5e46d94fbb9935bdfaddca27d4c553f73c4b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f39d5e46d94fbb9935bdfaddca27d4c553f73c4b

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Sep  2 12:25:39 2009 +0200

jscript: Make Array.slice generic.

---

 dlls/jscript/array.c      |    5 +++--
 dlls/jscript/tests/api.js |    9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 1c2b95a..c2c224e 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -456,8 +456,9 @@ static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS
     if(is_class(dispex, JSCLASS_ARRAY)) {
         length = ((ArrayInstance*)dispex)->length;
     }else {
-        FIXME("not Array this\n");
-        return E_NOTIMPL;
+        hres = get_jsdisp_length(dispex, lcid, ei, &length);
+        if(FAILED(hres))
+            return hres;
     }
 
     if(arg_cnt(dp)) {
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index cff7114..ca46f25 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -628,6 +628,15 @@ arr[12] = 2;
 ok(arr.slice(5).toString() === "a,,,,,,,2", "arr.slice(5).toString() = " + arr.slice(5).toString());
 ok(arr.slice(5).length === 8, "arr.slice(5).length = " + arr.slice(5).length);
 
+obj = new Object();
+obj.length = 3;
+obj[0] = 1;
+obj[1] = 2;
+obj[2] = 3;
+tmp = Array.prototype.slice.call(obj, 1, 2);
+ok(tmp.length === 1, "tmp.length = " + tmp.length);
+ok(tmp[0] === 2, "tmp[0] = " + tmp[0]);
+
 var num = new Number(2);
 ok(num.toString() === "2", "num(2).toString !== 2");
 var num = new Number();