September 2019 - Wine-Commits

Francois Gouget : winspool.drv/tests: Avoid an unneeded strlen() call.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 71ad4add7361c87936a103a4f759f0ff11e7797f URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ad4add7361c87936a103a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 30 01:39:57 2019 +0200 winspool.drv/tests: Avoid an unneeded strlen() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index bfc80ce0f6..03a2e3cd32 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1456,7 +1456,7 @@ static void test_GetDefaultPrinter(void) SetLastError(ERROR_SUCCESS); retval = pGetDefaultPrinterA(buffer, &exact); - if (!retval || !exact || !strlen(buffer) || + if (!retval || !exact || !*buffer || (ERROR_SUCCESS != GetLastError())) { if ((ERROR_FILE_NOT_FOUND == GetLastError()) || (ERROR_INVALID_NAME == GetLastError()))

1 0

Dmitry Timoshkov : winspool: Add support for level 1 printer info to GetPrinter.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: df8c52cd91ba71d1b778f749cae4f0cd1dfaf671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8c52cd91ba71d1b778f749… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 27 13:22:18 2019 +0800 winspool: Add support for level 1 printer info to GetPrinter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d7e2211102..1ab5e43aef 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4435,6 +4435,24 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } switch(Level) { + case 1: + { + PRINTER_INFO_1W *pi1 = (PRINTER_INFO_1W *)pPrinter; + + size = sizeof(PRINTER_INFO_1W); + if (size <= cbBuf) { + ptr = pPrinter + size; + cbBuf -= size; + memset(pPrinter, 0, size); + } else { + pi1 = NULL; + cbBuf = 0; + } + ret = WINSPOOL_GetPrinter_1(hkeyPrinter, pi1, ptr, cbBuf, &needed); + needed += size; + break; + } + case 2: { PRINTER_INFO_2W *pi2 = (PRINTER_INFO_2W *)pPrinter;

1 0

Huw Davies : winegcc: Add a missing break.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: ba2def2503ac16e11a6186909805e53b3ef1885b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba2def2503ac16e11a618690… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 30 08:35:47 2019 +0100 winegcc: Add a missing break. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0ca553318e..fa4407f913 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -737,6 +737,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D__stdcall=__attribute__((pcs(\"aapcs-vfp\")))"); strarray_add(comp_args, "-D__cdecl=__stdcall"); strarray_add(comp_args, "-D__fastcall=__stdcall"); + break; case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl=");

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer pin connection.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 696c4f8f938555676b4d45d1c5c2566fd15e202c URL: https://source.winehq.org/git/wine.git/?a=commit;h=696c4f8f938555676b4d45d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:25 2019 -0500 quartz/tests: Add some tests for video renderer pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/videorenderer.c | 235 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index da474e9530..fe1a45e8ec 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = advapi32 msvfw32 ole32 oleaut32 strmiids user32 uuid +IMPORTS = strmbase advapi32 msvfw32 ole32 oleaut32 strmiids user32 uuid C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 7d3b277617..24cf0cc828 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static const WCHAR sink_id[] = {'I','n',0}; @@ -33,6 +34,21 @@ static IBaseFilter *create_video_renderer(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 IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -472,6 +488,224 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static const IBaseFilterVtbl testfilter_vtbl = +{ + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, + BaseFilterImpl_GetClassID, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, + BaseFilterImpl_GetState, + BaseFilterImpl_SetSyncSource, + BaseFilterImpl_GetSyncSource, + BaseFilterImpl_EnumPins, + BaseFilterImpl_FindPin, + BaseFilterImpl_QueryFilterInfo, + BaseFilterImpl_JoinFilterGraph, + BaseFilterImpl_QueryVendorInfo, +}; + +static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + if (!index) + return &filter->source.pin.IPin_iface; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static const IPinVtbl testsource_vtbl = +{ + BasePinImpl_QueryInterface, + BasePinImpl_AddRef, + BasePinImpl_Release, + BaseOutputPinImpl_Connect, + BaseOutputPinImpl_ReceiveConnection, + BasePinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseOutputPinImpl_EndOfStream, + BaseOutputPinImpl_BeginFlush, + BaseOutputPinImpl_EndFlush, + BasePinImpl_NewSegment, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + 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.mtCurrent, 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.mtCurrent); + } + + return hr; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = testsource_AttemptConnection, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, &testfilter_vtbl, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &testsource_vtbl, &filter->filter, L"", &testsource_ops); +} + +static void test_connect_pin(void) +{ + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biBitCount = 16, + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 16, + .bmiHeader.biPlanes = 1, + .bmiHeader.biCompression = BI_RGB, + }; + AM_MEDIA_TYPE req_mt = + { + .majortype = MEDIATYPE_Video, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(vih), + .pbFormat = (BYTE *)&vih, + }; + IBaseFilter *filter = create_video_renderer(); + IFilterGraph2 *graph = create_graph(); + struct testfilter source; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + unsigned int i; + HRESULT hr; + ULONG ref; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB8, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + testfilter_init(&source); + + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, filter, NULL); + + IBaseFilter_FindPin(filter, sink_id, &pin); + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + req_mt.formattype = FORMAT_None; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.formattype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.formattype = FORMAT_VideoInfo; + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -597,6 +831,7 @@ START_TEST(videorenderer) test_media_types(); test_enum_media_types(); test_unconnected_filter_state(); + test_connect_pin(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Add some tests for allocator negotiation on the video renderer filter.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 23bd22a80b7c198fb573e865200cbc03c3485d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bd22a80b7c198fb573e865… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:26 2019 -0500 quartz/tests: Add some tests for allocator negotiation on the video renderer filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 50 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 24cf0cc828..bce42c4b8b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -600,6 +600,49 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &testsource_vtbl, &filter->filter, L"", &testsource_ops); } +static void test_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -621,6 +664,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_video_renderer(); IFilterGraph2 *graph = create_graph(); struct testfilter source; + IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; unsigned int i; @@ -682,6 +726,10 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + + test_allocator(input); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); @@ -697,6 +745,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -716,7 +765,6 @@ static void test_pin(IPin *pin) if (mpin) { ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); - ok(IMemInputPin_NotifyAllocator(mpin, NULL, 0) == E_POINTER, "NotifyAllocator likes a NULL pointer argument\n"); IMemInputPin_Release(mpin); } /* TODO */

1 0

Zebediah Figura : quartz/tests: Add tests for sample presentation time for the video renderer.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 78f6d6715320724735b9fbb0160498637806569e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f6d6715320724735b9fbb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:29 2019 -0500 quartz/tests: Add tests for sample presentation time for the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 88 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index a3ca8038bc..3919b419e1 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -663,11 +663,11 @@ static DWORD WINAPI frame_thread(void *arg) return hr; } -static HANDLE send_frame(IMemInputPin *sink) +static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) { struct frame_thread_params *params = heap_alloc(sizeof(*params)); - REFERENCE_TIME start_time, end_time; IMemAllocator *allocator; + REFERENCE_TIME end_time; IMediaSample *sample; HANDLE thread; HRESULT hr; @@ -681,12 +681,12 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 2); + memset(data, color, 32 * 16 * 2); hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); ok(hr == S_OK, "Got hr %#x.\n", hr); - start_time = 0; + start_time *= 10000000; end_time = start_time + 10000000; hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -699,6 +699,11 @@ static HANDLE send_frame(IMemInputPin *sink) return thread; } +static HANDLE send_frame(IMemInputPin *sink) +{ + return send_frame_time(sink, 0, 0x55); /* purple */ +} + static HRESULT join_thread_(int line, HANDLE thread) { DWORD ret; @@ -912,6 +917,80 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1, 0x11); /* dark blue */ + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Sample time is relative to the time passed to Run(). Thus a sample + * stamped at or earlier than 1s will now be displayed immediately, because + * that time has already passed. + * One may manually verify that all of the frames in this function are + * rendered, including (by adding a Sleep() after sending the frame) the + * dark and light green frames. Thus the video renderer does not attempt to + * drop any frames that it considers late. This remains true if the frames + * are marked as discontinuous. */ + + hr = join_thread(send_frame_time(input, 1, 0x22)); /* dark green */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame_time(input, 0, 0x33)); /* light green */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame_time(input, -2, 0x44)); /* dark red */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 2, 0x66); /* orange */ + ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1000000, 0xff); /* white */ + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1000000, 0xff); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1017,6 +1096,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); + test_sample_time(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Francois Gouget : mshtml: Fix the spelling of some comments.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: badcda7887c38da6766e5d67f7c1098405a6ea69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badcda7887c38da6766e5d67… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 30 01:39:00 2019 +0200 mshtml: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 09148aa9d1..6074edebca 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2989,7 +2989,7 @@ interface nsIDOMEvent : nsISupports nsresult DuplicatePrivateData(); nsresult SetTarget(nsIDOMEventTarget *aTarget); bool IsDispatchStopped(); - /*WidgedEvent*/ void *WidgetEventPtr(); + /*WidgetEvent*/ void *WidgetEventPtr(); void SetTrusted(bool aTrusted); void Serialize(/*IPC::Message*/ void *aMsg, bool aSerializeInterfaceType); bool Deserialize(const /*IPC::Message*/ void *aMsg, void **aIter); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index e239fb5b16..e87ca47c39 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -354,7 +354,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { - WARN("GetDiaplayName failed: %08x\n", hres); + WARN("GetDisplayName failed: %08x\n", hres); return hres; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f8ae785b39..d13381aa0a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5133,7 +5133,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG * STopLevelBrowser * IHTMLWindow2 * IInternetProtocol - * UrlHostory + * UrlHistory * IHTMLEditHost * IHlinkFrame */

1 0

Zebediah Figura : strmbase: Set the filter debug info only if valid.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 25609bd4127d6f38980321f0aa026f4d6cc88352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25609bd4127d6f38980321f0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:24 2019 -0500 strmbase: Set the filter debug info only if valid. Fixes using binaries compiled with Wine's strmbase with Windows 8 and higher. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index b52a99d25b..2de0a78f7a 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -302,7 +302,8 @@ void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl filter->refcount = 1; InitializeCriticalSection(&filter->csFilter); - filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter"); + if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter"); filter->clsid = *clsid; filter->pin_version = 1; filter->pFuncsTable = func_table; @@ -314,6 +315,5 @@ void strmbase_filter_cleanup(struct strmbase_filter *This) IReferenceClock_Release(This->pClock); This->IBaseFilter_iface.lpVtbl = NULL; - This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); }

1 0

Zebediah Figura : quartz/tests: Add some tests for flushing on the video renderer.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 0867dd77b63b91086f046d52b4d5e6758a8e963a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0867dd77b63b91086f046d52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:28 2019 -0500 quartz/tests: Add some tests for flushing on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4e948a9120..a3ca8038bc 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -850,6 +850,68 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* We dropped the sample we were holding, so now we need a new one... */ + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -954,6 +1016,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_filter_state(input, graph); + test_flushing(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Piotr Caban : kernel32: Don't use uninitialized ofs->szPathName in OpenFile.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 392648dda225c06955cbc9d57e12bb3f00d9e7bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=392648dda225c06955cbc9d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 20:00:32 2019 +0200 kernel32: Don't use uninitialized ofs->szPathName in OpenFile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2b6a13fc0d..bdf429cc05 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1166,6 +1166,7 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) HANDLE handle; FILETIME filetime; WORD filedatetime[2]; + DWORD len; if (!ofs) return HFILE_ERROR; @@ -1201,7 +1202,13 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) /* the watcom 10.6 IDE relies on a valid path returned in ofs->szPathName Are there any cases where getting the path here is wrong? Uwe Bonnes 1997 Apr 2 */ - if (!GetFullPathNameA( name, sizeof(ofs->szPathName), ofs->szPathName, NULL )) goto error; + len = GetFullPathNameA( name, sizeof(ofs->szPathName), ofs->szPathName, NULL ); + if (!len) goto error; + if (len >= sizeof(ofs->szPathName)) + { + SetLastError(ERROR_INVALID_DATA); + goto error; + } /* OF_PARSE simply fills the structure */ @@ -1224,8 +1231,13 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) { /* Now look for the file */ - if (!SearchPathA( NULL, name, NULL, sizeof(ofs->szPathName), ofs->szPathName, NULL )) + len = SearchPathA( NULL, name, NULL, sizeof(ofs->szPathName), ofs->szPathName, NULL ); + if (!len) goto error; + if (len >= sizeof(ofs->szPathName)) + { + SetLastError(ERROR_INVALID_DATA); goto error; + } TRACE("found %s\n", debugstr_a(ofs->szPathName) );

1 0