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

Piotr Caban : server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: wine Branch: master Commit: 9d1085c8d39daaa02a0d30ac4a7af2860ff9fe3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1085c8d39daaa02a0d30ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 10 17:05:37 2022 +0200 server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 77a88a7fcf7..8a0f3198c4e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2804,12 +2804,13 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { if (sock->errors[i]) { - error = sock_get_error( sock->errors[i] ); + error = sock->errors[i]; break; } } } + error = sock_get_error( error ); set_reply_data( &error, sizeof(error) ); return; }

1 0

Connor McAdams : uiautomationcore: Add stub IRawElementProviderFragment for MSAA providers.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: wine Branch: master Commit: f1d77f18b960d86f6e49014f896d2276a25591c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d77f18b960d86f6e49014f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 24 12:02:30 2022 -0400 uiautomationcore: Add stub IRawElementProviderFragment for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_provider.c | 89 ++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 9d8d44c90fd..8701d67a89f 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -289,6 +289,7 @@ static LONG msaa_role_to_uia_control_type(LONG role) */ struct msaa_provider { IRawElementProviderSimple IRawElementProviderSimple_iface; + IRawElementProviderFragment IRawElementProviderFragment_iface; ILegacyIAccessibleProvider ILegacyIAccessibleProvider_iface; LONG refcount; @@ -336,6 +337,8 @@ HRESULT WINAPI msaa_provider_QueryInterface(IRawElementProviderSimple *iface, RE *ppv = NULL; if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + else if (IsEqualIID(riid, &IID_IRawElementProviderFragment)) + *ppv = &msaa_prov->IRawElementProviderFragment_iface; else if (IsEqualIID(riid, &IID_ILegacyIAccessibleProvider)) *ppv = &msaa_prov->ILegacyIAccessibleProvider_iface; else @@ -481,6 +484,91 @@ static const IRawElementProviderSimpleVtbl msaa_provider_vtbl = { msaa_provider_get_HostRawElementProvider, }; +/* + * IRawElementProviderFragment interface for UiaProviderFromIAccessible + * providers. + */ +static inline struct msaa_provider *impl_from_msaa_fragment(IRawElementProviderFragment *iface) +{ + return CONTAINING_RECORD(iface, struct msaa_provider, IRawElementProviderFragment_iface); +} + +static HRESULT WINAPI msaa_fragment_QueryInterface(IRawElementProviderFragment *iface, REFIID riid, + void **ppv) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment(iface); + return IRawElementProviderSimple_QueryInterface(&msaa_prov->IRawElementProviderSimple_iface, riid, ppv); +} + +static ULONG WINAPI msaa_fragment_AddRef(IRawElementProviderFragment *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment(iface); + return IRawElementProviderSimple_AddRef(&msaa_prov->IRawElementProviderSimple_iface); +} + +static ULONG WINAPI msaa_fragment_Release(IRawElementProviderFragment *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment(iface); + return IRawElementProviderSimple_Release(&msaa_prov->IRawElementProviderSimple_iface); +} + +static HRESULT WINAPI msaa_fragment_Navigate(IRawElementProviderFragment *iface, + enum NavigateDirection direction, IRawElementProviderFragment **ret_val) +{ + FIXME("%p, %d, %p: stub!\n", iface, direction, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_GetRuntimeId(IRawElementProviderFragment *iface, + SAFEARRAY **ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_get_BoundingRectangle(IRawElementProviderFragment *iface, + struct UiaRect *ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_GetEmbeddedFragmentRoots(IRawElementProviderFragment *iface, + SAFEARRAY **ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_SetFocus(IRawElementProviderFragment *iface) +{ + FIXME("%p: stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_get_FragmentRoot(IRawElementProviderFragment *iface, + IRawElementProviderFragmentRoot **ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static const IRawElementProviderFragmentVtbl msaa_fragment_vtbl = { + msaa_fragment_QueryInterface, + msaa_fragment_AddRef, + msaa_fragment_Release, + msaa_fragment_Navigate, + msaa_fragment_GetRuntimeId, + msaa_fragment_get_BoundingRectangle, + msaa_fragment_GetEmbeddedFragmentRoots, + msaa_fragment_SetFocus, + msaa_fragment_get_FragmentRoot, +}; + /* * ILegacyIAccessibleProvider interface for UiaProviderFromIAccessible * providers. @@ -682,6 +770,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD return E_OUTOFMEMORY; msaa_prov->IRawElementProviderSimple_iface.lpVtbl = &msaa_provider_vtbl; + msaa_prov->IRawElementProviderFragment_iface.lpVtbl = &msaa_fragment_vtbl; msaa_prov->ILegacyIAccessibleProvider_iface.lpVtbl = &msaa_acc_provider_vtbl; msaa_prov->refcount = 1; msaa_prov->hwnd = hwnd;

1 0

Connor McAdams : uiautomationcore/tests: Add navigation tests for MSAA providers.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: wine Branch: master Commit: ef27965e822839a02869061746798d7e265ec30b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef27965e822839a028690617… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 24 11:57:28 2022 -0400 uiautomationcore/tests: Add navigation tests for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 630 ++++++++++++++++++++++++++++- 1 file changed, 618 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef27965e822839a02869…

1 0

Francois Gouget : testbot/WineSendLog: Remove a couple of unused variables.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: tools Branch: master Commit: f1144a5a3e77124fa88207f779c0ffdeac924e90 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f1144a5a3e77124fa88207f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 13 17:20:41 2022 +0200 testbot/WineSendLog: Remove a couple of unused variables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 37949e4..5affba6 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -247,7 +247,7 @@ EOF print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; # Print the job summary - my ($JobErrors, $ReportCounts); + my $JobErrors; foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); @@ -329,7 +329,6 @@ EOF { next if (!$JobErrors->{$Key}->{HasErrors}); my $StepTask = $StepsTasks->GetItem($Key); - my $TaskDir = $StepTask->GetTaskDir(); # Note: We could check $StepTask->Status for TestBot errors. However, # whether they are caused by the patch or not, they prevent the TestBot

1 0

Francois Gouget : testbot/WineSendLog: Use GetSortedItems() to sort the Steps/Tasks.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: tools Branch: master Commit: 8475a8ab57d626b10a82e443d0ba0e280b5d7345 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8475a8ab57d626b10a82e44… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 13 17:20:44 2022 +0200 testbot/WineSendLog: Use GetSortedItems() to sort the Steps/Tasks. This avoids having to look up the object in every loop. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 5affba6..8e2048e 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -183,7 +183,7 @@ sub SendLog($) } my $StepsTasks = CreateStepsTasks(undef, $Job); - my @SortedKeys = sort { $a <=> $b } @{$StepsTasks->GetKeys()}; + my $SortedStepsTasks = $StepsTasks->GetSortedItems(); my $JobURL = MakeOfficialURL("/JobDetails.pl?Key=". $Job->GetKey()); @@ -228,10 +228,8 @@ Content-Disposition: inline VM Status Failures Command EOF - foreach my $Key (@SortedKeys) + foreach my $StepTask (@$SortedStepsTasks) { - my $StepTask = $StepsTasks->GetItem($Key); - my $TestFailures = $StepTask->TestFailures; $TestFailures = "" if (!defined $TestFailures); my $Status = $StepTask->Status; @@ -248,19 +246,18 @@ EOF # Print the job summary my $JobErrors; - foreach my $Key (@SortedKeys) + foreach my $StepTask (@$SortedStepsTasks) { - my $StepTask = $StepsTasks->GetItem($Key); + my $Id = $StepTask->Id; my $TaskDir = $StepTask->GetTaskDir(); - my $LogNames = GetLogFileNames($TaskDir); - $JobErrors->{$Key}->{LogNames} = $LogNames; + $JobErrors->{$Id}->{LogNames} = $LogNames; foreach my $LogName (@$LogNames) { my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - $JobErrors->{$Key}->{HasErrors} = 1; - $JobErrors->{$Key}->{$LogName} = $LogInfo; + $JobErrors->{$Id}->{HasErrors} = 1; + $JobErrors->{$Id}->{$LogName} = $LogInfo; print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; print $Sendmail "$LogInfo->{BadLog}\n" if (defined $LogInfo->{BadLog}); @@ -275,12 +272,11 @@ EOF } # Print the log attachments - foreach my $Key (@SortedKeys) + foreach my $StepTask (@$SortedStepsTasks) { - my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) + foreach my $LogName (@{$JobErrors->{$StepTask->Id}->{LogNames}}) { print $Sendmail <<"EOF"; @@ -325,19 +321,19 @@ EOF # However in practice this would only be an issue if the patch reintroduced # an error that just disappeared in the latest Wine which is highly unlikely. my @Messages; - foreach my $Key (@SortedKeys) + foreach my $StepTask (@$SortedStepsTasks) { - next if (!$JobErrors->{$Key}->{HasErrors}); - my $StepTask = $StepsTasks->GetItem($Key); + my $Id = $StepTask->Id; + next if (!$JobErrors->{$Id}->{HasErrors}); # Note: We could check $StepTask->Status for TestBot errors. However, # whether they are caused by the patch or not, they prevent the TestBot # from checking for new errors which justifies sending an email to the # mailing list so that the patch receives greater scrutiny. - foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) + foreach my $LogName (@{$JobErrors->{$Id}->{LogNames}}) { - my $LogInfo = $JobErrors->{$Key}->{$LogName}; + my $LogInfo = $JobErrors->{$Id}->{$LogName}; # Skip if there are no errors next if (!$LogInfo->{NewCount}); @@ -428,12 +424,10 @@ EOF DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); DebugTee($Result, "URL: $JobURL\n"); - foreach my $Key (@SortedKeys) + foreach my $StepTask (@$SortedStepsTasks) { - my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - - foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) + foreach my $LogName (@{$JobErrors->{$StepTask->Id}->{LogNames}}) { print $Result "=== ", GetTitle($StepTask, $LogName), " ===\n"; DumpLogAndErr($Result, "$TaskDir/$LogName");

1 0

Francois Gouget : testbot/WineSendLog: Don't include the test logs in the job report.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: tools Branch: master Commit: f1b94848d2a7304948dcdd6405ba3b93e674fa97 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f1b94848d2a7304948dcdd6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 13 17:20:46 2022 +0200 testbot/WineSendLog: Don't include the test logs in the job report. The logs can be pretty big, causing the email to exceed typical email size limits and cause bounces. The logs can be downloaded from the website anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 47 +++------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 8e2048e..9351d5d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -51,9 +51,6 @@ use WineTestBot::StepsTasks; use WineTestBot::Utils; -my $PART_BOUNDARY = "==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47=="; - - # # Logging and error handling helpers # @@ -216,18 +213,9 @@ sub SendLog($) print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print $Sendmail <<"EOF"; -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="$PART_BOUNDARY" - ---$PART_BOUNDARY -Content-Type: text/plain; charset="UTF-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Content-Disposition: inline -VM Status Failures Command -EOF + print $Sendmail "\n"; + print $Sendmail "VM Status Failures Command\n"; foreach my $StepTask (@$SortedStepsTasks) { my $TestFailures = $StepTask->TestFailures; @@ -242,7 +230,7 @@ EOF $TestFailures, $Cmd; } - print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; + print $Sendmail "\nThe full results can be found at:\n$JobURL\n\n"; # Print the job summary my $JobErrors; @@ -271,35 +259,6 @@ EOF } } - # Print the log attachments - foreach my $StepTask (@$SortedStepsTasks) - { - my $TaskDir = $StepTask->GetTaskDir(); - - foreach my $LogName (@{$JobErrors->{$StepTask->Id}->{LogNames}}) - { - print $Sendmail <<"EOF"; - ---$PART_BOUNDARY -Content-Type: text/plain; charset="UTF-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -EOF - # Prepend the VM name to get unique attachment filenames for this email. - print $Sendmail "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, "-$LogName\n\n"; - if ($Debug) - { - print $Sendmail "Not dumping logs in debug mode\n"; - } - else - { - DumpLogAndErr($Sendmail, "$TaskDir/$LogName"); - } - } - } - - print $Sendmail "\n--$PART_BOUNDARY--\n"; close($Sendmail); # This is all for jobs submitted from the website

1 0

Francois Gouget : testbot/web: Remove the duplicate Author column on the main page.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: tools Branch: master Commit: 292ba034e3bc0b9ae95c7aa5932c7544aecc6d90 URL: https://source.winehq.org/git/tools.git/?a=commit;h=292ba034e3bc0b9ae95c7aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 10 17:41:15 2022 +0200 testbot/web: Remove the duplicate Author column on the main page. Use the job's UserName field instead of looking up the (Itemref) user object for every job. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 8b4af53..2073b1e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -39,7 +39,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Branch|PatchId|Patch)$/ ? "" : + return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); @@ -74,16 +74,16 @@ sub GenerateDataView($$$) my $Job = $Row->{Item}; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName eq "User") + if ($PropertyName eq "UserName") { - if (defined $Job->Patch and defined $Job->Patch->FromName and - $Job->User->GetKey() eq GetBatchUser()->GetKey()) + if (defined $Job->PatchId and defined $Job->Patch->FromName and + $Job->UserName eq GetBatchUser()->Name) { print $self->escapeHTML($Job->Patch->FromName); } else { - print $self->escapeHTML($Job->User->Name); + print $self->escapeHTML($Job->UserName); } } elsif ($PropertyName eq "Status")

1 0

Francois Gouget : testbot/orm: Prepare and validate the filters before use.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: tools Branch: master Commit: 7f7f8edb414d00846873a1aeec3bc0159920ce09 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7f7f8edb414d00846873a1a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 9 18:50:26 2022 +0200 testbot/orm: Prepare and validate the filters before use. This adds documentation to the filter methods. The preparation step replaces the Itemref properties with filters on the underlying database columns so that DBIBackend only has to deal with 'real' table columns. This also adds better support for multi-column Itemref properties. The validation is performed when building the filter. This means errors are reported close to when the invalid instructions were provided rather than when the database complains about a non-sensical WHERE clause. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45023 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 154 +++++++++++++++++++++++++++++++++- testbot/lib/ObjectModel/DBIBackEnd.pm | 34 +------- 2 files changed, 153 insertions(+), 35 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1a48eec..9dcaf33 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014, 2021 Francois Gouget +# Copyright 2012-2014, 2021-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 @@ -700,11 +700,31 @@ my %ValueComparators = ( 'NOT LIKE' => 1, ); +=pod +=over 12 + +=item C<FilterValue()> + +Compares the specified property to a set of values, joining the results with +an OR operator. + +If the property is an Itemref, the only allowed comparators are '=' and '<>', +and they apply to the underlying columns. +The inequality and like comparators are not allowed on boolean properties. + +Finally note that applying comparators like ">=" to multiple values is just an +inefficient way of requiring the property to be greater than or equal to the +minimum / maximum value. + +=back +=cut + sub FilterValue($$$) { my ($PropertyName, $Comparator, $Values) = @_; - die "unknown '$Comparator' comparator" if (!$ValueComparators{$Comparator}); + die "unknown $Comparator comparator" if (!$ValueComparators{$Comparator}); + die "invalid set of values" if (ref($Values) ne 'ARRAY' or @$Values == 0); return { Type => 'value', Property => $PropertyName, Comparator => $Comparator, @@ -719,6 +739,17 @@ sub FilterNull($) return { Type => 'null', Property => $PropertyName }; } +=pod +=over 12 + +=item C<FilterNotNull()> + +Requires that the specified property not be NULL. +This type of check is not allowed on required properties. + +=back +=cut + sub FilterNotNull($) { my ($PropertyName) = @_; @@ -744,10 +775,127 @@ sub FilterNot($) return { Type => 'not', Term => $Term }; } +=pod +=over 12 + +=item C<PrepareFilter()> + +Validates the filter and performs some preprocessing to remove references to +Itemrefs. + +=back +=cut + +sub PrepareFilter($$) +{ + my ($self, $Filter) = @_; + + die "undefined filter" if (!defined $Filter); + if ($Filter->{Terms}) + { + foreach my $Term (@{$Filter->{Terms}}) + { + $self->PrepareFilter($Term); + } + return; + } + if ($Filter->{Term}) + { + $self->PrepareFilter($Filter->{Term}); + return; + } + + my $PropertyName = $Filter->{Property}; + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($PropertyName); + die "unknown $PropertyName property" if (!$PropertyDescriptor); + if ($PropertyDescriptor->GetClass() eq "Detailref") + { + die "$PropertyName: cannot filter on Detailref properties"; + } + + if ($Filter->{Type} eq "value") + { + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + if ($Filter->{Comparator} ne "=" and $Filter->{Comparator} ne "<>") + { + die "$PropertyName: cannot perform $Filter->{Comparator} comparisons on Itemrefs"; + } + + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + if (@$RefColNames == 1) + { + $Filter->{Property} = $RefColNames->[0]; + # @$RefColNames == 1 => $Value->GetKey() == column value + $Filter->{Values} = [ map { $_->GetKey() } @{$Filter->{Values}} ]; + $self->PrepareFilter($Filter); + } + elsif (@{$Filter->{Values}} == 1) + { + delete $Filter->{Property}; + delete $Filter->{Values}; + $Filter->{Type} = $Filter->{Comparator} eq "=" ? 'and' : 'or'; + + # The target table column names are unknown and thus cannot be accessed + # directly. But their values correspond to the target's key components. + my ($_ColNames, $ColValues) = $Filter->{Values}->[0]->GetMasterKey(); + foreach my $ColIndex (0..$#{$RefColNames}) + { + my $Term = FilterValue($RefColNames->[$ColIndex], $ColValues->[$ColIndex], $Filter->{Comparator}); + $self->PrepareFilter($Term); + push @{$Filter->{Terms}}, $Term; + } + } + else + { + my @Terms; + foreach my $Item (@{$Filter->{Values}}) + { + my $Term = FilterValue($PropertyName, [$Item], $Filter->{Comparator}); + $self->PrepareFilter($Term); + push @Terms, $Term; + } + delete $Filter->{Property}; + delete $Filter->{Values}; + $Filter->{Type} = 'or'; + $Filter->{Terms} = \@Terms; + } + } + elsif ($Filter->{Comparator} ne "=" and $Filter->{Comparator} ne "<>" and + $PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "B") + { + die "$PropertyName: cannot perform $Filter->{Comparator} comparisons on booleans"; + } + } + elsif ($Filter->{Type} =~ /null/) + { + if ($PropertyDescriptor->GetIsRequired()) + { + die "$PropertyName cannot be NULL (pointless filter)"; + } + elsif ($PropertyDescriptor->GetClass() eq "Itemref") + { + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + if (@$RefColNames > 1) + { + delete $Filter->{Property}; + $Filter->{Terms} = [ map { { Type => $Filter->{Type}, Property => $_ } } @$RefColNames ]; + $Filter->{Type} = $Filter->{Type} eq 'null' ? 'and' : 'or'; + } + else + { + $Filter->{Property} = $RefColNames->[0]; + } + } + } +} + sub AddFilter($$;$$) { my $self = shift; - my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + my $Filter =@_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + $self->PrepareFilter($Filter); if (!$self->{Filter}) { diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index e837d47..d21b3f0 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -215,31 +215,6 @@ sub BuildFieldList($$) return $Fields; } -sub ColNameToDb($) -{ - my ($PropertyDescriptor) = @_; - - my $ColNames; - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColNames = $PropertyDescriptor->GetRefColNames(); - if (@$ColNames != 1) - { - # This would require building a more complex where clause, something like - # ((col1 = item1.val1 AND col2 = item1.val2...) OR - # (col1 = item2.val1 AND col2 = item2.val2...) OR ...) - # So it is not supported. Instead one should build the where clause by - # hand from the underlying columns. - die "cannot filter on the ". $PropertyDescriptor->GetName() ." Itemref because it has a multi-column key: @$ColNames"; - } - } - else - { - $ColNames = $PropertyDescriptor->GetColNames(); - } - return $ColNames->[0]; -} - =pod =over 12 @@ -273,13 +248,8 @@ sub GetFilterWhere($$$) my (@Wheres, @Data); foreach my $ColValue (@$Values) { - my $ColName = ColNameToDb($PropertyDescriptor); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; push @Wheres, "$ColName $Filter->{Comparator} ?"; - - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColValue = $ColValue->GetKey(); - } push @Data, $self->ToDb($ColValue, $PropertyDescriptor); } return (@$Values > 1, join(" OR ", @Wheres), \@Data); @@ -312,7 +282,7 @@ sub GetFilterWhere($$$) if ($Filter->{Type} eq 'null' or $Filter->{Type} eq 'not null') { my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); - my $ColName = ColNameToDb($PropertyDescriptor); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; my $Operator = ($Filter->{Type} eq 'null' ? "IS NULL" : "IS NOT NULL"); return (0, "$ColName $Operator", []); }

1 0

Francois Gouget : testbot/orm: Make the Itemref columns read-only.
by Alexandre Julliard 13 Jun '22

13 Jun '22

Module: tools Branch: master Commit: d14084c1c2f78b5a140987e9ccc9adfe9b66972a URL: https://source.winehq.org/git/tools.git/?a=commit;h=d14084c1c2f78b5a140987e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 13 17:14:50 2022 +0200 testbot/orm: Make the Itemref columns read-only. The columns used by an Itemref should be modified through the Itemref property to ensure that they remain in sync with it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 ++- testbot/lib/ObjectModel/Item.pm | 8 +++++++ .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 28 +++++++++++++++++++++- testbot/lib/ObjectModel/PropertyDescriptor.pm | 7 ++++++ testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 224bf36..6f3449b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -198,7 +198,8 @@ sub DisplayProperty($$) # 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 displayed, + $PropertyDescriptor->GetIsReadOnly() ? "ro" : + # All other properties can be displayed, !$self->{RW} ? "ro" : # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index b07b760..11d09be 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -270,6 +270,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Value = shift; if ($self->ValuesDiffer($Value, $self->{ColValues}{$PropertyName})) { @@ -283,6 +287,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Item = shift; if (!$Item and !$self->{Itemrefs}{$PropertyName}) { diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 6895e80..171d00a 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -28,7 +28,7 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: use Exporter 'import'; use ObjectModel::PropertyDescriptor; our @ISA = qw(ObjectModel::PropertyDescriptor); -our @EXPORT = qw(CreateItemrefPropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor SetupItemrefColumns); sub _initialize($$$) { @@ -78,4 +78,30 @@ sub CreateItemrefPropertyDescriptor($$$$$) return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); } +sub SetupItemrefColumns($) +{ + my ($PropertyDescriptors) = @_; + + my (@Itemrefs, %Properties); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + $Properties{$PropertyDescriptor->GetName()} = $PropertyDescriptor; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + push @Itemrefs, $PropertyDescriptor; + } + } + + # Mark the Itemref columns as read-only so they are only modified + # through the Itemref. + foreach my $Itemref (@Itemrefs) + { + foreach my $ColName (@{$Itemref->GetRefColNames()}) + { + my $ColDescriptor = $Properties{$ColName}; + $ColDescriptor->{IsReadOnly} = 1; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index f13a4b2..2f9411a 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -86,6 +86,13 @@ sub GetIsRequired($) return $self->{IsRequired}; } +sub GetIsReadOnly($) +{ + my ($self) = @_; + + return $self->{IsReadOnly}; +} + sub GetClass($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 5ca84e7..8594cfc 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,6 +75,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("User", "User", 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); +SetupItemrefColumns(\@PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 140bd57..7f15a9c 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -524,6 +524,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", \&CreateSteps), ); +SetupItemrefColumns(\@PropertyDescriptors); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index f4768b8..32a6af4 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -68,6 +68,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, \&CreatePatches, ["PatchId"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 2533c6a..87146b2 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -192,6 +192,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); sub CreateStepsTasks(;$$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5c5813c..0360e4e 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,6 +363,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 90c4332..900f41f 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -61,6 +61,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), CreateItemrefPropertyDescriptor("Role", "Role", 1, \&CreateRoles, ["RoleName"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), @PropertyDescriptors

1 0

Cressida Silver : WWN 420.
by Jeremy Newman 12 Jun '22

12 Jun '22

Module: website Branch: master Commit: b203db7956fa631916091f5ef4e297706696db84 URL: https://source.winehq.org/git/website.git/?a=commit;h=b203db7956fa631916091… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Jun 10 09:45:59 2022 -0500 WWN 420. --- news/en/2022061002.xml | 13 + wwn/en/wn20220610_420.xml | 690 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 703 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=b203db7956fa63191…

1 0