April 2021 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ole32/tests: Add more tests for custom ILockBytes implementation.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 6fdbec0890d34e2e98a811d8aa42031b0a6677ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fdbec0890d34e2e98a811d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 31 10:45:33 2021 +0300 ole32/tests: Add more tests for custom ILockBytes implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/storage32.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index eea78c6d3fe..44ff3a07a21 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -241,6 +241,9 @@ static void CreateTestLockBytes(TestLockBytes **This) { (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; (*This)->ref = 1; + (*This)->size = 0; + (*This)->buffer_size = 1024; + (*This)->contents = HeapAlloc(GetProcessHeap(), 0, (*This)->buffer_size); } } @@ -3872,9 +3875,16 @@ static void test_custom_lockbytes(void) hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + IStream_Write(stm, "Hello World!", 12, NULL); IStream_Release(stm); + memset(lockbytes->contents, 0, lockbytes->buffer_size); + hr = IStorage_Commit(stg, 0); + ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); + +todo_wine + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); IStorage_Release(stg); @@ -3888,14 +3898,25 @@ static void test_custom_lockbytes(void) hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + IStream_Write(stm, "Hello World!", 12, NULL); IStream_Release(stm); hr = IStorage_Commit(stg, 0); - - IStorage_Release(stg); + ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); ok(lockbytes->lock_called, "expected LockRegion to be called\n"); + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + + memset(lockbytes->contents, 0, lockbytes->buffer_size); + + hr = IStorage_Commit(stg, 0); + ok(hr==STG_E_INVALIDHEADER, "IStorage_Commit should fail: %x\n", hr); + + ok(*(DWORD *)lockbytes->contents == 0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + + IStorage_Release(stg); + lockbytes->lock_hr = STG_E_INVALIDFUNCTION; hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg);

1 0

Francois Gouget : testbot/web: Fix Apache intermittently not finding CreatePatches().
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: tools Branch: master Commit: 50ecc7020fc26c2117c3499c5e9256688ec7a933 URL: https://source.winehq.org/git/tools.git/?a=commit;h=50ecc7020fc26c2117c3499… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 1 15:52:34 2021 +0200 testbot/web: Fix Apache intermittently not finding CreatePatches(). If CreatePatches() is not refered to with its full name Apache (mod_perl really) intermittently fails to find it and issues an error of the form: Undefined subroutine &WineTestBot::Jobs::CreatePatches called at .../testbot/lib/ObjectModel/Item.pm line 275. Strangely enough it never has trouble finding any of the other Create*() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 5dbc1a7..a5ae135 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -454,7 +454,10 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), - CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&CreatePatches, ["PatchId"]), + # Somehow mod_perl sometimes fails to find CreatePatches() if not given the + # fully qualified name, but never has any trouble with the other Create*() + # functions. + CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), ); SetDetailrefKeyPrefix("Job", @PropertyDescriptors);

1 0

Francois Gouget : testbot/PatchUtils: Rework GetPatchImpacts() to fix patchset handling.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: tools Branch: master Commit: bcf62d46c35d3583617cc51797f070aaf915cb2c URL: https://source.winehq.org/git/tools.git/?a=commit;h=bcf62d46c35d3583617cc51… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 2 03:27:11 2021 +0200 testbot/PatchUtils: Rework GetPatchImpacts() to fix patchset handling. Rename the Tests set to Modules since it contains information about each module impacted by the patch, including a full list of the still existing and patched test units. Better separate the build impacts from the test impacts: the former impact the build of all following parts, while only the last part impacts the tests that need to be run. This stops the TestBot from running test units which were not impacted by the _last part_ of the patchset. Document the returned $Impacts structure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 6 +- testbot/bin/build/WineTest.pl | 30 +-- testbot/lib/WineTestBot/PatchUtils.pm | 370 ++++++++++++++++++++-------------- testbot/lib/WineTestBot/Patches.pm | 15 +- testbot/web/Submit.pl | 36 ++-- 5 files changed, 266 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=bcf62d46c35d3583617…

1 0

Lauri Kenttä : msvcrt: Handle negative zero, infinity and nan in _ecvt and others.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 97b420224e767b24d89722ff5efeca38a8ecf1e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97b420224e767b24d89722ff… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 1 20:58:46 2021 +0200 msvcrt: Handle negative zero, infinity and nan in _ecvt and others. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 65 ++++++++++++++++++---------------------------- dlls/msvcrt/tests/printf.c | 11 ++++++++ 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6b2d08a8294..9e75f2977a7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2579,21 +2579,22 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) int prec, len; thread_data_t *data = msvcrt_get_thread_data(); /* FIXME: check better for overflow (native supports over 300 chars) */ - ndigits = min( ndigits, 80 - 7); /* 7 : space for dec point, 1 for "e", + ndigits = min( ndigits, 80 - 8); /* 8 : space for sign, dec point, "e", * 4 for exponent and one for * terminating '\0' */ if (!data->efcvt_buffer) data->efcvt_buffer = malloc( 80 ); /* ought to be enough */ - if( number < 0) { - *sign = TRUE; - number = -number; - } else - *sign = FALSE; /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; len = _snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); + + if (data->efcvt_buffer[0] == '-') { + memmove( data->efcvt_buffer, data->efcvt_buffer + 1, len-- ); + *sign = 1; + } else *sign = 0; + /* take the decimal "point away */ if( prec != 1) memmove( data->efcvt_buffer + 1, data->efcvt_buffer + 2, len - 1 ); @@ -2622,7 +2623,6 @@ int CDECL _ecvt_s( char *buffer, size_t length, double number, int ndigits, int { int prec, len; char *result; - const char infret[] = "1#INF"; if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(decpt != NULL)) return EINVAL; @@ -2630,30 +2630,17 @@ int CDECL _ecvt_s( char *buffer, size_t length, double number, int ndigits, int if (!MSVCRT_CHECK_PMT_ERR( length > 2, ERANGE )) return ERANGE; if (!MSVCRT_CHECK_PMT_ERR(ndigits < (int)length - 1, ERANGE )) return ERANGE; - /* special case - inf */ - if(number == HUGE_VAL || number == -HUGE_VAL) - { - memset(buffer, '0', ndigits); - memcpy(buffer, infret, min(ndigits, sizeof(infret) - 1 ) ); - buffer[ndigits] = '\0'; - (*decpt) = 1; - if(number == -HUGE_VAL) - (*sign) = 1; - else - (*sign) = 0; - return 0; - } /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - result = malloc(prec + 7); - - if( number < 0) { - *sign = TRUE; - number = -number; - } else - *sign = FALSE; - len = _snprintf(result, prec + 7, "%.*le", prec - 1, number); + result = malloc(prec + 8); + + len = _snprintf(result, prec + 8, "%.*le", prec - 1, number); + if (result[0] == '-') { + memmove( result, result + 1, len-- ); + *sign = 1; + } else *sign = 0; + /* take the decimal "point away */ if( prec != 1) memmove( result + 1, result + 2, len - 1 ); @@ -2690,12 +2677,6 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) if (!data->efcvt_buffer) data->efcvt_buffer = malloc( 80 ); /* ought to be enough */ - if (number < 0) - { - *sign = 1; - number = -number; - } else *sign = 0; - stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); ptr1 = buf; ptr2 = data->efcvt_buffer; @@ -2703,6 +2684,11 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) dec1 = 0; dec2 = 0; + if (*ptr1 == '-') { + *sign = 1; + ptr1++; + } else *sign = 0; + /* For numbers below the requested resolution, work out where the decimal point will be rather than finding it in the string */ if (number < 1.0 && number > 0.0) { @@ -2774,12 +2760,6 @@ int CDECL _fcvt_s(char* outbuffer, size_t size, double number, int ndigits, int return EINVAL; } - if (number < 0) - { - *sign = 1; - number = -number; - } else *sign = 0; - stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); ptr1 = buf; ptr2 = outbuffer; @@ -2787,6 +2767,11 @@ int CDECL _fcvt_s(char* outbuffer, size_t size, double number, int ndigits, int dec1 = 0; dec2 = 0; + if (*ptr1 == '-') { + *sign = 1; + ptr1++; + } else *sign = 0; + /* For numbers below the requested resolution, work out where the decimal point will be rather than finding it in the string */ if (number < 1.0 && number > 0.0) { diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index fbb43c78168..6905b8d01ca 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -643,6 +643,9 @@ static struct { { 0.0, 5, "00000", "00000", 0, 0, 0 }, { 0.0, 0, "", "", 0, 0, 0 }, { 0.0, -1, "", "", 0, 0, 0 }, + { -0.0, 5, "00000", "00000", 0, 0, 1 }, + { -0.0, 0, "", "", 0, 0, 1 }, + { -0.0, -1, "", "", 0, 0, 1 }, { -123.0001, 0, "", "123", 3, 3, 1 }, { -123.0001, -1, "", "12", 3, 3, 1 }, { -123.0001, -2, "", "1", 3, 3, 1 }, @@ -656,6 +659,14 @@ static struct { { 0.4, 0, "", "", 0, 0, 0 }, { 0.49, 0, "", "", 0, 0, 0 }, { 0.51, 0, "", "1", 1, 1, 0 }, + { NAN, 2, "1$", "1#R", 1, 1, 0 }, + { NAN, 5, "1#QNB", "1#QNAN", 1, 1, 0 }, + { -NAN, 2, "1$", "1#J", 1, 1, 1 }, + { -NAN, 5, "1#IND", "1#IND0", 1, 1, 1 }, + { INFINITY, 2, "1$", "1#J", 1, 1, 0 }, + { INFINITY, 5, "1#INF", "1#INF0", 1, 1, 0 }, + { -INFINITY, 2, "1$", "1#J", 1, 1, 1 }, + { -INFINITY, 5, "1#INF", "1#INF0", 1, 1, 1 }, { 1.0, 30, "100000000000000000000000000000", "1000000000000000000000000000000", 1, 1, 0}, { 123456789012345678901.0, 30, "123456789012345680000000000000",

1 0

Hugh McMaster : reg: Better indicate when a registry value is not found.
by Alexandre Julliard April 1, 2021

April 1, 2021

1 0

Jacek Caban : jscript: Support non-extensible objects in jsdisp_define_property.
by Alexandre Julliard April 1, 2021

April 1, 2021

1 0

Jacek Caban : jscript: Support non-extensible objects.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 7750753758693cbd09b978dfb53557c3b0715335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7750753758693cbd09b978df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 1 18:18:40 2021 +0200 jscript: Support non-extensible objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 12 +++++++++--- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 3 ++- dlls/mshtml/tests/es5.js | 8 +++++++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0f0907063f8..303e5bb8c99 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -474,6 +474,8 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return prop->u.p->setter(This->ctx, This, val); case PROP_PROTREF: case PROP_DELETED: + if(!This->extensible) + return S_OK; prop->type = PROP_JSVAL; prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE; prop->u.val = jsval_undefined(); @@ -1747,6 +1749,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->ref = 1; dispex->builtin_info = builtin_info; + dispex->extensible = TRUE; dispex->props = heap_alloc_zero(sizeof(dispex_prop_t)*(dispex->buf_size=4)); if(!dispex->props) @@ -1894,7 +1897,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * dispex_prop_t *prop; HRESULT hres; - if(flags & fdexNameEnsure) + if(jsdisp->extensible && (flags & fdexNameEnsure)) hres = ensure_prop_name(jsdisp, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, &prop); else @@ -2147,8 +2150,11 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, flags, &prop); - if(FAILED(hres)) + if(obj->extensible) + hres = ensure_prop_name(obj, name, flags, &prop); + else + hres = find_prop_name_prot(obj, string_hash(name), name, &prop); + if(FAILED(hres) || !prop) return hres; return prop_put(obj, prop, val); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c8ec7622caf..f27f660d802 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -247,6 +247,7 @@ struct jsdisp_t { DWORD prop_cnt; dispex_prop_t *props; script_ctx_t *ctx; + BOOL extensible; jsdisp_t *prototype; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 1e94f163446..da91b744128 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -680,7 +680,7 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD return E_NOTIMPL; } - FIXME("(%s) semi-stub\n", debugstr_jsval(argv[0])); + TRACE("(%s)\n", debugstr_jsval(argv[0])); obj = to_jsdisp(get_object(argv[0])); if(!obj) { @@ -688,6 +688,7 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD return E_NOTIMPL; } + obj->extensible = FALSE; if(r) *r = jsval_obj(jsdisp_addref(obj)); return S_OK; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e8c523b0bf7..3eccc38fada 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -947,7 +947,6 @@ sync_test("preventExtensions", function() { var r = Object.preventExtensions(o); ok(r === o, "r != o"); o.x = 1; - todo_wine. ok(!("x" in o), "x property added to o"); try { Object.defineProperty(o, "y", { value: true }); @@ -960,6 +959,13 @@ sync_test("preventExtensions", function() { r = Object.preventExtensions(o); ok(r === o, "r != o"); + function Constr() {} + o = Object.preventExtensions(new Constr()); + Constr.prototype.prop = 1; + ok(o.prop === 1, "o.prop = " + o.prop); + o.prop = 2; + ok(o.prop === 1, "o.prop = " + o.prop); + ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); });

1 0

Jacek Caban : jscript: Add Object.freeze implementation.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 0d3634b3ffb1fe4d58a883244c9ab74b370f8aa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d3634b3ffb1fe4d58a88324… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 1 18:19:09 2021 +0200 jscript: Add Object.freeze implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 13 +++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 24 ++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9b11f607791..57f5d09daee 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2628,6 +2628,19 @@ HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned f return jsdisp_define_property(obj, name, &prop_desc); } +void jsdisp_freeze(jsdisp_t *obj) +{ + unsigned int i; + + for(i = 0; i < obj->prop_cnt; i++) { + if(obj->props[i].type == PROP_JSVAL) + obj->props[i].flags &= ~PROPF_WRITABLE; + obj->props[i].flags &= ~PROPF_CONFIGURABLE; + } + + obj->extensible = FALSE; +} + HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) { dispex_prop_t *prop = get_prop(obj, id); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 750158aabd9..d4ebb3246dd 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -317,6 +317,7 @@ HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); +void jsdisp_freeze(jsdisp_t*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 8ff040853ef..3dcfd297a9b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -693,6 +693,29 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD return S_OK; } +static HRESULT Object_freeze(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, + jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + WARN("argument is not an object\n"); + return JS_E_OBJECT_EXPECTED; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + jsdisp_freeze(obj); + if(r) *r = jsval_obj(jsdisp_addref(obj)); + return S_OK; +} + static HRESULT Object_isExtensible(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -718,6 +741,7 @@ static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, + {L"freeze", Object_freeze, PROPF_ES5|PROPF_METHOD|1}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, {L"isExtensible", Object_isExtensible, PROPF_ES5|PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 5851278e983..ae73d435456 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -983,6 +983,47 @@ sync_test("preventExtensions", function() { ok(Object.isExtensible.length === 1, "Object.isExtensible.length = " + Object.isExtensible.length); }); +sync_test("freeze", function() { + ok(Object.freeze.length === 1, "Object.freeze.length = " + Object.freeze.length); + try { + Object.freeze(1); + ok(false, "exception expected"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + + function f() {} + + var o = {}, r; + o.prop = 1; + o.func = f; + Object.defineProperty(o, "accprop", { + get: function() { + return r; + }, + set: function(v) { + r = v; + } + }); + + test_own_data_prop_desc(o, "prop", true, true, true); + r = Object.freeze(o); + ok(r === o, "r != o"); + test_own_data_prop_desc(o, "prop", false, true, false); + test_own_data_prop_desc(o, "func", false, true, false); + ok(!Object.isExtensible(o), "o is still extensible"); + o.prop = false; + o.func = false; + ok(o.prop === 1, "o.prop = " + o.prop); + ok(o.func === f, "o.func = " + o.func); + + r = 1; + o.accprop = 2; + ok(r === 2, "r = " + r); + r = 3; + ok(o.accprop === 3, "o.accprop = " + o.accprop); +}); + sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head));

1 0

Jacek Caban : jscript: Add Object.seal implementation.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 51742d80cd6d4ca9d07aab4f76abd8da0898b4d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51742d80cd6d4ca9d07aab4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 1 18:19:16 2021 +0200 jscript: Add Object.seal implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/object.c | 26 +++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 57f5d09daee..ca404f92fe5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2628,12 +2628,12 @@ HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned f return jsdisp_define_property(obj, name, &prop_desc); } -void jsdisp_freeze(jsdisp_t *obj) +void jsdisp_freeze(jsdisp_t *obj, BOOL seal) { unsigned int i; for(i = 0; i < obj->prop_cnt; i++) { - if(obj->props[i].type == PROP_JSVAL) + if(!seal && obj->props[i].type == PROP_JSVAL) obj->props[i].flags &= ~PROPF_WRITABLE; obj->props[i].flags &= ~PROPF_CONFIGURABLE; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d4ebb3246dd..3999f04a970 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -317,7 +317,7 @@ HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); -void jsdisp_freeze(jsdisp_t*) DECLSPEC_HIDDEN; +void jsdisp_freeze(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 3dcfd297a9b..86c656a719a 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -711,7 +711,30 @@ static HRESULT Object_freeze(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_NOTIMPL; } - jsdisp_freeze(obj); + jsdisp_freeze(obj, FALSE); + if(r) *r = jsval_obj(jsdisp_addref(obj)); + return S_OK; +} + +static HRESULT Object_seal(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, + jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + WARN("argument is not an object\n"); + return JS_E_OBJECT_EXPECTED; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + jsdisp_freeze(obj, TRUE); if(r) *r = jsval_obj(jsdisp_addref(obj)); return S_OK; } @@ -747,6 +770,7 @@ static const builtin_prop_t ObjectConstr_props[] = { {L"isExtensible", Object_isExtensible, PROPF_ES5|PROPF_METHOD|1}, {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1}, {L"preventExtensions", Object_preventExtensions, PROPF_ES5|PROPF_METHOD|1}, + {L"seal", Object_seal, PROPF_ES5|PROPF_METHOD|1}, }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index ae73d435456..6099c4090f3 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1024,6 +1024,47 @@ sync_test("freeze", function() { ok(o.accprop === 3, "o.accprop = " + o.accprop); }); +sync_test("seal", function() { + ok(Object.seal.length === 1, "Object.seal.length = " + Object.seal.length); + try { + Object.seal(1); + ok(false, "exception expected"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + + function f() {} + + var o = {}, r; + o.prop = 1; + o.func = f; + Object.defineProperty(o, "accprop", { + get: function() { + return r; + }, + set: function(v) { + r = v; + } + }); + + test_own_data_prop_desc(o, "prop", true, true, true); + r = Object.seal(o); + ok(r === o, "r != o"); + test_own_data_prop_desc(o, "prop", true, true, false); + test_own_data_prop_desc(o, "func", true, true, false); + ok(!Object.isExtensible(o), "o is still extensible"); + o.prop = false; + o.func = false; + ok(o.prop === false, "o.prop = " + o.prop); + ok(o.func === false, "o.func = " + o.func); + + r = 1; + o.accprop = 2; + ok(r === 2, "r = " + r); + r = 3; + ok(o.accprop === 3, "o.accprop = " + o.accprop); +}); + sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head));

1 0

Piotr Caban : msvcrt: Cleanup _ecvt tests.
by Alexandre Julliard April 1, 2021

April 1, 2021

Module: wine Branch: master Commit: 0f7ed5685200ac53884a99f52c9c7b7fc471367a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7ed5685200ac53884a99f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 20:58:36 2021 +0200 msvcrt: Cleanup _ecvt tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 8960671f23e..fbb43c78168 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -634,27 +634,20 @@ static struct { int expsign; } test_cvt_testcases[] = { { 45.0, 2, "45", "4500", 2, 2, 0 }, - /* Numbers less than 1.0 with different precisions */ { 0.0001, 1, "1", "", -3, -3, 0 }, { 0.0001, 10,"1000000000", "1000000", -3, -3, 0 }, - /* Basic sign test */ { -111.0001, 5, "11100", "11100010", 3, 3, 1 }, { 111.0001, 5, "11100", "11100010", 3, 3, 0 }, - /* big numbers with low precision */ { 3333.3, 2, "33", "333330", 4, 4, 0 }, {999999999999.9, 3, "100","999999999999900", 13, 12, 0 }, - /* 0.0 with different precisions */ { 0.0, 5, "00000", "00000", 0, 0, 0 }, { 0.0, 0, "", "", 0, 0, 0 }, { 0.0, -1, "", "", 0, 0, 0 }, - /* Numbers > 1.0 with 0 or -ve precision */ { -123.0001, 0, "", "123", 3, 3, 1 }, { -123.0001, -1, "", "12", 3, 3, 1 }, { -123.0001, -2, "", "1", 3, 3, 1 }, { -123.0001, -3, "", "", 3, 3, 1 }, - /* Numbers > 1.0, but with rounding at the point of precision */ { 99.99, 1, "1", "1000", 3, 3, 0 }, - /* Numbers < 1.0 where rounding occurs at the point of precision */ { 0.0063, 2, "63", "1", -2, -1, 0 }, { 0.0063, 3, "630", "6", -2, -2, 0 }, { 0.09999999996, 2, "10", "10", 0, 0, 0 }, @@ -663,12 +656,10 @@ static struct { { 0.4, 0, "", "", 0, 0, 0 }, { 0.49, 0, "", "", 0, 0, 0 }, { 0.51, 0, "", "1", 1, 1, 0 }, - /* ask for ridiculous precision, ruin formatting this table */ { 1.0, 30, "100000000000000000000000000000", "1000000000000000000000000000000", 1, 1, 0}, { 123456789012345678901.0, 30, "123456789012345680000000000000", "123456789012345680000000000000000000000000000000000", 21, 21, 0}, - /* end marker */ { 0, 0, "END"} }; @@ -683,14 +674,14 @@ static void test_xcvt(void) test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_e, 15), - "_ecvt() bad return, got \n'%s' expected \n'%s'\n", str, + ok( !strncmp( str, test_cvt_testcases[i].expstr_e, 15), + "%d) _ecvt() bad return, got '%s' expected '%s'\n", i, str, test_cvt_testcases[i].expstr_e); ok( decpt == test_cvt_testcases[i].expdecpt_e, - "_ecvt() decimal point wrong, got %d expected %d\n", decpt, + "%d) _ecvt() decimal point wrong, got %d expected %d\n", i, decpt, test_cvt_testcases[i].expdecpt_e); ok( sign == test_cvt_testcases[i].expsign, - "_ecvt() sign wrong, got %d expected %d\n", sign, + "%d) _ecvt() sign wrong, got %d expected %d\n", i, sign, test_cvt_testcases[i].expsign); } for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ @@ -699,14 +690,14 @@ static void test_xcvt(void) test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), - "_fcvt() bad return, got \n'%s' expected \n'%s'\n", str, + ok( !strncmp( str, test_cvt_testcases[i].expstr_f, 15), + "%d) _fcvt() bad return, got '%s' expected '%s'\n", i, str, test_cvt_testcases[i].expstr_f); ok( decpt == test_cvt_testcases[i].expdecpt_f, - "_fcvt() decimal point wrong, got %d expected %d\n", decpt, + "%d) _fcvt() decimal point wrong, got %d expected %d\n", i, decpt, test_cvt_testcases[i].expdecpt_f); ok( sign == test_cvt_testcases[i].expsign, - "_fcvt() sign wrong, got %d expected %d\n", sign, + "%d) _fcvt() sign wrong, got %d expected %d\n", i, sign, test_cvt_testcases[i].expsign); } @@ -717,14 +708,14 @@ static void test_xcvt(void) decpt = sign = 100; err = p__ecvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); ok(err == 0, "_ecvt_s() failed with error code %d\n", err); - ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_e, 15), - "_ecvt_s() bad return, got \n'%s' expected \n'%s'\n", str, + ok( !strncmp( str, test_cvt_testcases[i].expstr_e, 15), + "%d) _ecvt_s() bad return, got '%s' expected '%s'\n", i, str, test_cvt_testcases[i].expstr_e); ok( decpt == test_cvt_testcases[i].expdecpt_e, - "_ecvt_s() decimal point wrong, got %d expected %d\n", decpt, + "%d) _ecvt_s() decimal point wrong, got %d expected %d\n", i, decpt, test_cvt_testcases[i].expdecpt_e); ok( sign == test_cvt_testcases[i].expsign, - "_ecvt_s() sign wrong, got %d expected %d\n", sign, + "%d) _ecvt_s() sign wrong, got %d expected %d\n", i, sign, test_cvt_testcases[i].expsign); } free(str); @@ -761,15 +752,15 @@ static void test_xcvt(void) for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok(err == 0, "_fcvt_s() failed with error code %d\n", err); - ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), - "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, + ok(!err, "%d) _fcvt_s() failed with error code %d\n", i, err); + ok( !strncmp( str, test_cvt_testcases[i].expstr_f, 15), + "%d) _fcvt_s() bad return, got '%s' expected '%s'. test %d\n", i, str, test_cvt_testcases[i].expstr_f, i); ok( decpt == test_cvt_testcases[i].expdecpt_f, - "_fcvt_s() decimal point wrong, got %d expected %d\n", decpt, + "%d) _fcvt_s() decimal point wrong, got %d expected %d\n", i, decpt, test_cvt_testcases[i].expdecpt_f); ok( sign == test_cvt_testcases[i].expsign, - "_fcvt_s() sign wrong, got %d expected %d\n", sign, + "%d) _fcvt_s() sign wrong, got %d expected %d\n", i, sign, test_cvt_testcases[i].expsign); } free(str);

1 0