wine-devel February 2020

wine-devel@winehq.org

80 participants
745 discussions

[PATCH 1/9] rtworkq: Add a stub dll.
by Nikolay Sivov 05 Feb '20

05 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/rtworkq/Makefile.in | 4 ++++ dlls/rtworkq/rtworkq.spec | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 dlls/rtworkq/Makefile.in create mode 100644 dlls/rtworkq/rtworkq.spec diff --git a/configure b/configure index 80235dd995..9f23d268e8 100755 --- a/configure +++ b/configure @@ -1539,6 +1539,7 @@ enable_rsabase enable_rsaenh enable_rstrtmgr enable_rtutils +enable_rtworkq enable_samlib enable_sane_ds enable_sapi @@ -20798,6 +20799,7 @@ wine_fn_config_makefile dlls/rsaenh enable_rsaenh wine_fn_config_makefile dlls/rsaenh/tests enable_tests wine_fn_config_makefile dlls/rstrtmgr enable_rstrtmgr wine_fn_config_makefile dlls/rtutils enable_rtutils +wine_fn_config_makefile dlls/rtworkq enable_rtworkq wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi diff --git a/configure.ac b/configure.ac index 40374210bb..e06743c2ea 100644 --- a/configure.ac +++ b/configure.ac @@ -3606,6 +3606,7 @@ WINE_CONFIG_MAKEFILE(dlls/rsaenh) WINE_CONFIG_MAKEFILE(dlls/rsaenh/tests) WINE_CONFIG_MAKEFILE(dlls/rstrtmgr) WINE_CONFIG_MAKEFILE(dlls/rtutils) +WINE_CONFIG_MAKEFILE(dlls/rtworkq) WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in new file mode 100644 index 0000000000..d6d7d6f715 --- /dev/null +++ b/dlls/rtworkq/Makefile.in @@ -0,0 +1,4 @@ +MODULE = rtworkq.dll +IMPORTLIB = rtworkq + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec new file mode 100644 index 0000000000..29e56846c6 --- /dev/null +++ b/dlls/rtworkq/rtworkq.spec @@ -0,0 +1,37 @@ +@ stub RtwqAddPeriodicCallback +@ stub RtwqAllocateSerialWorkQueue +@ stub RtwqAllocateWorkQueue +@ stub RtwqBeginRegisterWorkQueueWithMMCSS +@ stub RtwqBeginUnregisterWorkQueueWithMMCSS +@ stub RtwqCancelDeadline +@ stub RtwqCancelMultipleWaitingWorkItem +@ stub RtwqCancelWorkItem +@ stub RtwqCreateAsyncResult +@ stub RtwqEndRegisterWorkQueueWithMMCSS +@ stub RtwqEndUnregisterWorkQueueWithMMCSS +@ stub RtwqGetPlatform +@ stub RtwqGetWorkQueueMMCSSClass +@ stub RtwqGetWorkQueueMMCSSPriority +@ stub RtwqGetWorkQueueMMCSSTaskId +@ stub RtwqInvokeCallback +@ stub RtwqJoinWorkQueue +@ stub RtwqLockPlatform +@ stub RtwqLockSharedWorkQueue +@ stub RtwqLockWorkQueue +@ stub RtwqPutMultipleWaitingWorkItem +@ stub RtwqPutWaitingWorkItem +@ stub RtwqPutWorkItem +@ stub RtwqRegisterPlatformEvents +@ stub RtwqRegisterPlatformWithMMCSS +@ stub RtwqRemovePeriodicCallback +@ stub RtwqScheduleWorkItem +@ stub RtwqSetDeadline +@ stub RtwqSetDeadline2 +@ stub RtwqSetLongRunning +@ stub RtwqShutdown +@ stub RtwqStartup +@ stub RtwqUnjoinWorkQueue +@ stub RtwqUnlockPlatform +@ stub RtwqUnlockWorkQueue +@ stub RtwqUnregisterPlatformEvents +@ stub RtwqUnregisterPlatformFromMMCSS -- 2.24.1

1 8

[PATCH 1/5] quartz/tests: Add tests for AVI splitter pin connection.
by Zebediah Figura 05 Feb '20

05 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 458 +++++++++++++++++++++++++++++++++++ 1 file changed, 458 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 4af101767d6..23b7c5b9150 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -23,6 +23,7 @@ #include "dshow.h" #include "initguid.h" #include "wmcodecdsp.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_avi_splitter(void) @@ -34,6 +35,12 @@ static IBaseFilter *create_avi_splitter(void) return filter; } +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -792,6 +799,456 @@ static void test_enum_media_types(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; + struct strmbase_sink sink; + IAsyncReader IAsyncReader_iface, *reader; + const AM_MEDIA_TYPE *mt; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + else if (index == 1) + return &filter->sink.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IAsyncReader)) + *out = &filter->IAsyncReader_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, + IPin *peer, const AM_MEDIA_TYPE *mt) +{ + HRESULT hr; + + iface->pin.peer = peer; + IPin_AddRef(peer); + CopyMediaType(&iface->pin.mt, mt); + + if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) + { + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + IPin_Release(peer); + iface->pin.peer = NULL; + FreeMediaType(&iface->pin.mt); + } + + return hr; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_interface = testsource_query_interface, + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = testsource_AttemptConnection, +}; + +static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT testsink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + if (filter->mt && !compare_media_types(mt, filter->mt)) + return S_FALSE; + return S_OK; +} + +static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + if (!index && filter->mt) + { + CopyMediaType(mt, filter->mt); + return S_OK; + } + return VFW_S_NO_MORE_ITEMS; +} + +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + return S_OK; +} + +static const struct strmbase_sink_ops testsink_ops = +{ + .base.pin_query_interface = testsink_query_interface, + .base.pin_query_accept = testsink_query_accept, + .base.pin_get_media_type = testsink_get_media_type, + .pfnReceive = testsink_Receive, +}; + +static struct testfilter *impl_from_IAsyncReader(IAsyncReader *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IAsyncReader_iface); +} + +static HRESULT WINAPI async_reader_QueryInterface(IAsyncReader *iface, REFIID iid, void **out) +{ + return IPin_QueryInterface(&impl_from_IAsyncReader(iface)->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI async_reader_AddRef(IAsyncReader *iface) +{ + return IPin_AddRef(&impl_from_IAsyncReader(iface)->source.pin.IPin_iface); +} + +static ULONG WINAPI async_reader_Release(IAsyncReader *iface) +{ + return IPin_Release(&impl_from_IAsyncReader(iface)->source.pin.IPin_iface); +} + +static HRESULT WINAPI async_reader_RequestAllocator(IAsyncReader *iface, + IMemAllocator *preferred, ALLOCATOR_PROPERTIES *props, IMemAllocator **allocator) +{ + return IAsyncReader_RequestAllocator(impl_from_IAsyncReader(iface)->reader, preferred, props, allocator); +} + +static HRESULT WINAPI async_reader_Request(IAsyncReader *iface, IMediaSample *sample, DWORD_PTR cookie) +{ + return IAsyncReader_Request(impl_from_IAsyncReader(iface)->reader, sample, cookie); +} + +static HRESULT WINAPI async_reader_WaitForNext(IAsyncReader *iface, + DWORD timeout, IMediaSample **sample, DWORD_PTR *cookie) +{ + return IAsyncReader_WaitForNext(impl_from_IAsyncReader(iface)->reader, timeout, sample, cookie); +} + +static HRESULT WINAPI async_reader_SyncReadAligned(IAsyncReader *iface, IMediaSample *sample) +{ + return IAsyncReader_SyncReadAligned(impl_from_IAsyncReader(iface)->reader, sample); +} + +static HRESULT WINAPI async_reader_SyncRead(IAsyncReader *iface, LONGLONG position, LONG length, BYTE *buffer) +{ + return IAsyncReader_SyncRead(impl_from_IAsyncReader(iface)->reader, position, length, buffer); +} + +static HRESULT WINAPI async_reader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) +{ + return IAsyncReader_Length(impl_from_IAsyncReader(iface)->reader, total, available); +} + +static HRESULT WINAPI async_reader_BeginFlush(IAsyncReader *iface) +{ + return IAsyncReader_BeginFlush(impl_from_IAsyncReader(iface)->reader); +} + +static HRESULT WINAPI async_reader_EndFlush(IAsyncReader *iface) +{ + return IAsyncReader_EndFlush(impl_from_IAsyncReader(iface)->reader); +} + +static const struct IAsyncReaderVtbl async_reader_vtbl = +{ + async_reader_QueryInterface, + async_reader_AddRef, + async_reader_Release, + async_reader_RequestAllocator, + async_reader_Request, + async_reader_WaitForNext, + async_reader_SyncReadAligned, + async_reader_SyncRead, + async_reader_Length, + async_reader_BeginFlush, + async_reader_EndFlush, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + memset(filter, 0, sizeof(*filter)); + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); + strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); + filter->IAsyncReader_iface.lpVtbl = &async_reader_vtbl; +} + +static void test_connect_pin(void) +{ + AM_MEDIA_TYPE req_mt = + { + .majortype = MEDIATYPE_Stream, + .subtype = MEDIASUBTYPE_Avi, + .lSampleSize = 888, + }; + IBaseFilter *filter = create_avi_splitter(), *reader; + const WCHAR *filename = load_resource(L"test.avi"); + struct testfilter testsource, testsink; + IFileSourceFilter *filesource; + AM_MEDIA_TYPE mt, *source_mt; + IPin *sink, *source, *peer; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + BOOL ret; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + testfilter_init(&testsource); + testfilter_init(&testsink); + IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"splitter"); + IBaseFilter_FindPin(filter, L"input pin", &sink); + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + IFileSourceFilter_Release(filesource); + IBaseFilter_FindPin(reader, L"Output", &source); + IPin_QueryInterface(source, &IID_IAsyncReader, (void **)&testsource.reader); + IPin_Release(source); + + /* Test sink connection. */ + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(sink, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(sink, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + req_mt.majortype = MEDIATYPE_Video; + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Stream; + + req_mt.subtype = MEDIASUBTYPE_RGB8; + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_Avi; + + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(sink, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &testsource.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(sink, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + + /* Test source connection. */ + + IBaseFilter_FindPin(filter, L"Stream 00", &source); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(source, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + /* Exact connection. */ + + IPin_EnumMediaTypes(source, &enummt); + IEnumMediaTypes_Next(enummt, 1, &source_mt, NULL); + IEnumMediaTypes_Release(enummt); + CopyMediaType(&req_mt, source_mt); + + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(source, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &testsink.sink.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(testsink.sink.pin.peer == source, "Got peer %p.\n", testsink.sink.pin.peer); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.lSampleSize = 999; + req_mt.bTemporalCompression = req_mt.bFixedSizeSamples = TRUE; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.majortype = MEDIATYPE_Stream; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.subtype = MEDIASUBTYPE_RGB32; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } + req_mt.subtype = MEDIASUBTYPE_I420; + + /* Connection with wildcards. */ + + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.majortype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.subtype = MEDIASUBTYPE_RGB32; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.formattype = FORMAT_None; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } + + req_mt.majortype = MEDIATYPE_Video; + req_mt.subtype = MEDIASUBTYPE_I420; + req_mt.formattype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.subtype = MEDIASUBTYPE_RGB32; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.majortype = MEDIATYPE_Audio; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + testsink.mt = &req_mt; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.subtype = MEDIASUBTYPE_I420; + req_mt.formattype = FORMAT_VideoInfo; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(source); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(testsource.source.pin.peer == sink, "Got peer %p.\n", testsource.source.pin.peer); + IFilterGraph2_Disconnect(graph, &testsource.source.pin.IPin_iface); + + CoTaskMemFree(req_mt.pbFormat); + CoTaskMemFree(source_mt->pbFormat); + CoTaskMemFree(source_mt); + + IAsyncReader_Release(testsource.reader); + IPin_Release(sink); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -1114,6 +1571,7 @@ START_TEST(avisplit) test_enum_media_types(); test_unconnected_filter_state(); test_filter_graph(); + test_connect_pin(); CoUninitialize(); } -- 2.25.0

1 4

[PATCH 1/2] comctl32/tests: Add a test for notification messages order in the monthcal control.
by Dmitry Timoshkov 05 Feb '20

05 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/monthcal.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 11a637fb82..974787ac36 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -47,6 +47,7 @@ static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND parent_wnd; +static BOOL got_MCN_SELECT, got_MCN_SELCHANGE; static const struct message create_parent_window_seq[] = { { WM_GETMINMAXINFO, sent }, @@ -544,6 +545,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if(GetWindowLongPtrA(nmchg->nmhdr.hwndFrom, GWLP_ID) != SEL_NOTIFY_TEST_ID) break; + + if (hdr->code == MCN_SELECT) + got_MCN_SELECT = TRUE; + else + got_MCN_SELCHANGE = TRUE; + SendMessageA(nmchg->nmhdr.hwndFrom, is_multisel ? MCM_GETSELRANGE : MCM_GETCURSEL, 0, (LPARAM)st); @@ -2032,8 +2039,21 @@ static void test_sel_notify(void) mchit.pt.y++; SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); } + got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + if (styles[i].val & MCS_MULTISELECT) +todo_wine + ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); + else + ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); + ok(!got_MCN_SELECT, "%d: MCN_SELECT should not be sent\n", i); + got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + if (styles[i].val & MCS_MULTISELECT) + ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); + else + ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); + ok(got_MCN_SELECT, "%d: MCN_SELECT should be sent\n", i); DestroyWindow(hwnd); } } -- 2.20.1

1 1

[PATCH] testbot/LogUtils: Reorder the functions to get a more logical grouping.
by Francois Gouget 05 Feb '20

05 Feb '20

Add headers to each section. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 185 ++++++++++++++-------------- 1 file changed, 92 insertions(+), 93 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0a98a5a693..66359a9dc7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -63,6 +63,78 @@ sub _IsPerlError($) $Str =~ /^Possible precedence issue /; } +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a Wine +diagnostic line, a TestBot error, etc. + +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if (# Build messages + $Line =~ /^\+ \S/ or + $Line =~ /^LANG=/ or + $Line =~ /^Running (?:the tests|WineTest) / or + $Line =~ /^Task: (?:ok|tests|Updated)/) + { + return "info"; + } + if (# Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /: undefined reference to `/ or + $Line =~ /^make: [*]{3} No rule to make target / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^Task: / or + # Typical perl errors + _IsPerlError($Line)) + { + return "error"; + } + if ($Line =~ /:winediag:/) + { + if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree + # calls it as a test. + $Line =~ /CorIsLatestSvc If this function is called,/ or + # VMs and most test machines don't have a midi port. + $Line =~ /No software synthesizer midi port found,/ or + # Most VMs have limited OpenGL support. + $Line =~ /None of the requested D3D feature levels is supported / or + # The tests are not run as root. + $Line =~ /this requires special permissions/) + { + return "diag"; + } + return "error"; + } + if (# TestBot script error messages + $Line =~ /^[a-zA-Z.]+:error: / or + # TestBot error + $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or + # X errors + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) + { + return "boterror"; + } + + return "none"; +} + =pod =over 12 @@ -138,13 +210,17 @@ sub ParseTaskLog($) } +# +# WineTest report parser +# + =pod =over 12 -=item C<GetLogLineCategory()> +=item C<GetReportLineCategory()> -Identifies the category of the given log line: an error message, a Wine -diagnostic line, a TestBot error, etc. +Identifies the category of the given test report line: an error message, +a todo, just an informational message or none of these. The category can then be used to decide whether to hide the line or, on the contrary, highlight it. @@ -152,69 +228,36 @@ the contrary, highlight it. =back =cut -sub GetLogLineCategory($) +sub GetReportLineCategory($) { my ($Line) = @_; - if (# Build messages - $Line =~ /^\+ \S/ or - $Line =~ /^LANG=/ or - $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + if ($Line =~ /: Test marked todo: /) { - return "info"; + return "todo"; } - if (# Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /: undefined reference to `/ or - $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^Task: / or - # Typical perl errors - _IsPerlError($Line)) + if ($Line =~ /: Tests skipped: / or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) { - return "error"; + return "skip"; } - if ($Line =~ /:winediag:/) + if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or + $Line =~ /Fatal: test .* does not exist/ or + $Line =~ / done $258$/ or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /^Unhandled exception: /) { - if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree - # calls it as a test. - $Line =~ /CorIsLatestSvc If this function is called,/ or - # VMs and most test machines don't have a midi port. - $Line =~ /No software synthesizer midi port found,/ or - # Most VMs have limited OpenGL support. - $Line =~ /None of the requested D3D feature levels is supported / or - # The tests are not run as root. - $Line =~ /this requires special permissions/) - { - return "diag"; - } return "error"; } - if (# TestBot script error messages - $Line =~ /^[a-zA-Z.]+:error: / or - # TestBot error - $Line =~ /^BotError:/ or - $Line =~ /^Error:/ or - # X errors - $Line =~ /^X Error of failed request: / or - $Line =~ / opcode of failed request: /) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) { - return "boterror"; + return "info"; } return "none"; } -# -# WineTest report parser -# - sub _NewCurrentUnit($$) { my ($Dll, $Unit) = @_; @@ -553,50 +596,6 @@ sub ParseWineTestReport($$$) } -=pod -=over 12 - -=item C<GetReportLineCategory()> - -Identifies the category of the given test report line: an error message, -a todo, just an informational message or none of these. - -The category can then be used to decide whether to hide the line or, on -the contrary, highlight it. - -=back -=cut - -sub GetReportLineCategory($) -{ - my ($Line) = @_; - - if ($Line =~ /: Test marked todo: /) - { - return "todo"; - } - if ($Line =~ /: Tests skipped: / or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) - { - return "skip"; - } - if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or - $Line =~ /Fatal: test .* does not exist/ or - $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: /) - { - return "error"; - } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) - { - return "info"; - } - - return "none"; -} - - # # Log querying and formatting # -- 2.20.1

1 0

[PATCH] testbot/doc: There is no direct dependency on DBD.
by Francois Gouget 05 Feb '20

05 Feb '20

Standardize the way the DBI::mysql dependency is documented. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4d430d9157..7ac155d09f 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -4,9 +4,9 @@ Dependencies: - Apache2 with mod_perl - MySQL -- Perl DBD and DBI::mysql modules - Sendmail and Procmail - Bytes::Random::Secure (libbytes-random-secure-perl) +- DBI::mysql (libdbd-mysql-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) -- 2.20.1

1 0

[PATCH] testbot/UpdateTaskLogs: Also remove the .err file for the step reference report.
by Francois Gouget 05 Feb '20

05 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 4ba383f5ab..4fe6ff3c42 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -341,6 +341,7 @@ sub ProcessTaskLogs($$$) $StepReportPath = $Step->GetFullFileName($StepReportName); } $Rc += Delete($StepReportPath, "unneeded"); + $Rc += Delete("$StepReportPath.err", "unneeded"); } my %LogMap = ( -- 2.20.1

1 0

[PATCH] itss/tests: Get rid of a2w() and strcmp_wa()
by Michael Stefaniuc 05 Feb '20

05 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/tests/protocol.c | 79 +++++++++++++++----------------------- 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index a41916b192..4cafba7b61 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -98,24 +98,6 @@ static const WCHAR cache_file3[] = {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; static const WCHAR *cache_file = cache_file1; -static const WCHAR *a2w(const char *str) -{ - static WCHAR bufs[8][128]; - static int i; - - if(!str) - return NULL; - - i = (i+1) % 8; - MultiByteToWideChar(CP_ACP, 0, str, -1, bufs[i], 128); - return bufs[i]; -} - -static int strcmp_wa(const WCHAR *str1, const char *str2) -{ - return lstrcmpW(str1, a2w(str2)); -} - static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -456,34 +438,34 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url, BOOL expect_m } static const struct { - const char *base_url; - const char *rel_url; + const WCHAR *base_url; + const WCHAR *rel_url; DWORD flags; HRESULT hres; - const char *combined_url; + const WCHAR *combined_url; } combine_tests[] = { - {"its:test.chm::/blank.html", "its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, - {"mS-iTs:test.chm::/blank.html", "mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "te:t.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "dir/test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, - {"test.html", "test.chm::/test.html", 0, 0x80041001, NULL}, - {"its:test:.chm::/blank.html", "test.html", 0, S_OK, "its:test:.chm::/test.html"}, - {"its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, - {"its:test.chm::blank.html", "test.html", 0, S_OK, "its:test.chm::blank.htmltest.html"}, - {"ms-its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "ms-its:test.chm::/dir/test.html"}, - {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, - {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, - {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, - {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, - {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, - {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, - {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, - {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, + {L"its:test.chm::/blank.html", L"its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {L"mS-iTs:test.chm::/blank.html", L"mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"/test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"te:t.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"dir/test.html", 0, S_OK, L"its:test.chm::/dir/test.html"}, + {L"test.html", L"test.chm::/test.html", 0, 0x80041001, NULL}, + {L"its:test:.chm::/blank.html", L"test.html", 0, S_OK, L"its:test:.chm::/test.html"}, + {L"its:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"its:test.chm::/dir/test.html"}, + {L"its:test.chm::blank.html", L"test.html", 0, S_OK, L"its:test.chm::blank.htmltest.html"}, + {L"ms-its:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"ms-its:test.chm::/dir/test.html"}, + {L"mk:@MSITStore:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"mk:@MSITStore:test.chm::/dir/test.html"}, + {L"xxx:test.chm::/dir/blank.html", L"test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, + {L"its:test.chm::/dir/blank.html", L"/test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"#frag", 0, S_OK, L"its:test.chm::/blank.html#frag"}, + {L"its:test.chm::/blank.html#hash", L"#frag", 0, S_OK, L"its:test.chm::/blank.html#hash#frag"}, + {L"its:test.chm::/blank.html", L"test.html#frag", 0, S_OK, L"its:test.chm::/test.html#frag"}, + {L"its:test.chm::/blank.html", L"/test.html#frag", 0, S_OK, L"its:test.chm::/test.html#frag"}, + {L"its:test.chm::/blank.html", L"?query", 0, S_OK, L"its:test.chm::/?query"}, + {L"its:test.chm::/blank.html#frag/blank", L"test.html", 0, S_OK, L"its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol) @@ -510,22 +492,21 @@ static void test_its_protocol_info(IInternetProtocol *protocol) for(i=0; i < ARRAY_SIZE(combine_tests); i++) { size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), - a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, - ARRAY_SIZE(buf), &size, 0); + hres = IInternetProtocolInfo_CombineUrl(info, combine_tests[i].base_url, + combine_tests[i].rel_url, combine_tests[i].flags, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", i, hres, combine_tests[i].hres); - ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1 + ok(size == (combine_tests[i].combined_url ? lstrlenW(combine_tests[i].combined_url)+1 : 0xdeadbeef), "[%d] unexpected size=%d\n", i, size); if(combine_tests[i].combined_url) - ok(!strcmp_wa(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); else ok(buf[0] == 0xfefe, "buf changed\n"); } size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, a2w("its:test.chm::/blank.html"), a2w("test.html"), 0, buf, + hres = IInternetProtocolInfo_CombineUrl(info, L"its:test.chm::/blank.html", L"test.html", 0, buf, 1, &size, 0); ok(hres == E_OUTOFMEMORY, "CombineUrl failed: %08x\n", hres); ok(size == 25, "size=%d\n", size); -- 2.24.1

1 0

[PATCH] include: Add X3DAUDIO_CALCULATE_* defines.
by Alistair Leslie-Hughes 04 Feb '20

04 Feb '20

--- include/x3daudio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index a503507a40..0fd9a30092 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -87,6 +87,16 @@ typedef struct X3DAUDIO_DSP_SETTINGS { float ListenerVelocityComponent; } X3DAUDIO_DSP_SETTINGS; +#define X3DAUDIO_CALCULATE_MATRIX 0x00000001 +#define X3DAUDIO_CALCULATE_DELAY 0x00000002 +#define X3DAUDIO_CALCULATE_LPF_DIRECT 0x00000004 +#define X3DAUDIO_CALCULATE_LPF_REVERB 0x00000008 +#define X3DAUDIO_CALCULATE_REVERB 0x00000010 +#define X3DAUDIO_CALCULATE_DOPPLER 0x00000020 +#define X3DAUDIO_CALCULATE_EMITTER_ANGLE 0x00000040 +#define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 +#define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE]; -- 2.24.1

1 0

[PATCH 1/2] testbot: Move reference logs to the task and prepare for having more than one.
by Francois Gouget 04 Feb '20

04 Feb '20

The old reference report filename format was '<vmname>_<reportname>' which means there could only be one per report. Each job should only have one report of a given type per VM so add it to the reference filename. Also the use of an underscore as the separator made it hard to split the components apart as both <vmname> and <reportname> can contain underscores such as 'w1064v1809_fr' and 'win32_fr_FR.report'. Dashes are a better choice since they are not allowed in either the VM name or the report name. So the new refeence filename format is '<vmname>-job<jobid>-<reportname>'. Note: * After applying this patch run UpdateTaskLogs to move and rename the existing reference reports. * When downgrading to run code before this patch it's best to run UpdateTaskLogs --delete before downgrading and then UpdateTaskLogs after the downgrade. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- To simplify one can just apply both patches in the series and then just run UpdateTaskLogs once to upgrade the existing reports and logs. It may be a good idea to run it as follows to help with debugging in case something goes wrong: cd testbot/var && ../bin/UpdateTaskLogs --debug 2>&1 | tee UpdateTaskLogs.log testbot/bin/Janitor.pl | 3 +- testbot/bin/UpdateTaskLogs | 113 +++++++++++++++++++++++--- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 5 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/JobDetails.pl | 4 +- 7 files changed, 110 insertions(+), 21 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index bf3989a712..dd13966018 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -314,7 +314,8 @@ if (opendir(my $dh, "$DataDir/latest")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) + # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() + if ($Entry =~ /^([a-zA-Z0-9_]+)-job[0-9]+-[a-zA-Z0-9_]+\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion. diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 887061dab2..11dd6d31b9 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -261,18 +261,66 @@ sub DoUpdateLatestReport($$$) return $Rc; } +sub MoveRefReport($$;$) +{ + my ($RefDir, $RefName, $NewDir) = @_; + + my $RefPath = "$RefDir/$RefName"; + return Delete("$RefPath.err", "orphaned") if (!-f $RefPath); + + $NewDir ||= $RefDir; + my $NewName = $RefName; + if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?)$/) + { + # We don't know which job generated this reference log. + # So use a fixed, arbitrary JobId. + $NewName = "$1-job000000-$2"; + } + + my $NewPath = "$NewDir/$NewName"; + return 0 if ($RefPath eq $NewPath); + + my $Rc = 0; + my $TaskKey = Path2TaskKey($NewDir); + if (-f $NewPath and -M $NewPath <= -M $RefPath) + { + # A WineTest job has probably completed after the upgrade already + $Rc += Delete($RefPath); + $Rc += Delete("$RefPath.err"); + return $Rc; + } + + if (-f $NewPath) + { + Error "Could not move '$RefName' because '$NewName' already exists and is older!\n"; + return 1; + } + + my $RelRefDir = ($RefDir eq $NewDir) ? "" : "../"; + Debug("$TaskKey: $RelRefDir$RefName* -> $NewName\n"); + foreach my $Suffix ("", ".err") + { + next if (!-f "$RefPath$Suffix"); + next if (rename("$RefPath$Suffix", "$NewPath$Suffix")); + Error "Could not move '$RefName$Suffix' to '$NewName$Suffix' for $TaskKey: $!\n"; + $Rc = 1; + } + + return $Rc; +} + sub ProcessTaskLogs($$$) { my ($Step, $Task, $CollectOnly) = @_; my $Rc = 0; - my $StepDir = $Step->GetDir(); + my $ReportNames; my $TaskDir = $Task->GetDir(); - if (($OptDelete or $OptRebuild) and !$CollectOnly) + if (!$CollectOnly) { - # Save / delete the task's reference reports... all of them, - # even if they were not supposed to exist (e.g. failed builds). + # Upgrade the naming scheme of the task's old reference reports, + # delete those that are not meant to exist. my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); if ($ErrMessage) { @@ -280,9 +328,30 @@ sub ProcessTaskLogs($$$) $Rc = 1; } foreach my $ReportName (@$ReportNames) + { + my $StepReportName = $Task->VM->Name ."_$ReportName"; + my $StepReportPath = $Step->GetFullFileName($StepReportName); + if (-f "$TaskDir/$ReportName") + { + $Rc += MoveRefReport(dirname($StepReportPath), $StepReportName, $TaskDir); + # The old WineTest reference reports for Windows tasks may end up being + # duplicated: one copy in the build step and another in the step for + # the task. MoveRefReport() moved the latter, now ensure Delete() can + # remove the former. + $StepReportPath = $Step->GetFullFileName($StepReportName); + } + $Rc += Delete($StepReportPath, "unneeded"); + } + } + + if (($OptDelete or $OptRebuild) and !$CollectOnly) + { + # Save / delete the task's reference reports... all of them, + # even if they were not supposed to exist (e.g. failed builds). + foreach my $ReportName (@$ReportNames) { my $RefReportName = $Task->GetRefReportName($ReportName); - my $RefReportPath = "$StepDir/$RefReportName"; + my $RefReportPath = "$TaskDir/$RefReportName"; if (-f $RefReportPath or -f "$RefReportPath.err") { @@ -290,7 +359,7 @@ sub ProcessTaskLogs($$$) { # (Re)Build the .err file before adding the reference report to # latest/. - my $ErrMessage = BuildErrFile($StepDir, $RefReportName, 1, 0); + my $ErrMessage = BuildErrFile($TaskDir, $RefReportName, 1, 0); if (defined $ErrMessage) { Error "$ErrMessage\n"; @@ -315,7 +384,7 @@ sub ProcessTaskLogs($$$) { next if ($ReportName !~ /\.report$/); my $RefReportName = $Task->GetRefReportName($ReportName); - next if (-f "$StepDir/$RefReportName"); + next if (-f "$TaskDir/$RefReportName"); my $LatestReportPath = $LatestReports{$RefReportName}; if (!defined $LatestReportPath) @@ -328,9 +397,9 @@ sub ProcessTaskLogs($$$) Debug(TaskKeyStr($Task) .": Snapshotting $RefReportName from ". Path2TaskKey($LatestReportPath) ."\n"); foreach my $Suffix ("", ".err") { - unlink "$StepDir/$RefReportName$Suffix"; + unlink "$TaskDir/$RefReportName$Suffix"; if (-f "$LatestReportPath$Suffix" and - !link("$LatestReportPath$Suffix", "$StepDir/$RefReportName$Suffix")) + !link("$LatestReportPath$Suffix", "$TaskDir/$RefReportName$Suffix")) { Error "Could not link '$RefReportName$Suffix': $!\n"; $Rc = 1; @@ -390,18 +459,38 @@ sub ProcessLatestReports() my $Rc = 0; my $LatestGlob = "$DataDir/latest/*.report"; - # Perform cleanups and updates + # Delete or rename the old reference reports foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) { my $RefReportName = basename($LatestReportPath); - # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() next if ($RefReportName !~ /^([a-zA-Z0-9_]+_[a-zA-Z0-9_]+\.report)(?:\.err)?$/); $RefReportName = $1; # untaint $LatestReportPath = "$DataDir/latest/$RefReportName"; if ($OptDelete or $OptRebuild) { - # Delete the reports that should be deleted / rebuilt + $Rc += Delete($LatestReportPath); + $Rc += Delete("$LatestReportPath.err"); + } + else + { + # MoveRefReport() also renames .err files + $Rc += MoveRefReport("$DataDir/latest", $RefReportName); + } + } + + # Then perform cleanups and rebuild missing files + foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) + { + my $RefReportName = basename($LatestReportPath); + # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() + next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.report)(?:\.err)?$/); + $RefReportName = $1; # untaint + $LatestReportPath = "$DataDir/latest/$RefReportName"; + + if ($OptDelete or $OptRebuild) + { + # These can be rebuilt from the task reports $Rc += Delete($LatestReportPath); $Rc += Delete("$LatestReportPath.err"); } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 44d7255e71..e0cd585b11 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -293,7 +293,7 @@ EOF next if (!$LogInfo->{ErrCount}); my $AllNew; - my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + my $RefReportPath = "$TaskDir/". $StepTask->GetRefReportName($LogName); TagNewErrors($RefReportPath, $LogInfo); if ($LogInfo->{NoRef}) { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5b567bc23b..36f367497b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1070,11 +1070,10 @@ sub SnapshotLatestReport($$) { next if (!-f "$DataDir/latest/$RefReportName$Suffix"); - # FIXME: The reference reports are stored at the step level! if (!link("$DataDir/latest/$RefReportName$Suffix", - "$TaskDir/../$RefReportName$Suffix")) + "$TaskDir/$RefReportName$Suffix")) { - push @ErrMessages, "Could not create the '../$RefReportName$Suffix' link: $!"; + push @ErrMessages, "Could not create the '$RefReportName$Suffix' link: $!"; } } diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index bad0e24375..f65e6a6327 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -71,7 +71,7 @@ sub GetTaskDir($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - return $self->VM->Name ."_$ReportName"; + return $self->VM->Name ."-job000000-$ReportName"; } sub GetTitle($) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 1a46f0d57c..7b9ac9b816 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -141,7 +141,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - return $self->VM->Name ."_$ReportName"; + return $self->VM->Name ."-job000000-$ReportName"; } sub _SetupTask($$) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f1ffd498ed..3dce91595d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -494,7 +494,7 @@ EOF if ($LogInfo->{ErrCount}) { # Identify new errors in test reports - my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($MoreInfo->{Full})); + my $RefReportPath = "$TaskDir/". $StepTask->GetRefReportName($MoreInfo->{Full}); TagNewErrors($RefReportPath, $LogInfo); } } @@ -563,7 +563,7 @@ EOF if ($LogName =~ /\.report$/) { # For test reports try to identify the new errors - my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + my $RefReportPath = "$TaskDir/". $StepTask->GetRefReportName($LogName); TagNewErrors($RefReportPath, $LogInfo); } -- 2.20.1

1 2

[PATCH v5] ucrtbase: Added stub for _get_FMA3_enable.
by Piotr Caban 04 Feb '20

04 Feb '20

From: Rosa Hase <daxcore(a)online.de> Proton-Bug: https://github.com/ValveSoftware/Proton/issues/3227 Signed-off-by: Rosa Hase <daxcore(a)online.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - don't export the function from msvcr120.dll .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 15 ++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-)

2 1

← Newer
1
...
62
63
64
65
66
67
68
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2020