wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Francois Gouget : testbot/orm: Simplify CombineKey() and SplitKey() a bit.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 71c7c8376cbb98272b9fed71b35b88cfcd82c141 URL: https://source.winehq.org/git/tools.git/?a=commit;h=71c7c8376cbb98272b9fed7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 6 02:59:20 2022 +0200 testbot/orm: Simplify CombineKey() and SplitKey() a bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 63d470b..1a48eec 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -462,18 +462,14 @@ sub IsEmpty($) sub CombineKey($@) { - my $self = shift; - - my $CombinedKey = join("#@#", @_); - return $CombinedKey; + my $_self = shift; + return join("#@#", @_); } sub SplitKey($$) { - my ($self, $CombinedKey) = @_; - - my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; + my ($_self, $CombinedKey) = @_; + return split /#@#/, $CombinedKey; } =pod

1 0

Francois Gouget : testbot: Access the master columns directly instead of going through GetMasterKey().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 2da4c9bf6bb4466fb745ec00231f3d56cfafae09 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2da4c9bf6bb4466fb745ec0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 6 02:59:13 2022 +0200 testbot: Access the master columns directly instead of going through GetMasterKey(). We now have read-only access to them. This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Steps.pm | 5 ++--- testbot/lib/WineTestBot/StepsTasks.pm | 6 ++---- testbot/lib/WineTestBot/Tasks.pm | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 860dc49..d2e2831 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -154,9 +154,8 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; - foreach my $StepNo ($StepNo, $self->PreviousNo) + my $Path = "$DataDir/jobs/". $self->JobId ."/"; + foreach my $StepNo ($self->No, $self->PreviousNo) { next if (!$StepNo); my $Full = "$Path$StepNo/$FileName"; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 0b1655a..5970c87 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -37,8 +37,7 @@ use WineTestBot::Missions; sub GetStepDir($) { my ($self) = @_; - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/". $self->StepNo; + return "$DataDir/jobs/". $self->JobId ."/". $self->StepNo; } # Keep in sync with WineTestBot::Step::GetFullFileName() @@ -49,8 +48,7 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; + my $Path = "$DataDir/jobs/". $self->JobId ."/"; foreach my $StepNo ($self->StepNo, $self->PreviousNo) { next if (!$StepNo); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 50ce960..c80b432 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -142,8 +142,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - my ($JobId, $_StepNo, $_TaskNo) = @{$self->GetMasterKey()}; - return sprintf("%s-job%06d-%s", $self->VM->Name, $JobId, $ReportName); + return sprintf("%s-job%06d-%s", $self->VM->Name, $self->JobId, $ReportName); } sub GetRefReportPaths($$;$$) @@ -240,13 +239,12 @@ sub Run($$) { my ($self, $Step) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $Script = $Step->Type eq "reconfig" ? "Reconfig" : $self->VM->Type eq "wine" ? "WineTest" : $Step->Type eq "build" ? "Build" : "Task"; my $Args = ["$BinDir/${ProjectName}Run$Script.pl", "--log-only", - $JobId, $StepNo, $TaskNo]; + $self->JobId, $self->StepNo, $self->No]; my $ErrMessage = $self->VM->Run("running", $Args, $self->Timeout + $TimeoutMargin,

1 0

Francois Gouget : testbot: Slightly simplify $Job->Restart().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 4358c8d349975c68401be7431a44c9bd2c0d3b1c URL: https://source.winehq.org/git/tools.git/?a=commit;h=4358c8d349975c68401be74… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 6 02:58:37 2022 +0200 testbot: Slightly simplify $Job->Restart(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 778a0f4..1eb7bb7 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -417,11 +417,9 @@ sub Restart($) return "This job is already " . $self->Status; } - my $Steps = $self->Steps; - foreach my $Step (@{$Steps->GetSortedItems()}) + foreach my $Step (@{$self->Steps->GetSortedItems()}) { - my $Tasks = $Step->Tasks; - foreach my $Task (@{$Tasks->GetItems()}) + foreach my $Task (@{$Step->Tasks->GetItems()}) { $Task->Status("queued"); $Task->Started(undef);

1 0

Francois Gouget : testbot/orm: Fix multi-column key support in Item::Compare().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 4a9e60c2ce8626b618241663d3fd697d155857a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4a9e60c2ce8626b61824166… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 3 19:22:51 2022 +0200 testbot/orm: Fix multi-column key support in Item::Compare(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 7d36ffa..0b1da92 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -422,22 +422,27 @@ sub Compare($$) { my $ColName = $ColNames->[0]; my $ColType = $PropertyDescriptor->GetType(); - return ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? - $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : - $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + my $Cmp = ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? + $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : + $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); } - if ($PropertyDescriptor->GetClass() eq "Enum") + elsif ($PropertyDescriptor->GetClass() eq "Enum") { my $ColName = $ColNames->[0]; - return $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; - } - - # A Detailref cannot be a key so this is an Itemref - foreach my $ColName (@$ColNames) - { my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; return $Cmp if ($Cmp); } + else + { + # A Detailref cannot be a key so this is an Itemref. Note that its + # underlying column types are unknown so treat them as strings. + foreach my $ColName (@$ColNames) + { + my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); + } + } } return 0; }

1 0

Francois Gouget : testbot/orm: Protect DBIBackend::LoadItem() from invalid keys.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: dc8da3cac05d6b1b5c98cdec6c086d97f27c6986 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc8da3cac05d6b1b5c98cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 3 19:21:44 2022 +0200 testbot/orm: Protect DBIBackend::LoadItem() from invalid keys. Check that the requested key has the right number of parts to avoid a crash during the SQL execution. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 07b838d..62332c1 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -169,22 +169,19 @@ sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; + # Faster than join+map+grep + my $PartCount; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { - if ($PropertyDescriptor->GetIsKey()) + next if (!$PropertyDescriptor->GetIsKey()); + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - if ($Where ne "") - { - $Where .= " AND "; - } - $Where .= "$ColName = ?"; - } + $Where .= " AND " if ($Where ne ""); + $Where .= "$ColName = ?"; + $PartCount++; } } - - return $Where; + return ($PartCount, $Where); } =pod @@ -422,8 +419,10 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); - push @Data, $Collection->SplitKey($RequestedKey); + (my $PartCount, $Where) = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); + my @KeyParts = $Collection->SplitKey($RequestedKey); + return undef if ($PartCount != @KeyParts); + push @Data, @KeyParts; my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -572,7 +571,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -713,7 +712,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " .

1 0

Francois Gouget : testbot/web: Only link to the VM details page for administrators.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: c134dc1579cc697df495adc533434a2123d13b8d URL: https://source.winehq.org/git/tools.git/?a=commit;h=c134dc1579cc697df495adc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 3 19:20:14 2022 +0200 testbot/web: Only link to the VM details page for administrators. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b07b39d..21ee5fe 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -176,6 +176,15 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +sub GetDetailsPage($) +{ + my ($self) = @_; + my $Session = $self->{EnclosingPage}->GetCurrentSession(); + my $CurrentUser = $Session->User if (defined $Session); + return (!$CurrentUser or !$CurrentUser->HasRole("admin")) ? undef : + "/admin/VMDetails.pl"; +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_;

1 0

Jeremy White : gitlab: Handle email encoded in a non utf-8 charset.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 001ed5565377ccde1ecbbce75806a0a65bd31348 URL: https://source.winehq.org/git/tools.git/?a=commit;h=001ed5565377ccde1ecbbce… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Jun 3 10:16:47 2022 -0500 gitlab: Handle email encoded in a non utf-8 charset. See https://www.winehq.org/pipermail/wine-devel/2022-June/218864.html. --- gitlab/gitlab-to-mail/mailtogitlab.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index ecc73fc..bc9944a 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -53,6 +53,7 @@ def find_mr(mail): def get_email_body(mail): + charset = mail.get_content_charset(failobj='UTF-8') if mail.is_multipart(): result = "" for part in mail.walk(): @@ -60,14 +61,14 @@ def get_email_body(mail): payload = part.get_payload(decode=True) # Skip things that look like a mailman tail if not re.search(r"^--[ ]*[\r\n]*.*mailing list[ \r\n]*.*[\r\n]^https", payload.decode(), re.MULTILINE): - result += payload.decode() + result += payload.decode(encoding=charset) return result else: if mail.get_content_type() != "text/plain": return "" payload = mail.get_payload(decode=True) - return payload.decode() + return payload.decode(encoding=charset) def escape_body(body): return body.replace("```", '\`\`\`')

1 0

Jeremy White : gitlab: Respect READ_ONLY for mailtogitlab.py as well.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: dd97169f1220d1457bf5eb41b6499c54bbfac788 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dd97169f1220d1457bf5eb4… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Jun 3 10:16:09 2022 -0500 gitlab: Respect READ_ONLY for mailtogitlab.py as well. --- gitlab/gitlab-to-mail/mailtogitlab.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index d3eeee7..ecc73fc 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -139,8 +139,11 @@ def post_discussion_note(mr_iid, note, replyto): did = find_discussion(mr_iid, replyto) if did: url += f"/{did}/notes" - r = requests.post(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}, data={'body': note, 'note_id': replyto}) - r.raise_for_status() + if settings.READ_ONLY: + print(f"Post: {url} (note_id: {replyto})\nBody:\n{note}\n---\n") + else: + r = requests.post(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}, data={'body': note, 'note_id': replyto}) + r.raise_for_status() def main():

1 0

Alexandre Julliard : packaging: Remove Fedora 34.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: c1e94015e48925b719964fa63c8908b272502d1f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c1e94015e48925b719964fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 4 10:30:45 2022 +0200 packaging: Remove Fedora 34. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 831c2b1..226da8a 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -199,7 +199,7 @@ publish_files () cd $basedir -distros="34 35 36 buster bullseye bookworm bionic focal impish jammy" +distros="35 36 buster bullseye bookworm bionic focal impish jammy" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 220e0fd..80331b2 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/34 + /fedora/35 + /fedora/36 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 4ad17e2..b9340f3 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-34] -name = Fedora 34 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_34 - [fedora-35] name = Fedora 35 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Alexandre Julliard : Wine release 7.10
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: website Branch: master Commit: 2f4f22e89eb598546ddac714799ff23f48817c88 URL: https://source.winehq.org/git/website.git/?a=commit;h=2f4f22e89eb598546ddac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:53:30 2022 +0200 Wine release 7.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022060301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022060301.xml b/news/en/2022060301.xml new file mode 100644 index 00000000..e722ca94 --- /dev/null +++ b/news/en/2022060301.xml @@ -0,0 +1,17 @@ +<news> +<date>June 3, 2022</date> +<title>Wine 7.10 Released</title> +<body> + The Wine development release 7.10 is now available. + <a href="{$root}/announce/7.10">What's new</a> in this release: +<ul> + <li>macOS driver converted to PE.</li> + <li>Mono engine updated to version 7.3.0.</li> + <li>Windows-compatible Unicode collation.</li> + <li>Wow64 support in SECUR32.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022