wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Piotr Caban : d3dx10: Use CRT memory allocators.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 9bc80fbf87fc9db4db548949406f5c400055571f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc80fbf87fc9db4db548949… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 1 16:39:35 2022 +0200 d3dx10: Use CRT memory allocators. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 36 ++++++++++++++++++------------------ dlls/d3dx10_43/compiler.c | 9 ++++----- dlls/d3dx10_43/font.c | 31 +++++++++++++++---------------- dlls/d3dx10_43/mesh.c | 5 ++--- dlls/d3dx10_43/sprite.c | 5 ++--- dlls/d3dx10_43/texture.c | 21 ++++++++++----------- 6 files changed, 51 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9bc80fbf87fc9db4db54…

1 0

Alexandre Julliard : faudio: Import upstream release 22.06.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: acf815fd8af0c44ac162400781e4da6c8f897293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf815fd8af0c44ac1624007… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 08:17:41 2022 +0200 faudio: Import upstream release 22.06. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/LICENSE | 2 +- libs/faudio/include/F3DAudio.h | 2 +- libs/faudio/include/FACT.h | 2 +- libs/faudio/include/FACT3D.h | 2 +- libs/faudio/include/FAPO.h | 2 +- libs/faudio/include/FAPOBase.h | 2 +- libs/faudio/include/FAPOFX.h | 2 +- libs/faudio/include/FAudio.h | 4 ++-- libs/faudio/include/FAudioFX.h | 2 +- libs/faudio/src/F3DAudio.c | 2 +- libs/faudio/src/FACT.c | 4 +++- libs/faudio/src/FACT3D.c | 2 +- libs/faudio/src/FACT_internal.c | 10 +++++++++- libs/faudio/src/FACT_internal.h | 2 +- libs/faudio/src/FAPOBase.c | 2 +- libs/faudio/src/FAPOFX.c | 2 +- libs/faudio/src/FAPOFX_echo.c | 2 +- libs/faudio/src/FAPOFX_eq.c | 2 +- libs/faudio/src/FAPOFX_masteringlimiter.c | 2 +- libs/faudio/src/FAPOFX_reverb.c | 2 +- libs/faudio/src/FAudio.c | 2 +- libs/faudio/src/FAudioFX_reverb.c | 2 +- libs/faudio/src/FAudioFX_volumemeter.c | 2 +- libs/faudio/src/FAudio_internal.c | 10 +++++++--- libs/faudio/src/FAudio_internal.h | 2 +- libs/faudio/src/FAudio_internal_simd.c | 2 +- libs/faudio/src/FAudio_operationset.c | 2 +- 27 files changed, 44 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acf815fd8af0c44ac162…

1 0

Jeremy White : Avoid extra quoting if the current note is quoted.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 1b867cb3e46155e7d85c7c629980093c1d768b22 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b867cb3e46155e7d85c7c6… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jun 6 16:04:51 2022 -0500 Avoid extra quoting if the current note is quoted. If you look at: https://www.winehq.org/pipermail/wine-devel/2022-May/217121.html and compare with the merge request itself, you can see that the combined quotes create a deceptive looking trail on the mailing list. This is event 1549 on the winehq gitlab. --- gitlab/gitlab-to-mail/gitlabtomail.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index d426cc9..e113eaa 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -339,8 +339,11 @@ def process_commented_on(event): # If we are part of a thread, naively quote the last comment # this seems slightly improve reported context. + # Unless the commentor has already injected some quoting, in which + # case let's trust them to get it right. + quoting = len(event['note']['body']) > 0 and event['note']['body'][0] == '>' original = find_original_comment(event['note']['noteable_iid'], event['note']['id']) - if original: + if original and not quoting: body += quote_original_comment(original) body += event['note']['body']

1 0

Francois Gouget : testbot/cgi: Don't pass the master columns to the list page.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 352c2c7ba2830aafef52ec6cdfd7a0e87a25bed7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=352c2c7ba2830aafef52ec6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:49 2022 +0200 testbot/cgi: Don't pass the master columns to the list page. ItemPage ignores any master column parameter that it might receive so RedirectToList() has nothing to pass on. CollectionPage would ignore the master column parameters anyway. Fortunately this functionality is not used and not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b4d79e7..690458e 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -129,17 +129,7 @@ sub RedirectToList($) { my ($self) = @_; - my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . url_escape($MasterColValues->[$ColIndex]); - } - } - return $self->Redirect($Target); + return $self->Redirect($self->{Collection}->GetCollectionName() . "List.pl"); } sub OnAction($$)

1 0

Francois Gouget : testbot/cgi: ItemPage does not retrieve the master columns so simplify GenerateFormStart().
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 284612cab919e96658bd78129982d6e3af04b706 URL: https://source.winehq.org/git/tools.git/?a=commit;h=284612cab919e96658bd781… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:46 2022 +0200 testbot/cgi: ItemPage does not retrieve the master columns so simplify GenerateFormStart(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 8bea816..b4d79e7 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -106,16 +106,6 @@ sub GenerateFormStart($) $self->SUPER::GenerateFormStart(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], - "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), - "' /></div>\n"; - } - } if (! $self->{Item}->GetIsNew()) { print "<div><input type='hidden' name='Key' value='",

1 0

Francois Gouget : testbot/cgi: Pass the full key to the details page.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: c18c125f01e39bc6ba82dd36b118adbbf88cc5da URL: https://source.winehq.org/git/tools.git/?a=commit;h=c18c125f01e39bc6ba82dd3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:43 2022 +0200 testbot/cgi: Pass the full key to the details page. The details page's collection does not have master columns and thus it needs the full key to load the Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 7d42ba2..0f0a3bd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -239,7 +239,7 @@ sub GetDetailsLink($$) if (!$Row->{DetailsLink}) { - $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); + $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetFullKey()); } return $Row->{DetailsLink}; }

1 0

Francois Gouget : testbot/cgi: Don't pass the master columns to the details pages.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 5156da1e4b7bc8fa34f85784ddf7084b28f6284b URL: https://source.winehq.org/git/tools.git/?a=commit;h=5156da1e4b7bc8fa34f8578… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:39 2022 +0200 testbot/cgi: Don't pass the master columns to the details pages. The details pages have no way to pass the master columns to the collection used to retrieve the Item to display: what they would need instead is a master object. So they don't even try to retrieve the master column values from the parameters (see *Param() in the FormPage and ItemPage classes). Fortunately so far there is no case where we need this functionality. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index e8156a1..7d42ba2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -240,15 +240,6 @@ sub GetDetailsLink($$) if (!$Row->{DetailsLink}) { $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); - my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); - if (defined $MasterColNames) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". - uri_escape($MasterColValues->[$ColIndex]); - } - } } return $Row->{DetailsLink}; } @@ -680,17 +671,7 @@ sub OnAction($$) if ($self->{RW} and $Action eq $self->GetAddButtonLabel()) { - my $Target = $self->GetDetailsPage(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . uri_escape($MasterColValues->[$ColIndex]); - } - } - exit($self->{EnclosingPage}->Redirect($Target)); + exit($self->{EnclosingPage}->Redirect($self->GetDetailsPage())); } foreach my $Key (@{$self->{Collection}->GetKeys()})

1 0

Francois Gouget : testbot/web: Query the VMs table only once for the main page.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: d18131423558cadca25db714adc95cc6559bbb4d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d18131423558cadca25db71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:28 2022 +0200 testbot/web: Query the VMs table only once for the main page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 21ee5fe..1083d3b 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -264,14 +264,15 @@ sub GenerateBody($) print "<div class='GeneralStatusItemText'><a href='#jobs'>Engine appears to be dead and is not processing jobs</a></div>"; } print "</div>\n"; - - my $OfflineVMs = CreateVMs(); - $OfflineVMs->FilterEnabledRole(); - $OfflineVMs->AddFilter("Status", ["offline"]); - my $MaintenanceVMs = CreateVMs(); - $MaintenanceVMs->FilterEnabledRole(); - $MaintenanceVMs->AddFilter("Status", ["maintenance"]); - if ($OfflineVMs->IsEmpty() and $MaintenanceVMs->IsEmpty()) + + my $VMs = CreateVMs(); + my ($OfflineVMs, $MaintenanceVMs); + foreach my $VM (@{$VMs->GetItems()}) + { + $OfflineVMs++ if ($VM->Status eq "offline"); + $MaintenanceVMs++ if ($VM->Status eq "maintenance"); + } + if (!$OfflineVMs and !$MaintenanceVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("green"); @@ -280,18 +281,18 @@ sub GenerateBody($) } else { - if (!$OfflineVMs->IsEmpty()) + if ($OfflineVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + print "<div class='GeneralStatusItemText'><a href='#vms'>$OfflineVMs VMs are offline</a></div>"; print "</div>\n"; } - if (!$MaintenanceVMs->IsEmpty()) + if ($MaintenanceVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are undergoing maintenance</a></div>"; + print "<div class='GeneralStatusItemText'><a href='#vms'>$MaintenanceVMs VMs are undergoing maintenance</a></div>"; print "</div>\n"; } } @@ -343,7 +344,7 @@ sub GenerateBody($) EOF print "<h2><a name='vms'></a>VMs</h2>\n"; - my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + my $VMsCollectionBlock = new VMStatusBlock($VMs, $self); $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n";

1 0

Francois Gouget : testbot/orm: Add support for multi-column Itemrefs.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 763995636b6b2fb1e703fbb405b651d057a22ed0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=763995636b6b2fb1e703fbb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:35 2022 +0200 testbot/orm: Add support for multi-column Itemrefs. Also document why they are not supported in filters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45023 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 6 ++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 7 ++++- testbot/lib/ObjectModel/Item.pm | 41 ++++++++++++++++++++------- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 41d1e14..49bf856 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -306,16 +306,18 @@ sub GenerateValueHTML($$$;$) } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { - # Note: This only supports single-key Itemrefs + my $First = 1; foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) { if ($ValuePD->GetIsKey()) { + print "/" if (!$First); + $First = 0; my $PropertyName = $ValuePD->GetName(); GenerateValueHTML($Parent, $ValuePD, $Value->$PropertyName); - return; } } + return; } print defined $Value ? $Parent->escapeHTML($Value) : " "; } diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 62332c1..f4d1683 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -222,7 +222,12 @@ sub ColNameToDb($) my $ColNames = $PropertyDescriptor->GetColNames(); if (@$ColNames != 1) { - die "cannot filter on Itemref with more than one column name: @$ColNames"; + # 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"; } return $ColNames->[0]; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 39c80cc..593b039 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -281,26 +281,45 @@ sub AUTOLOAD } elsif($PropertyDescriptor->GetClass() eq "Itemref") { - my $ColNames = $PropertyDescriptor->GetColNames(); - if (@{$ColNames} != 1) - { - die "Multiple key components not supported"; - } if (@_) { - $self->{Itemrefs}{$PropertyName} = shift; - if ($self->ValuesDiffer($self->{ColValues}{@{$ColNames}[0]}, - $self->{Itemrefs}{$PropertyName}->GetKey())) + my $Item = shift; + if (!$Item and !$self->{Itemrefs}{$PropertyName}) + { + # No change -> nothing to do + } + elsif (!$Item) + { + $self->{IsModified} = 1; + $self->{Itemrefs}{$PropertyName} = undef; + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) + { + $self->{ColValues}{$ColName} = undef; + } + } + elsif (!$self->{Itemrefs}{$PropertyName} or + $self->{Itemrefs}{$PropertyName} ne $Item) { $self->{IsModified} = 1; - $self->{ColValues}{@{$ColNames}[0]} = $self->{Itemrefs}{$PropertyName}->GetKey(); + $self->{Itemrefs}{$PropertyName} = $Item; + # Note that the foreign key names ($RefColNames) typically don't + # match the Item's primary key column names. But their order and + # count must match the primary key values. + my $RefColNames = $PropertyDescriptor->GetColNames(); + my ($_ColNames, $ColValues) = $Item->GetMasterKey(); + foreach my $ColIndex (0..$#{$RefColNames}) + { + $self->{ColValues}{$RefColNames->[$ColIndex]} = $ColValues->[$ColIndex]; + } } } elsif (! defined($self->{Itemrefs}{$PropertyName})) { + my $ColNames = $PropertyDescriptor->GetColNames(); + my @KeyComponents = map { $self->{ColValues}{$_} || "" } @$ColNames; my $Collection = &{$PropertyDescriptor->GetCreator()}($self); - my $Item = $Collection->GetItem($self->{ColValues}{@{$ColNames}[0]}); - $self->{Itemrefs}{$PropertyName} = $Item; + my $Key = $Collection->CombineKey(@KeyComponents); + $self->{Itemrefs}{$PropertyName} = $Collection->GetItem($Key); } return $self->{Itemrefs}{$PropertyName}; }

1 0

Zebediah Figura : vkd3d-shader/spirv: Do not print a warning for VKD3D_SHADER_COMPILE_OPTION_API_VERSION.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: vkd3d Branch: master Commit: 14f77294b184260dcd4f79d7a016e2444de09d95 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=14f77294b184260dcd4f79d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 14:25:48 2022 -0500 vkd3d-shader/spirv: Do not print a warning for VKD3D_SHADER_COMPILE_OPTION_API_VERSION. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d746a35a..d361b8a6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2376,6 +2376,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); + + case VKD3D_SHADER_COMPILE_OPTION_API_VERSION: break; } }

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
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