[PATCH v2 11/11] jscript: Implement Uint8ClampedArray.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/jscript/arraybuf.c  | 18 ++++++++++++++++++
 dlls/jscript/jscript.h   |  1 +
 dlls/jscript/object.c    |  1 +
 dlls/mshtml/tests/es5.js | 12 ++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/dlls/jscript/arraybuf.c b/dlls/jscript/arraybuf.c
index b11691c7053..09a332bb0a3 100644
--- a/dlls/jscript/arraybuf.c
+++ b/dlls/jscript/arraybuf.c
@@ -17,6 +17,7 @@
  */

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

@@ -734,11 +735,28 @@ static const builtin_info_t DataViewConstr_info = {
     NULL
 };

+static HRESULT clamped_u8(script_ctx_t *ctx, jsval_t v, UINT8 *ret)
+{
+    HRESULT hres;
+    double n;
+
+    hres = to_number(ctx, v, &n);
+    if(FAILED(hres))
+        return hres;
+
+    if(!isfinite(n))
+        *ret = (n == INFINITY ? 255 : 0);
+    else
+        *ret = (n >= 255.0 ? 255 : n <= 0 ? 0 : lround(n));
+    return S_OK;
+}
+
 #define TYPEDARRAY_LIST \
 X(Int8Array,            JSCLASS_INT8ARRAY,          INT8,   to_int32,   INT)    \
 X(Int16Array,           JSCLASS_INT16ARRAY,         INT16,  to_int32,   INT)    \
 X(Int32Array,           JSCLASS_INT32ARRAY,         INT32,  to_int32,   INT)    \
 X(Uint8Array,           JSCLASS_UINT8ARRAY,         UINT8,  to_int32,   INT)    \
+X(Uint8ClampedArray,    JSCLASS_UINT8CLAMPEDARRAY,  UINT8,  clamped_u8, UINT8)  \
 X(Uint16Array,          JSCLASS_UINT16ARRAY,        UINT16, to_int32,   INT)    \
 X(Uint32Array,          JSCLASS_UINT32ARRAY,        UINT32, to_int32,   INT)    \
 X(Float32Array,         JSCLASS_FLOAT32ARRAY,       float,  to_number,  double) \
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 8c2b4103825..a955f34600b 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -122,6 +122,7 @@ typedef enum {
     JSCLASS_INT16ARRAY,
     JSCLASS_INT32ARRAY,
     JSCLASS_UINT8ARRAY,
+    JSCLASS_UINT8CLAMPEDARRAY,
     JSCLASS_UINT16ARRAY,
     JSCLASS_UINT32ARRAY,
     JSCLASS_FLOAT32ARRAY,
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 1b33f481b3b..a918b55f020 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -56,6 +56,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns
         L"[object Int16Array]",
         L"[object Int32Array]",
         L"[object Uint8Array]",
+        L"[object Uint8ClampedArray]",
         L"[object Uint16Array]",
         L"[object Uint32Array]",
         L"[object Float32Array]",
diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js
index b344061ef5c..fe3ee2dfc78 100644
--- a/dlls/mshtml/tests/es5.js
+++ b/dlls/mshtml/tests/es5.js
@@ -2491,6 +2491,18 @@ sync_test("ArrayBuffers & Views", function() {
         var n = ex.number >>> 0;
         ok(n === JS_E_NOT_TYPEDARRAY, "calling Uint32Array's subarray with Int32Array context threw " + n);
     }
+
+    /* clamped array */
+    arr = new Uint8ClampedArray(7);
+    arr2 = new Uint8Array(7);
+    arr.set ([42, -1, 999, 0.9, NaN, Infinity, -Infinity]);
+    arr2.set([42, -1, 999, 0.9, NaN, Infinity, -Infinity]);
+    for(var j = 0; j < 7; j++) {
+        ok(arr[j] ===  [42, 0, 255, 1, 0, 255, 0][j], "clamped arr[" + j + "] = " + arr[j]);
+        ok(arr2[j] === [42, 255, 231, 0, 0, 0, 0][j], "non-clamped arr[" + j + "] = " + arr2[j]);
+    }
+    r = Object.prototype.toString.call(arr);
+    ok(r === "[object Uint8ClampedArray]", "Object toString for Uint8ClampedArray = " + r);
 });

sync_test("builtin_context", function() {