March 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Remove extra critical section from stream descriptor.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 2f4ba6e88bd7e48d1ef6d868fa864f566eccbb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4ba6e88bd7e48d1ef6d868… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:32:27 2020 +0300 mfplat: Remove extra critical section from stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index c52255723c..69b302ca89 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -43,7 +43,6 @@ struct stream_desc IMFMediaType **media_types; unsigned int media_types_count; IMFMediaType *current_type; - CRITICAL_SECTION cs; }; struct presentation_desc_entry @@ -665,7 +664,6 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface) if (stream_desc->current_type) IMFMediaType_Release(stream_desc->current_type); clear_attributes_object(&stream_desc->attributes); - DeleteCriticalSection(&stream_desc->cs); heap_free(stream_desc); } @@ -1087,12 +1085,12 @@ static HRESULT WINAPI mediatype_handler_SetCurrentMediaType(IMFMediaTypeHandler if (!type) return E_POINTER; - EnterCriticalSection(&stream_desc->cs); + EnterCriticalSection(&stream_desc->attributes.cs); if (stream_desc->current_type) IMFMediaType_Release(stream_desc->current_type); stream_desc->current_type = type; IMFMediaType_AddRef(stream_desc->current_type); - LeaveCriticalSection(&stream_desc->cs); + LeaveCriticalSection(&stream_desc->attributes.cs); return S_OK; } @@ -1104,7 +1102,7 @@ static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler TRACE("%p, %p.\n", iface, type); - EnterCriticalSection(&stream_desc->cs); + EnterCriticalSection(&stream_desc->attributes.cs); if (stream_desc->current_type) { *type = stream_desc->current_type; @@ -1112,7 +1110,7 @@ static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler } else hr = MF_E_NOT_INITIALIZED; - LeaveCriticalSection(&stream_desc->cs); + LeaveCriticalSection(&stream_desc->attributes.cs); return hr; } @@ -1124,12 +1122,12 @@ static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, TRACE("%p, %p.\n", iface, type); - EnterCriticalSection(&stream_desc->cs); + EnterCriticalSection(&stream_desc->attributes.cs); if (stream_desc->current_type) hr = IMFMediaType_GetGUID(stream_desc->current_type, &MF_MT_MAJOR_TYPE, type); else hr = MF_E_ATTRIBUTENOTFOUND; - LeaveCriticalSection(&stream_desc->cs); + LeaveCriticalSection(&stream_desc->attributes.cs); return hr; } @@ -1175,7 +1173,6 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; object->identifier = identifier; object->media_types = heap_alloc(count * sizeof(*object->media_types)); - InitializeCriticalSection(&object->cs); if (!object->media_types) { IMFStreamDescriptor_Release(&object->IMFStreamDescriptor_iface);

1 0

Nikolay Sivov : include: Add some MFT flags types.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 7e289dec7688a94e126c2c9859fa63b78d2ec5d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e289dec7688a94e126c2c98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 18:33:06 2020 +0300 include: Add some MFT flags types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mftransform.idl | 108 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 24 deletions(-) diff --git a/include/mftransform.idl b/include/mftransform.idl index 8cc0ffbc50..59e40f95f7 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -18,6 +18,90 @@ import "mfobjects.idl"; +typedef [v1_enum] enum _MFT_MESSAGE_TYPE +{ + MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, + MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, + MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, + MFT_MESSAGE_DROP_SAMPLES = 0x00000003, + MFT_MESSAGE_COMMAND_TICK = 0x00000004, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, + MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, + MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, + MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, + MFT_MESSAGE_NOTIFY_RELEASE_RESOURCES = 0x10000004, + MFT_MESSAGE_NOTIFY_REACQUIRE_RESOURCES = 0x10000005, + MFT_MESSAGE_NOTIFY_EVENT = 0x10000006, + MFT_MESSAGE_COMMAND_SET_OUTPUT_STREAM_STATE = 0x10000007, + MFT_MESSAGE_COMMAND_FLUSH_OUTPUT_STREAM = 0x10000008, + MFT_MESSAGE_COMMAND_MARKER = 0x20000000 +} MFT_MESSAGE_TYPE; + +enum _MFT_SET_TYPE_FLAGS +{ + MFT_SET_TYPE_TEST_ONLY = 0x00000001, +}; + +enum _MFT_INPUT_STREAM_INFO_FLAGS +{ + MFT_INPUT_STREAM_WHOLE_SAMPLES = 0x00000001, + MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004, + MFT_INPUT_STREAM_HOLDS_BUFFERS = 0x00000008, + MFT_INPUT_STREAM_DOES_NOT_ADDREF = 0x00000100, + MFT_INPUT_STREAM_REMOVABLE = 0x00000200, + MFT_INPUT_STREAM_OPTIONAL = 0x00000400, + MFT_INPUT_STREAM_PROCESSES_IN_PLACE = 0x00000800 +}; + +enum _MFT_INPUT_STATUS_FLAGS +{ + MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, +}; + +enum _MFT_OUTPUT_STREAM_INFO_FLAGS +{ + MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001, + MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004, + MFT_OUTPUT_STREAM_DISCARDABLE = 0x00000008, + MFT_OUTPUT_STREAM_OPTIONAL = 0x00000010, + MFT_OUTPUT_STREAM_PROVIDES_SAMPLES = 0x00000100, + MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES = 0x00000200, + MFT_OUTPUT_STREAM_LAZY_READ = 0x00000400, + MFT_OUTPUT_STREAM_REMOVABLE = 0x00000800 +}; + +enum _MFT_OUTPUT_DATA_BUFFER_FLAGS +{ + MFT_OUTPUT_DATA_BUFFER_INCOMPLETE = 0x01000000, + MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE = 0x00000100, + MFT_OUTPUT_DATA_BUFFER_STREAM_END = 0x00000200, + MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE = 0x00000300 +}; + +enum _MFT_OUTPUT_STATUS_FLAGS +{ + MFT_OUTPUT_STATUS_SAMPLE_READY = 0x00000001 +}; + +enum _MFT_PROCESS_OUTPUT_FLAGS +{ + MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001, + MFT_PROCESS_OUTPUT_REGENERATE_LAST_OUTPUT = 0x00000002 +}; + +enum _MFT_PROCESS_OUTPUT_STATUS +{ + MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS = 0x00000100 +}; + +enum _MFT_DRAIN_TYPE +{ + MFT_DRAIN_PRODUCE_TAILS = 0x00000000, + MFT_DRAIN_NO_TAILS = 0x00000001 +}; + typedef struct _MFT_INPUT_STREAM_INFO { LONGLONG hnsMaxLatency; @@ -42,30 +126,6 @@ typedef struct _MFT_OUTPUT_DATA_BUFFER IMFCollection *pEvents; } MFT_OUTPUT_DATA_BUFFER, *PMFT_OUTPUT_DATA_BUFFER; -typedef [v1_enum] enum _MFT_MESSAGE_TYPE -{ - MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, - MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, - MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, - MFT_MESSAGE_DROP_SAMPLES = 0x00000003, - MFT_MESSAGE_COMMAND_TICK = 0x00000004, - MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, - MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, - MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, - MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, - MFT_MESSAGE_COMMAND_MARKER = 0x20000000 -} MFT_MESSAGE_TYPE; - -enum _MFT_SET_TYPE_FLAGS -{ - MFT_SET_TYPE_TEST_ONLY = 0x00000001, -}; - -enum _MFT_INPUT_STATUS_FLAGS -{ - MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, -}; - [ object, uuid(bf94c121-5b05-4e6f-8000-ba598961414d)

1 0

Vincent Povirk : windowscodecs: Fix ICNS encoder write_source call.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: fea96a5739573d7d1deff38588e29f278cd388a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea96a5739573d7d1deff385… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 6 10:02:58 2020 -0600 windowscodecs: Fix ICNS encoder write_source call. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 8194bc508a..5b94906e80 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -401,7 +401,7 @@ static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - &GUID_WICPixelFormat32bppBGRA, 32, This->size, This->size); + &GUID_WICPixelFormat32bppBGRA, 32, FALSE, This->size, This->size); } return hr;

1 0

Zebediah Figura : qcap/capturegraph: Return BOOL from pin_matches().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: e09be148f2220b3706f7c4e95e9a04d473d03883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09be148f2220b3706f7c4e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:04:33 2020 -0600 qcap/capturegraph: Return BOOL from pin_matches(). It is not interesting to account for IPin::QueryDirection failing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index bae75f8372..7a96101724 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -580,25 +580,24 @@ fnCaptureGraphBuilder2_CopyCaptureFile(ICaptureGraphBuilder2 * iface, return E_NOTIMPL; } -static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) +static BOOL pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) { IPin *partner; PIN_DIRECTION pindir; HRESULT hr; - hr = IPin_QueryDirection(pin, &pindir); + if (FAILED(hr = IPin_QueryDirection(pin, &pindir))) + ERR("Failed to query direction, hr %#x.\n", hr); if (unconnected && IPin_ConnectedTo(pin, &partner) == S_OK && partner!=NULL) { IPin_Release(partner); TRACE("No match, %p already connected to %p\n", pin, partner); - return FAILED(hr) ? hr : S_FALSE; + return FALSE; } - if (FAILED(hr)) - return hr; - if (SUCCEEDED(hr) && pindir != direction) - return S_FALSE; + if (pindir != direction) + return FALSE; if (cat) { @@ -608,13 +607,13 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, hr = IPin_QueryInterface(pin, &IID_IKsPropertySet, (void**)&props); if (FAILED(hr)) - return S_FALSE; + return FALSE; hr = IKsPropertySet_Get(props, &AMPROPSETID_Pin, 0, NULL, 0, &category, sizeof(category), &fetched); IKsPropertySet_Release(props); if (FAILED(hr) || !IsEqualIID(&category, cat)) - return S_FALSE; + return FALSE; } if (type) @@ -625,14 +624,14 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, hr = IPin_EnumMediaTypes(pin, &types); if (FAILED(hr)) - return S_FALSE; + return FALSE; IEnumMediaTypes_Reset(types); while (1) { if (IEnumMediaTypes_Next(types, 1, &media_type, &fetched) != S_OK || fetched != 1) { IEnumMediaTypes_Release(types); - return S_FALSE; + return FALSE; } if (IsEqualIID(&media_type->majortype, type)) @@ -646,7 +645,7 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, } TRACE("Pin matched\n"); - return S_OK; + return TRUE; } static HRESULT WINAPI @@ -712,13 +711,10 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, } TRACE("Testing match\n"); - hr = pin_matches(pin, pindir, pCategory, pType, fUnconnected); - if (hr == S_OK && numcurrent++ == num) + if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) && numcurrent++ == num) break; IPin_Release(pin); pin = NULL; - if (FAILED(hr)) - break; } IEnumPins_Release(enumpins); IBaseFilter_Release(filter); @@ -729,7 +725,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, return E_FAIL; } } - else if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) != S_OK) + else if (!pin_matches(pin, pindir, pCategory, pType, fUnconnected)) { IPin_Release(pin); return E_FAIL;

1 0

Zebediah Figura : qcap/capturegraph: Implement ICaptureGraphBuilder2::FindInterface().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: fc7477d83e2aac72a08de57fc4970d016ae1ff12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7477d83e2aac72a08de57f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:04:34 2020 -0600 qcap/capturegraph: Implement ICaptureGraphBuilder2::FindInterface(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 245 ++++++++++++------- dlls/qcap/tests/Makefile.in | 1 + dlls/qcap/tests/capturegraph.c | 538 +++++++++++++++++++++++++++++++++++++++++ include/axextend.idl | 6 + 4 files changed, 706 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc7477d83e2aac72a08d…

1 0

Zebediah Figura : quartz/filesource: Check if the media type is acceptable.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 8e80f68dce41d4cbab7f23c14d9c51c7c615e7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e80f68dce41d4cbab7f23c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:04:35 2020 -0600 quartz/filesource: Check if the media type is acceptable. PowerPoint 2016 tries to build a graph by autoplugging the file source to the sample grabber; direct connection should fail here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/tests/filesource.c | 30 +++++------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index c1f7f69d5e..53d9528d26 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -611,7 +611,8 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt); - /* FIXME: call queryacceptproc */ + if (This->pin.ops->pin_query_accept(&This->pin, pmt) != S_OK) + return VFW_E_TYPE_NOT_ACCEPTED; This->pin.peer = pReceivePin; IPin_AddRef(pReceivePin); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 846b92ac60..2040910516 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1363,12 +1363,7 @@ static void test_connect_pin(void) req_mt.majortype = MEDIATYPE_Video; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.pin.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.pin.pin.IPin_iface); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Stream; req_mt.subtype = MEDIASUBTYPE_RGB8; @@ -1379,12 +1374,7 @@ static void test_connect_pin(void) IFilterGraph2_Disconnect(graph, &testsink.pin.pin.IPin_iface); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.pin.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.pin.pin.IPin_iface); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_Avi; /* Test connection with wildcards. */ @@ -1445,12 +1435,7 @@ static void test_connect_pin(void) * consistent with its being rejected by IPin::QueryAccept(). */ testsink.reject_avi = TRUE; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.pin.pin.IPin_iface, NULL); - 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.pin.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); /* But any types we expose are tried. */ testsink.mt = &mt; @@ -1459,17 +1444,12 @@ static void test_connect_pin(void) mt.subtype = MEDIASUBTYPE_RGB8; mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.pin.pin.IPin_iface, NULL); - 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.pin.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Stream; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.pin.pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_media_types(&testsink.pin.pin.mt, &mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.pin.pin.mt, &mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.pin.pin.IPin_iface);

1 0

Zebediah Figura : qedit/samplegrabber: Check the filter media type also in sample_grabber_sink_query_accept().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 1196f4dfe088b422dcd119614ff1103bcab01107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1196f4dfe088b422dcd11961… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:04:36 2020 -0600 qedit/samplegrabber: Check the filter media type also in sample_grabber_sink_query_accept(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 64 +++++++++++++++------------------------- dlls/qedit/tests/samplegrabber.c | 12 ++++---- 2 files changed, 30 insertions(+), 46 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 3ec440d155..898b67fc9a 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -480,9 +480,31 @@ static HRESULT sample_grabber_sink_query_interface(struct strmbase_pin *iface, R return S_OK; } +static BOOL check_filter_mt(SG_Impl *filter, const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL)) + return TRUE; + if (!IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) + return FALSE; + + if (IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL)) + return TRUE; + if (!IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) + return FALSE; + + if (IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL)) + return TRUE; + if (!IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) + return FALSE; + + return TRUE; +} + static HRESULT sample_grabber_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - return S_OK; + SG_Impl *filter = impl_from_sink_pin(iface); + + return check_filter_mt(filter, mt) ? S_OK : S_FALSE; } static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, @@ -498,32 +520,11 @@ static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, return VFW_S_NO_MORE_ITEMS; } -static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) -{ - SG_Impl *filter = impl_from_sink_pin(&iface->pin); - - if (!IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL) - && !IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - if (!IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL) - && !IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - if (!IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL) - && !IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - return S_OK; -} - static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = sample_grabber_sink_query_interface, .base.pin_query_accept = sample_grabber_sink_query_accept, .base.pin_get_media_type = sample_grabber_sink_get_media_type, - .sink_connect = sample_grabber_sink_connect, }; static inline SG_Impl *impl_from_source_pin(struct strmbase_pin *iface) @@ -548,24 +549,7 @@ static HRESULT sample_grabber_source_query_accept(struct strmbase_pin *iface, co if (filter->sink.pin.peer && IPin_QueryAccept(filter->sink.pin.peer, mt) != S_OK) return S_FALSE; - strmbase_dump_media_type(&filter->filter_mt); - - if (IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL)) - return S_OK; - if (!IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) - return S_FALSE; - - if (IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL)) - return S_OK; - if (!IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) - return S_FALSE; - - if (IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL)) - return S_OK; - if (!IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) - return S_FALSE; - - return S_OK; + return check_filter_mt(filter, mt) ? S_OK : S_FALSE; } static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface, diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 06db9d740e..5436700d17 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -513,13 +513,13 @@ static void test_media_types(void) hr = ISampleGrabber_SetMediaType(grabber, &match_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.majortype = GUID_NULL; hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.majortype = match_mt.majortype; @@ -533,13 +533,13 @@ static void test_media_types(void) hr = ISampleGrabber_SetMediaType(grabber, &match_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.subtype = GUID_NULL; hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.subtype = match_mt.subtype; @@ -552,13 +552,13 @@ static void test_media_types(void) hr = ISampleGrabber_SetMediaType(grabber, &match_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.formattype = GUID_NULL; hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.formattype = match_mt.formattype;

1 0

Zebediah Figura : qedit/samplegrabber: Correctly implement sample_grabber_sink_get_media_type().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 8baf53bc077820f01bf7a5913cd1ea8b5a17753e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8baf53bc077820f01bf7a591… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:04:37 2020 -0600 qedit/samplegrabber: Correctly implement sample_grabber_sink_get_media_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 18 ++++++++++++++++-- dlls/qedit/tests/samplegrabber.c | 17 +++++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 898b67fc9a..9492620d04 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -511,12 +511,26 @@ static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { SG_Impl *filter = impl_from_sink_pin(iface); + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + if (!filter->source.pin.peer) + return VFW_E_NOT_CONNECTED; + + if (FAILED(hr = IPin_EnumMediaTypes(filter->source.pin.peer, &enummt))) + return hr; - if (!index) + if ((!index || IEnumMediaTypes_Skip(enummt, index) == S_OK) + && IEnumMediaTypes_Next(enummt, 1, &pmt, NULL) == S_OK) { - CopyMediaType(mt, &filter->filter_mt); + CopyMediaType(mt, pmt); + DeleteMediaType(pmt); + IEnumMediaTypes_Release(enummt); return S_OK; } + + IEnumMediaTypes_Release(enummt); return VFW_S_NO_MORE_ITEMS; } diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 5436700d17..8e68e3efae 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -482,8 +482,7 @@ static void test_media_types(void) IBaseFilter_FindPin(filter, L"Out", &source); hr = IPin_EnumMediaTypes(sink, &enummt); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); - if (hr == S_OK) IEnumMediaTypes_Release(enummt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IPin_EnumMediaTypes(source, &enummt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); @@ -497,8 +496,7 @@ static void test_media_types(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_EnumMediaTypes(sink, &enummt); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); - if (hr == S_OK) IEnumMediaTypes_Release(enummt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IPin_EnumMediaTypes(source, &enummt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); @@ -824,8 +822,7 @@ static void test_connect_pin(void) ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); hr = IPin_EnumMediaTypes(sink, &enummt); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); - if (hr == S_OK) IEnumMediaTypes_Release(enummt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IPin_EnumMediaTypes(source, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); @@ -1000,6 +997,14 @@ static void test_connect_pin(void) 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"); ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + + hr = IPin_EnumMediaTypes(sink, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(pmt, testsink.sink_mt), "Media types didn't match.\n"); + IEnumMediaTypes_Release(enummt); + IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);

1 0

Zebediah Figura : d3dcompiler: Pass a struct source_location to hlsl_report_message().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: eef3e3dacd2b1f96ce63585a0e1f151c4d71f70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eef3e3dacd2b1f96ce63585a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:47 2020 -0600 d3dcompiler: Pass a struct source_location to hlsl_report_message(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 +- dlls/d3dcompiler_43/hlsl.y | 136 +++++++++++++----------------- dlls/d3dcompiler_43/utils.c | 19 ++--- 3 files changed, 67 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eef3e3dacd2b1f96ce63…

1 0

Zebediah Figura : d3dcompiler: Return a struct source_location from set_location().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 77fe277a62b577a9460c0d3f6556142ddb2971cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fe277a62b577a9460c0d3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:46 2020 -0600 d3dcompiler: Return a struct source_location from set_location(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 153 +++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77fe277a62b577a9460c…

1 0