January 2021 - Wine-Commits

Zebediah Figura : quartz/avidec: Use the strmbase stream lock.
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: wine Branch: master Commit: 92ee89c9d3bf5a34c8c90849baac9341eae82457 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ee89c9d3bf5a34c8c90849… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:35:37 2021 -0600 quartz/avidec: Use the strmbase stream lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 77d2b5e2aa5..b1e07fe5879 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct avi_decompressor { struct strmbase_filter filter; - CRITICAL_SECTION stream_cs; struct strmbase_source source; IQualityControl source_IQualityControl_iface; @@ -129,13 +128,10 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, if (This->sink.flushing) return S_FALSE; - EnterCriticalSection(&This->stream_cs); - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - LeaveCriticalSection(&This->stream_cs); return hr; } @@ -149,7 +145,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - LeaveCriticalSection(&This->stream_cs); return hr; } @@ -160,7 +155,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, if (FAILED(hr)) { ERR("Unable to get pointer to buffer (%x)\n", hr); IMediaSample_Release(pOutSample); - LeaveCriticalSection(&This->stream_cs); return hr; } cbDstStream = IMediaSample_GetSize(pOutSample); @@ -168,7 +162,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, { ERR("Sample size is too small (%u < %u).\n", cbDstStream, source_format->bmiHeader.biSizeImage); IMediaSample_Release(pOutSample); - LeaveCriticalSection(&This->stream_cs); return E_FAIL; } @@ -187,7 +180,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, /* Drop sample if it's intended to be dropped */ if (flags & ICDECOMPRESS_HURRYUP) { IMediaSample_Release(pOutSample); - LeaveCriticalSection(&This->stream_cs); return S_OK; } @@ -209,7 +201,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, ERR("Error sending sample (%x)\n", hr); IMediaSample_Release(pOutSample); - LeaveCriticalSection(&This->stream_cs); return hr; } @@ -491,12 +482,12 @@ static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface, TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); - EnterCriticalSection(&filter->stream_cs); + EnterCriticalSection(&filter->filter.stream_cs); if (q.Late > 0) filter->late = q.Late + q.TimeStamp; else filter->late = -1; - LeaveCriticalSection(&filter->stream_cs); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -545,8 +536,6 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_passthrough_cleanup(&filter->passthrough); - filter->stream_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->stream_cs); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -614,9 +603,6 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_AVIDec, &filter_ops); - InitializeCriticalSection(&object->stream_cs); - object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": avi_decompressor.stream_cs"); - strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops);

1 0

Zebediah Figura : quartz/acmwrapper: Use the strmbase stream lock.
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: wine Branch: master Commit: 53d8a28a433164707ce1d98e10ea018864a521cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=53d8a28a433164707ce1d98e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:35:36 2021 -0600 quartz/acmwrapper: Use the strmbase stream lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index ada8c474640..81e856a00df 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -38,7 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct acm_wrapper { struct strmbase_filter filter; - CRITICAL_SECTION stream_cs; struct strmbase_source source; IQualityControl source_IQualityControl_iface; @@ -108,13 +107,10 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed if (This->sink.flushing) return S_FALSE; - EnterCriticalSection(&This->stream_cs); - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - LeaveCriticalSection(&This->stream_cs); return hr; } @@ -150,7 +146,6 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - LeaveCriticalSection(&This->stream_cs); return hr; } IMediaSample_SetPreroll(pOutSample, preroll); @@ -267,7 +262,6 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; - LeaveCriticalSection(&This->stream_cs); return hr; } @@ -487,8 +481,6 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_passthrough_cleanup(&filter->passthrough); - filter->stream_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->stream_cs); FreeMediaType(&filter->mt); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -532,9 +524,6 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_ACMWrapper, &filter_ops); - InitializeCriticalSection(&object->stream_cs); - object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": acm_wrapper.stream_cs"); - strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops);

1 0

Zebediah Figura : strmbase: Acquire the streaming lock in MemInputPin_Receive().
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: wine Branch: master Commit: 32d339829e1b2b1f16479b458fa28424d7432f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d339829e1b2b1f16479b45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:35:34 2021 -0600 strmbase: Acquire the streaming lock in MemInputPin_Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 7 +------ dlls/strmbase/pin.c | 4 ++++ dlls/strmbase/renderer.c | 5 ----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 27347ab6039..3615193269f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -373,18 +373,13 @@ static HRESULT WINAPI dsound_render_sink_Receive(struct strmbase_sink *iface, IM if (FAILED(hr = DSoundRender_PrepareReceive(filter, sample))) return hr; - EnterCriticalSection(&filter->filter.stream_cs); - if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) strmbase_passthrough_update_time(&filter->passthrough, start); if (filter->filter.state == State_Paused) SetEvent(filter->state_event); - hr = DSoundRender_DoRenderSample(filter, sample); - - LeaveCriticalSection(&filter->filter.stream_cs); - return hr; + return DSoundRender_DoRenderSample(filter, sample); } static HRESULT dsound_render_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index dcfbdcd767e..54f8662e7ff 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1140,7 +1140,11 @@ static HRESULT WINAPI MemInputPin_Receive(IMemInputPin *iface, IMediaSample *sam debugstr_w(pin->pin.name), sample); if (pin->pFuncsTable->pfnReceive) + { + EnterCriticalSection(&pin->pin.filter->stream_cs); hr = pin->pFuncsTable->pfnReceive(pin, sample); + LeaveCriticalSection(&pin->pin.filter->stream_cs); + } return hr; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b63129e0e87..b890ab72bf6 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -192,8 +192,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp DeleteMediaType(mt); } - EnterCriticalSection(&filter->filter.stream_cs); - if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) { strmbase_passthrough_update_time(&filter->passthrough, start); @@ -229,7 +227,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (ret == 1) { - LeaveCriticalSection(&filter->filter.stream_cs); TRACE("Flush signaled; discarding current sample.\n"); return S_OK; } @@ -245,8 +242,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp QualityControlRender_DoQOS(&filter->qc); - LeaveCriticalSection(&filter->filter.stream_cs); - return hr; }

1 0

Zebediah Figura : strmbase: Acquire the streaming lock in sink_EndOfStream().
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: wine Branch: master Commit: 480ece6a15a7a4bccee8b21022911e5e984906b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=480ece6a15a7a4bccee8b210… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:35:35 2021 -0600 strmbase: Acquire the streaming lock in sink_EndOfStream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 3 --- dlls/strmbase/pin.c | 21 +++++++++++++-------- dlls/strmbase/renderer.c | 3 --- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3615193269f..6c6732e468a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -465,8 +465,6 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) void *buffer; DWORD size; - EnterCriticalSection(&filter->filter.stream_cs); - filter->eos = TRUE; if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, @@ -485,7 +483,6 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) memset(buffer, 0, size); IDirectSoundBuffer_Unlock(filter->dsbuffer, buffer, size, NULL, 0); - LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 54f8662e7ff..e815f7b82df 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -926,21 +926,26 @@ static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) static HRESULT WINAPI sink_EndOfStream(IPin *iface) { - struct strmbase_sink *This = impl_sink_from_IPin(iface); + struct strmbase_sink *pin = impl_sink_from_IPin(iface); HRESULT hr = S_OK; - TRACE("pin %p %s:%s.\n", This, debugstr_w(This->pin.filter->name), debugstr_w(This->pin.name)); + TRACE("pin %p %s:%s.\n", pin, debugstr_w(pin->pin.filter->name), debugstr_w(pin->pin.name)); - if (This->pFuncsTable->sink_eos) - return This->pFuncsTable->sink_eos(This); + if (pin->pFuncsTable->sink_eos) + { + EnterCriticalSection(&pin->pin.filter->stream_cs); + hr = pin->pFuncsTable->sink_eos(pin); + LeaveCriticalSection(&pin->pin.filter->stream_cs); + return hr; + } - EnterCriticalSection(&This->pin.filter->filter_cs); - if (This->flushing) + EnterCriticalSection(&pin->pin.filter->filter_cs); + if (pin->flushing) hr = S_FALSE; - LeaveCriticalSection(&This->pin.filter->filter_cs); + LeaveCriticalSection(&pin->pin.filter->filter_cs); if (hr == S_OK) - hr = SendFurther(This, deliver_endofstream, NULL); + hr = SendFurther(pin, deliver_endofstream, NULL); return hr; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b890ab72bf6..8da3d81de61 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -268,8 +268,6 @@ static HRESULT sink_eos(struct strmbase_sink *iface) IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; - EnterCriticalSection(&filter->filter.stream_cs); - filter->eos = TRUE; if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, @@ -282,7 +280,6 @@ static HRESULT sink_eos(struct strmbase_sink *iface) strmbase_passthrough_eos(&filter->passthrough); SetEvent(filter->state_event); - LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; }

1 0

Jeff Latimer : ws2_32: Do not print an ERR message when returning WSAEWOULDBLOCK from WSAIoctl().
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: wine Branch: master Commit: 89b82195cd43cebee2c174e89baa0489429289ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=89b82195cd43cebee2c174e8… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Jan 17 10:08:19 2021 +1100 ws2_32: Do not print an ERR message when returning WSAEWOULDBLOCK from WSAIoctl(). Signed-off-by: Jeff Latimer <lats(a)yless4u.com.au> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d865a5dd05f..381c61d5e10 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4957,7 +4957,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID overlapped, completion); if (status != WSAEOPNOTSUPP) { - if (status == 0 || status == WSA_IO_PENDING) + if (status == 0 || status == WSA_IO_PENDING || status == WSAEWOULDBLOCK) TRACE("-> %s request\n", debugstr_wsaioctl(code)); else ERR("-> %s request failed with status 0x%x\n", debugstr_wsaioctl(code), status);

1 0

Francois Gouget : testbot/TestWTBS: Allow verifying the presence of specific errors.
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: tools Branch: master Commit: 1b3cd386fb5b51525336b721c4027c9042394da8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b3cd386fb5b51525336b72… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 20 13:57:00 2021 +0100 testbot/TestWTBS: Allow verifying the presence of specific errors. This allows verifying that the TestBot detected the errors issued by the test suite; or reported the expected consistency issues. For instance: ----- TestWTBS ----- g 0 tests.report.Report validation errors n 0 kernel32:comm has unaccounted for failure messages ----- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6e1e7ed..af43060 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -297,6 +297,24 @@ sub LoadTestInfo($) fail("$FileName: $Entry is not a valid property name"); } } + foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) + { + my $GroupName = lcfirst($RawGroupName); + if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(log|report)\.//) + { + my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); + push @{$ErrInfo->{ErrGroupNames}}, $GroupName; + my $ErrGroup = $RawInfo->{ErrGroups}->{$RawGroupName}; + $ErrInfo->{ErrGroups}->{$GroupName} = $ErrGroup; + $ErrInfo->{ErrCount} += @{$ErrGroup->{Errors}}; + $ErrInfo->{NewCount} += $ErrGroup->{NewCount} || 0; + $HasTestInfo = 1; + } + else + { + fail("$FileName: $RawGroupName is not a valid group name"); + } + } return undef if (!$HasTestInfo); # Fill in some useful defaults @@ -345,6 +363,95 @@ sub IsMailingListJob($) return $Job->Remarks =~ /^\[\Q$PatchesMailingList\E\] /; } +=pod +=item <tasks.(log|report).groupname> + +Verifies the presence of new errors in the specified error log or report +of the tasks in the specified category. For this, list the group and errors +that are expected to appear; where the group name is prefixed by the task +category and either 'log' or 'report'. + +For instance: +g 0 tests.report.kernel32 +n 0 comm.c:2210: Test failed: WTBS Simulate an unreported test failure +g 0 tests.report.Report validation errors +n 0 kernel32:comm has unaccounted for failure messages + +This checks that the 'comm.c' failure appears in the 'kernel32' group +of the reports of all test tasks; that the TestBot issues a report consistency +failure as well; and that no other new error is present. If no preexisting +errors are expected, that is if test unit produces no failure when run outside +the test suite, then one could also issue the following check: + +p tests.TestFailures 2 + +=cut + +sub CheckLogErrors($$$) +{ + my ($LogInfo, $RefInfo, $LogKey) = @_; + + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + if ($RefGroup) + { + my $Diff = Algorithm::Diff->new($LogGroup->{Errors}, $RefGroup->{Errors}, + { keyGen => \&WineTestBot::LogUtils::_GetLineKey }); + my ($LogIndex, $RefIndex) = (0, 0); + while ($Diff->Next()) + { + my $SameCount = $Diff->Same(); + if ($SameCount) + { + $LogIndex += $SameCount; + $RefIndex += $SameCount; + } + else + { + # Check for extra new errors in the log + my $ExtraCount = $Diff->Items(1); + foreach (1..$ExtraCount) + { + next if (!$LogGroup->{IsNew}->[$LogIndex]); + fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$LogIndex]"); + $LogIndex++; + } + # And for missing expected errors + my $MissingCount = $Diff->Items(2); + foreach (1..$MissingCount) + { + fail("$LogKey is missing an error in $GroupName: $RefGroup->{Errors}->[$RefIndex]"); + $RefIndex++; + } + } + } + } + else + { + # Check that the log's extra errors are old errors + foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) + { + next if (!$LogGroup->{IsNew}->[$ErrIndex]); + fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$ErrIndex]"); + } + } + } + foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) + { + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + next if ($LogGroup); + + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + foreach my $Error (@{$RefGroup->{Errors}}) + { + fail("$LogKey is missing an error in $GroupName: $Error"); + } + } +} + =pod =item <job.Status> @@ -378,9 +485,16 @@ sub CheckTask($$$) my $LogPath = $Task->GetDir() ."/$LogName"; my $LogInfo = LoadLogErrors($LogPath); + my $LogType = "log"; if ($LogName =~ /\.report$/) { $ReportCount++; + $LogType = "report"; + } + if ($TaskInfo->{"$LogType.errors"}) + { + CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, + TaskKeyStr($Task) ."/$LogName"); } } if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures}))

1 0

Francois Gouget : testbot/TestWTBS: Allow restricting the range of jobs to check.
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: tools Branch: master Commit: a693b1d7751c5a40e7008137937c188b7e4e33f9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a693b1d7751c5a40e700813… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 20 13:56:57 2021 +0100 testbot/TestWTBS: Allow restricting the range of jobs to check. This allows ignoring a previous test run that produced buggy results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 786d369..6e1e7ed 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -87,10 +87,33 @@ p tests.TestFailures 1 =cut my $Usage; +sub check_opt_val($$) +{ + my ($option, $val) = @_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +my $OptJobs; while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--help") + if ($Arg eq "--jobs") + { + $OptJobs = check_opt_val($Arg, $OptJobs); + } + elsif ($Arg eq "--help") { $Usage = 0; } @@ -101,6 +124,30 @@ while (@ARGV) } } +my @JobRanges; +if (!defined $Usage) +{ + if (defined $OptJobs) + { + foreach my $Range (split /,+/, $OptJobs) + { + if ($Range =~ /^([0-9]+)$/) + { + push @JobRanges, [$1, $1]; + } + elsif ($Range =~ /^([0-9]*)\.\.([0-9]*)/) + { + push @JobRanges, [$1 || 0, $2 || 0]; + } + else + { + error("'$Range' is not a valid job range\n"); + $Usage = 2; + } + } + } +} + if (defined $Usage) { if ($Usage) @@ -108,11 +155,15 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--help]\n"; print "\n"; print "Tests the Patches subject parser.\n"; print "\n"; print "Where:\n"; + print " --jobs RANGES Only check the jobs in one of the specified comma-separated\n"; + print " job id ranges. Each range is either a single job id, or of the\n"; + print " form 'FIRST..LAST' where FIRST and LAST are either the empty\n"; + print " string or a job id.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -369,6 +420,19 @@ sub CheckJob($$) } } +sub IsJobInRange($) +{ + my ($Job) = @_; + + return 1 if (!@JobRanges); + foreach my $Range (@JobRanges) + { + return 1 if (($Range->[0] == 0 or $Range->[0] <= $Job->Id) and + ($Range->[1] == 0 or $Job->Id <= $Range->[1])); + } + return 0; +} + =pod =item <tasks.HasTask> @@ -388,6 +452,7 @@ p win.HasTask 0 sub CheckJobTree($) { my ($Job) = @_; + return if (!IsJobInRange($Job)); my ($TestInfo, $HasTask);

1 0

Francois Gouget : testbot/TestWTBS: Allow checking which test units were run.
by Alexandre Julliard Jan. 20, 2021

Jan. 20, 2021

Module: tools Branch: master Commit: 7a60a50ad9a7d3a269af90c8a50bf73572735716 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7a60a50ad9a7d3a269af90c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 20 13:57:03 2021 +0100 testbot/TestWTBS: Allow checking which test units were run. This is useful to verify the TestBot runs extra tests when patching a resource file or other non-test file. For instance: ----- TestWTBS ----- p win.TestUnits cabinet:extract cabinet:fdi ----- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 54 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index af43060..b4460b8 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -344,6 +344,25 @@ sub LoadTestInfo($) return $TestInfo; } +sub GetReportTestUnits($) +{ + my ($LogPath) = @_; + + my $TestUnits = {}; + if (open(my $LogFile, "<", $LogPath)) + { + foreach my $Line (<$LogFile>) + { + if ($Line =~ m%^([_.a-z0-9-]+:[_a-z0-9]*) start (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)%) + { + $TestUnits->{$1} = 1; + } + } + close($LogFile); + } + return $TestUnits; +} + # # Verify the Jobs and Tasks @@ -469,9 +488,9 @@ By default the TestFailures field is not checked. =cut -sub CheckTask($$$) +sub CheckTask($$$$) { - my ($Task, $TaskType, $TestInfo) = @_; + my ($Task, $TaskType, $TestInfo, $TestUnits) = @_; my $TaskInfo = $TestInfo->{$TaskType}; if (CheckValue($TaskInfo->{Status})) @@ -490,6 +509,11 @@ sub CheckTask($$$) { $ReportCount++; $LogType = "report"; + if ($TaskType eq "wine") + { + my $ReportTestUnits = GetReportTestUnits($LogPath); + map { $TestUnits->{wine}->{$_} = 1 } (keys %$ReportTestUnits); + } } if ($TaskInfo->{"$LogType.errors"}) { @@ -561,6 +585,14 @@ lines below to make sure the TestBot did not try to run the tests on Windows. p build.HasTask 0 p win.HasTask 0 +=item <tests.TestUnits> + +Checks that the TestBot ran at least the test units mentioned in this +space-separated list on the VMs matching the specified category. + +For instance: +p win.TestUnits cabinet:extract cabinet:fdi + =cut sub CheckJobTree($) @@ -569,6 +601,7 @@ sub CheckJobTree($) return if (!IsJobInRange($Job)); my ($TestInfo, $HasTask); + my $TestUnits = { wine => {} }; my $Steps = $Job->Steps; foreach my $Step (sort { $a->No <=> $b->No } @{$Job->Steps->GetItems()}) @@ -589,7 +622,14 @@ sub CheckJobTree($) foreach my $Task (sort { $a->No <=> $b->No } @{$Step->Tasks->GetItems()}) { $HasTask->{$TaskType} = 1; - CheckTask($Task, $TaskType, $TestInfo); + CheckTask($Task, $TaskType, $TestInfo, $TestUnits); + if ($TaskType =~ /^win(?:32|64)$/) + { + my $TestUnit = $Step->FileName; + $TestUnit =~ s/_test(?:64)?\.exe$//; + $TestUnit .= ":". $Task->CmdLineArg; + $TestUnits->{$TaskType}->{$TestUnit} = 1; + } } } CheckJob($Job, $TestInfo); @@ -608,6 +648,14 @@ sub CheckJobTree($) $HasTask->{$Type} ||= 0; is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job ". $Job->Id); } + if (CheckValue($TypeInfo->{TestUnits})) + { + foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) + { + ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) or + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); + } + } } } }

1 0

Jacek Caban : ntdll: Honour alertable argument in NtContinue.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 46a81fa966d5049952faf8b7d5bea390f5b97769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a81fa966d5049952faf8b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 20:04:33 2021 +0100 ntdll: Honour alertable argument in NtContinue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a9608abfb73..db09d7759da 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -721,8 +721,11 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) user_apc_t apc; NTSTATUS status; - status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); - if (status == STATUS_USER_APC) invoke_apc( context, &apc ); + if (alertable) + { + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + if (status == STATUS_USER_APC) invoke_apc( context, &apc ); + } return NtSetContextThread( GetCurrentThread(), context ); }

1 0

Henri Verbeet : wined3d: Introduce wined3d_context_vk_reference_resource().
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: e2e776462d08d9b83bd98dcd5001c75d56d5f2b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e776462d08d9b83bd98dcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:56 2021 +0100 wined3d: Introduce wined3d_context_vk_reference_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd848f61e32..50b512365f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6043,6 +6043,15 @@ static inline void wined3d_context_vk_reference_texture(const struct wined3d_con texture_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_resource(const struct wined3d_context_vk *context_vk, + struct wined3d_resource *resource) +{ + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); +} + static inline void wined3d_context_vk_reference_query(const struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) { @@ -6058,36 +6067,21 @@ static inline void wined3d_context_vk_reference_sampler(const struct wined3d_con static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view_vk *rtv_vk) { - struct wined3d_resource *resource = rtv_vk->v.resource; - - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + wined3d_context_vk_reference_resource(context_vk, rtv_vk->v.resource); rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; } static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, struct wined3d_shader_resource_view_vk *srv_vk) { - struct wined3d_resource *resource = srv_vk->v.resource; - - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + wined3d_context_vk_reference_resource(context_vk, srv_vk->v.resource); srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; } static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, struct wined3d_unordered_access_view_vk *uav_vk) { - struct wined3d_resource *resource = uav_vk->v.resource; - - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + wined3d_context_vk_reference_resource(context_vk, uav_vk->v.resource); uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; }

1 0