[PATCH v3 4/6] jscript: Implement Typed Array construction from objects.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---

fill_typedarr_data_from_object will also be used for 'set'.
---
 dlls/jscript/arraybuf.c  | 58 ++++++++++++++++++++++++++++++++++++++--
 dlls/mshtml/tests/es5.js | 47 +++++++++++++++++++++++++++++++-
 2 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/arraybuf.c b/dlls/jscript/arraybuf.c
index 716aa3cf93d..369988996af 100644
--- a/dlls/jscript/arraybuf.c
+++ b/dlls/jscript/arraybuf.c
@@ -18,6 +18,7 @@

#include <limits.h>
+#include <assert.h>

#include "jscript.h"

@@ -788,6 +789,32 @@ static HRESULT TypedArray_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_
     return S_OK;
 }

+static HRESULT fill_typedarr_data_from_object(unsigned desc_idx, script_ctx_t *ctx, BYTE *data, jsdisp_t *obj, DWORD length)
+{
+    HRESULT hres;
+    jsval_t val;
+    UINT32 i;
+
+    for(i = 0; i < length; i++) {
+        double n;
+
+        hres = jsdisp_get_idx(obj, i, &val);
+        if(FAILED(hres)) {
+            if(hres != DISP_E_UNKNOWNNAME)
+                return hres;
+            val = jsval_undefined();
+        }
+
+        hres = to_number(ctx, val, &n);
+        jsval_release(val);
+        if(FAILED(hres))
+            return hres;
+        typed_array_descs[desc_idx].set(&data[i * typed_array_descs[desc_idx].size], n);
+    }
+
+    return S_OK;
+}
+
 static void TypedArray_destructor(jsdisp_t *dispex)
 {
     TypedArrayInstance *typedarr = typedarr_from_jsdisp(dispex);
@@ -923,8 +950,35 @@ static HRESULT TypedArrayConstr_value(const builtin_info_t *info, script_ctx_t *
                     }
                     jsdisp_addref(&buffer->dispex);
                 }else {
-                    FIXME("Construction from object not implemented\n");
-                    return E_NOTIMPL;
+                    jsval_t val;
+                    UINT32 len;
+                    DWORD size;
+
+                    hres = jsdisp_propget_name(obj, L"length", &val);
+                    if(FAILED(hres))
+                        return hres;
+                    if(is_undefined(val))
+                        return JS_E_TYPEDARRAY_BAD_CTOR_ARG;
+
+                    hres = to_uint32(ctx, val, &len);
+                    jsval_release(val);
+                    if(FAILED(hres))
+                        return hres;
+
+                    length = len;
+                    size = length * elem_size;
+                    if(size < length || size > (UINT_MAX - FIELD_OFFSET(ArrayBufferInstance, buf[0])))
+                        return E_OUTOFMEMORY;
+
+                    hres = create_arraybuf(ctx, size, &buffer);
+                    if(FAILED(hres))
+                        return hres;
+
+                    hres = fill_typedarr_data_from_object(desc_idx, ctx, buffer->buf, obj, length);
+                    if(FAILED(hres)) {
+                        jsdisp_release(&buffer->dispex);
+                        return hres;
+                    }
                 }
             }else if(is_number(argv[0])) {
                 hres = to_integer(ctx, argv[0], &n);
diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js
index a70c49e8a33..eca06223a9e 100644
--- a/dlls/mshtml/tests/es5.js
+++ b/dlls/mshtml/tests/es5.js
@@ -2174,6 +2174,13 @@ sync_test("ArrayBuffers & Views", function() {
             var n = ex.number >>> 0;
             ok(n === JS_E_TYPEDARRAY_BAD_CTOR_ARG, "new " + name + "(null) threw " + n);
         }
+        try {
+            new arrType({});
+            ok(false, "new " + name + "({}) did not throw exception");
+        }catch(ex) {
+            var n = ex.number >>> 0;
+            ok(n === JS_E_TYPEDARRAY_BAD_CTOR_ARG, "new " + name + "({}) threw " + n);
+        }
         if(typeSz > 1) {
             /* test misalignment */
             var a = typeSz >>> 1;
@@ -2300,6 +2307,23 @@ sync_test("ArrayBuffers & Views", function() {
         delete arr[-1];
         delete arr.foo;

+        arr2 = { length: 4 };
+        arr2[0] = 1.5;
+        arr2[1] = '3';
+        arr2[3] = 12;
+        arr = arrType(arr2);
+        r = name + "(array-like object)";
+        ok(arr.byteLength === 4 * typeSz, r + ".byteLength = " + arr.byteLength);
+        ok(arr.byteOffset === 0, r + ".byteOffset = " + arr.byteOffset);
+        ok(arr.length === 4, r + ".length = " + arr.length);
+        if(isNaN(arr[2])) {
+            ok(arr[0] === 1.5, r + "[0] = " + arr[0]);
+            ok(arr[1] === 3,   r + "[1] = " + arr[1]);
+            ok(arr[3] === 12,  r + "[3] = " + arr[3]);
+        }else
+            for(var j = 0; j < 4; j++)
+                ok(arr[j] === [1, 3, 0, 12][j], r + "[" + j + "] = " + arr[j]);
+
         arr = arrType(buf, typeSz, 2);
         name = name + "(buf, " + typeSz + ", 2)";
         ok(arr.byteLength === 2 * typeSz, name + ".byteLength = " + arr.byteLength);
@@ -2315,7 +2339,28 @@ sync_test("ArrayBuffers & Views", function() {
         Object.freeze(arr);
         todo_wine.
         ok(Object.isFrozen(arr) === true, name + " not frozen");
-    }
+
+        arr2 = arrType(arr);
+        ok(arr2.byteLength === arr.byteLength, name + " copy.byteLength = " + arr2.byteLength);
+        ok(arr2.byteOffset === 0, name + " copy.byteOffset = " + arr2.byteOffset);
+        ok(arr2.length === arr.length, name + " copy.length = " + arr2.length);
+        ok(arr2.buffer !== arr.buffer, name + " copy.buffer = " + arr2.buffer);
+    }
+
+    arr = new Float32Array(3);
+    arr[0] = 1.125;
+    arr[1] = 2.25;
+    arr[2] = 3.375;
+    arr2 = new Uint16Array(arr);
+    ok(arr[0] === 1.125, "arr[0] = " + arr[0]);
+    ok(arr[1] === 2.25, "arr[1] = " + arr[1]);
+    ok(arr[2] === 3.375, "arr[2] = " + arr[2]);
+    ok(arr2[0] === 1, "arr2[0] = " + arr2[0]);
+    ok(arr2[1] === 2, "arr2[1] = " + arr2[1]);
+    ok(arr2[2] === 3, "arr2[2] = " + arr2[2]);
+    arr2[0] = 100;
+    ok(arr[0] === 1.125, "arr[0] after arr2[0] changed = " + arr[0]);
+    ok(arr2[0] === 100, "arr2[0] after change = " + arr2[0]);

arr = new Int16Array(2);
     arr[0] = 65535;