wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Francois Gouget : testbot: Provide (quick) read access to Itemref columns.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: cc83679b83689e24e92df8060ca9d3d7fe014b54 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cc83679b83689e24e92df80… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 26 19:35:55 2022 +0200 testbot: Provide (quick) read access to Itemref columns. Specifically this provides read-only access to the Itemref column(s). For instance if a task refers to a VM using a VMName field, then one can now write $Task->VMName instead of $Task->VM->Name. Incidentally read accesses are also much faster, except for the first Itemref / Detailref access which has to go through the slow path to initialize the relevant hashtable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index c086aec..d472381 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -230,10 +230,29 @@ sub AUTOLOAD # strip fully-qualified portion my $PropertyName = substr($ObjectModel::Item::AUTOLOAD, rindex($ObjectModel::Item::AUTOLOAD, ':') + 1); + + if (!@_) + { + # Provide quick read access to all the columns and cached object refs + if (defined $self->{ColValues}{$PropertyName}) + { + return $self->{ColValues}{$PropertyName}; + } + elsif (defined $self->{Itemrefs}{$PropertyName}) + { + return $self->{Itemrefs}{$PropertyName}; + } + elsif (defined $self->{Details}{$PropertyName}) + { + return $self->{Details}{$PropertyName}; + } + } if ($PropertyName eq "DESTROY") { return; } + + # Populate the Itemrefs and Details hashtable if necessary foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { if ($PropertyName eq $PropertyDescriptor->GetName())

1 0

Francois Gouget : testbot/web: Only show the patches day and time to limit line wrapping.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: 6d36294a90ec9ffab9057e70828945cef49dc91a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6d36294a90ec9ffab9057e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 26 19:33:30 2022 +0200 testbot/web: Only show the patches day and time to limit line wrapping. This adds ValueFormatter::GenerateDayTimeTipDate(). As usual the full date is shown as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 55 ++++++++++++++++++++++++++- testbot/web/PatchesList.pl | 3 +- testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 13 +++++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index d987cee..41d1e14 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -23,7 +23,7 @@ package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime - GenerateTimeTipDate GenerateValueHTML); + GenerateDayTimeTipDate GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -151,6 +151,51 @@ sub GenerateTipDateTime($$;$$) =pod =over 12 +=item C<GenerateDayTimeTipDate()> + +Show the timestamp's day and time with the date as a tooltip. + +The timestamp is shown in the user's timezone if JavaScript is available and +in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateDayTimeTipDate($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}daytimetipdate' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d'>%d %H:%M:%S", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. @@ -221,6 +266,9 @@ for timestamp properties. =item "timetipdate" Same as above but put the date part in a tooltip. +=item "daytimetipdate" +Show the day and time and put the full date as a tooltip. + =back =back @@ -250,6 +298,11 @@ sub GenerateValueHTML($$$;$) GenerateTimeTipDate($Value); return; } + if ($Format eq "daytimetipdate") + { + GenerateDayTimeTipDate($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 30cfc75..fc074ad 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,7 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + return $PropertyName eq "Received" ? ("ro", "daytimetipdate") : + $PropertyName =~ /^(?:Disposition|FromName|Subject)$/ ? "ro" : ""; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 350ab64..a8756df 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -410,6 +410,7 @@ pre a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } +a.daytimetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 23b7b27..d21bf5c 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -40,6 +40,16 @@ function ShowDateTime(dom, attr) } } +function ShowDayTimeTipDate(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) + +'-'+ Pad2(dt.getDate())); + dom.innerHTML = Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); +} + function ShowTimeTipDate(dom) { const sec1970 = dom.getAttribute("timestamp"); @@ -58,6 +68,9 @@ function init() document.querySelectorAll(".tipdatetime").forEach(dom => { ShowDateTime(dom, 'title'); }); + document.querySelectorAll(".daytimetipdate").forEach(dom => { + ShowDayTimeTipDate(dom); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); });

1 0

Francois Gouget : testbot/web: Tweak the Activity page VMs iteration.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: 153512200dcdf9901429bbe9d2e6f737a158939b URL: https://source.winehq.org/git/tools.git/?a=commit;h=153512200dcdf9901429bbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 26 19:32:53 2022 +0200 testbot/web: Tweak the Activity page VMs iteration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index ffdf0fe..adf5a45 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -158,7 +158,7 @@ sub GenerateBody($) print "<td class='Record'> </td>"; } - foreach my $Col (0..@SortedVMs-1) + foreach my $Col (0..$#SortedVMs) { my $VM = $SortedVMs[$Col]; my $VMStatus = $Group->{statusvms}->{$VM->Name};

1 0

Francois Gouget : testbot: Tweak the error groups iteration.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: a63fae570a64b4405921f4f7371ff7616fe35c7c URL: https://source.winehq.org/git/tools.git/?a=commit;h=a63fae570a64b4405921f4f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 26 19:32:44 2022 +0200 testbot: Tweak the error groups iteration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 2 +- testbot/web/JobDetails.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 954edae..37949e4 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -350,7 +350,7 @@ EOF next if (!$Group->{NewCount}); push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - foreach my $ErrIndex (0..@{$Group->{Errors}} - 1) + foreach my $ErrIndex (0..$#{$Group->{Errors}}) { if ($Group->{IsNew}->[$ErrIndex]) { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0b2edf7..17cfc35 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1052,7 +1052,7 @@ sub _WriteLogErrorsToFh($$) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; print $Fh "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) + foreach my $Index (0..$#{$Group->{Errors}}) { my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 33a9525..c042663 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -513,7 +513,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - for my $ErrIndex (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) {

1 0

Francois Gouget : testbot/web: Show the job start / end dates as tooltips on the job details page.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: 7f0f497a6570e014cb7d7c0275c7c916f7929b93 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7f0f497a6570e014cb7d7c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 26 19:32:29 2022 +0200 testbot/web: Show the job start / end dates as tooltips on the job details page. This also delegates the timestamp formatting to ValueFormatter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 591a47e..33a9525 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -26,7 +26,8 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; -use POSIX qw(strftime); + +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Utils; use WineTestBot::Missions; @@ -50,6 +51,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -67,9 +69,13 @@ sub GenerateHeaderView($$$) { print "Arguments / <span class='MissionHeader'>Missions</span>"; } + elsif ($PropertyName eq "Started") + { + print "<a class='title' title='Start Date'>Start</a>"; + } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Execution ended'>Time</a>"; + print "<a class='title' title='End Time'>Time</a>"; } else { @@ -129,13 +135,7 @@ sub GenerateDataView($$$) if (defined $StepTask->Ended) { my $Duration = $StepTask->Ended - $StepTask->Started; - my $TagId = "E". $StepTask->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); } else {

1 0

Alexandre Julliard : patches: Add "merge request" patch status.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: e18f0667f9a7507e9315c0a54d907ae851448cb0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e18f0667f9a7507e9315c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 26 22:07:38 2022 +0200 patches: Add "merge request" patch status. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 7 +++++++ patches/patches.css | 1 + patches/update | 12 ++++++++++++ 3 files changed, 20 insertions(+) diff --git a/patches/expire b/patches/expire index 53e3f27..4f506a0 100755 --- a/patches/expire +++ b/patches/expire @@ -33,6 +33,7 @@ my %status_expiry = "authorship" => 7, "formatting" => 7, "other" => 7, + "mergereq" => 3, "nopatch" => 3, "reply" => 1, "rejected" => 7, @@ -50,6 +51,7 @@ my %status_descr = "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", + "mergereq" => "Merge request", "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", @@ -133,6 +135,7 @@ the patch is correct.", # No notifications are sent for the following: # "nil" # "reply" +# "mergereq" # "superseded" # "testfail" ); @@ -199,6 +202,10 @@ sub get_patch_state($) $patch{mtime} = (stat STATUS)[9] unless $patch{status} eq "nil"; close STATUS; } + elsif (defined $patch{msgid} && $patch{msgid} =~ /<wine-wine-mr\d+-v\d+.*\@gitlab-mail-bridge>/) + { + $patch{status} = "mergereq"; + } $patch{file} = $file; $patch{status} ||= "nil"; $patch{mtime} ||= (stat "$dir/$file")[9]; diff --git a/patches/patches.css b/patches/patches.css index f2240d9..cc8e908 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -147,6 +147,7 @@ tr.odd { background-color: #f8e8e8; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } .reply, .reply :link, .reply :visited { color: #e08000; } +.mergereq, .mergereq :link, .mergereq :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } diff --git a/patches/update b/patches/update index e45bad9..5d20f2a 100755 --- a/patches/update +++ b/patches/update @@ -27,6 +27,7 @@ my %status_descr = "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", + "mergereq" => "Merge request", "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", @@ -56,6 +57,7 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], + [ "mergereq", "<ul><li>The patch was submitted through a Gitlab merge request. The actual status of the patch can be viewed on Gitlab.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" . @@ -84,6 +86,7 @@ my @legend = my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; +my $gitlab = "https://gitlab.winehq.org/wine/wine"; my %patches; my %messages; my %subdirs; @@ -216,6 +219,11 @@ foreach my $file (readdir DIR) if (defined $patch{"msgid"}) { $messages{$patch{"msgid"}} = \%patch; + if ($patch{msgid} =~ /<wine-wine-mr(\d+)-v\d+.*\@gitlab-mail-bridge>/) + { + $patch{mr} = "$gitlab/-/merge_requests/$1"; + $patch{status} = "mergereq" if $patch{status} eq "nil"; + } } $patches{$file} = \%patch; if ($file =~ /^([0-9]+)[0-9]{4}$/) { $subdirs{$1} = 1; } @@ -277,6 +285,10 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"status\"><a href=\"%s\">%s</a></td>", $patch->{commit}, $status_descr{$patch->{status}}; } + elsif (defined($patch->{mr})) + { + printf INDEX "<td class=\"status\"><a href=\"%s\">%s</a></td>", $patch->{mr}, $status_descr{$patch->{status}}; + } else { printf INDEX "<td class=\"status\"><a href=\"#legend\">%s</a></td>", $status_descr{$patch->{status}} || $patch->{status};

1 0

Jeremy White : Look for settings in the current directory.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: tools Branch: master Commit: 6a6da8e826fa6f07f4a55c9362efbe510d62f815 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a6da8e826fa6f07f4a55c9… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Apr 26 11:26:12 2022 -0500 Look for settings in the current directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 2 ++ gitlab/gitlab-to-mail/mailtogitlab.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 178368b..c10a0ed 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -5,6 +5,7 @@ from urllib.parse import urljoin, urlparse import db import re import sys +import os import datetime import dateutil.parser import requests @@ -15,6 +16,7 @@ import importlib from util import fetch_all +sys.path.append(os.getcwd()) settings = importlib.import_module(f"settings_{sys.argv[1]}") diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index 9586d1b..7e3c318 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -5,11 +5,13 @@ from urllib.parse import urljoin import re import sys +import os import importlib import email.utils import requests from util import fetch_all +sys.path.append(os.getcwd()) settings = importlib.import_module(f"settings_{sys.argv[1]}") MIN_PYTHON = (3, 8) # because of the walrus operator use

1 0

Piotr Caban : msvcrt: Use TICKSPERMSEC define in concurrency functions.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 7af93f497c3e71f69511743f42b86b2ef5e13b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af93f497c3e71f69511743f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 25 18:34:31 2022 +0200 msvcrt: Use TICKSPERMSEC define in concurrency functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f9a7f489ceb..c26478f36cd 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1944,8 +1944,8 @@ bool __thiscall critical_section_try_lock_for( last->next = q; GetSystemTimeAsFileTime(&ft); - to.QuadPart = ((LONGLONG)ft.dwHighDateTime<<32) + - ft.dwLowDateTime + (LONGLONG)timeout*10000; + to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); if(status == STATUS_TIMEOUT) { if(!InterlockedExchange(&q->free, TRUE)) @@ -2128,7 +2128,7 @@ unsigned int __cdecl _GetConcurrency(void) static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int timeout) { if(timeout == COOPERATIVE_TIMEOUT_INFINITE) return NULL; - pTime->QuadPart = (ULONGLONG)timeout * -10000; + pTime->QuadPart = (ULONGLONG)timeout * -TICKSPERMSEC; return pTime; } @@ -2396,7 +2396,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, GetSystemTimeAsFileTime(&ft); to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + - ft.dwLowDateTime + (LONGLONG)timeout * 10000; + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; while (q->next != CV_WAKE) { status = RtlWaitOnAddress(&q->next, &next, sizeof(next), &to); if(status == STATUS_TIMEOUT) {

1 0

Anton Baskanov : winegstreamer: Add a skeleton MPEG audio decoder filter.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: d7c4fa0d5724b7a89f5b80970e8f62efcc457f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c4fa0d5724b7a89f5b8097… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 25 14:32:13 2022 +0700 winegstreamer: Add a skeleton MPEG audio decoder filter. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 6 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/quartz_transform.c | 120 +++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 7 ++ 6 files changed, 135 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index d948c2648f2..44e1a9ad2e6 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -28,7 +28,7 @@ static IBaseFilter *create_mpeg_audio_codec(void) IBaseFilter *filter = NULL; HRESULT hr = CoCreateInstance(&CLSID_CMpegAudioCodec, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return filter; } @@ -156,12 +156,12 @@ static void test_aggregation(void) filter = (IBaseFilter *)0xdeadbeef; hr = CoCreateInstance(&CLSID_CMpegAudioCodec, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!filter, "Got interface %p.\n", filter); hr = CoCreateInstance(&CLSID_CMpegAudioCodec, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (FAILED(hr)) { skip("Failed to create MPEG audio decoder instance, skipping tests.\n"); diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 3524cffb399..00b7c72a5f3 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ media_source.c \ mfplat.c \ quartz_parser.c \ + quartz_transform.c \ wg_format.c \ wg_parser.c \ wg_transform.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index f5da807a2ab..2a4b16079c1 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -103,6 +103,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out); HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index d88a462d81e..a408704cf47 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -431,6 +431,7 @@ static const IClassFactoryVtbl class_factory_vtbl = static struct class_factory avi_splitter_cf = {{&class_factory_vtbl}, avi_splitter_create}; static struct class_factory decodebin_parser_cf = {{&class_factory_vtbl}, decodebin_parser_create}; +static struct class_factory mpeg_audio_codec_cf = {{&class_factory_vtbl}, mpeg_audio_codec_create}; static struct class_factory mpeg_splitter_cf = {{&class_factory_vtbl}, mpeg_splitter_create}; static struct class_factory wave_parser_cf = {{&class_factory_vtbl}, wave_parser_create}; static struct class_factory wma_decoder_cf = {{&class_factory_vtbl}, wma_decoder_create}; @@ -452,6 +453,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) factory = &avi_splitter_cf; else if (IsEqualGUID(clsid, &CLSID_decodebin_parser)) factory = &decodebin_parser_cf; + else if (IsEqualGUID(clsid, &CLSID_CMpegAudioCodec)) + factory = &mpeg_audio_codec_cf; else if (IsEqualGUID(clsid, &CLSID_MPEG1Splitter)) factory = &mpeg_splitter_cf; else if (IsEqualGUID(clsid, &CLSID_WAVEParser)) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c new file mode 100644 index 00000000000..9665c56d848 --- /dev/null +++ b/dlls/winegstreamer/quartz_transform.c @@ -0,0 +1,120 @@ +/* + * DirectShow transform filters + * + * Copyright 2022 Anton Baskanov + * + * 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 + */ + +#include "gst_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +struct transform +{ + struct strmbase_filter filter; + + struct strmbase_sink sink; + struct strmbase_source source; +}; + +static inline struct transform *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct transform, filter); +} + +static struct strmbase_pin *transform_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + if (index == 0) + return &filter->sink.pin; + if (index == 1) + return &filter->source.pin; + return NULL; +} + +static void transform_destroy(struct strmbase_filter *iface) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + + strmbase_source_cleanup(&filter->source); + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); + + free(filter); +} + +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = transform_get_pin, + .filter_destroy = transform_destroy, +}; + +static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID iid, void **out) +{ + struct transform *filter = impl_from_strmbase_filter(pin->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = transform_sink_query_interface, +}; + +static const struct strmbase_source_ops source_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, +}; + +static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, struct transform **out) +{ + struct transform *object; + + object = calloc(1, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + strmbase_filter_init(&object->filter, outer, clsid, &filter_ops); + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + + *out = object; + return S_OK; +} + +HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out) +{ + struct transform *object; + HRESULT hr; + + hr = transform_create(outer, &CLSID_CMpegAudioCodec, &object); + if (FAILED(hr)) + return hr; + + wcscpy(object->sink.pin.name, L"XForm In"); + wcscpy(object->source.pin.name, L"XForm Out"); + + TRACE("Created MPEG audio decoder %p.\n", object); + *out = &object->filter.IUnknown_inner; + return hr; +} diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index 347ee906a52..037f0573b34 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -28,6 +28,13 @@ ] coclass AviSplitter {} +[ + helpstring("MPEG Audio Decoder"), + threading(both), + uuid(4a2286e0-7bef-11ce-9bd9-0000e202599c) +] +coclass CMpegAudioCodec {} + [ helpstring("MPEG-I Stream Splitter"), threading(both),

1 0

Anton Baskanov : quartz/tests: Add tests for querying MPEG audio decoder pin info.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: cf849b73087f25acf6615ca128178740adc6cda8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf849b73087f25acf6615ca1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 25 14:32:12 2022 +0700 quartz/tests: Add tests for querying MPEG audio decoder pin info. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 77 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 11816e65cfc..d948c2648f2 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -450,6 +450,82 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter; + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + filter = create_mpeg_audio_codec(); + if (!filter) + { + skip("Failed to create MPEG audio decoder instance, skipping tests.\n"); + return; + } + + hr = IBaseFilter_FindPin(filter, L"In", &pin); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"XForm In"), "Got name %s.\n", debugstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %ld.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!wcscmp(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, L"Out", &pin); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"XForm Out"), "Got name %s.\n", debugstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!wcscmp(id, L"Out"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpegaudio) { CoInitialize(NULL); @@ -459,6 +535,7 @@ START_TEST(mpegaudio) test_unconnected_filter_state(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

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