wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Francois Gouget : winetest/cron: Parameterize when to delete/archive old data.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 858019cb9d9a507d82f6ac56b11542cfa894a55e URL: https://source.winehq.org/git/tools.git/?a=commit;h=858019cb9d9a507d82f6ac5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 15:29:26 2021 +0200 winetest/cron: Parameterize when to delete/archive old data. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 6119013..df27116 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -17,6 +17,12 @@ # Cron job for generating winetest reports. Use it like # */5 * * * * winetest.cron WORKDIR +# Leave empty to disable the corresponding task +build_compress=120 # days before compressing old-data builds +winetest_expire=120 # days before deleting winetest binaries +queue_expire=30 # days before deleting queued reports + + name0=`basename "$0"` tools=`dirname "$0"` case "$tools" in @@ -36,9 +42,6 @@ cleanup() rm -f "$lock" } -# expiration age (in days) before results get archived -expire=120 - if [ ! -f "$lock" ] then touch "$lock" @@ -69,27 +72,34 @@ then [ -n "$refresh_index" ] && "$tools/build-index" [ -n "$refresh_errors" ] && "$tools/build-errors" - # archive old results - ( + # compress old build reports + if [ -n "$build_compress" ] + then ( set -e cd old-data - dir=`find . -maxdepth 1 -mtime "+$expire" -type d -print -quit` + dir=`find . -maxdepth 1 -mtime "+$build_compress" -type d -print -quit` test -n "$dir" tar cfj "$dir.tar.bz2" "$dir" touch -r "$dir" "$dir.tar.bz2" rm -rf "$dir" - ) + fi ) - # remove old test builds - ( + # remove old winetest binaries + if [ -n "$winetest_expire" ] + then ( set -e mkdir -p builds cd builds - find . -mtime "+$expire" -name "winetest*.exe" -print0 | \ + find . -mtime "+$winetest_expire" -name "winetest*.exe" -print0 | \ xargs -0 rm -f - ) + fi ) - # remove old queue files - find queue -maxdepth 1 -mtime +30 -name "err*" -print0 | xargs -0 rm -rf - find queue -maxdepth 1 -mtime +30 -name "CGI*" -print0 | xargs -0 rm -f + # remove old queued files + if [ -n "$queue_expire" ] + then + find queue -maxdepth 1 -mtime +$queue_expire -name "err*" -print0 | \ + xargs -0 rm -rf + find queue -maxdepth 1 -mtime +$queue_expire -name "CGI*" -print0 | \ + xargs -0 rm -f + fi fi

1 0

Francois Gouget : testbot/WineRun*: Account for any task.log error.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 57f184fb49c3ff9bfb3573d13449c6b84514b5c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=57f184fb49c3ff9bfb3573d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:38:26 2021 +0200 testbot/WineRun*: Account for any task.log error. This ensures TestLauncher errors are accounted for in the task result. Builds are not expected to generate errors in task.log but if they do, they too should be accounted for. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 9 ++++++--- testbot/bin/WineRunReconfig.pl | 10 +++++++--- testbot/bin/WineRunTask.pl | 1 + testbot/bin/WineRunWineTest.pl | 11 ++++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 13f488b..8585882 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -385,7 +385,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); +my ($NewStatus, $ErrMessage, $TaskFailures, $TaskTimedOut, $TAError); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -407,12 +407,15 @@ Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # So forget any prior error... $NewStatus = "completed"; $TAError = $ErrMessage = undef; + # ...but keep keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif ($LogInfo->{Task} eq "badpatch") { @@ -489,4 +492,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus, undef, undef, $TaskTimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ec82849..9bd9429 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -385,7 +385,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); +my ($NewStatus, $ErrMessage, $TaskFailures, $TaskTimedOut, $TAError); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -394,6 +394,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = "The build timed out\n"; $NewStatus = "badbuild"; + $TaskFailures = 1; $TaskTimedOut = 1; } else @@ -408,12 +409,15 @@ Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # So forget any prior error... $NewStatus = "completed"; $TAError = $ErrMessage = undef; + # ...but keep keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif (defined $LogInfo->{BadLog}) { @@ -566,4 +570,4 @@ if ($NewStatus eq 'completed') # In case of a regular build failure retrying is pointless. But in case of a # timeout the VM host may be less busy next time and since the snapshot is # unchanged we can retry. -WrapUpAndExit($NewStatus, undef, $TaskTimedOut, $TaskTimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, $TaskTimedOut, $TaskTimedOut); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index b1578ad..db274b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -534,6 +534,7 @@ Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; my $ErrMessage = CreateLogErrorsCache($LogInfo); LogTaskError("$ErrMessage\n") if (defined $ErrMessage); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3a267ac..c9a57bb 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -508,19 +508,24 @@ Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully # (with or without test failures). So clear any previous errors, including # $TaskFailures since there was not really a timeout after all. $NewStatus = "completed"; - $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; + $TAError = $ErrMessage = $PossibleCrash = undef; + # Reset the timeout error but keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif ($LogInfo->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; - $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; + $TAError = $ErrMessage = $PossibleCrash = undef; + # Reset the timeout error but keep the keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif (defined $LogInfo->{BadLog}) { @@ -532,7 +537,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $NewStatus = "badbuild"; $TaskFailures = $PossibleCrash = undef; } - elsif (!$TaskTimedOut and !defined $TAError) + elsif (!$TaskTimedOut and !defined $TAError and !$LogInfo->{ErrCount}) { # Did WineTest.pl crash? $NewStatus = "boterror";

1 0

Francois Gouget : testbot/WineRun*: Standardize the WrapUpAndExit() functions.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 84cb43cede00f1bc3d00964a4a457f69cb176bb3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84cb43cede00f1bc3d00964… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:38:24 2021 +0200 testbot/WineRun*: Standardize the WrapUpAndExit() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 7 +++---- testbot/bin/WineRunReconfig.pl | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8a92f88..13f488b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -181,16 +181,15 @@ sub LogTaskError($) print STDERR "$Name0:error: ", $ErrMessage; } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $Retry, $TimedOut, $Reason) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = defined $Reason ? $Reason : $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; - my $TestFailures; my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -490,4 +489,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus, undef, $TaskTimedOut); +WrapUpAndExit($NewStatus, undef, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 49e7305..ec82849 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -182,9 +182,9 @@ sub LogTaskError($) print STDERR "$Name0:error: ", $ErrMessage; } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $Retry, $TimedOut, $Reason) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; my $VMResult = defined $Reason ? $Reason : @@ -192,7 +192,6 @@ sub WrapUpAndExit($;$$$) $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; - my $TestFailures; my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -567,4 +566,4 @@ if ($NewStatus eq 'completed') # In case of a regular build failure retrying is pointless. But in case of a # timeout the VM host may be less busy next time and since the snapshot is # unchanged we can retry. -WrapUpAndExit($NewStatus, $TaskTimedOut, $TaskTimedOut); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut, $TaskTimedOut);

1 0

Francois Gouget : winetest/dissect: Update the dll version error highlighting.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 90a052f049eb1d5ec1f0fa3a9ac6d5c614ef409e URL: https://source.winehq.org/git/tools.git/?a=commit;h=90a052f049eb1d5ec1f0fa3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:32:37 2021 +0200 winetest/dissect: Update the dll version error highlighting. Match all the 'dll is missing' errors. There should be no native dlls when running the tests in Wine so treat 'dlls is native' messages as errors. Also we don't get the load error 1157 anymore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48061 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2c89aba..c681c7d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -838,24 +838,28 @@ mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfile $box->{data} .= "<table class=\"output\">\n"; foreach my $dll (sort keys %dllinfo) { - if ($dllinfo{$dll}->{version} eq "dll is missing") + if ($dllinfo{$dll}->{version} =~ /^dll is missing/) { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); + my $reason = $dllinfo{$dll}->{version}; + $reason =~ s/dll is //; + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); } elsif ($dllinfo{$dll}->{version} eq "skipped") { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} eq "load error 1157") + elsif ($dllinfo{$dll}->{version} eq "dll is a stub") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} eq "dll is a stub") + elsif ($dllinfo{$dll}->{version} eq "dll is native") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">dll is a stub</td></tr>\n", escapeHTML($dll); + # There should be no native dll in the Wine tests + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { + # Flag unknown errors $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); }

1 0

Francois Gouget : testbot/LogUtils: Add a timeout error if the task timed out.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 6be4865e9d78290bad907a65b03cc4c0924f513a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6be4865e9d78290bad907a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:32:21 2021 +0200 testbot/LogUtils: Add a timeout error if the task timed out. This ensures that the report is flagged as failed even if the timeout happened at the task level. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5d2dc33..0b2edf7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -455,6 +455,10 @@ sub _CloseTestUnit($$$) { _AddExtra($LogInfo, "The report seems to have been truncated"); } + elsif ($Last and $LogInfo->{TaskTimedOut}) + { + _AddExtra($LogInfo, "$Cur->{Unit}: Timeout"); + } } }

1 0

Francois Gouget : winetest/gather: Remove an unused variable.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 625a72e173c98fa5457e01da14b491e931dfc0eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=625a72e173c98fa5457e01d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:23:28 2021 +0200 winetest/gather: Remove an unused variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 7c4984c..302def4 100755 --- a/winetest/gather +++ b/winetest/gather @@ -180,7 +180,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Command line processing # -my ($update, $builddir, $usage); +my ($builddir, $usage); sub check_opt_val($$) { @@ -210,7 +210,6 @@ while (@ARGV) elsif ($arg eq "--update") { $builddir = check_opt_val($arg, $builddir); - $update = 1; } elsif ($arg eq "--help") {

1 0

Francois Gouget : winetest/gather: Avoid a variable name collision for the header rows.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: tools Branch: master Commit: 70987e5b99ea27e4871e921084d03a3600412909 URL: https://source.winehq.org/git/tools.git/?a=commit;h=70987e5b99ea27e4871e921… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:23:22 2021 +0200 winetest/gather: Avoid a variable name collision for the header rows. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/gather b/winetest/gather index a0b259b..7c4984c 100755 --- a/winetest/gather +++ b/winetest/gather @@ -505,7 +505,7 @@ sub build_header_footer($) my ($reports)=@_; my $unit_count=scalar(keys %alltests); - my ($title, $stats); + my ($title_row, $stats_row); foreach my $rep (@{$reports}) { my $report=$rep; my $msg; @@ -529,7 +529,7 @@ sub build_header_footer($) EOF chop $msg; } - $title .= <<"EOF"; + $title_row .= <<"EOF"; <th class="sticky"> $msg </th> @@ -550,31 +550,31 @@ EOF my $title = "$unit_count unit tests, $report->{errors} have errors"; $title .= ", $report->{todos} have todos" if $report->{todos}; - $stats .= " <th class=\"result $class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; + $stats_row .= " <th class=\"result $class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; } - chop $title; - chop $stats; + chop $title_row; + chop $stats_row; return <<"EOF"; <thead> <tr> <th class="test sticky" colspan="2">platforms</th> -$title +$title_row </tr> <tr> <th class="test" colspan="2">errors</th> -$stats +$stats_row <th class="test"></th> </tr> </thead> <tfoot> <tr> <th class="test" colspan="2">errors</th> -$stats +$stats_row <th class="test"></th> </tr> <tr> <th class="test" colspan="2">platforms</th> -$title +$title_row </tr> </tfoot> EOF

1 0

Anton Baskanov : amstream/tests: Add tests for MediaStreamFilter::EndOfStream.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: ac65e1540960e64ce29e40ec19e4eade8369d520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac65e1540960e64ce29e40ec… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 7 01:04:33 2021 +0700 amstream/tests: Add tests for MediaStreamFilter::EndOfStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 285 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 280 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac65e1540960e64ce29e…

1 0

Anton Baskanov : amstream/tests: Refactor test graph to support multiple interfaces.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: ad61b392834d4eba44a7e340b61d54a4d7076e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad61b392834d4eba44a7e340… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 7 01:04:32 2021 +0700 amstream/tests: Refactor test graph to support multiple interfaces. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 96 ++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2c5252d8eed..93600f5941d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2031,15 +2031,25 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static IUnknown *graph_inner_unk; -static IFilterGraph2 *graph_inner; -static LONG graph_refcount = 1; -static unsigned int got_add_filter; -static IBaseFilter *graph_filter; -static WCHAR graph_filter_name[128]; +struct graph +{ + IFilterGraph2 IFilterGraph2_iface; + IUnknown *inner_unk; + IFilterGraph2 *inner; + LONG refcount; + unsigned int got_add_filter; + IBaseFilter *filter; + WCHAR filter_name[128]; +}; + +static struct graph *impl_from_IFilterGraph2(IFilterGraph2 *iface) +{ + return CONTAINING_RECORD(iface, struct graph, IFilterGraph2_iface); +} static HRESULT WINAPI graph_QueryInterface(IFilterGraph2 *iface, REFIID iid, void **out) { + struct graph *graph = impl_from_IFilterGraph2(iface); if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); if (IsEqualGUID(iid, &IID_IFilterGraph2) || IsEqualGUID(iid, &IID_IGraphBuilder) @@ -2054,31 +2064,34 @@ static HRESULT WINAPI graph_QueryInterface(IFilterGraph2 *iface, REFIID iid, voi || IsEqualGUID(iid, &IID_IMediaControl) || IsEqualGUID(iid, &IID_IMediaEventEx)) { - return IUnknown_QueryInterface(graph_inner_unk, iid, out); + return IUnknown_QueryInterface(graph->inner_unk, iid, out); } return E_NOINTERFACE; } static ULONG WINAPI graph_AddRef(IFilterGraph2 *iface) { - return InterlockedIncrement(&graph_refcount); + struct graph *graph = impl_from_IFilterGraph2(iface); + return InterlockedIncrement(&graph->refcount); } static ULONG WINAPI graph_Release(IFilterGraph2 *iface) { - return InterlockedDecrement(&graph_refcount); + struct graph *graph = impl_from_IFilterGraph2(iface); + return InterlockedDecrement(&graph->refcount); } static HRESULT WINAPI graph_AddFilter(IFilterGraph2 *iface, IBaseFilter *filter, const WCHAR *name) { + struct graph *graph = impl_from_IFilterGraph2(iface); if (winetest_debug > 1) trace("AddFilter(%p, %s)\n", filter, wine_dbgstr_w(name)); - ++got_add_filter; - graph_filter = filter; + ++graph->got_add_filter; + graph->filter = filter; if (name) - wcscpy(graph_filter_name, name); + wcscpy(graph->filter_name, name); else - graph_filter_name[0] = 0; - return IFilterGraph2_AddFilter(graph_inner, filter, name); + graph->filter_name[0] = 0; + return IFilterGraph2_AddFilter(graph->inner, filter, name); } static HRESULT WINAPI graph_RemoveFilter(IFilterGraph2 *iface, IBaseFilter *filter) @@ -2089,8 +2102,9 @@ static HRESULT WINAPI graph_RemoveFilter(IFilterGraph2 *iface, IBaseFilter *filt static HRESULT WINAPI graph_EnumFilters(IFilterGraph2 *iface, IEnumFilters **enumfilters) { + struct graph *graph = impl_from_IFilterGraph2(iface); if (winetest_debug > 1) trace("EnumFilters()\n"); - return IFilterGraph2_EnumFilters(graph_inner, enumfilters); + return IFilterGraph2_EnumFilters(graph->inner, enumfilters); } static HRESULT WINAPI graph_FindFilterByName(IFilterGraph2 *iface, const WCHAR *name, IBaseFilter **filter) @@ -2210,13 +2224,36 @@ static const IFilterGraph2Vtbl graph_vtbl = graph_RenderEx, }; +static void graph_init(struct graph *graph) +{ + HRESULT hr; + + memset(graph, 0, sizeof(*graph)); + graph->IFilterGraph2_iface.lpVtbl = &graph_vtbl; + graph->refcount = 1; + hr = CoCreateInstance(&CLSID_FilterGraph, (IUnknown *)&graph->IFilterGraph2_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&graph->inner_unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IUnknown_QueryInterface(graph->inner_unk, &IID_IFilterGraph2, (void **)&graph->inner); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + +static void graph_destroy(struct graph *graph) +{ + ULONG ref; + + IFilterGraph2_Release(graph->inner); + ref = IUnknown_Release(graph->inner_unk); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_initialize(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); - IFilterGraph2 graph = {&graph_vtbl}; IMediaStreamFilter *filter; IGraphBuilder *ret_graph; IMediaStream *stream; + struct graph graph; STREAM_TYPE type; HRESULT hr; ULONG ref; @@ -2351,9 +2388,7 @@ static void test_initialize(void) mmstream = create_ammultimediastream(); - CoCreateInstance(&CLSID_FilterGraph, (IUnknown *)&graph, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&graph_inner_unk); - IUnknown_QueryInterface(graph_inner_unk, &IID_IFilterGraph2, (void **)&graph_inner); + graph_init(&graph); ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); @@ -2364,27 +2399,27 @@ static void test_initialize(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!filter, "Expected a non-NULL filter."); - got_add_filter = 0; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph); + graph.got_add_filter = 0; + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph.IFilterGraph2_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(got_add_filter == 1, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); - ok(graph_filter == (IBaseFilter *)filter, "Got filter %p.\n", filter); - ok(!wcscmp(graph_filter_name, L"MediaStreamFilter"), "Got unexpected name %s.\n", wine_dbgstr_w(graph_filter_name)); + ok(graph.got_add_filter == 1, "Got %d calls to IGraphBuilder::AddFilter().\n", graph.got_add_filter); + ok(graph.filter == (IBaseFilter *)filter, "Got filter %p.\n", filter); + ok(!wcscmp(graph.filter_name, L"MediaStreamFilter"), "Got unexpected name %s.\n", wine_dbgstr_w(graph.filter_name)); hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_graph == (IGraphBuilder *)&graph, "Got unexpected graph %p.\n", ret_graph); IGraphBuilder_Release(ret_graph); - got_add_filter = 0; + graph.got_add_filter = 0; hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); + ok(!graph.got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", graph.got_add_filter); - got_add_filter = 0; + graph.got_add_filter = 0; hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); + ok(!graph.got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", graph.got_add_filter); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); @@ -2398,9 +2433,8 @@ static void test_initialize(void) IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); - IFilterGraph2_Release(graph_inner); - ok(graph_refcount == 1, "Got outstanding refcount %d.\n", graph_refcount); - IUnknown_Release(graph_inner_unk); + + graph_destroy(&graph); } static IAMMultiMediaStream *mmstream_mmstream;

1 0

Giovanni Mascellani : advapi32/tests: Use wide character string literals in registry.c.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 9bf5cb3fa52ed87170faca1b69ea45c2c310a68f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf5cb3fa52ed87170faca1b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 7 16:18:24 2021 +0200 advapi32/tests: Use wide character string literals in registry.c. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 120 ++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9bf5cb3fa52ed87170fa…

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
87
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 April 2021