June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/1] MR184: mscoree: Update Wine Mono to 7.3.0. - approved
by Alexandre Julliard (＠julliard) June 3, 2022

June 3, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/184

1 0

Re: [PATCH v2 0/11] MR177: winemac: PE conversion - approved
by Alexandre Julliard (＠julliard) June 3, 2022

June 3, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/177

1 0

[PATCH] vbscript: Implement IsDate().
by Robert Wilhelm June 3, 2022

June 3, 2022

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 31 +++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 13 +++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 90cfd557038..222e0534665 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -425,6 +425,25 @@ HRESULT to_int(VARIANT *v, int *ret) return S_OK; } +static HRESULT to_date(VARIANT *v, DATE *ret) +{ + VARIANT r; + HRESULT hres; + + V_VT(&r) = VT_EMPTY; + hres = VariantChangeType(&r, v, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&r, v, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&r, &r, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + *ret = V_DATE(&r); + return S_OK; +} + static HRESULT to_double(VARIANT *v, double *ret) { VARIANT dst; @@ -935,8 +954,16 @@ static HRESULT Global_VarType(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + DATE d; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_date(arg, &d); + + return return_bool(res, SUCCEEDED(hres)); } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be1d4a806c0..d70f95ce69b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -181,6 +181,19 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isDate(new EmptyClass), "isDate(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isDate(x), "isDate(x) is true?") +x = CDate(1) +Call ok(isDate(x), "isDate(x) is not true?") +Call ok(isDate(empty), "isDate(empty) is not true?") +Call ok(not isDate(Nothing), "isDate(Nothing) is true?") +Call ok(isDate(true), "isDate(true) is not true?") +Call ok(isDate(4), "isDate(4) is not true?") +Call ok(isDate("4"), "isDate(""4"") is not true?") +Call ok(not isDate("x"), "isDate(""x"") is true?") +Call ok(not isDate(Null), "isDate(Null) is true?") + Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") Set x = new EmptyClass Call ok(not isEmpty(x), "isEmpty(x) is true?") -- 2.36.1

2 1

[PATCH 0/1] MR184: mscoree: Update Wine Mono to 7.3.0.
by Esme (＠madewokherd) June 3, 2022

June 3, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/184

3 2

[PATCH 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12)
by Rémi Bernon June 3, 2022

June 3, 2022

The mscoree one is a genuine UAF bug, other are more arguably false positive but GCC doesn't like freed pointer value to be used in any way. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/180

7 18

[tools] testbot/orm: Fix multi-column key support in Item::Compare().
by Francois Gouget June 3, 2022

June 3, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I think that so far this issue has been masked by the MasterColumns. --- testbot/lib/ObjectModel/Item.pm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 7d36ffa38..0b1da92a2 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -422,22 +422,27 @@ sub Compare($$) { my $ColName = $ColNames->[0]; my $ColType = $PropertyDescriptor->GetType(); - return ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? - $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : - $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + my $Cmp = ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? + $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : + $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); } - if ($PropertyDescriptor->GetClass() eq "Enum") + elsif ($PropertyDescriptor->GetClass() eq "Enum") { my $ColName = $ColNames->[0]; - return $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; - } - - # A Detailref cannot be a key so this is an Itemref - foreach my $ColName (@$ColNames) - { my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; return $Cmp if ($Cmp); } + else + { + # A Detailref cannot be a key so this is an Itemref. Note that its + # underlying column types are unknown so treat them as strings. + foreach my $ColName (@$ColNames) + { + my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); + } + } } return 0; } -- 2.30.2

1 0

[tools] testbot/orm: Protect DBIBackend::LoadItem() from invalid keys.
by Francois Gouget June 3, 2022

June 3, 2022

Check that the requested key has the right number of parts to avoid a crash during the SQL execution. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 29 +++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 07b838d74..62332c1f6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -169,22 +169,19 @@ sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; + # Faster than join+map+grep + my $PartCount; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { - if ($PropertyDescriptor->GetIsKey()) + next if (!$PropertyDescriptor->GetIsKey()); + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - if ($Where ne "") - { - $Where .= " AND "; - } - $Where .= "$ColName = ?"; - } + $Where .= " AND " if ($Where ne ""); + $Where .= "$ColName = ?"; + $PartCount++; } } - - return $Where; + return ($PartCount, $Where); } =pod @@ -422,8 +419,10 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); - push @Data, $Collection->SplitKey($RequestedKey); + (my $PartCount, $Where) = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); + my @KeyParts = $Collection->SplitKey($RequestedKey); + return undef if ($PartCount != @KeyParts); + push @Data, @KeyParts; my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -572,7 +571,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -713,7 +712,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . -- 2.30.2

1 0

[tools] testbot/web: Only link to the VM details page for administrators.
by Francois Gouget June 3, 2022

June 3, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b07b39d22..21ee5fea4 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -176,6 +176,15 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +sub GetDetailsPage($) +{ + my ($self) = @_; + my $Session = $self->{EnclosingPage}->GetCurrentSession(); + my $CurrentUser = $Session->User if (defined $Session); + return (!$CurrentUser or !$CurrentUser->HasRole("admin")) ? undef : + "/admin/VMDetails.pl"; +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

[PATCH v3 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) June 3, 2022

June 3, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v3: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource https://gitlab.winehq.org/wine/wine/-/merge_requests/167

3 2

[PATCH v2 1/3] jscript: Don't allow starting script using state from uninitialized.
by Gabriel Ivăncescu June 3, 2022

June 3, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d..d6028e6 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5..8723541 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.34.1

2 5