December 2019 - Wine-Commits

Zebediah Figura : qcap: Rework v4l2 state change logic.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 84e55192fa2d6610acac2edfef3421cba0705331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e55192fa2d6610acac2edf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:30 2019 -0600 qcap: Rework v4l2 state change logic. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capture.h | 7 +- dlls/qcap/v4l.c | 170 ++++++++++++++++--------------------------------- dlls/qcap/vfwcapture.c | 60 +++++++++-------- 3 files changed, 91 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84e55192fa2d6610acac…

1 0

Zebediah Figura : qcap/avico: Use strmbase filter state change methods.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: f815626640a0dd99d4c5f03b2ad68be5b8d7080d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f815626640a0dd99d4c5f03b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:28 2019 -0600 qcap/avico: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 81 ++++++++++++++++++------------------------------- dlls/qcap/tests/avico.c | 8 ++--- 2 files changed, 33 insertions(+), 56 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index f0f60ae439..f65f33fe44 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -56,12 +56,6 @@ static inline AVICompressor *impl_from_strmbase_filter(struct strmbase_filter *f return CONTAINING_RECORD(filter, AVICompressor, filter); } -static inline AVICompressor *impl_from_IBaseFilter(IBaseFilter *iface) -{ - struct strmbase_filter *filter = CONTAINING_RECORD(iface, struct strmbase_filter, IBaseFilter_iface); - return impl_from_strmbase_filter(filter); -} - static inline AVICompressor *impl_from_strmbase_pin(struct strmbase_pin *pin) { return impl_from_strmbase_filter(pin->filter); @@ -117,57 +111,14 @@ static HRESULT fill_format_info(AVICompressor *This, VIDEOINFOHEADER *src_videoi return S_OK; } -static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)\n", This); - - if(This->filter.state == State_Stopped) - return S_OK; - - ICCompressEnd(This->hic); - This->filter.state = State_Stopped; - return S_OK; -} - -static HRESULT WINAPI AVICompressor_Pause(IBaseFilter *iface) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - HRESULT hres; - - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); - - if(This->filter.state == State_Running) - return S_OK; - - if (This->source.pAllocator && FAILED(hres = IMemAllocator_Commit(This->source.pAllocator))) - { - FIXME("Commit failed: %08x\n", hres); - return hres; - } - - This->frame_cnt = 0; - - This->filter.state = State_Running; - return S_OK; -} - static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - AVICompressor_Stop, - AVICompressor_Pause, - AVICompressor_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, @@ -215,11 +166,37 @@ static HRESULT avi_compressor_query_interface(struct strmbase_filter *iface, REF return S_OK; } +static HRESULT avi_compressor_init_stream(struct strmbase_filter *iface) +{ + AVICompressor *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + if (filter->source.pAllocator && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + { + ERR("Failed to commit allocator, hr %#x.\n", hr); + return hr; + } + + filter->frame_cnt = 0; + + return S_OK; +} + +static HRESULT avi_compressor_cleanup_stream(struct strmbase_filter *iface) +{ + AVICompressor *filter = impl_from_strmbase_filter(iface); + + ICCompressEnd(filter->hic); + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = avi_compressor_get_pin, .filter_destroy = avi_compressor_destroy, .filter_query_interface = avi_compressor_query_interface, + .filter_init_stream = avi_compressor_init_stream, + .filter_cleanup_stream = avi_compressor_cleanup_stream, }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 5c6d4aa54f..b4f52f1021 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -665,11 +665,11 @@ static void test_unconnected_filter_state(IBaseFilter *filter) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -679,11 +679,11 @@ static void test_unconnected_filter_state(IBaseFilter *filter) ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontResource.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 393d50f9814d3d83e4489266b9dd0ba75ba46c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=393d50f9814d3d83e4489266… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:55:57 2019 +0300 dwrite: Add partial implementation for IDWriteFontResource. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 217 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 22 +++-- 4 files changed, 233 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=393d50f9814d3d83e448…

1 0

Nikolay Sivov : dwrite: Implement GetFontResource() for fontface.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 6f7a9158f487c5f610a6e6f664805981ab07796c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7a9158f487c5f610a6e6f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:56:00 2019 +0300 dwrite: Implement GetFontResource() for fontface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 6 ++++-- dlls/dwrite/tests/font.c | 13 ++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8c58d7561a..8045bce870 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1435,9 +1435,11 @@ static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface) static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, IDWriteFontResource **resource) { - FIXME("%p, %p: stub\n", iface, resource); + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, resource); + + return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } static const IDWriteFontFace5Vtbl dwritefontfacevtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d06b2f555a..83d6be4449 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9294,28 +9294,19 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2); -todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); - -if (SUCCEEDED(hr)) -{ ok(resource != resource2, "Unexpected resource instance.\n"); IDWriteFontResource_Release(resource); -} + hr = IDWriteFontFace5_GetFontResource(fontface5, &resource); -todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); - -if (SUCCEEDED(hr)) -{ ok(resource != resource2, "Unexpected resource instance.\n"); EXPECT_REF(resource, 1); IDWriteFontResource_Release(resource); IDWriteFontResource_Release(resource2); -} + IDWriteFontFace5_Release(fontface5); - IDWriteFontResource_Release(resource); IDWriteFontFile_Release(fontfile); IDWriteFontFace_Release(fontface);

1 0

Nikolay Sivov : dwrite: Respond to IDWriteFontFace5 queries.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 0f22205768ab1e03ef9e5c0294c2dcd37f46f771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f22205768ab1e03ef9e5c02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 11:55:58 2019 +0300 dwrite: Respond to IDWriteFontFace5 queries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 ++++--- dlls/dwrite/tests/font.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8788181303..bfe32d5fd9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -474,7 +474,8 @@ static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace5 *iface, REF TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IDWriteFontFace4) || + if (IsEqualIID(riid, &IID_IDWriteFontFace5) || + IsEqualIID(riid, &IID_IDWriteFontFace4) || IsEqualIID(riid, &IID_IDWriteFontFace3) || IsEqualIID(riid, &IID_IDWriteFontFace2) || IsEqualIID(riid, &IID_IDWriteFontFace1) || @@ -1425,7 +1426,7 @@ static HRESULT WINAPI dwritefontface5_GetFontAxisValues(IDWriteFontFace5 *iface, return E_NOTIMPL; } -static BOOL WINAPI dwritefontface5_HasVariantions(IDWriteFontFace5 *iface) +static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface) { FIXME("%p: stub\n", iface); @@ -1496,7 +1497,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface4_ReleaseGlyphImageData, dwritefontface5_GetFontAxisValueCount, dwritefontface5_GetFontAxisValues, - dwritefontface5_HasVariantions, + dwritefontface5_HasVariations, dwritefontface5_GetFontResource, }; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f0266cb751..d06b2f555a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9291,25 +9291,28 @@ if (SUCCEEDED(hr)) IDWriteFontFaceReference1_Release(reference); } hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5); -todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - if (FAILED(hr)) - return; - hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2); +todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ ok(resource != resource2, "Unexpected resource instance.\n"); IDWriteFontResource_Release(resource); - +} hr = IDWriteFontFace5_GetFontResource(fontface5, &resource); +todo_wine ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ ok(resource != resource2, "Unexpected resource instance.\n"); EXPECT_REF(resource, 1); - IDWriteFontResource_Release(resource); IDWriteFontResource_Release(resource2); - +} IDWriteFontFace5_Release(fontface5); IDWriteFontResource_Release(resource);

1 0

Zebediah Figura : strmbase: Get rid of the "vtbl" parameter to strmbase_filter_init().
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 18f561a78334da35adc0f11ae00134e2cafc5cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f561a78334da35adc0f11a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:31 2019 -0600 strmbase: Get rid of the "vtbl" parameter to strmbase_filter_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 20 +-------------- dlls/qcap/avico.c | 20 +-------------- dlls/qcap/avimux.c | 20 +-------------- dlls/qcap/smartteefilter.c | 20 +-------------- dlls/qcap/vfwcapture.c | 21 +--------------- dlls/qedit/samplegrabber.c | 21 +--------------- dlls/quartz/dsoundrender.c | 12 ++++----- dlls/quartz/filesource.c | 22 +--------------- dlls/quartz/tests/videorenderer.c | 21 +--------------- dlls/quartz/tests/vmr7.c | 21 +--------------- dlls/quartz/tests/vmr9.c | 21 +--------------- dlls/strmbase/filter.c | 53 ++++++++++++++++++++++++++------------- dlls/strmbase/renderer.c | 21 +--------------- dlls/strmbase/transform.c | 22 +--------------- dlls/winegstreamer/gstdemux.c | 27 +++----------------- dlls/wineqtdecoder/qtsplitter.c | 20 +-------------- include/wine/strmbase.h | 18 +------------ 17 files changed, 60 insertions(+), 320 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18f561a78334da35adc0…

1 0

Zebediah Figura : qcap/avimux: Use strmbase filter state change methods.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: wine Branch: master Commit: 74df86d8ed82de59f2a41dabdd6d5c699680cfcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=74df86d8ed82de59f2a41dab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 4 23:03:29 2019 -0600 qcap/avimux: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 58 +++++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 42 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 1995358ac2..a7a9ac7ced 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -167,19 +167,6 @@ static HRESULT avi_mux_query_interface(struct strmbase_filter *iface, REFIID iid return S_OK; } -static const struct strmbase_filter_ops filter_ops = -{ - .filter_get_pin = avi_mux_get_pin, - .filter_destroy = avi_mux_destroy, - .filter_query_interface = avi_mux_query_interface, -}; - -static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) -{ - struct strmbase_filter *filter = CONTAINING_RECORD(iface, struct strmbase_filter, IBaseFilter_iface); - return impl_from_strmbase_filter(filter); -} - static HRESULT out_flush(AviMux *This) { ULONG written; @@ -420,17 +407,12 @@ static HRESULT queue_sample(AviMux *avimux, AviMuxIn *avimuxin, IMediaSample *sa return flush_queue(avimux, avimuxin, FALSE); } -static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) +static HRESULT avi_mux_cleanup_stream(struct strmbase_filter *iface) { - AviMux *This = impl_from_IBaseFilter(iface); + AviMux *This = impl_from_strmbase_filter(iface); HRESULT hr; int i; - TRACE("(%p)\n", This); - - if(This->filter.state == State_Stopped) - return S_OK; - if (This->stream) { AVIEXTHEADER dmlh; @@ -559,36 +541,20 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) This->stream = NULL; } - This->filter.state = State_Stopped; return S_OK; } -static HRESULT WINAPI AviMux_Pause(IBaseFilter *iface) +static HRESULT avi_mux_init_stream(struct strmbase_filter *iface) { - AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - AviMux *This = impl_from_IBaseFilter(iface); + AviMux *This = impl_from_strmbase_filter(iface); HRESULT hr; int i, stream_id; - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); - - if(This->filter.state == State_Running) - return S_OK; - if(This->mode != INTERLEAVE_FULL) { FIXME("mode not supported (%d)\n", This->mode); return E_NOTIMPL; } - if(tStart) - FIXME("tStart parameter ignored\n"); - for(i=0; i<This->input_pin_no; i++) { IMediaSeeking *ms; LONGLONG cur, stop; @@ -694,18 +660,26 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->avih.dwWidth = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biWidth; This->avih.dwHeight = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biHeight; - This->filter.state = State_Running; return S_OK; } +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = avi_mux_get_pin, + .filter_destroy = avi_mux_destroy, + .filter_query_interface = avi_mux_query_interface, + .filter_init_stream = avi_mux_init_stream, + .filter_cleanup_stream = avi_mux_cleanup_stream, +}; + static const IBaseFilterVtbl AviMuxVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - AviMux_Stop, - AviMux_Pause, - AviMux_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource,

1 0

Francois Gouget : testbot/Janitor: Fix extracting the VM name from reference report filenames.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: tools Branch: master Commit: dc3a53cea57cee685cb79714ed68e8a0f375f7bc URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc3a53cea57cee685cb7971… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 13:22:16 2019 +0100 testbot/Janitor: Fix extracting the VM name from reference report filenames. The log name part can contain underscores and uppercase letters when testing locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 537a0dc..c51637a 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -308,7 +308,7 @@ if (opendir(my $dh, "$DataDir/latest")) { next if ($Entry eq "." or $Entry eq ".."); - if ($Entry =~ /^(.*)_[a-z0-9]+\.report(?:\.err)?$/) + if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion.

1 0

Francois Gouget : testbot/LogUtils: Fix GetNewLogErrors() when there are no errors.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: tools Branch: master Commit: d469942b22d626522a9316582294fb11d1a14f84 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d469942b22d626522a93165… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 10:53:28 2019 +0100 testbot/LogUtils: Fix GetNewLogErrors() when there are no errors. Don't use $Groups if it is undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5193296..32bf0fa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -889,7 +889,7 @@ sub GetNewLogErrors($$$) my ($RefFileName, $Groups, $Errors) = @_; my (@NewGroups, %NewErrors, %NewIndices); - return (\@NewGroups, \%NewErrors, \%NewIndices) if (!@$Groups); + return (\@NewGroups, \%NewErrors, \%NewIndices) if (!$Groups or !@$Groups); my ($RefGroups, $RefErrors) = GetLogErrors($RefFileName); return (undef, undef) if (!$RefGroups);

1 0

Francois Gouget : testbot/web: Require filling the captcha on the feedback page.
by Alexandre Julliard Dec. 5, 2019

Dec. 5, 2019

Module: tools Branch: master Commit: 345c225095e4be9cb97057e19b82cfd6f7a3e17b URL: https://source.winehq.org/git/tools.git/?a=commit;h=345c225095e4be9cb97057e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 10:39:43 2019 +0100 testbot/web: Require filling the captcha on the feedback page. Spammers (or their bots) have taken to spamming the TestBot's feedback page. As if that was going to egt them anywhere! The captcha is only required for users who are not logged in obviously. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 36f0a2b..b43397f 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -33,16 +33,21 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + my $Session = $self->GetCurrentSession(); my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("EMail", "Email", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "textarea", 1024), ); + if (!$Session and $RegistrationQ) + { + $self->GetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); + push @PropertyDescriptors, CreateBasicPropertyDescriptor("FeedA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); + } $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); - my $Session = $self->GetCurrentSession(); - if (defined($Session)) + if ($Session) { # Provide default values my $User = $Session->User; @@ -79,6 +84,17 @@ sub OnSend($) { my ($self) = @_; + my $Session = $self->GetCurrentSession(); + if (!$Session and $RegistrationQ) + { + my $FeedA = $self->GetParam("FeedA"); + if ($FeedA !~ /$RegistrationARE/) + { + $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; + $self->{ErrField} = "Captcha"; + return !1; + } + } if (! $self->Validate) { return !1;

1 0