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

[PATCH v3 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.

by Rémi Bernon

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

June 9, 2022

Re: [PATCH v2 4/4] user32: Use IOCTL_HID_GET_WINE_RAWINPUT_HANDLE to retrieve the raw input handle.

by Rémi Bernon

On 6/9/22 20:16, Zebediah Figura wrote: > The original ordering seems to have been lost here; this will cause a > temporary regression if ordered after 3/4. Indeed sorry, I applied the patches with WineHQ patch numbers, I'll resend. -- Rémi Bernon <rbernon(a)codeweavers.com>

June 9, 2022

Re: [PATCH v3 2/2] Set bound in accept_into_socket instead of changing getsockname

by Zebediah Figura

Can you please make this a single, self-contained commit, instead of fixing it up with a separate commit? We don't squash anything when merging, and we want to have a sensible commit history.

June 9, 2022

Re: [PATCH v2 4/4] user32: Use IOCTL_HID_GET_WINE_RAWINPUT_HANDLE to retrieve the raw input handle.

by Zebediah Figura

The original ordering seems to have been lost here; this will cause a temporary regression if ordered after 3/4.

June 9, 2022

Re: [PATCH 3/6] windows.media.speech/tests: Add basic tests for ssml/text to stream functions.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116574 Your paranoid android. === w864 (32 bit report) === windows.media.speech: 0bc8:speech: unhandled exception c0000005 at 7423B682

June 9, 2022

[tools 3/3] testbot/web: Add pages to add, edit and show known failures.

by Francois Gouget

The current policy is that everyone can see the failures but only administrators can create and modify them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/lib/WineTestBot/Config.pm | 6 +- testbot/web/FailureDetails.pl | 91 ++++++++++++++++ testbot/web/FailuresList.pl | 133 ++++++++++++++++++++++++ testbot/web/WineTestBot.css | 3 + 5 files changed, 232 insertions(+), 2 deletions(-) create mode 100644 testbot/web/FailureDetails.pl create mode 100644 testbot/web/FailuresList.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d6f33e2ca..0486bbefc 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -521,6 +521,7 @@ EOF print " <li><a href='/PatchesList.pl'>", ucfirst($PatchesMailingList), "</a></li>\n"; } + print " <li><a href='/FailuresList.pl'>Failures</a></li>\n"; my $Session = $self->GetCurrentSession(); if ($self->SessionActive()) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 089d792c5..6f57995e8 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail - $WinePatchToOverride $WinePatchCc + $WinePatchToOverride $WinePatchCc $WineBugUrl $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize @@ -48,7 +48,7 @@ require Exporter; $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries $AdminEMail - $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout + $RobotEMail $WinePatchToOverride $WinePatchCc $WineBugUrl $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize @@ -85,6 +85,8 @@ sub PrependPaths(@) "wine" => "git://source.winehq.org/git/wine.git", ); +$WineBugUrl = "https://bugs.winehq.org/show_bug.cgi?id="; + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0; diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl new file mode 100644 index 000000000..4c2c0d2a3 --- /dev/null +++ b/testbot/web/FailureDetails.pl @@ -0,0 +1,91 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Failure details page +# +# Copyright 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package FailureDetailsPage; + +use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + +use WineTestBot::Config; +use WineTestBot::Failures; + + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole, CreateFailures()); + + my $Session = $self->GetCurrentSession(); + if (!$Session or !$Session->User->HasRole("admin")) + { + # Only admin users can create and modify failures + exit($self->RedirectToParent()) if ($self->{Item}->GetIsNew()); + $self->SetReadWrite(0); + } +} + +sub DisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + return # Already shown in the title + $PropertyName eq "Id" ? "" : + # Showing these makes no sense for new items since they are read-only + $PropertyName =~ /^(?:LastNew|LastOld|BugStatus|BugDescription)$/ ? + ($self->{Item}->GetIsNew() ? "" : "ro") : + $self->SUPER::DisplayProperty($PropertyDescriptor); +} + +sub GenerateValueView($$$$) +{ + my ($self, $PropertyDescriptor, $Value, $Format) = @_; + + if ($PropertyDescriptor->GetName() =~ /^Bug(?:Id|Status|Description)$/) + { + print "<a href='$WineBugUrl", $self->{Item}->BugId, "' target='_blank'>", + $self->escapeHTML($Value || "Not fetched yet..."), "</a>"; + } + else + { + $self->SUPER::GenerateValueView($PropertyDescriptor, $Value, $Format); + } +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if (!$self->{RW} and $Action eq "Save") + { + $self->{ErrMessage} = "Only admin users can create or modify failures"; + return 0; + } + return $self->SUPER::OnAction($Action); +} + + +package main; + +my $Request = shift; +my $Page = FailureDetailsPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl new file mode 100644 index 000000000..23e66a3b9 --- /dev/null +++ b/testbot/web/FailuresList.pl @@ -0,0 +1,133 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Known failures index page +# +# Copyright 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package FailuresBlock; + +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); + +use WineTestBot::Config; +use WineTestBot::Failures; + + +sub _initialize($$$) +{ + my ($self, $Collection, $EnclosingPage) = @_; + + $self->SUPER::_initialize($Collection, $EnclosingPage); + + my $Session = $EnclosingPage->GetCurrentSession(); + if (!$Session or !$Session->User->HasRole("admin")) + { + $self->SetReadWrite(0); + # and hide the deleted entries + $self->{Collection}->AddFilter("BugStatus", ["deleted"], "<>"); + } +} + +sub Create($$) +{ + my ($Collection, $EnclosingPage) = @_; + + return FailuresBlock->new($Collection, $EnclosingPage); +} + +sub DisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp|BugId)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); +} + +sub GenerateDataView($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName =~ /^Test(?:Module|Unit)$/) + { + print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>", + $self->escapeHTML($Row->{Item}->$PropertyName), "</a>"; + } + elsif ($PropertyName eq "BugStatus") + { + my $Status = $Row->{Item}->BugStatus; + my $Class = ($Status eq "Does not exist") ? "-missing" : + ($Status =~ /^(?:CLOSED|RESOLVED)/) ? "-closed" : ""; + print "", $self->escapeHTML($Status), ""; + } + elsif ($PropertyName eq "BugDescription") + { + print "<a href='$WineBugUrl", $Row->{Item}->BugId, "' target='_blank'>", + $self->escapeHTML($Row->{Item}->BugDescription), "</a>"; + } + else + { + $self->SUPER::GenerateDataView($Row, $Col); + } +} + +sub GetItemActions($) +{ + my ($self) = @_; + + return ["Delete", "Restore"]; +} + +sub OnItemAction($$$) +{ + my ($self, $Failure, $Action) = @_; + + if ($self->{RW}) + { + my $NewStatus = $Action eq "Delete" ? "deleted" : + ($Action eq "Restore" and + $Failure->BugStatus eq "deleted") ? "unknown" : + undef; + if ($NewStatus) + { + $Failure->BugStatus($NewStatus); + my ($_ErrProperty, $ErrMessage) = $Failure->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + # FIXME Notify the TestBot Engine so it updates the bug information + return 1; + } + } + + return $self->SUPER::OnItemAction($Failure, $Action); +} + + +package main; + +use ObjectModel::CGI::CollectionPage; +use WineTestBot::Failures; + +my $Request = shift; +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreateFailures(), \&FailuresBlock::Create); +$Page->GeneratePage(); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index fd6fca359..5e0c39ff4 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -407,6 +407,9 @@ pre .log-new { color: #e56e00; font-weight: bold; } .log-fullnew { color: red; font-weight: bold; } +.bug-missing { color: red; font-weight: bold; } +.bug-closed { color: red; } + a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } -- 2.30.2

June 9, 2022

[tools 2/3] testbot: Add tables to track known test failures.

by Francois Gouget

This allows avoiding false positives for rare failures and failures with ever changing messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch requires updating the database schema and restarting the TestBot Engine and web server. Notes: - This first patch only introduces the core infrastructure. The other parts are: - Providing a web interface to enter known failures (next patch). - Matching the known failures in the logs and recording the matches in the database. - Taking the known failures into account in the report emails and patches status. - Identifying the known failures on the JobDetails page. - Update the associated bug information. - Because more patches are needed to to actually do anything useful, these two patches are mostly meant to show what the framework looks like. So if desired they can be dropped so they are committed as part of a more complete set. - Most bug tracking systems use integers to identify bugs. If we ever want to move Wine's bug tracking away from Bugzilla we may have to change the type of the BugId field. We may also need a way to know which bug tracker a given BugId refers to which may involve adding a BugTracker field or replacing the BugId field with the whole bug URL. - The Jobs::Restart() chunk depends on the patch that turns Itemrefs into virtual properties. Without it it would be unable to filter the TaskFailures table on the JobId property. --- testbot/ddl/update47.sql | 33 + testbot/ddl/winetestbot.sql | 32 + testbot/doc/winetestbot-schema.dia | 852 +++++++++++++++++++++--- testbot/lib/WineTestBot/Failures.pm | 150 +++++ testbot/lib/WineTestBot/Jobs.pm | 6 + testbot/lib/WineTestBot/TaskFailures.pm | 120 ++++ testbot/lib/WineTestBot/Tasks.pm | 4 + 7 files changed, 1108 insertions(+), 89 deletions(-) create mode 100644 testbot/ddl/update47.sql create mode 100644 testbot/lib/WineTestBot/Failures.pm create mode 100644 testbot/lib/WineTestBot/TaskFailures.pm diff --git a/testbot/ddl/update47.sql b/testbot/ddl/update47.sql new file mode 100644 index 000000000..ff59339f1 --- /dev/null +++ b/testbot/ddl/update47.sql @@ -0,0 +1,33 @@ +USE winetestbot; + +CREATE TABLE Failures +( + Id INT NOT NULL AUTO_INCREMENT, + TestModule VARCHAR(64) NOT NULL, + TestUnit VARCHAR(32) NOT NULL, + ConfigRegExp VARCHAR(64) NULL, + FailureRegExp VARCHAR(256) NOT NULL, + Notes VARCHAR(128) NULL, + LastNew DATETIME NULL, + LastOld DATETIME NULL, + BugId INT NOT NULL, + BugStatus VARCHAR(32) NULL, + BugDescription VARCHAR(128) NULL, + PRIMARY KEY (Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE TaskFailures +( + FailureId INT NOT NULL, + JobId INT NOT NULL, + StepNo INT(2) NOT NULL, + TaskNo INT(2) NOT NULL, + TaskLog VARCHAR(32) NOT NULL, + NewCount INT NULL, + OldCount INT NULL, + FOREIGN KEY(FailureId) REFERENCES Failures(Id), + FOREIGN KEY(JobId, StepNo, TaskNo) REFERENCES Tasks(JobId, StepNo, No), + PRIMARY KEY (FailureId, JobId, StepNo, TaskNo, TaskLog) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 2d085247c..9781fb8dd 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -164,6 +164,38 @@ CREATE TABLE Tasks ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE Failures +( + Id INT NOT NULL AUTO_INCREMENT, + TestModule VARCHAR(64) NOT NULL, + TestUnit VARCHAR(32) NOT NULL, + ConfigRegExp VARCHAR(64) NULL, + FailureRegExp VARCHAR(256) NOT NULL, + Notes VARCHAR(128) NULL, + LastNew DATETIME NULL, + LastOld DATETIME NULL, + BugId INT NOT NULL, + BugStatus VARCHAR(32) NULL, + BugDescription VARCHAR(128) NULL, + PRIMARY KEY (Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE TaskFailures +( + FailureId INT NOT NULL, + JobId INT NOT NULL, + StepNo INT(2) NOT NULL, + TaskNo INT(2) NOT NULL, + TaskLog VARCHAR(32) NOT NULL, + NewCount INT NULL, + OldCount INT NULL, + FOREIGN KEY(FailureId) REFERENCES Failures(Id), + FOREIGN KEY(JobId, StepNo, TaskNo) REFERENCES Tasks(JobId, StepNo, No), + PRIMARY KEY (FailureId, JobId, StepNo, TaskNo, TaskLog) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE RecordGroups ( Id INT NOT NULL AUTO_INCREMENT, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index b2a686285..13374ad73 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -669,7 +669,7 @@ <dia:point val="-7.87083,-21.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.92083,-23;-4.3375,-21.45"/> + <dia:rectangle val="-7.92083,-22.9955;-4.3375,-21.45"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -729,7 +729,7 @@ <dia:point val="4.6125,-22.35"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.5625,-23;11.0958,-22.2834"/> + <dia:rectangle val="4.5625,-22.9955;11.0958,-22.2834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -789,7 +789,7 @@ <dia:point val="19.6608,-21.5334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.6108,-22.2;25.4458,-21.4834"/> + <dia:rectangle val="19.6108,-22.1955;25.4458,-21.4834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -846,16 +846,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="-16.8208,-13.3167"/> + <dia:point val="-16.8208,-6.6667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.8208,-13.3167;-7.8208,-10.3167"/> + <dia:rectangle val="-16.8208,-6.6667;-7.8208,-3.6667"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-16.8208,-13.3167"/> + <dia:point val="-16.8208,-6.6667"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9"/> @@ -962,16 +962,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="-16.3208,-2.55002"/> + <dia:point val="-16.3208,3.89998"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.3208,-2.55002;-6.1658,5.24998"/> + <dia:rectangle val="-16.3208,3.89998;-6.1658,11.7"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-16.3208,-2.55002"/> + <dia:point val="-16.3208,3.89998"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="10.155000000000001"/> @@ -1216,16 +1216,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="-4.57083,-14.9167"/> + <dia:point val="-4.57083,-8.2667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-4.57083,-14.9167;4.81417,-6.3167"/> + <dia:rectangle val="-4.57083,-8.2667;4.81417,0.3333"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-4.57083,-14.9167"/> + <dia:point val="-4.57083,-8.2667"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9.3850000000000016"/> @@ -1493,16 +1493,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="-2.55417,-2.51669"/> + <dia:point val="-2.55417,3.88331"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-2.55417,-2.51669;12.6058,2.88331"/> + <dia:rectangle val="-2.55417,3.88331;12.6058,9.28331"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-2.55417,-2.51669"/> + <dia:point val="-2.55417,3.88331"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="15.16"/> @@ -1678,16 +1678,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="8.24583,-14.8834"/> + <dia:point val="8.19583,-8.2334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="8.24583,-14.8834;22.2508,-6.2834"/> + <dia:rectangle val="8.19583,-8.2334;22.2008,0.3666"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="8.24583,-14.8834"/> + <dia:point val="8.19583,-8.2334"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="14.004999999999999"/> @@ -1955,16 +1955,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="25.4792,-14.8834"/> + <dia:point val="25.4792,-8.2334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.4792,-14.8834;36.0192,-4.6834"/> + <dia:rectangle val="25.4792,-8.2334;36.0192,1.9666"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="25.4792,-14.8834"/> + <dia:point val="25.4792,-8.2334"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="10.539999999999999"/> @@ -2278,16 +2278,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="25.6708,-2.02919"/> + <dia:point val="25.6708,3.87081"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;36.5958,12.1708"/> + <dia:rectangle val="25.6708,3.87081;36.5958,18.0708"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="25.6708,-2.02919"/> + <dia:point val="25.6708,3.87081"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="10.925000000000001"/> @@ -2716,19 +2716,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="-7.8208,-11.6167"/> + <dia:point val="-7.8208,-4.9667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.8708,-12.2667;-4.52083,-11.5667"/> + <dia:rectangle val="-7.8708,-5.61225;-4.52083,-4.9167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-7.8208,-11.6167"/> - <dia:point val="-5.92083,-11.6167"/> - <dia:point val="-5.92083,-11.6167"/> - <dia:point val="-4.57083,-11.6167"/> + <dia:point val="-7.8208,-4.9667"/> + <dia:point val="-5.92083,-4.9667"/> + <dia:point val="-5.92083,-4.9667"/> + <dia:point val="-4.57083,-4.9667"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2776,19 +2776,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O15"> <dia:attribute name="obj_pos"> - <dia:point val="4.81417,-13.2167"/> + <dia:point val="4.81417,-6.5667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.76417,-13.8667;8.29583,-13.1334"/> + <dia:rectangle val="4.76417,-7.21225;8.24583,-6.4834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="4.81417,-13.2167"/> - <dia:point val="6.4625,-13.2167"/> - <dia:point val="6.4625,-13.1834"/> - <dia:point val="8.24583,-13.1834"/> + <dia:point val="4.81417,-6.5667"/> + <dia:point val="6.4625,-6.5667"/> + <dia:point val="6.4625,-6.5334"/> + <dia:point val="8.19583,-6.5334"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2836,19 +2836,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O16"> <dia:attribute name="obj_pos"> - <dia:point val="22.2508,-12.3834"/> + <dia:point val="22.2008,-5.7334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.2008,-13.0334;25.5292,-12.3334"/> + <dia:rectangle val="22.1508,-6.37895;25.5292,-5.6834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="22.2508,-12.3834"/> - <dia:point val="23.7334,-12.3834"/> - <dia:point val="23.7334,-12.3834"/> - <dia:point val="25.4792,-12.3834"/> + <dia:point val="22.2008,-5.7334"/> + <dia:point val="23.7334,-5.7334"/> + <dia:point val="23.7334,-5.7334"/> + <dia:point val="25.4792,-5.7334"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2896,19 +2896,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="36.0192,-9.98336"/> + <dia:point val="36.0192,-3.3334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="35.9692,-10.6334;37.6693,-0.27919"/> + <dia:rectangle val="35.9692,-3.97895;37.6693,5.62081"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="36.0192,-9.98336"/> - <dia:point val="37.6193,-9.98336"/> - <dia:point val="37.6193,-0.32919"/> - <dia:point val="36.5958,-0.32919"/> + <dia:point val="36.0192,-3.3334"/> + <dia:point val="37.6193,-3.3334"/> + <dia:point val="37.6193,5.57081"/> + <dia:point val="36.5958,5.57081"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2959,7 +2959,7 @@ <dia:point val="0.1125,-17.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.0625,-17.9;1.48167,-14.8667"/> + <dia:rectangle val="0.0625,-17.9;1.48167,-8.2167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2968,7 +2968,7 @@ <dia:point val="0.1125,-17.85"/> <dia:point val="0.1125,-15.3584"/> <dia:point val="0.12167,-15.3584"/> - <dia:point val="0.12167,-14.9167"/> + <dia:point val="0.12167,-8.2667"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="1"/> @@ -3016,19 +3016,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O19"> <dia:attribute name="obj_pos"> - <dia:point val="-4.57083,-6.8167"/> + <dia:point val="-4.57083,-0.1667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-18.2807,-7.4667;-4.52083,-0.80002"/> + <dia:rectangle val="-18.2807,-0.812247;-4.52083,5.64998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-4.57083,-6.8167"/> - <dia:point val="-18.2307,-6.8167"/> - <dia:point val="-18.2307,-0.85002"/> - <dia:point val="-16.3208,-0.85002"/> + <dia:point val="-4.57083,-0.1667"/> + <dia:point val="-18.2307,-0.1667"/> + <dia:point val="-18.2307,5.59998"/> + <dia:point val="-16.3208,5.59998"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3076,19 +3076,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O20"> <dia:attribute name="obj_pos"> - <dia:point val="-6.1658,-0.85002"/> + <dia:point val="-6.1658,5.59998"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-6.2158,-1.50002;-2.50417,1.63331"/> + <dia:rectangle val="-6.2158,4.95443;-2.50417,8.03331"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-6.1658,-0.85002"/> - <dia:point val="-4.29249,-0.85002"/> - <dia:point val="-4.29249,1.58331"/> - <dia:point val="-2.55417,1.58331"/> + <dia:point val="-6.1658,5.59998"/> + <dia:point val="-4.29249,5.59998"/> + <dia:point val="-4.29249,7.98331"/> + <dia:point val="-2.55417,7.98331"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3136,19 +3136,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O21"> <dia:attribute name="obj_pos"> - <dia:point val="12.6058,-0.81669"/> + <dia:point val="12.6058,5.58331"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.5558,-1.50002;15.1193,-0.76669"/> + <dia:rectangle val="12.5558,4.93776;15.1193,5.64998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="12.6058,-0.81669"/> - <dia:point val="13.7696,-0.81669"/> - <dia:point val="13.7696,-0.85002"/> - <dia:point val="15.0693,-0.85002"/> + <dia:point val="12.6058,5.58331"/> + <dia:point val="13.7696,5.58331"/> + <dia:point val="13.7696,5.59998"/> + <dia:point val="15.0693,5.59998"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3196,16 +3196,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O22"> <dia:attribute name="obj_pos"> - <dia:point val="15.0693,-2.55002"/> + <dia:point val="15.0693,3.89998"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.0693,-2.55002;24.4543,1.24998"/> + <dia:rectangle val="15.0693,3.89998;24.4543,7.69998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="15.0693,-2.55002"/> + <dia:point val="15.0693,3.89998"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9.3850000000000016"/> @@ -3335,16 +3335,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O23"> <dia:attribute name="obj_pos"> - <dia:point val="14.12,3.7"/> + <dia:point val="11.32,12.4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.12,3.7;24.66,8.3"/> + <dia:rectangle val="11.32,12.4;21.86,17"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="14.12,3.7"/> + <dia:point val="11.32,12.4"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="10.539999999999999"/> @@ -3497,16 +3497,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O24"> <dia:attribute name="obj_pos"> - <dia:point val="2.61,3.7125"/> + <dia:point val="-0.19,12.3625"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="2.61,3.7125;10.455,6.7125"/> + <dia:rectangle val="-0.19,12.3625;7.655,15.3625"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="2.61,3.7125"/> + <dia:point val="-0.19,12.3625"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="7.8449999999999998"/> @@ -3613,19 +3613,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O25"> <dia:attribute name="obj_pos"> - <dia:point val="10.455,5.4125"/> + <dia:point val="7.655,14.0625"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.405,4.75;14.17,5.4625"/> + <dia:rectangle val="7.605,13.417;11.37,14.15"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="10.455,5.4125"/> - <dia:point val="11.95,5.4125"/> - <dia:point val="11.95,5.4"/> - <dia:point val="14.12,5.4"/> + <dia:point val="7.655,14.0625"/> + <dia:point val="9.8693,14.0625"/> + <dia:point val="9.8693,14.1"/> + <dia:point val="11.32,14.1"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3673,19 +3673,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O26"> <dia:attribute name="obj_pos"> - <dia:point val="8.24583,-12.3834"/> + <dia:point val="8.19583,-5.7334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="5.87763,-13.0334;8.29583,-11.5334"/> + <dia:rectangle val="5.87763,-6.37895;8.24583,-4.8834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="8.24583,-12.3834"/> - <dia:point val="5.92763,-12.3834"/> - <dia:point val="5.92763,-11.5834"/> - <dia:point val="8.24583,-11.5834"/> + <dia:point val="8.19583,-5.7334"/> + <dia:point val="5.92763,-5.7334"/> + <dia:point val="5.92763,-4.9334"/> + <dia:point val="8.19583,-4.9334"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -3731,5 +3731,679 @@ <dia:connection handle="1" to="O11" connection="16"/> </dia:connections> </dia:object> + <dia:object type="Database - Table" version="0" id="O27"> + <dia:attribute name="obj_pos"> + <dia:point val="25.4168,-19.2167"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="25.4168,-19.2167;34.4168,-12.2167"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="25.4168,-19.2167"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="9"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="7"/> + </dia:attribute> + <dia:attribute name="name"> + <dia:string>#TaskFailures#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="visible_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="underline_primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="tagging_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="bold_primary_keys"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="attributes"> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#FailureId#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#JobId#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#StepNo#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#TaskNo#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#TaskLog#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(32)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#NewCount#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#OldCount#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + </dia:object> + <dia:object type="Database - Table" version="0" id="O28"> + <dia:attribute name="obj_pos"> + <dia:point val="9.8001,-19.2167"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="9.8001,-19.2167;21.1101,-9.0167"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="9.8001,-19.2167"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="11.309999999999999"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="10.199999999999999"/> + </dia:attribute> + <dia:attribute name="name"> + <dia:string>#Failures#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="visible_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="underline_primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="tagging_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="bold_primary_keys"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="attributes"> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Id#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#TestModule#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(64)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#TestUnit#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(32)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#ConfigRegExp#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(64)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#FailureRegExp#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(256)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Notes#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(128)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#LastNew#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#DATETIME#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#LastOld#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#DATETIME#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#BugId#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#BugStatus#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(32)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#BugDescription#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(128)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + </dia:object> + <dia:object type="Database - Reference" version="0" id="O29"> + <dia:attribute name="obj_pos"> + <dia:point val="34.4168,-15.9167"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="34.3668,-16.5622;37.6001,-5.6834"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="orth_points"> + <dia:point val="34.4168,-15.9167"/> + <dia:point val="37.5501,-15.9167"/> + <dia:point val="37.5501,-5.7334"/> + <dia:point val="36.0192,-5.7334"/> + </dia:attribute> + <dia:attribute name="orth_orient"> + <dia:enum val="0"/> + <dia:enum val="1"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="orth_autoroute"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + <dia:attribute name="line_style"> + <dia:enum val="0"/> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="corner_radius"> + <dia:real val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="start_point_desc"> + <dia:string>#0..n#</dia:string> + </dia:attribute> + <dia:attribute name="end_point_desc"> + <dia:string>#1#</dia:string> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.59999999999999998"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O27" connection="17"/> + <dia:connection handle="1" to="O12" connection="15"/> + </dia:connections> + </dia:object> + <dia:object type="Database - Reference" version="0" id="O30"> + <dia:attribute name="obj_pos"> + <dia:point val="21.1101,-17.5167"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="21.0601,-18.1622;25.4668,-17.4667"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="orth_points"> + <dia:point val="21.1101,-17.5167"/> + <dia:point val="22.6693,-17.5167"/> + <dia:point val="22.6693,-17.5167"/> + <dia:point val="25.4168,-17.5167"/> + </dia:attribute> + <dia:attribute name="orth_orient"> + <dia:enum val="0"/> + <dia:enum val="1"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="orth_autoroute"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + <dia:attribute name="line_style"> + <dia:enum val="0"/> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="corner_radius"> + <dia:real val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="start_point_desc"> + <dia:string>#1#</dia:string> + </dia:attribute> + <dia:attribute name="end_point_desc"> + <dia:string>#0..n#</dia:string> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.59999999999999998"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O28" connection="13"/> + <dia:connection handle="1" to="O27" connection="12"/> + </dia:connections> + </dia:object> </dia:layer> </dia:diagram> diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm new file mode 100644 index 000000000..2443d0c5b --- /dev/null +++ b/testbot/lib/WineTestBot/Failures.pm @@ -0,0 +1,150 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + + +package WineTestBot::Failure; + +=head1 NAME + +WineTestBot::Failure - Describes a known Wine test failure + +=head1 DESCRIPTION + +Failure objects document known test failures and link them to the corresponding +bug describing the issue. They are mainly used to avoid reporting a test +failure as new when it has in fact happened before despite not being present +in the reference WineTest logs, either because it is just too rare, or because +its text is ever changing. + +Finally Failure objects are linked to the Task+Log they match by means of the +TaskFailure objects. + +=cut + +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + + +sub Compare($$) +{ + my ($self, $B) = @_; + + # Sort deleted entries last + my %StatusOrders = ("deleted" => 1); + + return ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || + $self->GetColValue("TestModule") cmp $B->GetColValue("TestModule") || + $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || + $self->GetColValue("Id") <=> $B->GetColValue("Id"); +} + + +package WineTestBot::Failures; + +=head1 NAME + +WineTestBot::Failures - A Failure collection + +=head1 DESCRIPTION + +This collection contains all known failures. + +=cut + +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateFailures); +} + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; +use ObjectModel::DetailrefPropertyDescriptor; +use WineTestBot::TaskFailures; + + +sub CreateItem($) +{ + my ($self) = @_; + + return WineTestBot::Failure->new($self); +} + +my @PropertyDescriptors = ( + # Rather than using a combination of the other fields, give each entry a + # unique id. This allows having multiple entries for a single Wine bug in + # case there are too many failures to match for the regular expression to + # fit in a single regular expression field. This also avoids using the + # regular expression as part of the primary key which would be troublesome + # as it may need to be adjusted in case it is buggy or if the test changes. + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "S", 10), + + # Identify the test unit the failure can occur in. + CreateBasicPropertyDescriptor("TestModule", "Test module", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("TestUnit", "Test unit", !1, 1, "A", 32), + + # A regular expression to match the configurations the failure can happen in. + # A configuration name is of the form 'VMNAME:REPORTNAME'. + CreateBasicPropertyDescriptor("ConfigRegExp", "Configurations RegExp", !1, !1, "A", 64), + + # A regular expression to match the troublesome failures. + CreateBasicPropertyDescriptor("FailureRegExp", "Failures RegExp", !1, 1, "A", 256), + + # Can be used for documentation when multiple entries are needed to match + # all the failures associated with a given bug. + # Can also be used to document when a regular expression has been modified, + # for instance to match changes in a test. + CreateBasicPropertyDescriptor("Notes", "Notes", !1, !1, "A", 128), + + # Record when an entry was last identified as a new or old failure, even + # after the corresponding tasks have expired (see the TaskFailures table). + CreateBasicPropertyDescriptor("LastNew", "Last new", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("LastOld", "Last old", !1, !1, "DT", 19), + + # Every entry must be associated with a Wine bug. + # Note: The 'deleted' bug status means this failure entry should be + # deleted as soon as it is not referenced anymore. + CreateBasicPropertyDescriptor("BugId", "WineHQ bug id", !1, 1, "N", 10), + CreateBasicPropertyDescriptor("BugStatus", "WineHQ bug status", !1, !1, "A", 32), + CreateBasicPropertyDescriptor("BugDescription", "WineHQ bug description", !1, !1, "A", 128), + + CreateDetailrefPropertyDescriptor("TaskFailures", "Tasks", \&CreateTaskFailures), +); +SetDetailrefKeyPrefix("Failure", @PropertyDescriptors); + +=pod +=over 12 + +=item C<CreateFailures()> + +Creates a collection of Failure objects. + +=back +=cut + +sub CreateFailures(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::Failures->new("Failures", "Failures", "Failure", + \@PropertyDescriptors, $ScopeObject); +} + +1; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 7f15a9c57..3da6ae7b0 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -89,6 +89,7 @@ use File::Path; use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; +use WineTestBot::TaskFailures; sub _initialize($$) @@ -435,6 +436,11 @@ sub Restart($) my ($ErrProperty, $ErrMessage) = $self->Save(); # Save it all return "$ErrMessage ($ErrProperty)" if ($ErrMessage); + # Remove the corresponding TaskFailures if any + my $TaskFailures = CreateTaskFailures(); + $TaskFailures->AddFilter("JobId", [$self->Id]); + $TaskFailures->DeleteAll(); + return undef; } diff --git a/testbot/lib/WineTestBot/TaskFailures.pm b/testbot/lib/WineTestBot/TaskFailures.pm new file mode 100644 index 000000000..bdbfd6e2e --- /dev/null +++ b/testbot/lib/WineTestBot/TaskFailures.pm @@ -0,0 +1,120 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + + +package WineTestBot::TaskFailure; + +=head1 NAME + +WineTestBot::TaskFailure - Ties a failure to its task+log matches + +=head1 DESCRIPTION + +A TaskFailure is created when a WineTestBot::Failure matches a line in a +task's log. It also records whether the matching failures occurred in previous +logs or not. This makes it possible to detect fixed failures. + +=cut + +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + + +sub Compare($$) +{ + my ($self, $B) = @_; + + return $B->Task->Started <=> $self->Task->Started || # newest first by default + $self->TaskLog cmp $B->TaskLog; +} + + +package WineTestBot::TaskFailures; + +=head1 NAME + +WineTestBot::TaskFailures - A TaskFailure collection + +=head1 DESCRIPTION + +This collection cross references the known failures with the tasks and logs they +matched. + +=cut + +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateTaskFailures); +} + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::ItemrefPropertyDescriptor; +use WineTestBot::Tasks; + + +sub CreateItem($) +{ + my ($self) = @_; + + return WineTestBot::TaskFailure->new($self); +} + +my @PropertyDescriptors = ( + # Identifies the task which has matching failures + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), + CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task", 1, 1, "N", 2), + CreateItemrefPropertyDescriptor("Task", "Task", 1, \&WineTestBot::Tasks::CreateTasks, ["JobId", "StepNo", "TaskNo"]), + + # and more specifically in which of its logs + CreateBasicPropertyDescriptor("TaskLog", "Task log", 1, 1, "A", 32), + + # Also store a count of matching new and old failures + CreateBasicPropertyDescriptor("NewCount", "Count of matching new failures", !1, !1, "N", 10), + CreateBasicPropertyDescriptor("OldCount", "Count of matching old failures", !1, !1, "N", 10), +); +SetupItemrefColumns(\@PropertyDescriptors); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("FailureId", "Failure id", 1, 1, "N", 10), + @PropertyDescriptors +); + +=pod +=over 12 + +=item C<CreateTaskFailures()> + +Creates a collection of TaskFailure objects. + +=back +=cut + +sub CreateTaskFailures(;$$) +{ + my ($ScopeObject, $Failure) = @_; + return WineTestBot::TaskFailures->new("TaskFailures", + "TaskFailures", "TaskFailure", + $Failure ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $Failure); +} + +1; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 0360e4ebc..5b87c782b 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -341,7 +341,9 @@ BEGIN use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; +use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::VMs; +use WineTestBot::TaskFailures; sub CreateItem($) @@ -362,8 +364,10 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Started", "Started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), + CreateDetailrefPropertyDescriptor("Failures", "Known failures", \&CreateTaskFailures), ); SetupItemrefColumns(\@PropertyDescriptors); +SetDetailrefKeyPrefix("Task", @PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), -- 2.30.2

June 9, 2022

[tools 1/3] testbot/orm: Make the Itemref columns read-only.

by Francois Gouget

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> --- This patch is independent from the next two. They just happen to both modify the Tasks property descriptors. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +- testbot/lib/ObjectModel/Item.pm | 8 ++++++ .../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 224bf3687..6f3449b5b 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 b07b76066..11d09be67 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 6895e801a..171d00a9e 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 f13a4b248..2f9411aa2 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 5ca84e734..8594cfcdf 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 140bd572b..7f15a9c57 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 f4768b823..32a6af44f 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 2533c6a01..87146b277 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 5c5813cd9..0360e4ebc 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 90c4332c3..900f41fc5 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 -- 2.30.2

June 9, 2022

[tools] testbot/orm: Prepare and validate the filters before use.

by Francois Gouget

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> --- This fixes the remainder of issue 9 "No Itemref support for multiple key fields". --- 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 1a48eec35..9dcaf33d4 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 e837d47f5..d21b3f03f 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", []); } -- 2.30.2

June 9, 2022

[PATCH 6/6] windows.media.speech: Add stub ISpeechSynthesisStream iface.

by Bernhard Kölbl

From: Bernhard Kölbl <besentv(a)gmail.com> Based on a patch by: Connor McAdams <cmcadams(a)codeweavers.com> Silences a warning about narrator being broken in Forza Horizon 5. CW-Bug-Id: #19642 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 122 ++++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 18 ++-- 2 files changed, 126 insertions(+), 14 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 22f28433216..9b3e0ae70fd 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -146,6 +146,124 @@ static struct voice_information_vector all_voices = 0 }; +/* + * + * ISpeechSynthesisStream + * + */ + +struct synthesis_stream +{ + ISpeechSynthesisStream ISpeechSynthesisStream_iface; + LONG ref; +}; + +static inline struct synthesis_stream *impl_from_ISpeechSynthesisStream( ISpeechSynthesisStream *iface ) +{ + return CONTAINING_RECORD(iface, struct synthesis_stream, ISpeechSynthesisStream_iface); +} + +HRESULT WINAPI synthesis_stream_QueryInterface( ISpeechSynthesisStream *iface, REFIID iid, void **out ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_ISpeechSynthesisStream)) + { + IInspectable_AddRef((*out = &impl->ISpeechSynthesisStream_iface)); + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +ULONG WINAPI synthesis_stream_AddRef( ISpeechSynthesisStream *iface ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +ULONG WINAPI synthesis_stream_Release( ISpeechSynthesisStream *iface ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + free(impl); + + return ref; +} + +HRESULT WINAPI synthesis_stream_GetIids( ISpeechSynthesisStream *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +HRESULT WINAPI synthesis_stream_GetRuntimeClassName( ISpeechSynthesisStream *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub.\n", iface, class_name); + return E_NOTIMPL; +} + +HRESULT WINAPI synthesis_stream_GetTrustLevel( ISpeechSynthesisStream *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); + return E_NOTIMPL; +} + +HRESULT WINAPI synthesis_stream_get_Markers( ISpeechSynthesisStream *iface, IVectorView_IMediaMarker **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + *value = NULL; + return S_OK; +} + +static const struct ISpeechSynthesisStreamVtbl synthesis_stream_vtbl = +{ + /* IUnknown methods */ + synthesis_stream_QueryInterface, + synthesis_stream_AddRef, + synthesis_stream_Release, + /* IInspectable methods */ + synthesis_stream_GetIids, + synthesis_stream_GetRuntimeClassName, + synthesis_stream_GetTrustLevel, + /* ISpeechSynthesisStream methods */ + synthesis_stream_get_Markers +}; + + +static HRESULT synthesis_stream_create( ISpeechSynthesisStream **out ) +{ + struct synthesis_stream *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + impl->ISpeechSynthesisStream_iface.lpVtbl = &synthesis_stream_vtbl; + impl->ref = 1; + + TRACE("created ISpeechSynthesisStream %p.\n", impl); + *out = &impl->ISpeechSynthesisStream_iface; + return S_OK; +} + /* * * SpeechSynthesizer runtimeclass @@ -243,7 +361,7 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus static HRESULT CALLBACK text_to_stream_operation( IInspectable *invoker, IInspectable **result ) { - return S_OK; + return synthesis_stream_create((ISpeechSynthesisStream **)result); } static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesizer *iface, HSTRING text, @@ -256,7 +374,7 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize static HRESULT CALLBACK ssml_to_stream_operation( IInspectable *invoker, IInspectable **result ) { - return S_OK; + return synthesis_stream_create((ISpeechSynthesisStream **)result); } static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml, diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 726ff6b0f5b..652542aac92 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -938,13 +938,10 @@ static void test_SpeechSynthesizer(void) check_interface(operation_ss_stream, &IID_IAgileObject, TRUE); hr = IAsyncOperation_SpeechSynthesisStream_GetResults(operation_ss_stream, &ss_stream); - todo_wine ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); - if (hr == S_OK && ss_stream) - { - ref = ISpeechSynthesisStream_Release(ss_stream); - todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); - } + ref = ISpeechSynthesisStream_Release(ss_stream); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); WindowsDeleteString(str); @@ -962,13 +959,10 @@ static void test_SpeechSynthesizer(void) check_interface(operation_ss_stream, &IID_IAgileObject, TRUE); hr = IAsyncOperation_SpeechSynthesisStream_GetResults(operation_ss_stream, &ss_stream); - todo_wine ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); - if (hr == S_OK && ss_stream) - { - ref = ISpeechSynthesisStream_Release(ss_stream); - ok(ref == 0, "Got unexpected ref %lu.\n", ref); - } + ref = ISpeechSynthesisStream_Release(ss_stream); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); WindowsDeleteString(str); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/217

June 9, 2022