wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Rémi Bernon : kernel32/tests: Add some GlobalMemoryStatusEx tests.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: ff0114eb545366d3f9b5d3634f00ee929f2747db URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0114eb545366d3f9b5d363… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 13:56:51 2022 +0100 kernel32/tests: Add some GlobalMemoryStatusEx tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c597ff9590b..fc4ece81e00 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1264,6 +1264,67 @@ static void test_GlobalMemoryStatus(void) wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); } +static void test_GlobalMemoryStatusEx(void) +{ + char buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* some Win 7 versions need a larger info */ + SYSTEM_PERFORMANCE_INFORMATION *perf_info = (void *)buffer; + SYSTEM_BASIC_INFORMATION basic_info; + MEMORYSTATUSEX memex = {0}, expect; + VM_COUNTERS_EX vmc; + NTSTATUS status; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = GlobalMemoryStatusEx( &memex ); + ok( !ret, "GlobalMemoryStatusEx succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + do + { + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); + } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize); + + ok( basic_info.PageSize, "got 0 PageSize\n" ); + ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); + ok( !!basic_info.HighestUserAddress, "got 0 HighestUserAddress\n" ); + ok( !!basic_info.LowestUserAddress, "got 0 LowestUserAddress\n" ); + ok( perf_info->TotalCommittedPages, "got 0 TotalCommittedPages\n" ); + ok( perf_info->TotalCommitLimit, "got 0 TotalCommitLimit\n" ); + ok( perf_info->AvailablePages, "got 0 AvailablePages\n" ); + + expect.dwMemoryLoad = (memex.ullTotalPhys - memex.ullAvailPhys) / (memex.ullTotalPhys / 100); + expect.ullTotalPhys = (ULONGLONG)basic_info.MmNumberOfPhysicalPages * basic_info.PageSize; + expect.ullAvailPhys = (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize; + expect.ullTotalPageFile = (ULONGLONG)perf_info->TotalCommitLimit * basic_info.PageSize; + expect.ullAvailPageFile = (ULONGLONG)(perf_info->TotalCommitLimit - perf_info->TotalCommittedPages) * basic_info.PageSize; + expect.ullTotalVirtual = (ULONG_PTR)basic_info.HighestUserAddress - (ULONG_PTR)basic_info.LowestUserAddress + 1; + expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; + expect.ullAvailExtendedVirtual = 0; + + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); + todo_wine + ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); + ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + todo_wine + ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); + /* allow some variability, page file is not always in sync on Windows */ + ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, + "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + todo_wine + ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); + todo_wine + ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); + ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); +} + START_TEST(heap) { int argc; @@ -1298,6 +1359,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); test_GlobalMemoryStatus(); + test_GlobalMemoryStatusEx(); if (pRtlGetNtGlobalFlags) {

1 0

Huw Davies : bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: ad0a18a49d06a61f06fd9b4515c695c51fef2696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad0a18a49d06a61f06fd9b45… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 14:49:27 2022 +0000 bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest. Mainly to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ba251c72fa1..b38bf4ba8ff 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1552,7 +1552,7 @@ static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; - return -1; + return GNUTLS_DIG_UNKNOWN; } static NTSTATUS key_asymmetric_verify( void *args ) @@ -1596,7 +1596,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1751,7 +1751,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_INVALID_PARAMETER; } - if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); return STATUS_NOT_SUPPORTED;

1 0

Gabriel Ivăncescu : jscript: Handle non-JS objects in Object.getPrototypeOf.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: f85831838436a8f0c754a71bfb64b104b04c9099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f85831838436a8f0c754a71b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 25 16:45:42 2022 +0200 jscript: Handle non-JS objects in Object.getPrototypeOf. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 7 +------ dlls/mshtml/tests/es5.js | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index d1522b1cd36..a675e45c4a0 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -850,13 +850,8 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, jsval_t vthis, WORD flag TRACE("(%s)\n", debugstr_jsval(argv[0])); obj = to_jsdisp(get_object(argv[0])); - if(!obj) { - FIXME("Non-JS object\n"); - return E_NOTIMPL; - } - if(r) - *r = obj->prototype + *r = obj && obj->prototype ? jsval_obj(jsdisp_addref(obj->prototype)) : jsval_null(); return S_OK; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index c03a2c2ec88..0339d9b08fa 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -803,6 +803,8 @@ sync_test("getPrototypeOf", function() { obj = Object.create(null); ok(!("toString" in obj), "toString is in obj"); ok(Object.getPrototypeOf(obj) === null, "Object.getPrototypeOf(obj) = " + Object.getPrototypeOf(obj)); + + ok(Object.getPrototypeOf(external) === null, "Object.getPrototypeOf(non-JS obj) = " + Object.getPrototypeOf(external)); }); sync_test("toString", function() {

1 0

Gabriel Ivăncescu : mshtml/tests: Test for RegExp.prototype.toString with non-regexp.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: b4175eebc0e9e21489f8c6b57e486f100bd394a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4175eebc0e9e21489f8c6b5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 25 16:45:41 2022 +0200 mshtml/tests: Test for RegExp.prototype.toString with non-regexp. According to the ES6 spec, it should work in generic way for objects exposing "source" and "flags", but native IE seems to not follow it here and throws. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index b4d0bebfef0..3f772cf092f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1300,6 +1300,13 @@ sync_test("builtins_diffs", function() { ok(e.number === (v < 9 ? 0xa01b6 : 0xa138f) - 0x80000000, "Object." + props[i] + " with non-object: exception = " + e.number); } } + + try { + RegExp.prototype.toString.call({source: "foo", flags: "g"}); + ok(false, "RegExp.toString with non-regexp: expected exception"); + }catch(e) { + ok(e.number === 0xa1398 - 0x80000000, "RegExp.toString with non-regexp: exception = " + e.number); + } }); sync_test("__proto__", function() {

1 0

Gabriel Ivăncescu : jscript: Throw proper error in Object methods with non-objects args.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: ed5521655875a9764588911f22a08474e6ee3668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5521655875a9764588911f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 25 16:45:40 2022 +0200 jscript: Throw proper error in Object methods with non-objects args. According to the ES6 spec, they don't throw anymore (compared to ES5), but native IE seems to not follow it here and throws anyway. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 18 ++++++------------ dlls/mshtml/tests/documentmode.js | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bf0be64e12a..d1522b1cd36 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -844,10 +844,8 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, jsval_t vthis, WORD flag { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0])) { - FIXME("invalid arguments\n"); - return E_NOTIMPL; - } + if(!argc || !is_object_instance(argv[0])) + return JS_E_OBJECT_EXPECTED; TRACE("(%s)\n", debugstr_jsval(argv[0])); @@ -872,10 +870,8 @@ static HRESULT object_keys(script_ctx_t *ctx, jsval_t arg, enum jsdisp_enum_type jsstr_t *key; HRESULT hres; - if(!is_object_instance(arg)) { - FIXME("invalid arguments %s\n", debugstr_jsval(arg)); - return E_NOTIMPL; - } + if(!is_object_instance(arg)) + return JS_E_OBJECT_EXPECTED; obj = to_jsdisp(get_object(arg)); if(!obj) { @@ -931,10 +927,8 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, jsval_t vthis, WORD f { jsdisp_t *obj; - if(!argc || !is_object_instance(argv[0])) { - FIXME("invalid arguments\n"); - return E_NOTIMPL; - } + if(!argc || !is_object_instance(argv[0])) + return JS_E_OBJECT_EXPECTED; TRACE("(%s)\n", debugstr_jsval(argv[0])); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 4a776f87195..b4d0bebfef0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1278,6 +1278,30 @@ sync_test("elem_attr", function() { } }); +sync_test("builtins_diffs", function() { + var v = document.documentMode; + + /* despite what spec says for ES6, IE still throws */ + var props = [ + "freeze", + "getPrototypeOf", + "isExtensible", + "isFrozen", + "isSealed", + "keys", + "preventExtensions", + "seal" + ]; + for(var i = 0; i < props.length; i++) { + try { + Object[props[i]]("test"); + ok(false, "Object." + props[i] + " with non-object: expected exception"); + }catch(e) { + ok(e.number === (v < 9 ? 0xa01b6 : 0xa138f) - 0x80000000, "Object." + props[i] + " with non-object: exception = " + e.number); + } + } +}); + sync_test("__proto__", function() { var v = document.documentMode; var r, x = 42;

1 0

Gabriel Ivăncescu : jscript: Implement Object.prototype.__defineSetter__.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 9785781fbc767105dd1c1083ea9b62dac7da017a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9785781fbc767105dd1c1083… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 25 16:45:39 2022 +0200 jscript: Implement Object.prototype.__defineSetter__. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 44 ++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 95 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index d7650ffa7c5..bf0be64e12a 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -337,6 +337,49 @@ done: return S_OK; } +static HRESULT Object_defineSetter(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.setter = to_jsdisp(get_object(argv[1])); + if(!desc.setter) { + FIXME("setter 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 = FALSE; + desc.explicit_setter = TRUE; + desc.explicit_value = FALSE; + desc.getter = 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; @@ -409,6 +452,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"__defineSetter__", Object_defineSetter, 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 18dd65ec6d5..4a776f87195 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1503,6 +1503,101 @@ sync_test("__defineGetter__", function() { ok(x.bar === "wine", "x.bar with getter = " + x.bar); }); +sync_test("__defineSetter__", function() { + var v = document.documentMode; + var r, x = 42; + + if(v < 11) { + ok(x.__defineSetter__ === undefined, "x.__defineSetter__ = " + x.__defineSetter__); + ok(!("__defineSetter__" in Object), "Object.__defineSetter__ = " + Object.__defineSetter__); + return; + } + ok(Object.prototype.hasOwnProperty("__defineSetter__"), "__defineSetter__ is not a property of Object.prototype"); + ok(Object.prototype.__defineSetter__.length === 2, "__defineSetter__.length = " + Object.prototype.__defineSetter__.length); + + function getter() { return "wine"; } + function setter(val) { this.setterVal = val - 1; } + + r = x.__defineSetter__("foo", setter); + ok(r === undefined, "__defineSetter__ on 42 returned " + r); + ok(x.foo === undefined, "42.foo = " + x.foo); + + x = {}; + r = x.__defineSetter__("foo", setter); + ok(r === undefined, "__defineSetter__ returned " + r); + ok(x.setterVal === undefined, "x.setterVal = " + x.setterVal); + x.foo = 13; + ok(x.setterVal === 12, "x.setterVal = " + x.setterVal); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo value = " + r.value); + ok(r.get === undefined, "x.foo get = " + r.get); + ok(r.set === setter, "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: getter, set: undefined, configurable: false }); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo getter value = " + r.value); + ok(r.get === getter, "x.foo getter get = " + r.get); + ok(r.set === undefined, "x.foo getter set = " + r.set); + ok(r.writable === undefined, "x.foo getter writable = " + r.writable); + ok(r.enumerable === true, "x.foo getter enumerable = " + r.enumerable); + ok(r.configurable === false, "x.foo getter configurable = " + r.configurable); + try { + x.__defineSetter__("foo", setter); + ok(false, "expected exception calling __defineSetter__ on non-configurable property"); + }catch(e) { + ok(e.number === 0xa13d6 - 0x80000000, "__defineSetter__ on non-configurable property threw exception " + e.number); + } + + r = Object.prototype.__defineSetter__.call(undefined, "bar", setter); + ok(r === undefined, "__defineSetter__ on undefined returned " + r); + r = Object.prototype.__defineSetter__.call(null, "bar", setter); + ok(r === undefined, "__defineSetter__ on null returned " + r); + r = x.__defineSetter__(null, setter); + ok(r === undefined, "__defineSetter__ null prop returned " + r); + x["null"] = 100; + ok(x.setterVal === 99, "x.setterVal after setting x.null = " + x.setterVal); + r = x.__defineSetter__(50, setter); + ok(r === undefined, "__defineSetter__ 50 prop returned " + r); + x["50"] = 33; + ok(x.setterVal === 32, "x.setterVal after setting x.50 = " + x.setterVal); + + try { + x.__defineSetter__("bar", true); + ok(false, "expected exception calling __defineSetter__ with bool"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineSetter__ with bool threw exception " + e.number); + } + try { + x.__defineSetter__("bar", undefined); + ok(false, "expected exception calling __defineSetter__ with undefined"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineSetter__ with undefined threw exception " + e.number); + } + try { + x.__defineSetter__("bar", null); + ok(false, "expected exception calling __defineSetter__ with null"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineSetter__ with null threw exception " + e.number); + } + try { + Object.prototype.__defineSetter__.call(x, "bar"); + ok(false, "expected exception calling __defineSetter__ with only one arg"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineSetter__ with only one arg threw exception " + e.number); + } + + x.bar = "test"; + ok(x.bar === "test", "x.bar = " + x.bar); + x.__defineSetter__("bar", setter); + ok(x.bar === undefined, "x.bar with setter = " + x.bar); + x.bar = 10; + ok(x.bar === undefined, "x.bar with setter = " + x.bar); + ok(x.setterVal === 9, "x.setterVal after setting bar = " + x.setterVal); +}); + async_test("postMessage", function() { var v = document.documentMode; var onmessage_called = false;

1 0

Gabriel Ivăncescu : jscript: Implement Object.prototype.__defineGetter__.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 8eac0fc60aaa364a4fc4522e15e33a452a700e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eac0fc60aaa364a4fc4522e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 25 16:45:38 2022 +0200 jscript: Implement Object.prototype.__defineGetter__. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9d4a747ea4e..d7650ffa7c5 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 29029023906..18dd65ec6d5 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;

1 0

Rémi Bernon : kernel32/tests: Use HeapAlloc function pointer to silent a warning.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 1a1f471cc42e1a409c84e6dd2c11d75b88771439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1f471cc42e1a409c84e6dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 13:47:59 2022 +0100 kernel32/tests: Use HeapAlloc function pointer to silent a warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc573050d16..c597ff9590b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -898,7 +898,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08lx\n", flags ); - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); + p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); ret = HeapValidate( GetProcessHeap(), 0, p );

1 0

Huw Davies : mountmgr: Fix long type warnings on macOS.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 1c04073772254fa452f90aa27ea9945b53a49ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c04073772254fa452f90aa2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 12:13:10 2022 +0000 mountmgr: Fix long type warnings on macOS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 50a32bef079..462ff82c691 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -229,7 +229,7 @@ void run_diskarbitration_loop(void) #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) -static UInt8 map_option( ULONG option ) +static UInt8 map_option( unsigned int option ) { switch (option) { @@ -314,7 +314,7 @@ NTSTATUS dhcp_request( void *args ) case OPTION_ROUTER_ADDRESS: case OPTION_BROADCAST_ADDRESS: { - DWORD *ptr = (DWORD *)(params->buffer + params->offset); + unsigned int *ptr = (unsigned int *)(params->buffer + params->offset); if (len == sizeof(*ptr) && params->size >= sizeof(*ptr)) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); @@ -341,7 +341,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; }

1 0

Jacek Caban : win32u: Move menu handle management from user32.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 27c0b997f0ed937536261f21856e071dd7e87ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c0b997f0ed937536261f21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:19:05 2022 +0100 win32u: Move menu handle management from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 91 +++++++++----------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 20 +--------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 42 +++++++++++++++++++- dlls/win32u/ntuser_private.h | 31 ++++++++++++++- dlls/win32u/sysparams.c | 6 +-- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 3 +- 17 files changed, 108 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27c0b997f0ed93753626…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022