September 2019 - Wine-commits

Zebediah Figura : qcap/avico: Don't try to commit a NULL allocator in AVICompressor_Run().
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 084cb90f5834aa6dbdf69c7e24b6f0f72b0707de URL: https://source.winehq.org/git/wine.git/?a=commit;h=084cb90f5834aa6dbdf69c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:50 2019 -0500 qcap/avico: Don't try to commit a NULL allocator in AVICompressor_Run(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 89e8dda08f..ea98b2a655 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -148,8 +148,8 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar if(This->filter.state == State_Running) return S_OK; - hres = IMemAllocator_Commit(This->source.pAllocator); - if(FAILED(hres)) { + if (This->source.pAllocator && FAILED(hres = IMemAllocator_Commit(This->source.pAllocator))) + { FIXME("Commit failed: %08x\n", hres); return hres; }

1 0

Zebediah Figura : qcap/tests: Add some tests for unconnected filter state change.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 4f29ddf7fbceb71ed209177089ce309736c046e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f29ddf7fbceb71ed2091770… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:51 2019 -0500 qcap/tests: Add some tests for unconnected filter state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avico.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avimux.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 58 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index e599165d19..11ef690b99 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -245,6 +245,58 @@ static void test_property_bag(IMoniker *mon) IPropertyBag_Release(devenum_bag); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine 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_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine 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_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + START_TEST(audiorecord) { ICreateDevEnum *devenum; @@ -285,6 +337,7 @@ START_TEST(audiorecord) ok(hr == S_OK, "Got hr %#x.\n", hr); test_interfaces(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index dbc15e3f15..5c6d4aa54f 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -655,6 +655,58 @@ static void test_enum_media_types(IBaseFilter *filter) IPin_Release(pin); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine 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); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine 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); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -697,6 +749,7 @@ START_TEST(avico) test_pin_info(filter); test_media_types(filter); test_enum_media_types(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 85ebd5c82c..572314f8ab 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -798,6 +798,63 @@ static void test_seeking(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_unconnected_filter_state(void) +{ + IBaseFilter *filter = create_avi_mux(); + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine 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); + + hr = IBaseFilter_Run(filter, 0); + todo_wine 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_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine 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); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine 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_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(avimux) { CoInitialize(NULL); @@ -810,6 +867,7 @@ START_TEST(avimux) test_media_types(); test_enum_media_types(); test_seeking(); + test_unconnected_filter_state(); CoUninitialize(); } diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 487c8eca3c..437f3f4a7f 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2154,6 +2154,63 @@ end: IEnumMediaTypes_Release(enumMediaTypes); } +static void test_unconnected_filter_state(void) +{ + IBaseFilter *filter = create_smart_tee(); + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine 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_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine 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_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_smart_tee_filter_aggregation(void) { SourceFilter *sourceFilter = create_video_SourceFilter(); @@ -2381,6 +2438,7 @@ START_TEST(smartteefilter) test_find_pin(); test_pin_info(); test_enum_media_types(); + test_unconnected_filter_state(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/smartteefilter: Use strmbase filter state change methods.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: e1f00bfc5e0dd9cd7c5b2a318c07986a4d332329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1f00bfc5e0dd9cd7c5b2a31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:52 2019 -0500 qcap/smartteefilter: 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/smartteefilter.c | 48 +++------------------------------------- dlls/qcap/tests/smartteefilter.c | 16 +++++++------- 2 files changed, 11 insertions(+), 53 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index b2e5496b7d..d7e9e8b5f1 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -46,61 +46,19 @@ static inline SmartTeeFilter *impl_from_strmbase_filter(struct strmbase_filter * return CONTAINING_RECORD(filter, SmartTeeFilter, filter); } -static inline SmartTeeFilter *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 SmartTeeFilter *impl_from_strmbase_pin(struct strmbase_pin *pin) { return impl_from_strmbase_filter(pin->filter); } -static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)\n", This); - EnterCriticalSection(&This->filter.csFilter); - This->filter.state = State_Stopped; - LeaveCriticalSection(&This->filter.csFilter); - return S_OK; -} - -static HRESULT WINAPI SmartTeeFilter_Pause(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(tStart)); - EnterCriticalSection(&This->filter.csFilter); - if(This->filter.state != State_Running) { - /* We share an allocator among all pins, an allocator can only get committed - * once, state transitions occur in upstream order, and only output pins - * commit allocators, so let the filter attached to the input pin worry about it. */ - if (This->sink.pin.pConnectedTo) - This->filter.state = State_Running; - else - hr = VFW_E_NOT_CONNECTED; - } - LeaveCriticalSection(&This->filter.csFilter); - return hr; -} - static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - SmartTeeFilter_Stop, - SmartTeeFilter_Pause, - SmartTeeFilter_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 437f3f4a7f..4eac344d53 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2166,25 +2166,25 @@ static void test_unconnected_filter_state(void) 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); todo_wine ok(hr == VFW_S_CANT_CUE, "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); - 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_Running, "Got state %u.\n", state); + 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); todo_wine ok(hr == VFW_S_CANT_CUE, "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); @@ -2194,11 +2194,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - 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_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : strmbase: Rename "pConnectedTo" to "peer".
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: c7a447b67afa3992405cd6b585310b606edc9ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a447b67afa3992405cd6b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:53 2019 -0500 strmbase: Rename "pConnectedTo" to "peer". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 16 ++++++++-------- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 10 +++++----- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 10 +++++----- dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/outputqueue.c | 4 ++-- dlls/strmbase/pin.c | 38 +++++++++++++++++++------------------- dlls/strmbase/renderer.c | 14 +++++++------- dlls/strmbase/transform.c | 12 ++++++------ dlls/strmbase/video.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 38 +++++++++++++++++++------------------- dlls/wineqtdecoder/qtsplitter.c | 20 ++++++++++---------- include/wine/strmbase.h | 2 +- 15 files changed, 93 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a447b67afa3992405c…

1 0

Alexandre Julliard : msvcrt: Move vtbl wrappers together with the other functions.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 0c853f026578dd7c8aede2f716c8e55d816ccf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c853f026578dd7c8aede2f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 13:57:06 2019 +0200 msvcrt: Move vtbl wrappers together with the other functions. The .text directive can mess up the variable definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47751 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 9e0de95740..53a9669fea 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -36,32 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static int context_id = -1; static int scheduler_id = -1; -#if defined(__i386__) && !defined(__MINGW32__) - -#define DEFINE_VTBL_WRAPPER(off) \ - __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ - "popl %eax\n\t" \ - "popl %ecx\n\t" \ - "pushl %eax\n\t" \ - "movl 0(%ecx), %eax\n\t" \ - "jmp *" #off "(%eax)\n\t") - -DEFINE_VTBL_WRAPPER(0); -DEFINE_VTBL_WRAPPER(4); -DEFINE_VTBL_WRAPPER(8); -DEFINE_VTBL_WRAPPER(12); -DEFINE_VTBL_WRAPPER(16); -DEFINE_VTBL_WRAPPER(20); -DEFINE_VTBL_WRAPPER(24); -DEFINE_VTBL_WRAPPER(28); -DEFINE_VTBL_WRAPPER(32); -DEFINE_VTBL_WRAPPER(36); -DEFINE_VTBL_WRAPPER(40); -DEFINE_VTBL_WRAPPER(44); -DEFINE_VTBL_WRAPPER(48); - -#endif - typedef enum { SchedulerKind, MaxConcurrency, @@ -1083,6 +1057,32 @@ void __cdecl _CurrentScheduler__ScheduleTask(void (__cdecl *proc)(void*), void * CurrentScheduler_ScheduleTask(proc, data); } +#if defined(__i386__) && !defined(__MINGW32__) + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); + +#endif + extern const vtable_ptr MSVCRT_type_info_vtable; DEFINE_RTTI_DATA0(Context, 0, ".?AVContext(a)Concurrency@@") DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase(a)details@Concurrency@@")

1 0

Alistair Leslie-Hughes : dsound: Primary buffer doesn't support flag DSBCAPS_CTRLFX.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: eabb3d444c4cd78381a096665133e286e0805267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabb3d444c4cd78381a09666… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 27 03:46:55 2019 +0000 dsound: Primary buffer doesn't support flag DSBCAPS_CTRLFX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40740 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 1 + dlls/dsound/dsound.c | 6 ++++++ dlls/dsound/tests/dsound8.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 6e4dae6be7..b7b4d01017 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1064,6 +1064,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire /* Update description for creating primary buffer */ desc.dwFlags |= DSBCAPS_PRIMARYBUFFER; + desc.dwFlags &= ~DSBCAPS_CTRLFX; desc.dwBufferBytes = 0; desc.lpwfxFormat = NULL; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index f3030d6834..8e2b839fe8 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -451,6 +451,12 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (dsbd->dwFlags & DSBCAPS_CTRLFX) + { + WARN("Invalid parameter DSBCAPS_CTRLFX\n"); + return DSERR_INVALIDPARAM; + } + if (device->primary) { WARN("Primary Buffer already created\n"); IDirectSoundBuffer8_AddRef(&device->primary->IDirectSoundBuffer8_iface); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 6ed32abbcb..b66275973f 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1173,6 +1173,55 @@ static void test_COM(void) while (IUnknown_Release(unk)); } +static void test_primary_flags(void) +{ + HRESULT rc; + IDirectSound8 *dso; + IDirectSoundBuffer *primary = NULL; + IDirectSoundFXI3DL2Reverb *reverb; + DSBUFFERDESC bufdesc; + DSCAPS dscaps; + + /* Create a DirectSound8 object */ + rc = pDirectSoundCreate8(NULL, &dso, NULL); + ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08x\n",rc); + + if (rc!=DS_OK) + return; + + rc = IDirectSound8_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK,"Failed: %08x\n", rc); + if (rc != DS_OK) { + IDirectSound8_Release(dso); + return; + } + + dscaps.dwSize = sizeof(dscaps); + rc = IDirectSound8_GetCaps(dso, &dscaps); + ok(rc == DS_OK,"Failed: %08x\n", rc); + trace("0x%x\n", dscaps.dwFlags); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLFX; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok(rc == E_INVALIDARG, "got %08x\n", rc); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRL3D; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08x\n", rc); + if (rc == DS_OK) { + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundFXI3DL2Reverb, (LPVOID*)&reverb); + ok(rc==E_NOINTERFACE,"Failed: %08x\n", rc); + + IDirectSoundBuffer_Release(primary); + } + + IDirectSound8_Release(dso); +} + static void test_effects(void) { HRESULT rc; @@ -1711,6 +1760,7 @@ START_TEST(dsound8) dsound8_tests(); test_hw_buffers(); test_first_device(); + test_primary_flags(); test_effects(); test_effects_parameters(); }

1 0

Piotr Caban : winebus.sys: Don't do anything in udev_driver_unload if udev was not initialized.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: ef59d2d11f5aed1d0bd249e159c672df2c8ccc3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef59d2d11f5aed1d0bd249e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:37:44 2019 +0200 winebus.sys: Don't do anything in udev_driver_unload if udev was not initialized. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b72e6bf47d..6fa6efb7dc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1488,6 +1488,9 @@ void udev_driver_unload( void ) { TRACE("Unload Driver\n"); + if (!deviceloop_handle) + return; + write(deviceloop_control[1], "q", 1); WaitForSingleObject(deviceloop_handle, INFINITE); close(deviceloop_control[0]);

1 0

Piotr Caban : winebus.sys: Don't do anything in iohid_driver_unload if iohid was not initialized.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 485aed9f1c0353597d8b5ebecf5599bfc6573d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=485aed9f1c0353597d8b5ebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:37:48 2019 +0200 winebus.sys: Don't do anything in iohid_driver_unload if iohid was not initialized. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index cda77e3011..f0f10ca98e 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -416,6 +416,10 @@ NTSTATUS iohid_driver_init(void) void iohid_driver_unload( void ) { TRACE("Unloading Driver\n"); + + if (!run_loop_handle) + return; + IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); CFRunLoopStop(run_loop); WaitForSingleObject(run_loop_handle, INFINITE);

1 0

Piotr Caban : winebus.sys: Stop SDL deviceloop_thread to avoid crash on driver unload.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 9d5c801d353b02ed0cf3c03bf5c957bb4ffbecdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5c801d353b02ed0cf3c03b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:37:52 2019 +0200 winebus.sys: Stop SDL deviceloop_thread to avoid crash on driver unload. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8fcec46d04..64c5a8a1d2 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -70,6 +70,8 @@ static DWORD map_controllers = 0; DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); static void *sdl_handle = NULL; +static HANDLE deviceloop_handle; +static UINT quit_event = -1; #ifdef SONAME_LIBSDL2 #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL @@ -109,6 +111,8 @@ MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); +MAKE_FUNCPTR(SDL_RegisterEvents); +MAKE_FUNCPTR(SDL_PushEvent); #endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); @@ -1075,17 +1079,41 @@ static DWORD CALLBACK deviceloop_thread(void *args) SetEvent(init_done); - while (1) - while (pSDL_WaitEvent(&event) != 0) + while (1) { + while (pSDL_WaitEvent(&event) != 0) { + if (event.type == quit_event) { + TRACE("Device thread exiting\n"); + return 0; + } process_device_event(&event); - - TRACE("Device thread exiting\n"); - return 0; + } + } } void sdl_driver_unload( void ) { + SDL_Event event; + TRACE("Unload Driver\n"); + + if (!deviceloop_handle) + return; + + quit_event = pSDL_RegisterEvents(1); + if (quit_event == -1) { + ERR("error registering quit event\n"); + return; + } + + event.type = quit_event; + if (pSDL_PushEvent(&event) != 1) { + ERR("error pushing quit event\n"); + return; + } + + WaitForSingleObject(deviceloop_handle, INFINITE); + CloseHandle(deviceloop_handle); + wine_dlclose(sdl_handle, NULL, 0); } NTSTATUS sdl_driver_init(void) @@ -1140,6 +1168,8 @@ NTSTATUS sdl_driver_init(void) LOAD_FUNCPTR(SDL_JoystickIsHaptic); LOAD_FUNCPTR(SDL_memset); LOAD_FUNCPTR(SDL_GameControllerAddMapping); + LOAD_FUNCPTR(SDL_RegisterEvents); + LOAD_FUNCPTR(SDL_PushEvent); #undef LOAD_FUNCPTR pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); @@ -1162,12 +1192,13 @@ NTSTATUS sdl_driver_init(void) result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); - CloseHandle(events[1]); if (result == WAIT_OBJECT_0) { TRACE("Initialization successful\n"); + deviceloop_handle = events[1]; return STATUS_SUCCESS; } + CloseHandle(events[1]); sym_not_found: wine_dlclose(sdl_handle, NULL, 0);

1 0

Francois Gouget : testbot/web: Add a page to create special jobs.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: tools Branch: master Commit: fc4933ddbf3c978553e3793f80f5a0a7abdc4837 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc4933ddbf3c978553e3793… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:03:59 2019 +0200 testbot/web: Add a page to create special jobs. These can be used to schedule a WineTest run on a specific VM or when the jobs were not created automatically for whatever reason. Note that the web server typically does not own the latest/ files and thus cannot hard-link them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 + testbot/lib/WineTestBot/SpecialJobs.pm | 12 +- testbot/web/admin/SpecialJobs.pl | 265 ++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e3d2e04..613bddd 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -287,6 +287,8 @@ EOF if (defined($Session) && $Session->User->HasRole("admin")) { print " <li class='top'><p>Admin</p></li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/SpecialJobs.pl"), + "'>Special Jobs</a></p></li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></p></li>\n"; print " <li class='divider'> </li>\n"; diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index c313567..0371084 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -36,6 +36,8 @@ our @EXPORT = qw(GetReconfigVMs AddReconfigJob GetWindowsTestVMs AddWindowsTestJob GetWineTestVMs AddWineTestJob); +use File::Copy; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Missions; @@ -189,9 +191,13 @@ sub AddWindowsTestJob($$$$$) return "Failed to save the '$Remarks' job: $ErrMessage"; } - # Stage the test file so it can be picked up by the job - if (!link("$DataDir/latest/$LatestBaseName", - "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName")) + # Stage the test file so it can be picked up by the job. Note that the + # caller may not own the latest files and thus may be unable to hard-link + # them (e.g. web server). + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + my $StagingFileName = "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName"; + if (!link($LatestFileName, $StagingFileName) && + !copy($LatestFileName, $StagingFileName)) { return "Failed to stage $LatestBaseName: $!"; } diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl new file mode 100644 index 0000000..1556b55 --- /dev/null +++ b/testbot/web/admin/SpecialJobs.pl @@ -0,0 +1,265 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# WineTestBot special jobs creation page +# +# Copyright 2019 Francois Gouget +# +# 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 + +use strict; + +package SpecialJobsPage; + +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use WineTestBot::Config; +use WineTestBot::Engine::Notify; +use WineTestBot::SpecialJobs; +use WineTestBot::Utils; +use WineTestBot::Log; + + +# +# Page state management +# + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->{JobTemplates} = { + "Build" => {Label => "Update build VMs", + Options => ["No", "All Build VMs"], + VMs => GetReconfigVMs(undef, "build"), + }, + "Win32" => {Label => "Run the 32 bit WineTest suite on Windows VMs", + Options => ["No", "All Base VMs", "All WineTest VMs", + "All Base and WineTest VMs"], + VMs => GetWindowsTestVMs(undef, "exe32", undef), + }, + "Win64" => {Label => "Run the 64 bit WineTest suite on Windows VMs", + Options => ["No", "All Base VMs", "All WineTest VMs", + "All Base and WineTest VMs"], + VMs => GetWindowsTestVMs(undef, "exe64", undef), + }, + "Wine" => {Label => "Update Wine VMs", + Options => ["No", "All Wine VMs"], + VMs => GetReconfigVMs(undef, "wine"), + }, + "WineTest" => {Label => "Run the WineTest suite on Wine VMs", + Options => ["No", "All Wine VMs"], + VMs => GetWineTestVMs(undef), + }, + }; + + foreach my $JobName (keys %{$self->{JobTemplates}}) + { + my $JobTemplate = $self->{JobTemplates}->{$JobName}; + my $VMKey = $self->GetParam($JobName); + foreach my $Option (@{$JobTemplate->{Options}}) + { + if ($VMKey eq "*$Option") + { + $JobTemplate->{VMKey} = $VMKey; + last; + } + } + if (!exists $JobTemplate->{VMKey}) + { + foreach my $VM (@{$JobTemplate->{VMs}}) + { + if ($VMKey eq $VM->Name) + { + $JobTemplate->{VMKey} = $VM->Name; + last; + } + } + } + $JobTemplate->{VMKey} ||= "*No"; + } + + $self->SUPER::_initialize($Request, $RequiredRole, undef); +} + + +# +# Page generation +# + +sub GetTitle($) +{ + #my ($self) = @_; + return "Create Special Jobs"; +} + +sub GenerateJobFields($$$$$) +{ + my ($self, $JobName) = @_; + + my $JobTemplate = $self->{JobTemplates}->{$JobName}; + return if (!@{$JobTemplate->{VMs}}); + + print "<div class='ItemProperty'><label>$JobTemplate->{Label}</label>\n", + "<div class='ItemValue'>\n", + "<select name='$JobName' size='1'>\n"; + foreach my $Option (@{$JobTemplate->{Options}}) + { + my $Selected = $JobTemplate->{VMKey} eq "*$Option" ? " selected" : ""; + print "<option value='*", $self->CGI->escapeHTML($Option), + "'$Selected>$Option</option>\n"; + } + foreach my $VM (@{$JobTemplate->{VMs}}) + { + my $Selected = $JobTemplate->{VMKey} eq $VM->Name ? " selected" : ""; + print "<option value='", $self->CGI->escapeHTML($VM->Name), + "'$Selected>", $self->CGI->escapeHTML($VM->Name), "</option>\n"; + } + print "</select> </div></div>\n"; +} + +sub GenerateFields($) +{ + my ($self) = @_; + + $self->GenerateJobFields("Build"); + $self->GenerateJobFields("Win32"); + $self->GenerateJobFields("Win64"); + + $self->GenerateJobFields("Wine"); + $self->GenerateJobFields("WineTest"); + + $self->SUPER::GenerateFields(); +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push @$Actions, "Submit"; + return $Actions; +} + + +# +# Page actions +# + +sub OnSubmit($) +{ + my ($self) = @_; + my $VMKey; + my @Errors = (); + + # Update Build VMs + $VMKey = $self->{JobTemplates}->{Build}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetReconfigVMs($VMKey, "build"); + push @Errors, "Found no build VM to update" if (!@$VMs); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); + } + + # Run 32 bit WineTest + $VMKey = $self->{JobTemplates}->{Win32}->{VMKey}; + if ($VMKey ne "*No") + { + my @BaseJobs = $VMKey eq "*All Base VMs" ? ("base") : + $VMKey eq "*All WineTest VMs" ? ("other") : + $VMKey eq "*All Base and WineTest VMs" ? ("base", "other") : + (undef); + $VMKey = undef if ($VMKey =~ /^\*/); + foreach my $BaseJob (@BaseJobs) + { + my $VMs = GetWindowsTestVMs($VMKey, "exe32", $BaseJob); + push @Errors, "Found no $BaseJob VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe32", $BaseJob, "winetest-latest.exe"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + } + + # Run 64 bit WineTest + $VMKey = $self->{JobTemplates}->{Win64}->{VMKey}; + if ($VMKey ne "*No") + { + # Traditionally we don't create separate 'base' and 'other' jobs for + # 64 bit VMs. + my $BaseJob = $VMKey eq "*All Base VMs" ? "base" : + $VMKey eq "*All WineTest VMs" ? "other" : + $VMKey eq "*All Base and WineTest VMs" ? "all" : + undef; + $VMKey = undef if ($VMKey eq "*All Base and WineTest VMs"); + my $VMs = GetWindowsTestVMs($VMKey, "exe64", $BaseJob); + push @Errors, "Found no 64 bit VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe64", $BaseJob, "winetest64-latest.exe"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Update Wine VMs + $VMKey = $self->{JobTemplates}->{Wine}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetReconfigVMs($VMKey, "wine"); + push @Errors, "Found no Wine VM to update" if (!@$VMs); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, "wine"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Run WineTest on Wine + $VMKey = $self->{JobTemplates}->{WineTest}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetWineTestVMs($VMKey); + push @Errors, "Found no Wine VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWineTestJob($VMs, $VMKey); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Notify engine + my $ErrMessage = RescheduleJobs(); + push @Errors, $ErrMessage if (defined $ErrMessage); + + if (@Errors) + { + $self->{ErrMessage} = join("\n", @Errors); + return undef; + } + + $self->Redirect("/"); # does not return + exit; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if ($Action eq "Submit") + { + return $self->OnSubmit(); + } + + return $self->SUPER::OnAction($Action); +} + + +package main; + +my $Request = shift; + +my $SubmitPage = SpecialJobsPage->new($Request, "admin"); +$SubmitPage->GeneratePage();

1 0