March 2022 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/cgi: Better select which FormPage fields can be shown / edited.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: bcab71a7c81db6ec8a285d0ec761c1b295650fea URL: https://source.winehq.org/git/tools.git/?a=commit;h=bcab71a7c81db6ec8a285d0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:15:26 2022 +0100 testbot/cgi: Better select which FormPage fields can be shown / edited. Also better document why each type of field can or cannot be edited / shown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 3ac6223..e432fcb 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -208,6 +208,8 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; + # Note: Editing Detailrefs and Itemrefs is not supported which leaves only + # Basic and Enum property descriptors here. return $PropertyDescriptor->GetClass() eq "Enum" ? "select" : $PropertyDescriptor->GetType() eq "B" ? "checkbox" : $PropertyDescriptor->GetType() eq "textarea" ? "textarea" : @@ -331,12 +333,20 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetClass() eq "Detailref") - { - return ""; - } - - return "rw"; + return # Detailref fields point to a Collection of objects matching the + # primary key of this form data. As such they can neither be shown + # nor edited. + $PropertyDescriptor->GetClass() eq "Detailref" ? "" : + # Itemref fields are keys identifying other objects and thus would + # require careful validation if edited. Requiring users to manually + # type the appropriate key value would also be cumbersome so this is + # currently not supported. But they can be displayed. + $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : + # All other properties can be edited... + $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : + $PropertyDescriptor->GetType() ne "S" ? "rw" : + # ...except autoincrement ones (shown as <unset> if undefined) + "ro"; } sub GetActions($)

1 0

Francois Gouget : testbot/cgi: Don't show autoincrement fields of new items.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 0a18c4e022589dabd375a51f5c979a296f180f83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a18c4e022589dabd375a51… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:15:17 2022 +0100 testbot/cgi: Don't show autoincrement fields of new items. They don't have a value yet and cannot be edited. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9401154..a178aa6 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -99,13 +99,16 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $Display = $self->SUPER::DisplayProperty($PropertyDescriptor); - if ($Display eq "rw" && ! $self->{Item}->GetIsNew() && - $PropertyDescriptor->GetIsKey()) - { - $Display = ""; - } - - return $Display; + return # Don't show autoincrement fields of new items: they don't have a + # value yet and cannot be edited anyway so there is no point. + ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "S" and + $self->{Item}->GetIsNew()) ? "" : + # Don't allow editing key attributes of existing items. Furthermore + # the item is identified in the page title so hide them altogether. + ($PropertyDescriptor->GetIsKey() and !$self->{Item}->GetIsNew() and + $Display eq "rw") ? "" : + $Display; } sub GetActions($)

1 0

Francois Gouget : testbot/web: Better initialize and check the Days main page parameter.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 45fb19982f2d0d6977fa8a6ffb75cda3c1fb149e URL: https://source.winehq.org/git/tools.git/?a=commit;h=45fb19982f2d0d6977fa8a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:21:28 2022 +0100 testbot/web: Better initialize and check the Days main page parameter. Set the FormPage property descriptors list. This allows FormPage::Validate() to do most of the validation work and removes the need for a custom Validate() method. Treat "00" the same as "0". Also remove the need for redefining OnAction(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1336d1e..605e23b 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -2,6 +2,7 @@ # WineTestBot status page # # Copyright 2009 Ge van Geldorp +# Copyright 2013-2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -31,6 +32,7 @@ use WineTestBot::Branches; use WineTestBot::Users; use WineTestBot::Utils; +my $DAYS_DEFAULT = 4; sub SortKeys($$) @@ -239,6 +241,7 @@ package StatusPage; use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::Collection; use WineTestBot::Config; @@ -253,29 +256,20 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; - $self->{Days} = $self->GetParam("Days"); - $self->Validate(); - $self->{start} = Time(); - $self->SUPER::_initialize($Request, $RequiredRole); -} - -sub Validate($) -{ - my ($self) = @_; + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Days", "Days ", !1, 1, "N", 2), + ); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); - if (!defined $self->{Days} or !$self->{Days}) + if (!$self->GetParam("Days") or !$self->Validate() or + !int($self->GetParam("Days"))) # 00 case! { - $self->{Days} = $DefaultIndexDays; + # Replace with the default value so the cutoff can be calculated + $self->SetParam("Days", $DAYS_DEFAULT); } - elsif ($self->{Days} !~ /^[0-9]{1,2}$/) - { - $self->{ErrField} = "Days"; - $self->{ErrMessage} = "The number of days must be between 1 and 99"; - $self->{Days} = $DefaultIndexDays; - return undef; - } - return $self->SUPER::Validate(); + # The action is a no-op so unset it to not need to redefine OnAction() + $self->SetParam("Action", undef); } sub OutputDot($$) @@ -351,7 +345,8 @@ sub GenerateBody($) print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); - my $CutOff = time() - $self->{Days} * 24 * 60 * 60; + my $Days = $self->GetParam("Days"); + my $CutOff = time() - $Days * 24 * 60 * 60; $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); @@ -385,7 +380,7 @@ sub GenerateBody($) <form id="Days" action='/' method='get'> <div class='ItemProperty'><label>Show jobs for the past</label> <div class='ItemValue'> - <input type='text' name='Days' maxlength='2' size='2' value='$self->{Days}' /> days + <input type='text' name='Days' maxlength='2' size='2' value='$Days' /> days <input type='submit' value='Update'/> </div> </div> @@ -400,11 +395,6 @@ EOF print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } -sub OnAction($$) -{ - my ($self, $Action) = @_; - return $self->Validate() ? 1 : undef; -} package main;

1 0

Francois Gouget : testbot/web: Better document the default Days stats page value.
by Alexandre Julliard March 22, 2022

March 22, 2022

Module: tools Branch: master Commit: 259b97e6f58f4ddb23912765d3ee7ceb86e53454 URL: https://source.winehq.org/git/tools.git/?a=commit;h=259b97e6f58f4ddb2391276… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 22 13:20:59 2022 +0100 testbot/web: Better document the default Days stats page value. Store it in a variable at the start of the file so it's easy to spot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 5ec6979..8433c6d 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -32,6 +32,8 @@ use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs; +my $DAYS_DEFAULT = 7; + sub _initialize($$$) { @@ -46,7 +48,7 @@ sub _initialize($$$) if (!$self->GetParam("Days") or !$self->Validate() or !int($self->GetParam("Days"))) # 00 case! { - $self->SetParam("Days", 7) if (!defined $self->{ErrMessage}); + $self->SetParam("Days", $DAYS_DEFAULT) if (!defined $self->{ErrMessage}); $self->{NoStats} = 1; } # The action is a no-op so unset it to not need to redefine OnAction()

1 0

Gabriel Ivăncescu : jscript: Throw error when attempting to set circular __proto__ chains.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 7858f87ae5b7b5a136df6c64ac68373f8c669610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7858f87ae5b7b5a136df6c64… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:31 2022 +0200 jscript: Throw error when attempting to set circular __proto__ chains. 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/dispex.c | 5 +++++ dlls/jscript/error.c | 1 + dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/mshtml/tests/documentmode.js | 13 +++++++++++++ 6 files changed, 22 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a74840ef701..eff91e93bbf 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2708,11 +2708,16 @@ HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned f HRESULT jsdisp_change_prototype(jsdisp_t *obj, jsdisp_t *proto) { + jsdisp_t *iter; DWORD i; if(obj->prototype == proto) return S_OK; + for(iter = proto; iter; iter = iter->prototype) + if(iter == obj) + return JS_E_CYCLIC_PROTO_VALUE; + if(obj->prototype) { for(i = 0; i < obj->prop_cnt; i++) if(obj->props[i].type == PROP_PROTREF) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 6f17699a210..4db95e5f9fe 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -477,6 +477,7 @@ jsdisp_t *create_builtin_error(script_ctx_t *ctx) case JS_E_ENUMERATOR_EXPECTED: case JS_E_REGEXP_EXPECTED: case JS_E_ARRAY_EXPECTED: + case JS_E_CYCLIC_PROTO_VALUE: case JS_E_OBJECT_NONEXTENSIBLE: case JS_E_NONCONFIGURABLE_REDEFINED: case JS_E_NONWRITABLE_MODIFIED: diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4a4d303f563..96f2270ad98 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -518,6 +518,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_PRECISION_OUT_OF_RANGE MAKE_JSERROR(IDS_PRECISION_OUT_OF_RANGE) #define JS_E_INVALID_LENGTH MAKE_JSERROR(IDS_INVALID_LENGTH) #define JS_E_ARRAY_EXPECTED MAKE_JSERROR(IDS_ARRAY_EXPECTED) +#define JS_E_CYCLIC_PROTO_VALUE MAKE_JSERROR(IDS_CYCLIC_PROTO_VALUE) #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) diff --git a/dlls/jscript/jscript.rc b/dlls/jscript/jscript.rc index 50e2c30700e..38a49d9b850 100644 --- a/dlls/jscript/jscript.rc +++ b/dlls/jscript/jscript.rc @@ -70,6 +70,7 @@ STRINGTABLE IDS_INVALID_LENGTH "Array length must be a finite positive integer" IDS_ARRAY_EXPECTED "Array object expected" IDS_INVALID_WRITABLE_PROP_DESC "'writable' attribute on the property descriptor cannot be set to 'true' on this object" + IDS_CYCLIC_PROTO_VALUE "Cyclic __proto__ value" 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 '|'" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index b17f9fbd561..07934311a1b 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -68,6 +68,7 @@ #define IDS_INVALID_LENGTH 0x13A5 #define IDS_ARRAY_EXPECTED 0x13A7 #define IDS_INVALID_WRITABLE_PROP_DESC 0x13AC +#define IDS_CYCLIC_PROTO_VALUE 0x13B0 #define IDS_OBJECT_NONEXTENSIBLE 0x13D5 #define IDS_NONCONFIGURABLE_REDEFINED 0x13D6 #define IDS_NONWRITABLE_MODIFIED 0x13D7 diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 43ebd56eb7e..51a8fe0f877 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1390,6 +1390,19 @@ sync_test("__proto__", function() { }catch(e) { ok(e.number === 0xa138f - 0x80000000, "calling __proto__ setter on null threw exception " + e.number); } + + x = {}; + r = Object.create(x); + ok(r.__proto__ === x, "r.__proto__ = " + r.__proto__); + r = Object.create(r); + ok(r.__proto__.__proto__ === x, "r.__proto__.__proto__ = " + r.__proto__.__proto__); + try { + x.__proto__ = r; + ok(false, "expected exception setting circular proto chain"); + }catch(e) { + ok(e.number === 0xa13b0 - 0x80000000 && e.name === "TypeError", + "setting circular proto chain threw exception " + e.number + " (" + e.name + ")"); + } }); async_test("postMessage", function() {

1 0

Gabriel Ivăncescu : jscript: Don't allow changing prototype on non-extensible objects.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 429325b6891bbb7488b3e8d8f97e4abb92879ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=429325b6891bbb7488b3e8d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:32 2022 +0200 jscript: Don't allow changing prototype on non-extensible objects. 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/dispex.c | 2 ++ dlls/jscript/error.c | 1 + dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/mshtml/tests/documentmode.js | 10 ++++++++++ 6 files changed, 16 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index eff91e93bbf..df2f65f265e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2713,6 +2713,8 @@ HRESULT jsdisp_change_prototype(jsdisp_t *obj, jsdisp_t *proto) if(obj->prototype == proto) return S_OK; + if(!obj->extensible) + return JS_E_CANNOT_CREATE_FOR_NONEXTENSIBLE; for(iter = proto; iter; iter = iter->prototype) if(iter == obj) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 4db95e5f9fe..d309d4207d3 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -478,6 +478,7 @@ jsdisp_t *create_builtin_error(script_ctx_t *ctx) case JS_E_REGEXP_EXPECTED: case JS_E_ARRAY_EXPECTED: case JS_E_CYCLIC_PROTO_VALUE: + case JS_E_CANNOT_CREATE_FOR_NONEXTENSIBLE: case JS_E_OBJECT_NONEXTENSIBLE: case JS_E_NONCONFIGURABLE_REDEFINED: case JS_E_NONWRITABLE_MODIFIED: diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 96f2270ad98..7ed44251820 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -519,6 +519,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_INVALID_LENGTH MAKE_JSERROR(IDS_INVALID_LENGTH) #define JS_E_ARRAY_EXPECTED MAKE_JSERROR(IDS_ARRAY_EXPECTED) #define JS_E_CYCLIC_PROTO_VALUE MAKE_JSERROR(IDS_CYCLIC_PROTO_VALUE) +#define JS_E_CANNOT_CREATE_FOR_NONEXTENSIBLE MAKE_JSERROR(IDS_CREATE_FOR_NONEXTENSIBLE) #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) diff --git a/dlls/jscript/jscript.rc b/dlls/jscript/jscript.rc index 38a49d9b850..c931eef2dba 100644 --- a/dlls/jscript/jscript.rc +++ b/dlls/jscript/jscript.rc @@ -71,6 +71,7 @@ STRINGTABLE IDS_ARRAY_EXPECTED "Array object expected" IDS_INVALID_WRITABLE_PROP_DESC "'writable' attribute on the property descriptor cannot be set to 'true' on this object" IDS_CYCLIC_PROTO_VALUE "Cyclic __proto__ value" + IDS_CREATE_FOR_NONEXTENSIBLE "Cannot create property for a non-extensible object" 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 '|'" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 07934311a1b..1338ac58f6c 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -69,6 +69,7 @@ #define IDS_ARRAY_EXPECTED 0x13A7 #define IDS_INVALID_WRITABLE_PROP_DESC 0x13AC #define IDS_CYCLIC_PROTO_VALUE 0x13B0 +#define IDS_CREATE_FOR_NONEXTENSIBLE 0x13B6 #define IDS_OBJECT_NONEXTENSIBLE 0x13D5 #define IDS_NONCONFIGURABLE_REDEFINED 0x13D6 #define IDS_NONWRITABLE_MODIFIED 0x13D7 diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 51a8fe0f877..29029023906 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1403,6 +1403,16 @@ sync_test("__proto__", function() { ok(e.number === 0xa13b0 - 0x80000000 && e.name === "TypeError", "setting circular proto chain threw exception " + e.number + " (" + e.name + ")"); } + + Object.preventExtensions(x); + x.__proto__ = Object.prototype; /* same prototype */ + try { + x.__proto__ = Number.prototype; + ok(false, "expected exception changing __proto__ on non-extensible object"); + }catch(e) { + ok(e.number === 0xa13b6 - 0x80000000 && e.name === "TypeError", + "changing __proto__ on non-extensible object threw exception " + e.number + " (" + e.name + ")"); + } }); async_test("postMessage", function() {

1 0

Gabriel Ivăncescu : jscript: Make Object.prototype.__proto__ an actual accessor.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 364e093ab7f8b473a40d31e03d533090c54f3649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364e093ab7f8b473a40d31e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:30 2022 +0200 jscript: Make Object.prototype.__proto__ an actual accessor. We have to define it after the constructors are initiated. 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/dispex.c | 3 +- dlls/jscript/global.c | 29 ++++++++++++++++ dlls/jscript/jscript.h | 2 ++ dlls/jscript/object.c | 71 +++++++++++++++++++++++++++++---------- dlls/mshtml/tests/documentmode.js | 60 +++++++++++++++++++++++++++++++++ 5 files changed, 146 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 03062eebb63..a74840ef701 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -488,8 +488,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) prop_iter = prototype_iter->props + prop_iter->u.ref; } while(prop_iter->type == PROP_PROTREF); - if(prop_iter->type == PROP_ACCESSOR || - (prop_iter->type == PROP_BUILTIN && prop_iter->u.p->setter)) + if(prop_iter->type == PROP_ACCESSOR) prop = prop_iter; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index b9e3d89f928..c0ed954230b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -911,6 +911,31 @@ static const builtin_info_t JSGlobal_info = { NULL }; +static HRESULT init_object_prototype_accessors(script_ctx_t *ctx, jsdisp_t *object_prototype) +{ + property_desc_t desc; + HRESULT hres = S_OK; + + /* __proto__ is an actual accessor on native, despite being a builtin */ + if(ctx->version >= SCRIPTLANGUAGEVERSION_ES6) { + desc.flags = PROPF_CONFIGURABLE; + desc.mask = PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + desc.explicit_getter = desc.explicit_setter = TRUE; + desc.explicit_value = FALSE; + + hres = create_builtin_function(ctx, Object_get_proto_, NULL, NULL, PROPF_METHOD, NULL, &desc.getter); + if(SUCCEEDED(hres)) { + hres = create_builtin_function(ctx, Object_set_proto_, NULL, NULL, PROPF_METHOD|1, NULL, &desc.setter); + if(SUCCEEDED(hres)) { + hres = jsdisp_define_property(object_prototype, L"__proto__", &desc); + jsdisp_release(desc.setter); + } + jsdisp_release(desc.getter); + } + } + return hres; +} + static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) { HRESULT hres; @@ -1073,6 +1098,10 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = init_object_prototype_accessors(ctx, ctx->object_prototype); + if(FAILED(hres)) + return hres; + hres = create_math(ctx, &math); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 41b6c01268a..4a4d303f563 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -451,6 +451,8 @@ BOOL bool_obj_value(jsdisp_t*) DECLSPEC_HIDDEN; unsigned array_get_length(jsdisp_t*) DECLSPEC_HIDDEN; HRESULT JSGlobal_eval(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT Object_get_proto_(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT Object_set_proto_(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class) { diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c01fbcce085..f8f1407a136 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -289,31 +289,69 @@ done: return hres; } -static HRESULT Object_get_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +HRESULT Object_get_proto_(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("%p\n", jsthis); + jsdisp_t *jsthis; + IDispatch *disp; + HRESULT hres; - if(r) - *r = jsthis->prototype - ? jsval_obj(jsdisp_addref(jsthis->prototype)) - : jsval_null(); - return S_OK; + TRACE("%s\n", debugstr_jsval(vthis)); + + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; + + if(!r) + goto done; + + if(!(jsthis = to_jsdisp(disp))) { + FIXME("Host object this\n"); + hres = E_FAIL; + goto done; + } + + *r = jsthis->prototype + ? jsval_obj(jsdisp_addref(jsthis->prototype)) + : jsval_null(); +done: + IDispatch_Release(disp); + return hres; } -static HRESULT Object_set_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) +HRESULT Object_set_proto_(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsdisp_t *proto; + jsdisp_t *jsthis, *proto; + HRESULT hres; - TRACE("%p\n", jsthis); + TRACE("%s\n", debugstr_jsval(vthis)); - if(is_undefined(value) || is_null(value)) - proto = NULL; - else if(!is_object_instance(value) || !(proto = to_jsdisp(get_object(value)))) { - FIXME("not an object\n"); - return E_FAIL; + if(is_undefined(vthis) || is_null(vthis)) + return JS_E_OBJECT_EXPECTED; + if(!argc) { + if(r) + *r = jsval_undefined(); + return S_OK; } + if(!is_object_instance(vthis) || !(jsthis = to_jsdisp(get_object(vthis)))) + goto done; - return jsdisp_change_prototype(jsthis, proto); + if(is_null(argv[0])) { + proto = NULL; + }else if(is_object_instance(argv[0])) { + proto = to_jsdisp(get_object(argv[0])); + if(!proto) { + FIXME("Host object value\n"); + return E_FAIL; + } + }else + goto done; + + hres = jsdisp_change_prototype(jsthis, proto); + if(FAILED(hres)) + return hres; + +done: + return r ? jsval_copy(argv[0], r) : S_OK; } static void Object_destructor(jsdisp_t *dispex) @@ -322,7 +360,6 @@ static void Object_destructor(jsdisp_t *dispex) } static const builtin_prop_t Object_props[] = { - {L"__proto__", NULL, PROPF_ES6, Object_get_proto_, Object_set_proto_}, {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 243a8faf263..43ebd56eb7e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1330,6 +1330,66 @@ sync_test("__proto__", function() { ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); r = Object.getPrototypeOf(x); ok(r === ctor.prototype, "x.__proto__ after delete = " + r); + + var desc = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__"); + ok(desc.value === undefined, "__proto__ value = " + desc.value); + ok(Object.getPrototypeOf(desc.get) === Function.prototype, "__proto__ getter not a function"); + ok(Object.getPrototypeOf(desc.set) === Function.prototype, "__proto__ setter not a function"); + ok(desc.get.length === 0, "__proto__ getter length = " + desc.get.length); + ok(desc.set.length === 1, "__proto__ setter length = " + desc.set.length); + + r = desc.get.call(x, 1, 2, 3, 4); + ok(r === x.__proto__, "calling __proto__ getter on x returned " + r); + + r = desc.set.call(x, obj); + ok(r === obj, "calling __proto__ setter(obj) on x returned " + r); + check(obj, "after set to obj via calling setter"); + r = desc.set.call(x, 42); + ok(r === 42, "calling __proto__ setter(42) on x returned " + r); + check(obj, "after set to obj via calling setter(42)"); + r = desc.set.call(x, "foo"); + ok(r === "foo", "calling __proto__ setter('foo') on x returned " + r); + check(obj, "after set to obj via calling setter('foo')"); + r = desc.set.call(x); + ok(r === undefined, "calling __proto__ setter() on x returned " + r); + r = desc.set.call(true, obj); + ok(r === obj, "calling __proto__ setter(obj) on true value returned " + r); + x = true; + r = desc.set.call(x, obj); + ok(r === obj, "calling __proto__ setter(obj) on x set to true returned " + r); + ok(x.__proto__ === Boolean.prototype, "true value __proto__ after set to obj = " + x.__proto__); + x = new Boolean(true); + r = desc.set.call(x, obj); + ok(r === obj, "calling __proto__ setter(obj) on x set to Boolean(true) returned " + r); + ok(x.__proto__ === obj, "Boolean(true) __proto__ after set to obj = " + x.__proto__); + + r = desc.get.call(13); + ok(r === Number.prototype, "calling __proto__ getter on 13 returned " + r); + try { + r = desc.get.call(undefined); + ok(false, "expected exception calling __proto__ getter on undefined"); + }catch(e) { + ok(e.number === 0xa138f - 0x80000000, "calling __proto__ getter on undefined threw exception " + e.number); + } + try { + r = desc.get.call(null); + ok(false, "expected exception calling __proto__ getter on null"); + }catch(e) { + ok(e.number === 0xa138f - 0x80000000, "calling __proto__ getter on null threw exception " + e.number); + } + + try { + r = desc.set.call(undefined, obj); + ok(false, "expected exception calling __proto__ setter on undefined"); + }catch(e) { + ok(e.number === 0xa138f - 0x80000000, "calling __proto__ setter on undefined threw exception " + e.number); + } + try { + r = desc.set.call(null, obj); + ok(false, "expected exception calling __proto__ setter on null"); + }catch(e) { + ok(e.number === 0xa138f - 0x80000000, "calling __proto__ setter on null threw exception " + e.number); + } }); async_test("postMessage", function() {

1 0

Gabriel Ivăncescu : jscript: Allow overriding builtin methods by setting the prop.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 94349fdd9abae527f6b71d9776663380d9ac81f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94349fdd9abae527f6b71d97… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:29 2022 +0200 jscript: Allow overriding builtin methods by setting the prop. Methods can be overriden by simple assignment, not just via defineProperty, unlike accessors. 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/dispex.c | 6 ++++++ dlls/jscript/tests/run.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1cacd49a1fa..03062eebb63 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -495,6 +495,12 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) switch(prop->type) { case PROP_BUILTIN: + if(prop->u.p->invoke) { + prop->type = PROP_JSVAL; + prop->flags = PROPF_CONFIGURABLE | PROPF_WRITABLE; + prop->u.val = jsval_undefined(); + break; + } if(!prop->u.p->setter) { TRACE("getter with no setter\n"); return S_OK; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 86d6fa46212..5e797a19cb9 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2955,7 +2955,6 @@ static void test_script_exprs(void) hres = parse_script_expr(L"var o=new Object(); Object.prototype.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); - todo_wine ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Gabriel Ivăncescu : jscript: Return JS_E_INVALID_PROPERTY in jsdisp_call_name if property is not found.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 324b82d9ec428e26929709ca321d04f6769b0f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=324b82d9ec428e26929709ca… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:28 2022 +0200 jscript: Return JS_E_INVALID_PROPERTY in jsdisp_call_name if property is not found. 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/dispex.c | 3 +++ dlls/jscript/tests/run.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e14001074ff..1cacd49a1fa 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2007,6 +2007,9 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, unsigned if(FAILED(hres)) return hres; + if(!prop || prop->type == PROP_DELETED) + return JS_E_INVALID_PROPERTY; + return invoke_prop_func(disp, to_disp(disp), prop, flags, argc, argv, r, NULL); } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 63d81150e0e..86d6fa46212 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2946,6 +2946,28 @@ static void test_script_exprs(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + hres = parse_script_expr(L"var o=new Object(); Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"[object Object]"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = parse_script_expr(L"var o=new Object(); Object.prototype.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + todo_wine + ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = parse_script_expr(L"var o=new Object(); delete Object.prototype.toString; Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == 0x800a01b6, "parse_script_expr failed: %08lx\n", hres); + + hres = parse_script_expr(L"var o=new Object(); o.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + test_default_value(); test_retval();

1 0

Jacek Caban : win32u: Move dib.drv implementation from gdi.exe.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 39ef9c3ad83e715611ebc2204ec09d83f3d5490f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39ef9c3ad83e715611ebc220… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:13:56 2022 +0100 win32u: Move dib.drv implementation from gdi.exe. 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/gdi.exe16/gdi.c | 141 +------------------------------------------ dlls/win32u/clipping.c | 6 +- dlls/win32u/dc.c | 7 +++ dlls/win32u/dce.c | 132 +++++++++++++++++++++++++++++++++++++++- dlls/win32u/gdiobj.c | 1 - dlls/win32u/ntgdi_private.h | 2 + dlls/win32u/win32u.spec | 3 - dlls/win32u/win32u_private.h | 3 +- dlls/win32u/wrappers.c | 7 --- include/ntgdi.h | 3 + include/wine/gdi_driver.h | 2 - 11 files changed, 149 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39ef9c3ad83e715611eb…

1 0