wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Francois Gouget : testbot: GetTaskURL() should load URI::Escape only when needed.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: tools Branch: master Commit: 8db6b37d2e0f03a607eddd20bf69948b5303d9db URL: https://source.winehq.org/git/tools.git/?a=commit;h=8db6b37d2e0f03a607eddd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 5 18:17:30 2022 +0200 testbot: GetTaskURL() should load URI::Escape only when needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index bc501ff..2ebad45 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -35,7 +35,6 @@ our @EXPORT = qw(SecureConnection MakeSecureURL MakeOfficialURL GetTaskURL BatchQuote ShQuote ShArgv2Cmd); use Fcntl qw(O_CREAT O_EXCL O_WRONLY); -use URI::Escape; use WineTestBot::Config; @@ -121,7 +120,11 @@ sub GetTaskURL($$$;$$) my $StepTask = 100 * $StepNo + $TaskNo; my $URL = "/JobDetails.pl?Key=$JobId"; $URL .= "&s$StepTask=1" if ($ShowScreenshot); - $URL .= "&f$StepTask=". uri_escape($LogName) if ($LogName); + if (defined $LogName) + { + require URI::Escape; + $URL .= "&f$StepTask=". URI::Escape::uri_escape($LogName); + } return "$URL#k$StepTask"; }

1 0

Francois Gouget : testbot: Use MakeOfficialURL() in non-CGI scripts.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: tools Branch: master Commit: b5cfda0874e819f1565da2daaac621f21f16767b URL: https://source.winehq.org/git/tools.git/?a=commit;h=b5cfda0874e819f1565da2d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 5 14:21:03 2022 +0200 testbot: Use MakeOfficialURL() in non-CGI scripts. Non-CGI scripts should not have $HTTP_HOST anyway so this is the same as MakeSecureURL(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/WineTestBot/Users.pm | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 1bddc04..7e8fced 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -334,7 +334,7 @@ if (!$Domain->IsPoweredOn()) NotifyAdministrator("Putting the ". $VM->Name ." VM offline", "The ". $VM->Name ." VM should have been powered on to run the task\n". "below but its state was ". $Domain->GetStateDescription() ." instead.\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); WrapUpAndExit('queued', undef, undef, 'boterror vm off'); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9f71ff4..5b6d7df 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -336,7 +336,7 @@ if (!$Domain->IsPoweredOn()) NotifyAdministrator("Putting the ". $VM->Name ." VM offline", "The ". $VM->Name ." VM should have been powered on to run the task\n". "below but its state was ". $Domain->GetStateDescription() ." instead.\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); WrapUpAndExit('queued', undef, undef, 'boterror vm off'); @@ -432,7 +432,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) NotifyAdministrator("The ". $VM->Name ." build failed", "The ". $VM->Name ." build failed and $Status\n\n". "See the link below for more details:\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } my $LogErrMsg = CreateLogErrorsCache($LogInfo); @@ -546,7 +546,7 @@ if ($NewStatus eq 'completed') "Could not recreate the $IdleSnapshot snapshot:\n\n". "$ErrMessage\n\n". "See the link below for more details:\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } @@ -562,7 +562,7 @@ if ($NewStatus eq 'completed') ." after its update:\n\n". "$ErrMessage\n\n". "See the link below for more details:\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); } else { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 017e8c4..0641bb5 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -386,7 +386,7 @@ if (!$Domain->IsPoweredOn()) NotifyAdministrator("Putting the ". $VM->Name ." VM offline", "The ". $VM->Name ." VM should have been powered on to run the task\n". "below but its state was ". $Domain->GetStateDescription() ." instead.\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); WrapUpAndExit('queued', undef, undef, undef, 'boterror vm off'); @@ -466,7 +466,7 @@ elsif ($Step->Type eq "suite") if (defined($WebHostName)) { my $URL = GetTaskURL($JobId, $StepNo, $TaskNo, 1); - $Script .= "-u ". BatchQuote(MakeSecureURL($URL)) ." "; + $Script .= "-u ". BatchQuote(MakeOfficialURL($URL)) ." "; } my $Tag = $VM->Type ne "win64" ? "" : $Step->FileType eq "exe64" ? "64" : "32"; $Tag = BuildTag($VM->Name, $Tag); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3526719..62a7fc5 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -383,7 +383,7 @@ if (!$Domain->IsPoweredOn()) NotifyAdministrator("Putting the ". $VM->Name ." VM offline", "The ". $VM->Name ." VM should have been powered on to run the task\n". "below but its state was ". $Domain->GetStateDescription() ." instead.\n". - MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". + MakeOfficialURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); WrapUpAndExit('queued', undef, undef, 'boterror vm off'); @@ -437,7 +437,7 @@ if ($Step->Type eq "suite") if (defined $WebHostName) { my $URL = GetTaskURL($JobId, $StepNo, $TaskNo, 1); - $Script .= "-u ". ShQuote(MakeSecureURL($URL)) ." "; + $Script .= "-u ". ShQuote(MakeOfficialURL($URL)) ." "; } my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 65c95de..954edae 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -48,6 +48,7 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::StepsTasks; +use WineTestBot::Utils; my $PART_BOUNDARY = "==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47=="; @@ -184,8 +185,7 @@ sub SendLog($) my $StepsTasks = CreateStepsTasks(undef, $Job); my @SortedKeys = sort { $a <=> $b } @{$StepsTasks->GetKeys()}; - my $JobURL = ($UseSSL ? "https://" : "http://") . - "$WebHostName/JobDetails.pl?Key=". $Job->GetKey(); + my $JobURL = MakeOfficialURL("/JobDetails.pl?Key=". $Job->GetKey()); # diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 772a2b7..bd9cf35 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -138,8 +138,8 @@ sub Approve($) return $ErrMessage; } - my $URL = MakeSecureURL("/ResetPassword.pl?Name=" . uri_escape($self->Name) . - "&ResetCode=" . uri_escape($self->ResetCode)); + my $URL = MakeOfficialURL("/ResetPassword.pl?Name=". uri_escape($self->Name) + ."&ResetCode=". uri_escape($self->ResetCode)); my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; @@ -177,8 +177,8 @@ sub SendResetCode($) return $ErrMessage; } - my $URL = MakeSecureURL("/ResetPassword.pl?Name=" . uri_escape($self->Name) . - "&ResetCode=" . uri_escape($self->ResetCode)); + my $URL = MakeOfficialURL("/ResetPassword.pl?Name=". uri_escape($self->Name) + ."&ResetCode=". uri_escape($self->ResetCode)); my $UserName = $self->Name; my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");

1 0

Francois Gouget : testbot/web: Add MakeOfficialURL() for sending URLs to third-parties.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: tools Branch: master Commit: 5d1dd2ee9e47c211eec016d0154ee4eb4a627030 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5d1dd2ee9e47c211eec016d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 5 14:20:59 2022 +0200 testbot/web: Add MakeOfficialURL() for sending URLs to third-parties. It should be used whenever sending a URL to a third-party. Also document SecureConnection() and MakeSecureURL(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 38 +++++++++++++++++++++++++++++++++++--- testbot/web/Register.pl | 5 ++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 13529c3..bc501ff 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,8 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString +our @EXPORT = qw(SecureConnection MakeSecureURL MakeOfficialURL GetTaskURL + GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator @@ -50,7 +51,8 @@ use WineTestBot::Config; Returns true if the user accessed the website over a secure connection. -This relies on the web server setting the $HTTPS environment variable. +This relies on the web server setting the $HTTPS environment variable for CGI +scripts. =back =cut @@ -69,12 +71,16 @@ Builds a URL that accesses this website using https if possible. The parameter should be an absolute path that includes neither the protocol nor the hostname. -Note that this method uses $HTTP_HOST which may not match the official website +This relies on the web server setting the $HTTP_HOST environment variable for +CGI scripts. However $HTTP_HOST which may not match the official website hostname. As such this should only be used for providing URLs back to the user accessing the website, not for URLs sent to third-parties. +See also MakeOfficialURL(). + =back =cut + sub MakeSecureURL($) { my ($URL) = @_; @@ -83,6 +89,32 @@ sub MakeSecureURL($) return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; } +=pod +=over 12 + +=item C<MakeOfficialURL()> + +Creates a URL pointing to the official website. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +This is the method to use in non-CGI scripts and to build URLs sent to any +third-party (e.g. via email); where a third party is any user other than the +one currently browsing the website. + +See also MakeSecureURL(). + +=back +=cut + +sub MakeOfficialURL($) +{ + my ($URL) = @_; + + my $Protocol = $UseSSL ? "https://" : "http://"; + return "$Protocol$WebHostName$URL"; +} + sub GetTaskURL($$$;$$) { my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index bbea0eb..b10be75 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -139,9 +139,8 @@ sub OnSendRequest($) { $Msg .= "Remarks:\n" . $self->GetParam("Remarks") . "\n"; } - my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . - "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); - $Msg .= "\nTo approve or deny the request, please go to " . $URL; + my $URL = MakeOfficialURL("/admin/UserDetails.pl?Key=". uri_escape($self->GetParam("Name"))); + $Msg .= "\nTo approve or deny the request, please go to $URL"; NotifyAdministrator("winetestbot account request", $Msg); return 1;

1 0

Francois Gouget : testbot/cgi: Let FormPage operate in read-only mode.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: tools Branch: master Commit: 69fe9a569f7eb9c313e82bc61ce5370a8b4d85f3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=69fe9a569f7eb9c313e82bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 5 14:20:41 2022 +0200 testbot/cgi: Let FormPage operate in read-only mode. The FormPage is in read-write mode by default as this is the most common case, but calling SetReadWrite(0) puts it in read-only mode where it shows the field values but does not allow modifying them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index dfcd55e..c6a8c6b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -70,6 +70,8 @@ properties that the form should show or allow editing, as specified by DisplayProperty(). It may be undefined if determining the property list is delegated to GetPropertyDescriptors(). +By default the form allows modifying the field values. + See also Page::new(). =back @@ -82,11 +84,30 @@ sub _initialize($$$$) $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; + $self->{RW} = 1; $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; $self->{Method} = "post"; } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the form allows editing the fields. +Otherwise it only shows their values. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + # # Property handling @@ -167,10 +188,12 @@ 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 be edited... + # All other properties can displayed, + !$self->{RW} ? "ro" : + # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : $PropertyDescriptor->GetType() ne "S" ? "rw" : - # ...except autoincrement ones (shown as <unset> if undefined) + # ...except autoincrement ones "ro"; }

1 0

Francois Gouget : testbot: Add Collection::GetSortedItems().
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: tools Branch: master Commit: 29cc30ec1abcfd5df03351f2a7cd06800018c578 URL: https://source.winehq.org/git/tools.git/?a=commit;h=29cc30ec1abcfd5df03351f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 5 14:20:33 2022 +0200 testbot: Add Collection::GetSortedItems(). This provides a default comparison function for items, letting them override it as appropriate for subclasses. Collection::GetSortedItems() then returns the collection's items sorted according to that order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 22 ++++++++++++++ testbot/lib/ObjectModel/Item.pm | 53 ++++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Patches.pm | 10 +++---- testbot/lib/WineTestBot/SpecialJobs.pm | 15 ++-------- testbot/lib/WineTestBot/VMs.pm | 12 ++++++++ 5 files changed, 94 insertions(+), 18 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index dd0be12..93a4502 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -395,6 +395,28 @@ sub GetItems($) =pod =over 12 +=item C<GetSortedItems()> + +Returns all the Item objects present in the Collection in the order defined +by the Item's Compare() method. + +See also GetItems() for the exact set of items being returned. + +=back +=cut + +sub GetSortedItems($$) +{ + my ($self, $Items) = @_; + + $self->Load() if (!$self->{Loaded}); + my @SortedItems = sort { $a->Compare($b) } values %{$self->{Items}}; + return \@SortedItems; +} + +=pod +=over 12 + =item C<GetItemsCount()> Returns how many Items are present in the Collection. diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index fb125f0..9cec7b4 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -363,6 +363,59 @@ sub GetKey($) return $Key; } +=pod +=over 12 + +=item C<Compare()> + +$A->Compare($B) return a negative, zero or positive value depending on whether +$A is less than, equal to, or greater than $B respectively. + +Neither object can be undefined, and both must be of the same type. + +The comparison is based on the Item's key fields which are compared in their +order in the property descriptors list, and based on their types (so numeric +comparison for numeric values, and alphabetical otherwise). + +Note that the comparison is not particularly optimised so if it is called +many times it would probably be more efficient to redefine it. + +=back +=cut + +sub Compare($$) +{ + my ($self, $B) = @_; + + foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) + { + next if (!$PropertyDescriptor->GetIsKey()); + + my $ColNames = $PropertyDescriptor->GetColNames(); + if ($PropertyDescriptor->GetClass() eq "Basic") + { + 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}; + } + if ($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); + } + } + return 0; +} + sub GetFullKey($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cc0fbe9..6891fa5 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -268,12 +268,11 @@ sub Submit($$;$) my $WinVMs = CreateVMs(); $WinVMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $WinVMs->AddFilter("Role", ["base"]); - my $SortedKeys = $WinVMs->SortKeysBySortOrder($WinVMs->GetKeys()); + my $SortedVMs = $WinVMs->GetSortedItems(); my $Tasks; - foreach my $VMKey (@$SortedKeys) + foreach my $VM (@$SortedVMs) { - my $VM = $WinVMs->GetItem($VMKey); my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); next if (defined $ErrMessage); @@ -338,12 +337,11 @@ sub Submit($$;$) my $WineVMs = CreateVMs(); $WineVMs->AddFilter("Type", ["wine"]); $WineVMs->AddFilter("Role", ["base"]); - my $SortedKeys = $WineVMs->SortKeysBySortOrder($WineVMs->GetKeys()); + my $SortedVMs = $WineVMs->GetSortedItems(); my $Tasks; - foreach my $VMKey (@$SortedKeys) + foreach my $VM (@$SortedVMs) { - my $VM = $WineVMs->GetItem($VMKey); my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); next if (defined $ErrMessage); diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index 360e1ff..e8677ec 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -54,10 +54,7 @@ sub GetReconfigVMs($$) $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", [$VMType]); $VMs->FilterEnabledRole(); - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddReconfigJob($$$) @@ -132,10 +129,7 @@ sub GetWindowsTestVMs($$$) { $VMs->FilterEnabledRole(); } - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddWindowsTestJob($$$$$) @@ -219,10 +213,7 @@ sub GetWineTestVMs($) $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", ["wine"]); $VMs->FilterEnabledRole(); - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddWineTestJob($$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 65f6333..ee0c1be 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -177,6 +177,18 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Sort retired and deleted VMs last + my %RoleOrders = ("retired" => 1, "deleted" => 2); + + return ($RoleOrders{$self->Role} || 0) <=> ($RoleOrders{$B->Role} || 0) || + $self->SortOrder <=> $B->SortOrder || + $self->Name <=> $B->Name; +} + sub HasEnabledRole($) { my ($self) = @_;

1 0

Francois Gouget : testbot/cgi: Replace CollectionPage with SimpleCollectionPage.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: tools Branch: master Commit: d489951de3136f39c5935e039fce371e96938050 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d489951de3136f39c5935e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 5 14:20:20 2022 +0200 testbot/cgi: Replace CollectionPage with SimpleCollectionPage. The old CollectionPage is not used anymore so replace it with the new implementation. This means CollectionBlockForPage and the CallXxx() trampolines are not needed anymore either. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 169 +++---------------- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 154 ------------------ testbot/lib/ObjectModel/CGI/CollectionPage.pm | 179 +++++---------------- .../lib/ObjectModel/CGI/SimpleCollectionPage.pm | 138 ---------------- testbot/web/JobDetails.pl | 4 +- testbot/web/PatchesList.pl | 4 +- testbot/web/admin/BranchesList.pl | 4 +- testbot/web/admin/UsersList.pl | 4 +- testbot/web/admin/VMsList.pl | 4 +- 9 files changed, 73 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=d489951de3136f39c59…

1 0

Henri Verbeet : wined3d: Spawn a separate thread to adjust the window state of windows belonging to other threads.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 1765c4594f6a11fe0df1aed7261cfafdb7514c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1765c4594f6a11fe0df1aed7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:02:59 2022 +0200 wined3d: Spawn a separate thread to adjust the window state of windows belonging to other threads. Sending messages to windows on other threads can deadlock if those threads aren't processing messages. The deeper issue is that we shouldn't be touching the window styles in the first place, but avoiding that may not be feasible without specific support from winex11/winemac. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 138 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 103 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 608a303c0f6..eef7d46ba39 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2178,12 +2178,43 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } +struct wined3d_window_state +{ + HWND window; + HWND window_pos_after; + LONG style, exstyle; + int x, y, width, height; + uint32_t flags; + bool set_style; +}; + +static DWORD WINAPI wined3d_set_window_state(void *ctx) +{ + struct wined3d_window_state *s = ctx; + bool filter; + + filter = wined3d_filter_messages(s->window, TRUE); + + if (s->set_style) + { + SetWindowLongW(s->window, GWL_STYLE, s->style); + SetWindowLongW(s->window, GWL_EXSTYLE, s->exstyle); + } + SetWindowPos(s->window, s->window_pos_after, s->x, s->y, s->width, s->height, s->flags); + + wined3d_filter_messages(s->window, filter); + + heap_free(s); + + return 0; +} + HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) { - unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOACTIVATE; - LONG style, exstyle; - BOOL filter; + struct wined3d_window_state *s; + DWORD window_tid, tid; + HANDLE thread; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -2193,33 +2224,50 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state return WINED3DERR_NOTAVAILABLE; } + if (!(s = heap_alloc(sizeof(*s)))) + return E_OUTOFMEMORY; + s->window = window; + s->window_pos_after = HWND_TOPMOST; + s->x = x; + s->y = y; + s->width = width; + s->height = height; + if (state->style || state->exstyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", window, state->style, state->exstyle); } + s->flags = SWP_FRAMECHANGED | SWP_NOACTIVATE; if (state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES) - window_pos_flags |= SWP_NOZORDER; + s->flags |= SWP_NOZORDER; else - window_pos_flags |= SWP_SHOWWINDOW; + s->flags |= SWP_SHOWWINDOW; state->style = GetWindowLongW(window, GWL_STYLE); state->exstyle = GetWindowLongW(window, GWL_EXSTYLE); - style = fullscreen_style(state->style); - exstyle = fullscreen_exstyle(state->exstyle); + s->style = fullscreen_style(state->style); + s->exstyle = fullscreen_exstyle(state->exstyle); + s->set_style = true; TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", - state->style, state->exstyle, style, exstyle); - - filter = wined3d_filter_messages(window, TRUE); - - SetWindowLongW(window, GWL_STYLE, style); - SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, x, y, width, height, window_pos_flags); - - wined3d_filter_messages(window, filter); + state->style, state->exstyle, s->style, s->exstyle); + + window_tid = GetWindowThreadProcessId(window, NULL); + tid = GetCurrentThreadId(); + + TRACE("Window %p belongs to thread %#x.\n", window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + wined3d_set_window_state(s); + else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); return WINED3D_OK; } @@ -2227,21 +2275,27 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) { - unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; - HWND window_pos_after = NULL; + struct wined3d_window_state *s; + DWORD window_tid, tid; LONG style, exstyle; - RECT rect = {0}; - BOOL filter; + HANDLE thread; if (!state->style && !state->exstyle) return; + if (!(s = heap_alloc(sizeof(*s)))) + return; + + s->window = window; + s->window_pos_after = NULL; + s->flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; + if ((state->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) && !(state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES)) { - window_pos_after = (state->exstyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST; - window_pos_flags |= (state->style & WS_VISIBLE) ? SWP_SHOWWINDOW : SWP_HIDEWINDOW; - window_pos_flags &= ~SWP_NOZORDER; + s->window_pos_after = (state->exstyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST; + s->flags |= (state->style & WS_VISIBLE) ? SWP_SHOWWINDOW : SWP_HIDEWINDOW; + s->flags &= ~SWP_NOZORDER; } style = GetWindowLongW(window, GWL_STYLE); @@ -2259,26 +2313,40 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st TRACE("Restoring window style of window %p to %08x, %08x.\n", window, state->style, state->exstyle); - filter = wined3d_filter_messages(window, TRUE); - + s->style = state->style; + s->exstyle = state->exstyle; /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ - if (style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle)) - { - SetWindowLongW(window, GWL_STYLE, state->style); - SetWindowLongW(window, GWL_EXSTYLE, state->exstyle); - } + s->set_style = style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle); if (window_rect) - rect = *window_rect; + { + s->x = window_rect->left; + s->y = window_rect->top; + s->width = window_rect->right - window_rect->left; + s->height = window_rect->bottom - window_rect->top; + } else - window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); - SetWindowPos(window, window_pos_after, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); + { + s->x = s->y = s->width = s->height = 0; + s->flags |= (SWP_NOMOVE | SWP_NOSIZE); + } - wined3d_filter_messages(window, filter); + window_tid = GetWindowThreadProcessId(window, NULL); + tid = GetCurrentThreadId(); + + TRACE("Window %p belongs to thread %#x.\n", window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + wined3d_set_window_state(s); + else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); /* Delete the old values. */ state->style = 0;

1 0

Zebediah Figura : winegstreamer: Add traces to Unix call wrappers.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 3827f0487db5ad12f1beb7aabb4e6bbc278a8145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3827f0487db5ad12f1beb7aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:57 2022 -0500 winegstreamer: Add traces to Unix call wrappers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 8a41df6b223..d88a462d81e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -70,13 +70,20 @@ struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buff .unlimited_buffering = unlimited_buffering, }; + TRACE("type %#x, unlimited_buffering %d.\n", type, unlimited_buffering); + if (__wine_unix_call(unix_handle, unix_wg_parser_create, &params)) return NULL; + + TRACE("Returning parser %p.\n", params.parser); + return params.parser; } void wg_parser_destroy(struct wg_parser *parser) { + TRACE("parser %p.\n", parser); + __wine_unix_call(unix_handle, unix_wg_parser_destroy, parser); } @@ -88,11 +95,15 @@ HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) .file_size = file_size, }; + TRACE("parser %p, file_size %I64u.\n", parser, file_size); + return __wine_unix_call(unix_handle, unix_wg_parser_connect, &params); } void wg_parser_disconnect(struct wg_parser *parser) { + TRACE("parser %p.\n", parser); + __wine_unix_call(unix_handle, unix_wg_parser_disconnect, parser); } @@ -103,6 +114,8 @@ bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, .parser = parser, }; + TRACE("parser %p, offset %p, size %p.\n", parser, offset, size); + if (__wine_unix_call(unix_handle, unix_wg_parser_get_next_read_offset, &params)) return false; *offset = params.offset; @@ -119,6 +132,8 @@ void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t si .size = size, }; + TRACE("parser %p, data %p, size %u.\n", parser, data, size); + __wine_unix_call(unix_handle, unix_wg_parser_push_data, &params); } @@ -129,6 +144,8 @@ uint32_t wg_parser_get_stream_count(struct wg_parser *parser) .parser = parser, }; + TRACE("parser %p.\n", parser); + __wine_unix_call(unix_handle, unix_wg_parser_get_stream_count, &params); return params.count; } @@ -141,7 +158,11 @@ struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t .index = index, }; + TRACE("parser %p, index %u.\n", parser, index); + __wine_unix_call(unix_handle, unix_wg_parser_get_stream, &params); + + TRACE("Returning stream %p.\n", params.stream); return params.stream; } @@ -153,6 +174,8 @@ void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, stru .format = format, }; + TRACE("stream %p, format %p.\n", stream, format); + __wine_unix_call(unix_handle, unix_wg_parser_stream_get_preferred_format, &params); } @@ -164,11 +187,15 @@ void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_fo .format = format, }; + TRACE("stream %p, format %p.\n", stream, format); + __wine_unix_call(unix_handle, unix_wg_parser_stream_enable, &params); } void wg_parser_stream_disable(struct wg_parser_stream *stream) { + TRACE("stream %p.\n", stream); + __wine_unix_call(unix_handle, unix_wg_parser_stream_disable, stream); } @@ -180,6 +207,8 @@ bool wg_parser_stream_get_buffer(struct wg_parser_stream *stream, struct wg_pars .buffer = buffer, }; + TRACE("stream %p, buffer %p.\n", stream, buffer); + return !__wine_unix_call(unix_handle, unix_wg_parser_stream_get_buffer, &params); } @@ -194,11 +223,15 @@ bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, .size = size, }; + TRACE("stream %p, data %p, offset %u, size %u.\n", stream, data, offset, size); + return !__wine_unix_call(unix_handle, unix_wg_parser_stream_copy_buffer, &params); } void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) { + TRACE("stream %p.\n", stream); + __wine_unix_call(unix_handle, unix_wg_parser_stream_release_buffer, stream); } @@ -214,6 +247,9 @@ void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, .timestamp = timestamp, }; + TRACE("stream %p, underflow %d, proportion %.16e, diff %I64d, timestamp %I64u.\n", + stream, underflow, proportion, diff, timestamp); + __wine_unix_call(unix_handle, unix_wg_parser_stream_notify_qos, &params); } @@ -224,7 +260,11 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) .stream = stream, }; + TRACE("stream %p.\n", stream); + __wine_unix_call(unix_handle, unix_wg_parser_stream_get_duration, &params); + + TRACE("Returning duration %I64u.\n", params.duration); return params.duration; } @@ -241,6 +281,9 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, .stop_flags = stop_flags, }; + TRACE("stream %p, rate %.16e, start_pos %I64u, stop_pos %I64u, start_flags %#lx, stop_flags %#lx.\n", + stream, rate, start_pos, stop_pos, start_flags, stop_flags); + __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } @@ -253,13 +296,19 @@ struct wg_transform *wg_transform_create(const struct wg_format *input_format, .output_format = output_format, }; + TRACE("input_format %p, output_format %p.\n", input_format, output_format); + if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) return NULL; + + TRACE("Returning transform %p.\n", params.transform); return params.transform; } void wg_transform_destroy(struct wg_transform *transform) { + TRACE("transform %p.\n", transform); + __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform); } @@ -272,6 +321,8 @@ HRESULT wg_transform_push_data(struct wg_transform *transform, struct wg_sample }; NTSTATUS status; + TRACE("transform %p, sample %p.\n", transform, sample); + if ((status = __wine_unix_call(unix_handle, unix_wg_transform_push_data, &params))) return HRESULT_FROM_NT(status); @@ -287,6 +338,8 @@ HRESULT wg_transform_read_data(struct wg_transform *transform, struct wg_sample }; NTSTATUS status; + TRACE("transform %p, sample %p.\n", transform, sample); + if ((status = __wine_unix_call(unix_handle, unix_wg_transform_read_data, &params))) return HRESULT_FROM_NT(status);

1 0

Zebediah Figura : winegstreamer: Unblock waits in sink_chain_cb() when disabling a stream.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: bcd39c5061768d6d9a822cb8f8effa715ca62972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd39c5061768d6d9a822cb8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:56 2022 -0500 winegstreamer: Unblock waits in sink_chain_cb() when disabling a stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a2ce92ccdc7..e7a60ec158a 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -255,6 +255,7 @@ static NTSTATUS wg_parser_stream_disable(void *args) pthread_mutex_lock(&parser->mutex); stream->enabled = false; pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&stream->event_empty_cond); return S_OK; } @@ -541,6 +542,12 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu pthread_mutex_lock(&parser->mutex); + /* Allow this buffer to be flushed by GStreamer. We are effectively + * implementing a queue object here. */ + + while (stream->enabled && !stream->flushing && stream->buffer) + pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); + if (!stream->enabled) { pthread_mutex_unlock(&parser->mutex); @@ -548,11 +555,6 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - /* Allow this buffer to be flushed by GStreamer. We are effectively - * implementing a queue object here. */ - - while (!stream->flushing && stream->buffer) - pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); if (stream->flushing) { pthread_mutex_unlock(&parser->mutex);

1 0

Zebediah Figura : winegstreamer: Protect access to the "enabled" field.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 5861379d6df87562753322e251261868943e91ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5861379d6df87562753322e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:55 2022 -0500 winegstreamer: Protect access to the "enabled" field. It is accessed from multiple threads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index df563e9336e..a2ce92ccdc7 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -205,10 +205,15 @@ static NTSTATUS wg_parser_stream_enable(void *args) const struct wg_parser_stream_enable_params *params = args; struct wg_parser_stream *stream = params->stream; const struct wg_format *format = params->format; + struct wg_parser *parser = stream->parser; + + pthread_mutex_lock(&parser->mutex); stream->current_format = *format; stream->enabled = true; + pthread_mutex_unlock(&parser->mutex); + if (format->major_type == WG_MAJOR_TYPE_VIDEO) { bool flip = (format->u.video.height < 0); @@ -245,8 +250,11 @@ static NTSTATUS wg_parser_stream_enable(void *args) static NTSTATUS wg_parser_stream_disable(void *args) { struct wg_parser_stream *stream = args; + struct wg_parser *parser = stream->parser; + pthread_mutex_lock(&parser->mutex); stream->enabled = false; + pthread_mutex_unlock(&parser->mutex); return S_OK; } @@ -437,6 +445,7 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) switch (event->type) { case GST_EVENT_SEGMENT: + pthread_mutex_lock(&parser->mutex); if (stream->enabled) { const GstSegment *segment; @@ -445,29 +454,31 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) if (segment->format != GST_FORMAT_TIME) { + pthread_mutex_unlock(&parser->mutex); GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); break; } gst_segment_copy_into(segment, &stream->segment); } + pthread_mutex_unlock(&parser->mutex); break; case GST_EVENT_EOS: pthread_mutex_lock(&parser->mutex); stream->eos = true; - pthread_mutex_unlock(&parser->mutex); if (stream->enabled) pthread_cond_signal(&stream->event_cond); else pthread_cond_signal(&parser->init_cond); + pthread_mutex_unlock(&parser->mutex); break; case GST_EVENT_FLUSH_START: + pthread_mutex_lock(&parser->mutex); + if (stream->enabled) { - pthread_mutex_lock(&parser->mutex); - stream->flushing = true; pthread_cond_signal(&stream->event_empty_cond); @@ -477,9 +488,9 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) gst_buffer_unref(stream->buffer); stream->buffer = NULL; } - - pthread_mutex_unlock(&parser->mutex); } + + pthread_mutex_unlock(&parser->mutex); break; case GST_EVENT_FLUSH_STOP: @@ -528,8 +539,11 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu GST_LOG("stream %p, buffer %p.", stream, buffer); + pthread_mutex_lock(&parser->mutex); + if (!stream->enabled) { + pthread_mutex_unlock(&parser->mutex); gst_buffer_unref(buffer); return GST_FLOW_OK; } @@ -537,8 +551,6 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu /* Allow this buffer to be flushed by GStreamer. We are effectively * implementing a queue object here. */ - pthread_mutex_lock(&parser->mutex); - while (!stream->flushing && stream->buffer) pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); if (stream->flushing) @@ -573,6 +585,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) { struct wg_parser_stream *stream = gst_pad_get_element_private(pad); + struct wg_parser *parser = stream->parser; GST_LOG("stream %p, type \"%s\".", stream, gst_query_type_get_name(query->type)); @@ -585,10 +598,15 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); + pthread_mutex_lock(&parser->mutex); + if (stream->enabled) caps = wg_format_to_caps(&stream->current_format); else caps = gst_caps_new_any(); + + pthread_mutex_unlock(&parser->mutex); + if (!caps) return FALSE; @@ -614,8 +632,11 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gboolean ret = TRUE; GstCaps *caps; + pthread_mutex_lock(&parser->mutex); + if (!stream->enabled) { + pthread_mutex_unlock(&parser->mutex); gst_query_set_accept_caps_result(query, TRUE); return TRUE; } @@ -623,6 +644,9 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_accept_caps(query, &caps); wg_format_from_caps(&format, caps); ret = wg_format_compare(&format, &stream->current_format); + + pthread_mutex_unlock(&parser->mutex); + if (!ret && gst_debug_category_get_threshold(GST_CAT_DEFAULT) >= GST_LEVEL_WARNING) { gchar *str = gst_caps_to_string(caps);

1 0

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 April 2022