[PATCH v3 1/7] jscript: Implement Object.prototype.__defineGetter__.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Fri Mar 25 09:45:38 CDT 2022
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/jscript/object.c | 44 ++++++++++++++++
dlls/mshtml/tests/documentmode.js | 88 +++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 9d4a747..d7650ff 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -294,6 +294,49 @@ done:
return hres;
}
+static HRESULT Object_defineGetter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+{
+ property_desc_t desc;
+ const WCHAR *name;
+ jsstr_t *name_str;
+ jsdisp_t *jsthis;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ if(!is_object_instance(vthis) || !(jsthis = to_jsdisp(get_object(vthis))))
+ goto done;
+
+ if(argc < 2 || !is_object_instance(argv[1]))
+ return JS_E_FUNCTION_EXPECTED;
+
+ desc.getter = to_jsdisp(get_object(argv[1]));
+ if(!desc.getter) {
+ FIXME("getter is not JS object\n");
+ return E_NOTIMPL;
+ }
+ /* FIXME: Check IsCallable */
+
+ hres = to_flat_string(ctx, argv[0], &name_str, &name);
+ if(FAILED(hres))
+ return hres;
+
+ desc.flags = desc.mask = PROPF_CONFIGURABLE | PROPF_ENUMERABLE;
+ desc.explicit_getter = TRUE;
+ desc.explicit_setter = FALSE;
+ desc.explicit_value = FALSE;
+ desc.setter = NULL;
+ hres = jsdisp_define_property(jsthis, name, &desc);
+
+ jsstr_release(name_str);
+ if(FAILED(hres))
+ return hres;
+done:
+ if(r)
+ *r = jsval_undefined();
+ return S_OK;
+}
+
HRESULT Object_get_proto_(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *jsthis;
@@ -365,6 +408,7 @@ static void Object_destructor(jsdisp_t *dispex)
}
static const builtin_prop_t Object_props[] = {
+ {L"__defineGetter__", Object_defineGetter, PROPF_METHOD|PROPF_ES6|2},
{L"hasOwnProperty", Object_hasOwnProperty, PROPF_METHOD|1},
{L"isPrototypeOf", Object_isPrototypeOf, PROPF_METHOD|1},
{L"propertyIsEnumerable", Object_propertyIsEnumerable, PROPF_METHOD|1},
diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index 2902902..18dd65e 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -1415,6 +1415,94 @@ sync_test("__proto__", function() {
}
});
+sync_test("__defineGetter__", function() {
+ var v = document.documentMode;
+ var r, x = 42;
+
+ if(v < 11) {
+ ok(x.__defineGetter__ === undefined, "x.__defineGetter__ = " + x.__defineGetter__);
+ ok(!("__defineGetter__" in Object), "Object.__defineGetter__ = " + Object.__defineGetter__);
+ return;
+ }
+ ok(Object.prototype.hasOwnProperty("__defineGetter__"), "__defineGetter__ is not a property of Object.prototype");
+ ok(Object.prototype.__defineGetter__.length === 2, "__defineGetter__.length = " + Object.prototype.__defineGetter__.length);
+
+ function getter() { return "wine"; }
+ function setter(val) { }
+
+ r = x.__defineGetter__("foo", getter);
+ ok(r === undefined, "__defineGetter__ on 42 returned " + r);
+ ok(x.foo === undefined, "42.foo = " + x.foo);
+
+ x = {};
+ r = x.__defineGetter__("foo", getter);
+ ok(r === undefined, "__defineGetter__ returned " + r);
+ ok(x.foo === "wine", "x.foo = " + x.foo);
+ r = Object.getOwnPropertyDescriptor(x, "foo");
+ ok(r.value === undefined, "x.foo value = " + r.value);
+ ok(r.get === getter, "x.foo get = " + r.get);
+ ok(r.set === undefined, "x.foo set = " + r.set);
+ ok(r.writable === undefined, "x.foo writable = " + r.writable);
+ ok(r.enumerable === true, "x.foo enumerable = " + r.enumerable);
+ ok(r.configurable === true, "x.foo configurable = " + r.configurable);
+
+ Object.defineProperty(x, "foo", { get: undefined, set: setter, configurable: false });
+ r = Object.getOwnPropertyDescriptor(x, "foo");
+ ok(r.value === undefined, "x.foo setter value = " + r.value);
+ ok(r.get === undefined, "x.foo setter get = " + r.get);
+ ok(r.set === setter, "x.foo setter set = " + r.set);
+ ok(r.writable === undefined, "x.foo setter writable = " + r.writable);
+ ok(r.enumerable === true, "x.foo setter enumerable = " + r.enumerable);
+ ok(r.configurable === false, "x.foo setter configurable = " + r.configurable);
+ try {
+ x.__defineGetter__("foo", getter);
+ ok(false, "expected exception calling __defineGetter__ on non-configurable property");
+ }catch(e) {
+ ok(e.number === 0xa13d6 - 0x80000000, "__defineGetter__ on non-configurable property threw exception " + e.number);
+ }
+
+ r = Object.prototype.__defineGetter__.call(undefined, "bar", getter);
+ ok(r === undefined, "__defineGetter__ on undefined returned " + r);
+ r = Object.prototype.__defineGetter__.call(null, "bar", getter);
+ ok(r === undefined, "__defineGetter__ on null returned " + r);
+ r = x.__defineGetter__(undefined, getter);
+ ok(r === undefined, "__defineGetter__ undefined prop returned " + r);
+ ok(x["undefined"] === "wine", "x.undefined = " + x["undefined"]);
+ r = x.__defineGetter__(false, getter);
+ ok(r === undefined, "__defineGetter__ undefined prop returned " + r);
+ ok(x["false"] === "wine", "x.false = " + x["false"]);
+
+ try {
+ x.__defineGetter__("bar", "string");
+ ok(false, "expected exception calling __defineGetter__ with string");
+ }catch(e) {
+ ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with string threw exception " + e.number);
+ }
+ try {
+ x.__defineGetter__("bar", undefined);
+ ok(false, "expected exception calling __defineGetter__ with undefined");
+ }catch(e) {
+ ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with undefined threw exception " + e.number);
+ }
+ try {
+ x.__defineGetter__("bar", null);
+ ok(false, "expected exception calling __defineGetter__ with null");
+ }catch(e) {
+ ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with null threw exception " + e.number);
+ }
+ try {
+ Object.prototype.__defineGetter__.call(x, "bar");
+ ok(false, "expected exception calling __defineGetter__ with only one arg");
+ }catch(e) {
+ ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with only one arg threw exception " + e.number);
+ }
+
+ x.bar = "test";
+ ok(x.bar === "test", "x.bar = " + x.bar);
+ x.__defineGetter__("bar", getter);
+ ok(x.bar === "wine", "x.bar with getter = " + x.bar);
+});
+
async_test("postMessage", function() {
var v = document.documentMode;
var onmessage_called = false;
--
2.34.1
More information about the wine-devel
mailing list