From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/jscript/arraybuf.c | 233 +++++++++++++++++++++++++++++++++++++++ dlls/jscript/error.c | 3 + dlls/jscript/jscript.h | 7 +- dlls/jscript/jscript.rc | 3 + dlls/jscript/object.c | 1 + dlls/jscript/resource.h | 3 + dlls/mshtml/tests/es5.js | 127 ++++++++++++++++++++- 7 files changed, 375 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/arraybuf.c b/dlls/jscript/arraybuf.c index 291af484138..173fca6d93c 100644 --- a/dlls/jscript/arraybuf.c +++ b/dlls/jscript/arraybuf.c @@ -31,11 +31,30 @@ typedef struct { DECLSPEC_ALIGN(sizeof(double)) BYTE buf[]; } ArrayBufferInstance;
+typedef struct { + jsdisp_t dispex; + + jsdisp_t *buffer; + DWORD offset; + DWORD size; +} DataViewInstance; + static inline ArrayBufferInstance *arraybuf_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, ArrayBufferInstance, dispex); }
+static inline DataViewInstance *dataview_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, DataViewInstance, dispex); +} + +static inline ArrayBufferInstance *arraybuf_this(jsval_t vthis) +{ + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_ARRAYBUFFER)) ? arraybuf_from_jsdisp(jsdisp) : NULL; +} + static HRESULT ArrayBuffer_get_byteLength(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("%p\n", jsthis); @@ -160,10 +179,179 @@ static const builtin_info_t ArrayBufferConstr_info = { NULL };
+static inline DataViewInstance *dataview_this(jsval_t vthis) +{ + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_DATAVIEW)) ? dataview_from_jsdisp(jsdisp) : NULL; +} + +static HRESULT DataView_get_buffer(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + DataViewInstance *view; + + TRACE("\n"); + + if(!(view = dataview_this(vthis))) + return JS_E_NOT_DATAVIEW; + if(r) *r = jsval_obj(jsdisp_addref(view->buffer)); + return S_OK; +} + +static HRESULT DataView_get_byteLength(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + DataViewInstance *view; + + TRACE("\n"); + + if(!(view = dataview_this(vthis))) + return JS_E_NOT_DATAVIEW; + if(r) *r = jsval_number(view->size); + return S_OK; +} + +static HRESULT DataView_get_byteOffset(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + DataViewInstance *view; + + TRACE("\n"); + + if(!(view = dataview_this(vthis))) + return JS_E_NOT_DATAVIEW; + if(r) *r = jsval_number(view->offset); + return S_OK; +} + +static void DataView_destructor(jsdisp_t *dispex) +{ + DataViewInstance *view = dataview_from_jsdisp(dispex); + if(view->buffer) + jsdisp_release(view->buffer); + free(view); +} + +static HRESULT DataView_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) +{ + DataViewInstance *view = dataview_from_jsdisp(dispex); + return gc_process_linked_obj(gc_ctx, op, dispex, view->buffer, (void**)&view->buffer); +} + +static const builtin_info_t DataView_info = { + JSCLASS_DATAVIEW, + NULL, + 0, + NULL, + DataView_destructor, + NULL, + NULL, + NULL, + NULL, + DataView_gc_traverse +}; + +static const builtin_info_t DataViewInst_info = { + JSCLASS_DATAVIEW, + NULL, + 0, + NULL, + DataView_destructor, + NULL, + NULL, + NULL, + NULL, + DataView_gc_traverse +}; + +static HRESULT DataViewConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + ArrayBufferInstance *arraybuf; + DataViewInstance *view; + DWORD offset = 0, size; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_METHOD: + case DISPATCH_CONSTRUCT: { + if(!argc || !(arraybuf = arraybuf_this(argv[0]))) + return JS_E_DATAVIEW_NO_ARGUMENT; + size = arraybuf->size; + + if(argc > 1) { + double offs, len, maxsize = size; + hres = to_integer(ctx, argv[1], &offs); + if(FAILED(hres)) + return hres; + if(offs < 0.0 || offs > maxsize) + return JS_E_DATAVIEW_INVALID_OFFSET; + offset = offs; + + if(argc > 2 && !is_undefined(argv[2])) { + hres = to_integer(ctx, argv[2], &len); + if(FAILED(hres)) + return hres; + if(len < 0.0 || offs+len > maxsize) + return JS_E_DATAVIEW_INVALID_OFFSET; + size = len; + }else + size -= offset; + } + + if(!r) + return S_OK; + + if(!(view = calloc(1, sizeof(DataViewInstance)))) + return E_OUTOFMEMORY; + + hres = init_dispex_from_constr(&view->dispex, ctx, &DataViewInst_info, ctx->dataview_constr); + if(FAILED(hres)) { + free(view); + return hres; + } + + view->buffer = jsdisp_addref(&arraybuf->dispex); + view->offset = offset; + view->size = size; + + *r = jsval_obj(&view->dispex); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const builtin_info_t DataViewConstr_info = { + JSCLASS_FUNCTION, + Function_value, + 0, + NULL, + NULL, + NULL +}; + HRESULT init_arraybuf_constructors(script_ctx_t *ctx) { + static const struct { + const WCHAR *name; + builtin_invoke_t get; + } DataView_getters[] = { + { L"buffer", DataView_get_buffer }, + { L"byteLength", DataView_get_byteLength }, + { L"byteOffset", DataView_get_byteOffset }, + }; ArrayBufferInstance *arraybuf; + DataViewInstance *view; + property_desc_t desc; HRESULT hres; + unsigned i;
if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) return S_OK; @@ -185,6 +373,51 @@ HRESULT init_arraybuf_constructors(script_ctx_t *ctx)
hres = jsdisp_define_data_property(ctx->global, L"ArrayBuffer", PROPF_CONFIGURABLE | PROPF_WRITABLE, jsval_obj(ctx->arraybuf_constr)); + if(FAILED(hres)) + return hres; + + if(!(view = calloc(1, sizeof(DataViewInstance)))) + return E_OUTOFMEMORY; + + hres = create_arraybuf(ctx, 0, &view->buffer); + if(FAILED(hres)) { + free(view); + return hres; + } + + hres = init_dispex(&view->dispex, ctx, &DataView_info, ctx->object_prototype); + if(FAILED(hres)) { + jsdisp_release(view->buffer); + free(view); + return hres; + } + + desc.flags = PROPF_CONFIGURABLE; + desc.mask = PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + desc.explicit_getter = desc.explicit_setter = TRUE; + desc.explicit_value = FALSE; + desc.setter = NULL; + + for(i = 0; i < ARRAY_SIZE(DataView_getters); i++) { + hres = create_builtin_function(ctx, DataView_getters[i].get, NULL, NULL, PROPF_METHOD, NULL, &desc.getter); + if(SUCCEEDED(hres)) { + hres = jsdisp_define_property(&view->dispex, DataView_getters[i].name, &desc); + jsdisp_release(desc.getter); + } + if(FAILED(hres)) { + jsdisp_release(&view->dispex); + return hres; + } + } + + hres = create_builtin_constructor(ctx, DataViewConstr_value, L"DataView", &DataViewConstr_info, + PROPF_CONSTR|1, &view->dispex, &ctx->dataview_constr); + jsdisp_release(&view->dispex); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, L"DataView", PROPF_CONFIGURABLE | PROPF_WRITABLE, + jsval_obj(ctx->dataview_constr));
return hres; } diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index f6eda62b88d..1c84ff70f87 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -483,6 +483,8 @@ jsdisp_t *create_builtin_error(script_ctx_t *ctx) case JS_E_OBJECT_NONEXTENSIBLE: case JS_E_NONCONFIGURABLE_REDEFINED: case JS_E_NONWRITABLE_MODIFIED: + case JS_E_NOT_DATAVIEW: + case JS_E_DATAVIEW_NO_ARGUMENT: case JS_E_WRONG_THIS: case JS_E_KEY_NOT_OBJECT: case JS_E_PROP_DESC_MISMATCH: @@ -494,6 +496,7 @@ jsdisp_t *create_builtin_error(script_ctx_t *ctx) case JS_E_FRACTION_DIGITS_OUT_OF_RANGE: case JS_E_PRECISION_OUT_OF_RANGE: case JS_E_INVALID_LENGTH: + case JS_E_DATAVIEW_INVALID_OFFSET: constr = ctx->range_error_constr; break;
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index dd7aa4dddcc..d792b34b3d1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -117,6 +117,7 @@ typedef enum { JSCLASS_VBARRAY, JSCLASS_JSON, JSCLASS_ARRAYBUFFER, + JSCLASS_DATAVIEW, JSCLASS_MAP, JSCLASS_SET, JSCLASS_WEAKMAP, @@ -437,11 +438,12 @@ struct _script_ctx_t { jsdisp_t *string_constr; jsdisp_t *vbarray_constr; jsdisp_t *arraybuf_constr; + jsdisp_t *dataview_constr; jsdisp_t *map_prototype; jsdisp_t *set_prototype; jsdisp_t *weakmap_prototype; }; - jsdisp_t *global_objects[24]; + jsdisp_t *global_objects[25]; }; }; C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, weakmap_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); @@ -579,6 +581,9 @@ static inline HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, jsval_ #define JS_E_OBJECT_NONEXTENSIBLE MAKE_JSERROR(IDS_OBJECT_NONEXTENSIBLE) #define JS_E_NONCONFIGURABLE_REDEFINED MAKE_JSERROR(IDS_NONCONFIGURABLE_REDEFINED) #define JS_E_NONWRITABLE_MODIFIED MAKE_JSERROR(IDS_NONWRITABLE_MODIFIED) +#define JS_E_NOT_DATAVIEW MAKE_JSERROR(IDS_NOT_DATAVIEW) +#define JS_E_DATAVIEW_NO_ARGUMENT MAKE_JSERROR(IDS_DATAVIEW_NO_ARGUMENT) +#define JS_E_DATAVIEW_INVALID_OFFSET MAKE_JSERROR(IDS_DATAVIEW_INVALID_OFFSET) #define JS_E_WRONG_THIS MAKE_JSERROR(IDS_WRONG_THIS) #define JS_E_KEY_NOT_OBJECT MAKE_JSERROR(IDS_KEY_NOT_OBJECT) #define JS_E_PROP_DESC_MISMATCH MAKE_JSERROR(IDS_PROP_DESC_MISMATCH) diff --git a/dlls/jscript/jscript.rc b/dlls/jscript/jscript.rc index e5289a550a3..31e2d18cf57 100644 --- a/dlls/jscript/jscript.rc +++ b/dlls/jscript/jscript.rc @@ -76,6 +76,9 @@ STRINGTABLE IDS_OBJECT_NONEXTENSIBLE "Cannot define property '|': object is not extensible" IDS_NONCONFIGURABLE_REDEFINED "Cannot redefine non-configurable property '|'" IDS_NONWRITABLE_MODIFIED "Cannot modify non-writable property '|'" + IDS_NOT_DATAVIEW "'this' is not a DataView object" + IDS_DATAVIEW_NO_ARGUMENT "Required argument offset or value in DataView method is not specified" + IDS_DATAVIEW_INVALID_OFFSET "DataView constructor argument offset is invalid" IDS_WRONG_THIS "'this' is not a | object" IDS_KEY_NOT_OBJECT "'key' is not an object" IDS_PROP_DESC_MISMATCH "Property cannot have both accessors and a value" diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index cba35927378..16ecc3dea3c 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -53,6 +53,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns L"[object ArrayBuffer]", L"[object Object]", L"[object Object]", + L"[object Object]", L"[object Object]" };
diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index ad771b67475..6d92e05a837 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -74,6 +74,9 @@ #define IDS_OBJECT_NONEXTENSIBLE 0x13D5 #define IDS_NONCONFIGURABLE_REDEFINED 0x13D6 #define IDS_NONWRITABLE_MODIFIED 0x13D7 +#define IDS_NOT_DATAVIEW 0x13DF +#define IDS_DATAVIEW_NO_ARGUMENT 0x13E0 +#define IDS_DATAVIEW_INVALID_OFFSET 0x13E2 #define IDS_WRONG_THIS 0x13FC #define IDS_KEY_NOT_OBJECT 0x13FD /* FIXME: This is not compatible with native, but we would diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index b9d9b0d03d6..dc15ed3af8a 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -32,6 +32,9 @@ var JS_E_INVALID_LENGTH = 0x800a13a5; var JS_E_INVALID_WRITABLE_PROP_DESC = 0x800a13ac; var JS_E_NONCONFIGURABLE_REDEFINED = 0x800a13d6; var JS_E_NONWRITABLE_MODIFIED = 0x800a13d7; +var JS_E_NOT_DATAVIEW = 0x800a13df; +var JS_E_DATAVIEW_NO_ARGUMENT = 0x800a13e0; +var JS_E_DATAVIEW_INVALID_OFFSET = 0x800a13e2; var JS_E_WRONG_THIS = 0x800a13fc;
var tests = []; @@ -1683,7 +1686,7 @@ sync_test("RegExp", function() { });
sync_test("ArrayBuffers & Views", function() { - var r, buf; + var i, r, buf, view, view2, arr;
function test_own_props(obj_name, props) { var obj = eval(obj_name); @@ -1691,6 +1694,12 @@ sync_test("ArrayBuffers & Views", function() { ok(Object.prototype.hasOwnProperty.call(obj, props[i]), props[i] + " not a property of " + obj_name); }
+ function test_not_own_props(obj_name, props) { + var obj = eval(obj_name); + for(var i = 0; i < props.length; i++) + ok(!Object.prototype.hasOwnProperty.call(obj, props[i]), props[i] + " is a property of " + obj_name); + } + function test_readonly(obj, prop, val) { var name = Object.getPrototypeOf(obj).constructor.toString(); name = name.substring(9, name.indexOf("(", 9)) + ".prototype." + prop; @@ -1727,6 +1736,122 @@ sync_test("ArrayBuffers & Views", function() { ok(buf.byteLength === 10, "ArrayBuffer(10).byteLength = " + buf.byteLength); test_readonly(buf, "byteLength", 10); test_own_data_prop_desc(buf, "byteLength", false, false, false); + + test_own_props("DataView.prototype", [ + "buffer", "byteLength", "byteOffset" + ]); + + r = Object.prototype.toString.call(new DataView(buf)); + ok(r === "[object Object]", "Object toString(new DataView(buf)) = " + r); + r = DataView.length; + ok(r === 1, "DataView.length = " + r); + + /* DataView.prototype has actual accessors, but others don't */ + arr = [ "buffer", "byteLength", "byteOffset" ]; + for(i = 0; i < arr.length; i++) { + var prop = arr[i], desc = Object.getOwnPropertyDescriptor(DataView.prototype, prop); + ok(!("value" in desc), "DataView: value is in desc"); + ok(!("writable" in desc), "DataView: writable is in desc"); + ok(desc.enumerable === false, "DataView: desc.enumerable = " + desc.enumerable); + ok(desc.configurable === true, "DataView: desc.configurable = " + desc.configurable); + ok(Object.getPrototypeOf(desc.get) === Function.prototype, "DataView: desc.get not a function: " + desc.get); + ok("set" in desc, "DataView: set is not in desc"); + ok(desc.set === undefined, "DataView: desc.set not undefined: " + desc.set); + try { + desc.get.call(null); + ok(false, "DataView: calling " + prop + " getter with null did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NOT_DATAVIEW, "DataView: calling " + prop + " getter with null threw " + n); + } + try { + desc.get.call({}); + ok(false, "DataView: calling " + prop + " getter with an object did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NOT_DATAVIEW, "DataView: calling " + prop + " getter with an object threw " + n); + } + try { + desc.get.call(DataView); + ok(false, "DataView: calling " + prop + " getter with DataView constructor did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NOT_DATAVIEW, "DataView: calling " + prop + " getter with DataView constructor threw " + n); + } + try { + desc.get.call(new ArrayBuffer()); + ok(false, "DataView: calling " + prop + " getter with ArrayBuffer did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NOT_DATAVIEW, "DataView: calling " + prop + " getter with ArrayBuffer threw " + n); + } + r = desc.get.call(DataView.prototype); + if(prop === "buffer") + ok(Object.getPrototypeOf(r) === ArrayBuffer.prototype, "DataView: calling " + prop + " getter with DataView.prototype returned " + r); + else + ok(r === 0, "DataView: calling " + prop + " getter with DataView.prototype returned " + r); + } + + try { + new DataView(); + ok(false, "new DataView() did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_DATAVIEW_NO_ARGUMENT, "new DataView() threw " + n); + } + try { + new DataView(ArrayBuffer); + ok(false, "new DataView(ArrayBuffer) did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_DATAVIEW_NO_ARGUMENT, "new DataView(ArrayBuffer) threw " + n); + } + try { + new DataView(buf, -1); + ok(false, "new DataView(buf, -1) did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_DATAVIEW_INVALID_OFFSET, "new DataView(buf, -1) threw " + n); + } + try { + new DataView(buf, 11); + ok(false, "new DataView(buf, 11) did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_DATAVIEW_INVALID_OFFSET, "new DataView(buf, 11) threw " + n); + } + try { + new DataView(buf, 9, 2); + ok(false, "new DataView(buf, 9, 2) did not throw exception"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_DATAVIEW_INVALID_OFFSET, "new DataView(buf, 9, 2) threw " + n); + } + + view = new DataView(buf, 9, 1); + ok(view.buffer === buf, "DataView(buf, 9, 1).buffer = " + view.buffer); + ok(view.byteLength === 1, "DataView(buf, 9, 1).byteLength = " + view.byteLength); + ok(view.byteOffset === 9, "DataView(buf, 9, 1).byteOffset = " + view.byteOffset); + test_readonly(view, "byteLength", 1); + test_readonly(view, "byteOffset", 9); + test_not_own_props("view", [ "buffer", "byteLength", "byteOffset" ]); + + view = new DataView(buf, 10); + ok(view.buffer === buf, "DataView(buf, 10).buffer = " + view.buffer); + ok(view.byteLength === 0, "DataView(buf, 10).byteLength = " + view.byteLength); + ok(view.byteOffset === 10, "DataView(buf, 10).byteOffset = " + view.byteOffset); + view = new DataView(buf, 1, 7); + ok(view.buffer === buf, "DataView(buf, 1, 7).buffer = " + view.buffer); + ok(view.byteLength === 7, "DataView(buf, 1, 7).byteLength = " + view.byteLength); + ok(view.byteOffset === 1, "DataView(buf, 1, 7).byteOffset = " + view.byteOffset); + view2 = new DataView(buf, 6); + ok(view2.buffer === buf, "DataView(buf, 6).buffer = " + view2.buffer); + ok(view2.byteLength === 4, "DataView(buf, 6).byteLength = " + view2.byteLength); + ok(view2.byteOffset === 6, "DataView(buf, 6).byteOffset = " + view2.byteOffset); + view = DataView(buf); + ok(view.buffer === buf, "DataView(buf).buffer = " + view.buffer); + ok(view.byteLength === 10, "DataView(buf).byteLength = " + view.byteLength); + ok(view.byteOffset === 0, "DataView(buf).byteOffset = " + view.byteOffset); });
sync_test("builtin_context", function() {