February 2020 - Wine-Commits

Zebediah Figura : qasf/dmowrapper: Flush the DMO on receiving EOS.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 86202ed6dff413d6d670118d6db0af9f3e533155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86202ed6dff413d6d670118d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:56 2020 -0600 qasf/dmowrapper: Flush the DMO on receiving EOS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 27 ++++++++++++++ dlls/qasf/tests/dmowrapper.c | 88 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 104 insertions(+), 11 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 41fe34cf1e..9e0a178542 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -335,6 +335,32 @@ out: return hr; } +static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); + DWORD index = iface - filter->sinks, i; + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) + ERR("Discontinuity() failed, hr %#x.\n", hr); + + process_output(filter, dmo); + if (FAILED(hr = IMediaObject_Flush(dmo))) + ERR("Flush() failed, hr %#x.\n", hr); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + IPin_EndOfStream(filter->sources[i].pin.pin.peer); + } + + IMediaObject_Release(dmo); + return hr; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dmo_wrapper_sink_query_interface, @@ -342,6 +368,7 @@ static const struct strmbase_sink_ops sink_ops = .base.pin_get_media_type = dmo_wrapper_sink_get_media_type, .sink_connect = dmo_wrapper_sink_connect, .sink_disconnect = dmo_wrapper_sink_disconnect, + .sink_eos = dmo_wrapper_sink_eos, .pfnReceive = dmo_wrapper_sink_Receive, }; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 5dcc75d555..b509839de4 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -307,7 +307,7 @@ static HRESULT WINAPI dmo_ProcessInput(IMediaObject *iface, DWORD index, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(len == 256, "Got length %u.\n", len); - if (testmode == 0) + if (testmode == 0 || testmode == 12) { ok(!flags, "Got flags %#x.\n", flags); ok(!timestamp, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp)); @@ -356,7 +356,10 @@ static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, ok(count == 2, "Got count %u.\n", count); ok(!!buffers[0].pBuffer, "Expected a buffer.\n"); - ok(!buffers[1].pBuffer, "Got unexpected buffer %p.\n", buffers[1].pBuffer); + if (testmode == 12) + ok(!!buffers[1].pBuffer, "Expected a buffer.\n"); + else + ok(!buffers[1].pBuffer, "Got unexpected buffer %p.\n", buffers[1].pBuffer); buffers[1].dwStatus = DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; @@ -372,6 +375,15 @@ static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, buffers[0].rtTimelength = 1000; buffers[0].rtTimestamp = 5000; + if (buffers[1].pBuffer) + { + buffers[1].dwStatus = buffers[0].dwStatus; + buffers[1].rtTimelength = buffers[0].rtTimelength; + buffers[1].rtTimestamp = buffers[0].rtTimestamp; + hr = IMediaBuffer_SetLength(buffers[1].pBuffer, 300); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + if (testmode == 3) { hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 16200); @@ -399,8 +411,9 @@ static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, data[i] = 111 - i; hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 300); ok(hr == S_OK, "Got hr %#x.\n", hr); - if (testmode != 10) + if (testdmo_buffer) IMediaBuffer_Release(testdmo_buffer); + testdmo_buffer = NULL; return S_OK; } @@ -1108,7 +1121,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; - unsigned int got_new_segment; + unsigned int got_new_segment, got_eos; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1210,12 +1223,15 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample ok(len == 300, "Got length %u.\n", len); - hr = IMediaSample_GetPointer(sample, &data); - ok(hr == S_OK, "Got hr %#x.\n", hr); + if (testmode != 12) + { + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); - for (i = 0; i < 300; ++i) - expect[i] = 111 - i; - ok(!memcmp(data, expect, 300), "Data didn't match.\n"); + for (i = 0; i < 300; ++i) + expect[i] = 111 - i; + ok(!memcmp(data, expect, 300), "Data didn't match.\n"); + } } hr = IMediaSample_GetTime(sample, &start, &stop); @@ -1262,6 +1278,13 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface, return 0xdeadbeef; } +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_eos; + return 0xdeadbeef; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, @@ -1269,6 +1292,7 @@ static const struct strmbase_sink_ops testsink_ops = .base.pin_get_media_type = testsink_get_media_type, .pfnReceive = testsink_Receive, .sink_new_segment = testsink_new_segment, + .sink_eos = testsink_eos, }; static void testfilter_init(struct testfilter *filter) @@ -1605,11 +1629,10 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input) ok(got_ProcessOutput == 2, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); - got_ProcessInput = got_ProcessOutput = got_Receive = 0; + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); - IMediaSample_Release(sample); IMemAllocator_Release(allocator); } @@ -1617,11 +1640,30 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input) static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputPin *input, struct testfilter *testsink, struct testfilter *testsink2) { + IMemAllocator *allocator; + IMediaSample *sample; HRESULT hr; + BYTE *data; + LONG i; hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + got_Flush = 0; + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); ok(!testsink2->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); hr = IPin_NewSegment(sink, 10000, 20000, 1.0); @@ -1629,8 +1671,32 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); ok(testsink2->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); + ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + ok(!testsink2->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); + testmode = 12; + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!got_ProcessInput, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); + ok(got_Flush == 1, "Got %u calls to Flush().\n", got_Flush); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; + + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); } static void test_connect_pin(void)

1 0

Zebediah Figura : qasf/tests: Add tests for IPin::NewSegment().
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: c10e54066ff6dfb7fdd3c50b80cfe8fd972834f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c10e54066ff6dfb7fdd3c50b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:55 2020 -0600 qasf/tests: Add tests for IPin::NewSegment(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 00ca09de2e..5dcc75d555 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1108,6 +1108,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; + unsigned int got_new_segment; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1250,12 +1251,24 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample return S_OK; } +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_new_segment; + ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop)); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return 0xdeadbeef; +} + 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, + .sink_new_segment = testsink_new_segment, }; static void testfilter_init(struct testfilter *filter) @@ -1601,6 +1614,25 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input) IMemAllocator_Release(allocator); } +static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputPin *input, + struct testfilter *testsink, struct testfilter *testsink2) +{ + HRESULT hr; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + ok(!testsink2->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); + hr = IPin_NewSegment(sink, 10000, 20000, 1.0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + ok(testsink2->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -1609,9 +1641,9 @@ static void test_connect_pin(void) .subtype = MEDIASUBTYPE_Avi, .formattype = FORMAT_None, }; + struct testfilter testsource, testsink, testsink2; IBaseFilter *filter = create_dmo_wrapper(); - struct testfilter testsource, testsink; - IPin *sink, *source, *peer; + IPin *sink, *source, *source2, *peer; IMediaControl *control; IMemInputPin *meminput; IFilterGraph2 *graph; @@ -1621,14 +1653,17 @@ static void test_connect_pin(void) testfilter_init(&testsource); testfilter_init(&testsink); + testfilter_init(&testsink2); CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + IFilterGraph2_AddFilter(graph, &testsink2.filter.IBaseFilter_iface, L"sink2"); IFilterGraph2_AddFilter(graph, filter, L"DMO wrapper"); IBaseFilter_FindPin(filter, L"in0", &sink); IBaseFilter_FindPin(filter, L"out0", &source); + IBaseFilter_FindPin(filter, L"out1", &source2); IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&meminput); /* Test sink connection. */ @@ -1695,6 +1730,17 @@ static void test_connect_pin(void) test_filter_state(control); test_sample_processing(control, meminput); + /* Streaming event tests are more interesting if multiple source pins are + * connected. */ + + hr = IFilterGraph2_ConnectDirect(graph, source2, &testsink2.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_streaming_events(control, sink, meminput, &testsink, &testsink2); + + IFilterGraph2_Disconnect(graph, source2); + IFilterGraph2_Disconnect(graph, &testsink2.sink.pin.IPin_iface); + hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, source); @@ -1830,6 +1876,7 @@ static void test_connect_pin(void) IPin_Release(sink); IPin_Release(source); + IPin_Release(source2); IMemInputPin_Release(meminput); IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); @@ -1840,6 +1887,8 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsink2.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); } START_TEST(dmowrapper)

1 0

Zebediah Figura : qasf/dmowrapper: Implement receiving and delivering samples.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: ed8d3d325fa53bcc70e16e17811f36e94f2b75c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed8d3d325fa53bcc70e16e17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:54 2020 -0600 qasf/dmowrapper: Implement receiving and delivering samples. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 247 ++++++++++++++++++++++++++++- dlls/qasf/tests/dmowrapper.c | 365 ++++++++++++++++++++++++++++++++++++++++--- include/mediaobj.idl | 17 ++ 3 files changed, 609 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed8d3d325fa53bcc70e1…

1 0

Zebediah Figura : qasf/dmowrapper: Implement seeking via pass-through.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: d4e91228e50595a632bbab63e5014a93c3037719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4e91228e50595a632bbab63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:58 2020 -0600 qasf/dmowrapper: Implement seeking via pass-through. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 26 ++++++++++++++++++++++++++ dlls/qasf/tests/dmowrapper.c | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 32a9d41b7a..cba9023e13 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -32,6 +32,7 @@ struct dmo_wrapper_source { struct strmbase_source pin; struct buffer buffer; + IUnknown *seeking; }; struct dmo_wrapper @@ -400,6 +401,16 @@ static inline struct dmo_wrapper_source *impl_source_from_strmbase_pin(struct st return CONTAINING_RECORD(iface, struct dmo_wrapper_source, pin.pin); } +static HRESULT dmo_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct dmo_wrapper_source *pin = impl_source_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMediaSeeking) || IsEqualGUID(iid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(pin->seeking, iid, out); + + return E_NOINTERFACE; +} + static HRESULT dmo_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); @@ -476,6 +487,7 @@ static void dmo_wrapper_source_disconnect(struct strmbase_source *iface) static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = dmo_wrapper_source_query_interface, .base.pin_query_accept = dmo_wrapper_source_query_accept, .base.pin_get_media_type = dmo_wrapper_source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -556,9 +568,20 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID for (i = 0; i < output_count; ++i) { + ISeekingPassThru *passthrough; + swprintf(id, ARRAY_SIZE(id), L"out%u", i); strmbase_source_init(&sources[i].pin, &filter->filter, id, &source_ops); sources[i].buffer.IMediaBuffer_iface.lpVtbl = &buffer_vtbl; + + if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, + (IUnknown *)&sources[i].pin.pin.IPin_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&sources[i].seeking))) + ERR("Failed to create SeekingPassThru object, hr %#x.\n", hr); + + IUnknown_QueryInterface(sources[i].seeking, &IID_ISeekingPassThru, (void **)&passthrough); + ISeekingPassThru_Init(passthrough, FALSE, &sinks[0].pin.IPin_iface); + ISeekingPassThru_Release(passthrough); } EnterCriticalSection(&filter->filter.csFilter); @@ -606,7 +629,10 @@ static void dmo_wrapper_destroy(struct strmbase_filter *iface) for (i = 0; i < filter->sink_count; ++i) strmbase_sink_cleanup(&filter->sinks[i]); for (i = 0; i < filter->source_count; ++i) + { + IUnknown_Release(filter->sources[i].seeking); strmbase_source_cleanup(&filter->sources[i].pin); + } free(filter->sinks); free(filter->sources); strmbase_filter_cleanup(&filter->filter); diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 9ec9f85d55..50546ec2a8 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -574,8 +574,8 @@ static void test_interfaces(void) IBaseFilter_FindPin(filter, L"out0", &pin); - todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); check_interface(pin, &IID_IPin, TRUE); todo_wine check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE);

1 0

Alexandre Julliard : ntdll: Use external NLS files for Unicode normalization.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 64dc42e34ffb0178fd9679359f41d09fca76d5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=64dc42e34ffb0178fd967935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 20:05:03 2020 +0100 ntdll: Use external NLS files for Unicode normalization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 - dlls/ntdll/locale.c | 350 ++++++++++++++++++++++++++++++------------- 2 files changed, 250 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64dc42e34ffb0178fd96…

1 0

Francois Gouget : shell32/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 8c5795611cb40f7fef6efe473a39402b3a68f168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5795611cb40f7fef6efe47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 08:08:49 2020 +0100 shell32/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9ec7226312..f3a634dc29 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1779,7 +1779,7 @@ static void test_NonExistentPath(void) STARTUPINFOA startup; PROCESS_INFORMATION info; - sprintf(buffer, "%s tests/shellpath.c 1", selfname); + sprintf(buffer, "%s shellpath 1", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -1794,7 +1794,7 @@ static void test_NonExistentPath(void) strlen(originalPath) + 1); RegFlushKey(key); - sprintf(buffer, "%s tests/shellpath.c 2", selfname); + sprintf(buffer, "%s shellpath 2", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

1 0

Francois Gouget : testbot/LogUtils: The exception codes are always 32 bit.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: tools Branch: master Commit: c80db6335fb2383cec0c49e875bbff231619c857 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c80db6335fb2383cec0c49e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:01:04 2020 +0100 testbot/LogUtils: The exception codes are always 32 bit. Only the addresses may be 64 bit. 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 2d4e4ee..734d322 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1045,7 +1045,7 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; # and the process id - $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/;

1 0

Francois Gouget : testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: tools Branch: master Commit: 24592cf8576879d60c63a3f9b62672eaf2c4877a URL: https://source.winehq.org/git/tools.git/?a=commit;h=24592cf8576879d60c63a3f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 11:37:05 2020 +0100 testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines. Changing the timeout lines for reporting prevented the parser from recognizing them and lead to extraneous missing failure / todo / skip errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 734d322..12decee 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -532,17 +532,18 @@ sub ParseWineTestReport($$$) if (GetReportLineCategory($Line) eq "error") { # Make the timeout messages more user-friendly - if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) { my $Unit = $1; - $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; } if (!$CurGroup) { $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); } - _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); } if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%)

1 0

Francois Gouget : testbot/LogUtils: The done lines always contain timing information.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: tools Branch: master Commit: a7914bbc8ec49e8d71e6ab66aae806a0eac849f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a7914bbc8ec49e8d71e6ab6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:02:41 2020 +0100 testbot/LogUtils: The done lines always contain timing information. Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a95eeca..18ebe93 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -648,8 +648,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) or + $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : winetest/dissect: The done lines always contain timing information.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: tools Branch: master Commit: 6bcbb9bd44c8f7ad18bb1a1f5d2f1ef5498ec73a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6bcbb9bd44c8f7ad18bb1a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:02:26 2020 +0100 winetest/dissect: The done lines always contain timing information. Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 6c6c594..ca8648a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -710,8 +710,8 @@ while ($line = <IN>) { } } elsif (($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) or + $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);

1 0