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

Michael Stefaniuc : shell32: Remove unused return variables (coccinelle).
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: c7e6fafa4c609fe7e3d7464a0c70b9b16e32fb43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7e6fafa4c609fe7e3d7464a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 12 21:19:17 2019 +0100 shell32: Remove unused return variables (coccinelle). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 36b0c5d..bd9b872 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -923,13 +923,12 @@ static HRESULT WINAPI IAutoComplete2_fnEnable( BOOL fEnable) { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false"); This->enabled = fEnable; - return hr; + return S_OK; } /****************************************************************************** @@ -1063,13 +1062,12 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( DWORD *pdwFlag) { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - HRESULT hr = S_OK; TRACE("(%p) -> (%p)\n", This, pdwFlag); *pdwFlag = This->options; - return hr; + return S_OK; } /**************************************************************************

1 0

Michael Stefaniuc : quartz: Remove an unused return variable (coccinelle).
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 91b53147f14d0ddcaa2ca26bb81737c1648b3465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b53147f14d0ddcaa2ca26b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 12 21:19:18 2019 +0100 quartz: Remove an unused return variable (coccinelle). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 477c63a..4e366f3 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -196,7 +196,6 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pProps) { BaseMemAllocator *This = impl_from_IMemAllocator(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, pProps); @@ -206,7 +205,7 @@ static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLO } LeaveCriticalSection(This->pCritSect); - return hr; + return S_OK; } static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_FindPin() on the DirectSound renderer.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 18fe24ae08ae3786530ac4bc7a5058e4b63a1f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18fe24ae08ae3786530ac4bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:58 2019 -0500 quartz/tests: Add some tests for IBaseFilter_FindPin() on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index aa24d33..37b9dfa 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -26,6 +26,8 @@ #include "amaudio.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'A','u','d','i','o',' ','I','n','p','u','t',' ','p','i','n',' ','(','r','e','n','d','e','r','e','d',')',0}; + static IBaseFilter *create_dsound_render(void) { IBaseFilter *filter = NULL; @@ -243,6 +245,39 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR inW[] = {'I','n',0}; + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_dsound_render(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); + IPin_Release(pin); + IPin_Release(pin2); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -320,6 +355,7 @@ START_TEST(dsoundrender) test_property_bag(); test_interfaces(); test_enum_pins(); + test_find_pin(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Add some tests for querying DirectSound renderer pin information.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: e657ea662fb9371365b42b339799a9c6ff936aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e657ea662fb9371365b42b33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:59 2019 -0500 quartz/tests: Add some tests for querying DirectSound renderer pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 37b9dfa..28166e5 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -278,6 +278,51 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_dsound_render(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -356,6 +401,7 @@ START_TEST(dsoundrender) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Add some tests for DirectSound renderer pin interfaces.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 6f81d51e38b76cbb9455e90d038440316f54042e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f81d51e38b76cbb9455e90d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:33:00 2019 -0500 quartz/tests: Add some tests for DirectSound renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 28166e5..0d48bec 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -129,6 +129,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_dsound_render(); + IPin *pin; check_interface(filter, &IID_IAMDirectSound, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); @@ -150,6 +151,18 @@ static void test_interfaces(void) check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); IBaseFilter_Release(filter); }

1 0

Nikolay Sivov : mfplat: Implement CreateObjectFromURL().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 7a025d83181cd0531463c2ed95ac163063a8ec78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a025d83181cd0531463c2ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 09:07:42 2019 +0300 mfplat: Implement CreateObjectFromURL(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 145 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 06be27d..c57dd10 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1908,6 +1908,7 @@ static const IMFMediaSourceVtbl mfsourcevtbl = enum resolved_object_origin { OBJECT_FROM_BYTESTREAM, + OBJECT_FROM_URL, }; struct resolver_queued_result @@ -1937,6 +1938,7 @@ typedef struct source_resolver IMFSourceResolver IMFSourceResolver_iface; LONG refcount; IMFAsyncCallback stream_callback; + IMFAsyncCallback url_callback; CRITICAL_SECTION cs; struct list pending; } mfsourceresolver; @@ -1951,6 +1953,11 @@ static struct source_resolver *impl_from_stream_IMFAsyncCallback(IMFAsyncCallbac return CONTAINING_RECORD(iface, struct source_resolver, stream_callback); } +static struct source_resolver *impl_from_url_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_resolver, url_callback); +} + static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enum resolved_object_origin origin, IMFAsyncResult *result) { @@ -1960,6 +1967,7 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu { IUnknown *handler; IMFByteStreamHandler *stream_handler; + IMFSchemeHandler *scheme_handler; } handler; queued_result = heap_alloc(sizeof(*queued_result)); @@ -1972,6 +1980,10 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu queued_result->hr = IMFByteStreamHandler_EndCreateObject(handler.stream_handler, result, &queued_result->obj_type, &queued_result->object); break; + case OBJECT_FROM_URL: + queued_result->hr = IMFSchemeHandler_EndCreateObject(handler.scheme_handler, result, &queued_result->obj_type, + &queued_result->object); + break; default: queued_result->hr = E_FAIL; } @@ -2132,6 +2144,34 @@ static const IMFAsyncCallbackVtbl source_resolver_callback_stream_vtbl = source_resolver_callback_stream_Invoke, }; +static ULONG WINAPI source_resolver_callback_url_AddRef(IMFAsyncCallback *iface) +{ + struct source_resolver *resolver = impl_from_url_IMFAsyncCallback(iface); + return IMFSourceResolver_AddRef(&resolver->IMFSourceResolver_iface); +} + +static ULONG WINAPI source_resolver_callback_url_Release(IMFAsyncCallback *iface) +{ + struct source_resolver *resolver = impl_from_url_IMFAsyncCallback(iface); + return IMFSourceResolver_Release(&resolver->IMFSourceResolver_iface); +} + +static HRESULT WINAPI source_resolver_callback_url_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct source_resolver *resolver = impl_from_url_IMFAsyncCallback(iface); + + return resolver_handler_end_create(resolver, OBJECT_FROM_URL, result); +} + +static const IMFAsyncCallbackVtbl source_resolver_callback_url_vtbl = +{ + source_resolver_callback_QueryInterface, + source_resolver_callback_url_AddRef, + source_resolver_callback_url_Release, + source_resolver_callback_GetParameters, + source_resolver_callback_url_Invoke, +}; + static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler) { unsigned int j = 0, name_length, type; @@ -2223,6 +2263,73 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA return hr; } +static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSchemeHandler **handler) +{ + static const char schemehandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers"; + static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + const WCHAR *ptr = url; + unsigned int len, i; + WCHAR *scheme; + HRESULT hr; + + /* RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) */ + while (*ptr) + { + WCHAR ch = tolowerW(*ptr); + + if (*ptr == '*' && ptr == url) + { + ptr++; + break; + } + else if (!(*ptr >= '0' && *ptr <= '9') && + !(ch >= 'a' && ch <= 'z') && + *ptr != '+' && *ptr != '-' && *ptr != '.') + { + break; + } + + ptr++; + } + + /* Schemes must end with a ':' */ + if (ptr == url || *ptr != ':') + return MF_E_UNSUPPORTED_SCHEME; + + len = ptr - url; + scheme = heap_alloc((len + 1) * sizeof(WCHAR)); + if (!scheme) + return E_OUTOFMEMORY; + + memcpy(scheme, url, len * sizeof(WCHAR)); + scheme[len] = 0; + + /* FIXME: check local handlers first */ + + for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) + { + HKEY hkey, hkey_handler; + + if (RegOpenKeyA(hkey_roots[i], schemehandlerspath, &hkey)) + continue; + + if (!RegOpenKeyW(hkey, scheme, &hkey_handler)) + { + hr = resolver_create_registered_handler(hkey_handler, &IID_IMFSchemeHandler, (void **)handler); + RegCloseKey(hkey_handler); + } + + RegCloseKey(hkey); + + if (SUCCEEDED(hr)) + break; + } + + heap_free(scheme); + + return hr; +} + static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum resolved_object_origin origin, IMFAsyncResult *result, MF_OBJECT_TYPE *obj_type, IUnknown **out) { @@ -2318,14 +2425,45 @@ static ULONG WINAPI source_resolver_Release(IMFSourceResolver *iface) return refcount; } -static HRESULT WINAPI mfsourceresolver_CreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, - DWORD flags, IPropertyStore *props, MF_OBJECT_TYPE *obj_type, IUnknown **object) +static HRESULT WINAPI source_resolver_CreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, + DWORD flags, IPropertyStore *props, MF_OBJECT_TYPE *obj_type, IUnknown **object) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); + IMFSchemeHandler *handler; + IMFAsyncResult *result; + MFASYNCRESULT *data; + HRESULT hr; - FIXME("(%p)->(%s, %#x, %p, %p, %p): stub\n", This, debugstr_w(url), flags, props, obj_type, object); + TRACE("%p, %s, %#x, %p, %p, %p\n", iface, debugstr_w(url), flags, props, obj_type, object); - return E_NOTIMPL; + if (!url || !obj_type || !object) + return E_POINTER; + + if (FAILED(hr = resolver_get_scheme_handler(url, flags, &handler))) + return hr; + + hr = MFCreateAsyncResult((IUnknown *)handler, NULL, NULL, &result); + IMFSchemeHandler_Release(handler); + if (FAILED(hr)) + return hr; + + data = (MFASYNCRESULT *)result; + data->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + hr = IMFSchemeHandler_BeginCreateObject(handler, url, flags, props, NULL, &resolver->stream_callback, + (IUnknown *)result); + if (FAILED(hr)) + { + IMFAsyncResult_Release(result); + return hr; + } + + WaitForSingleObject(data->hEvent, INFINITE); + + hr = resolver_end_create_object(resolver, OBJECT_FROM_URL, result, obj_type, object); + IMFAsyncResult_Release(result); + + return hr; } static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, @@ -2484,7 +2622,7 @@ static const IMFSourceResolverVtbl mfsourceresolvervtbl = source_resolver_QueryInterface, source_resolver_AddRef, source_resolver_Release, - mfsourceresolver_CreateObjectFromURL, + source_resolver_CreateObjectFromURL, source_resolver_CreateObjectFromByteStream, mfsourceresolver_BeginCreateObjectFromURL, mfsourceresolver_EndCreateObjectFromURL, @@ -2511,6 +2649,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) object->IMFSourceResolver_iface.lpVtbl = &mfsourceresolvervtbl; object->stream_callback.lpVtbl = &source_resolver_callback_stream_vtbl; + object->url_callback.lpVtbl = &source_resolver_callback_url_vtbl; object->refcount = 1; list_init(&object->pending); InitializeCriticalSection(&object->cs);

1 0

Nikolay Sivov : mfplat: Implement async object creation from URL.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 922698a9e02926ad6b36f39767b5fcf81647d780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=922698a9e02926ad6b36f397… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 09:07:43 2019 +0300 mfplat: Implement async object creation from URL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 60 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c57dd10..f12666f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1928,6 +1928,7 @@ struct resolver_cancel_object { IUnknown *handler; IMFByteStreamHandler *stream_handler; + IMFSchemeHandler *scheme_handler; } u; IUnknown *cancel_cookie; enum resolved_object_origin origin; @@ -1977,12 +1978,12 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu switch (origin) { case OBJECT_FROM_BYTESTREAM: - queued_result->hr = IMFByteStreamHandler_EndCreateObject(handler.stream_handler, result, &queued_result->obj_type, - &queued_result->object); + queued_result->hr = IMFByteStreamHandler_EndCreateObject(handler.stream_handler, result, + &queued_result->obj_type, &queued_result->object); break; case OBJECT_FROM_URL: - queued_result->hr = IMFSchemeHandler_EndCreateObject(handler.scheme_handler, result, &queued_result->obj_type, - &queued_result->object); + queued_result->hr = IMFSchemeHandler_EndCreateObject(handler.scheme_handler, result, + &queued_result->obj_type, &queued_result->object); break; default: queued_result->hr = E_FAIL; @@ -2528,25 +2529,47 @@ fallback: return E_NOTIMPL; } -static HRESULT WINAPI mfsourceresolver_BeginCreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, - DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *unk_state) +static HRESULT WINAPI source_resolver_BeginCreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, + DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); + IMFSchemeHandler *handler; + IUnknown *inner_cookie = NULL; + IMFAsyncResult *result; + HRESULT hr; - FIXME("(%p)->(%s, %#x, %p, %p, %p, %p): stub\n", This, debugstr_w(url), flags, props, cancel_cookie, - callback, unk_state); + TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); - return E_NOTIMPL; + if (FAILED(hr = resolver_get_scheme_handler(url, flags, &handler))) + return hr; + + if (cancel_cookie) + *cancel_cookie = NULL; + + hr = MFCreateAsyncResult((IUnknown *)handler, callback, state, &result); + IMFSchemeHandler_Release(handler); + if (FAILED(hr)) + return hr; + + hr = IMFSchemeHandler_BeginCreateObject(handler, url, flags, props, cancel_cookie ? &inner_cookie : NULL, + &resolver->url_callback, (IUnknown *)result); + + if (SUCCEEDED(hr) && inner_cookie) + resolver_create_cancel_object((IUnknown *)handler, OBJECT_FROM_URL, inner_cookie, cancel_cookie); + + IMFAsyncResult_Release(result); + + return hr; } -static HRESULT WINAPI mfsourceresolver_EndCreateObjectFromURL(IMFSourceResolver *iface, IMFAsyncResult *result, - MF_OBJECT_TYPE *obj_type, IUnknown **object) +static HRESULT WINAPI source_resolver_EndCreateObjectFromURL(IMFSourceResolver *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, result, obj_type, object); + TRACE("%p, %p, %p, %p.\n", iface, result, obj_type, object); - return E_NOTIMPL; + return resolver_end_create_object(resolver, OBJECT_FROM_URL, result, obj_type, object); } static HRESULT WINAPI source_resolver_BeginCreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, @@ -2610,6 +2633,9 @@ static HRESULT WINAPI source_resolver_CancelObjectCreation(IMFSourceResolver *if case OBJECT_FROM_BYTESTREAM: hr = IMFByteStreamHandler_CancelObjectCreation(object->u.stream_handler, object->cancel_cookie); break; + case OBJECT_FROM_URL: + hr = IMFSchemeHandler_CancelObjectCreation(object->u.scheme_handler, object->cancel_cookie); + break; default: hr = E_UNEXPECTED; } @@ -2624,8 +2650,8 @@ static const IMFSourceResolverVtbl mfsourceresolvervtbl = source_resolver_Release, source_resolver_CreateObjectFromURL, source_resolver_CreateObjectFromByteStream, - mfsourceresolver_BeginCreateObjectFromURL, - mfsourceresolver_EndCreateObjectFromURL, + source_resolver_BeginCreateObjectFromURL, + source_resolver_EndCreateObjectFromURL, source_resolver_BeginCreateObjectFromByteStream, source_resolver_EndCreateObjectFromByteStream, source_resolver_CancelObjectCreation,

1 0

Nikolay Sivov : mfplat: Implement equality test for media types.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 61f76829f4b15e8097837696c2b532343bedd69c URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f76829f4b15e8097837696… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 09:07:44 2019 +0300 mfplat: Implement equality test for media types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 101 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 89 +++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 3 ++ 3 files changed, 188 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 974ab3a..27ca405 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -332,9 +332,106 @@ static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *co static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, DWORD *flags) { - FIXME("%p, %p, %p.\n", iface, type, flags); + const DWORD full_equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA; + struct media_type *media_type = impl_from_IMFMediaType(iface); + struct comparand + { + IMFAttributes *type; + PROPVARIANT value; + UINT32 count; + GUID guid; + HRESULT hr; + } left, right, swp; + unsigned int i; + BOOL result; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, type, flags); + + *flags = 0; + + left.type = &media_type->attributes.IMFAttributes_iface; + right.type = (IMFAttributes *)type; + + if (FAILED(IMFAttributes_GetGUID(left.type, &MF_MT_MAJOR_TYPE, &left.guid))) + return E_INVALIDARG; + + if (FAILED(IMFAttributes_GetGUID(right.type, &MF_MT_MAJOR_TYPE, &right.guid))) + return E_INVALIDARG; + + if (IsEqualGUID(&left.guid, &right.guid)) + *flags |= MF_MEDIATYPE_EQUAL_MAJOR_TYPES; + + /* Subtypes equal or both missing. */ + left.hr = IMFAttributes_GetGUID(left.type, &MF_MT_SUBTYPE, &left.guid); + right.hr = IMFAttributes_GetGUID(right.type, &MF_MT_SUBTYPE, &right.guid); + + if ((SUCCEEDED(left.hr) && SUCCEEDED(right.hr) && IsEqualGUID(&left.guid, &right.guid)) || + (FAILED(left.hr) && FAILED(right.hr))) + { + *flags |= MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + } + + /* Format data */ + IMFAttributes_GetCount(left.type, &left.count); + IMFAttributes_GetCount(right.type, &right.count); + + if (right.count < left.count) + { + swp = left; + left = right; + right = swp; + } + + *flags |= MF_MEDIATYPE_EQUAL_FORMAT_DATA; + + for (i = 0; i < left.count; ++i) + { + PROPVARIANT value; + GUID key; + + if (SUCCEEDED(IMFAttributes_GetItemByIndex(left.type, i, &key, &value))) + { + if (IsEqualGUID(&key, &MF_MT_USER_DATA) || + IsEqualGUID(&key, &MF_MT_FRAME_RATE_RANGE_MIN) || + IsEqualGUID(&key, &MF_MT_FRAME_RATE_RANGE_MAX)) + { + PropVariantClear(&value); + continue; + } + + result = FALSE; + IMFAttributes_CompareItem(right.type, &key, &value, &result); + PropVariantClear(&value); + if (!result) + { + *flags &= ~MF_MEDIATYPE_EQUAL_FORMAT_DATA; + break; + } + } + } + + /* User data */ + PropVariantInit(&left.value); + left.hr = IMFAttributes_GetItem(left.type, &MF_MT_USER_DATA, &left.value); + PropVariantInit(&right.value); + right.hr = IMFAttributes_GetItem(right.type, &MF_MT_USER_DATA, &right.value); + + if (SUCCEEDED(left.hr) && SUCCEEDED(left.hr)) + { + result = FALSE; + IMFAttributes_CompareItem(left.type, &MF_MT_USER_DATA, &left.value, &result); + } + else if (FAILED(left.hr) && FAILED(left.hr)) + result = TRUE; + + PropVariantClear(&left.value); + PropVariantClear(&right.value); + + if (result) + *flags |= MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA; + + return *flags == full_equality_flags ? S_OK : S_FALSE; } static HRESULT WINAPI mediatype_GetRepresentation(IMFMediaType *iface, GUID guid, void **representation) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa729b..ca00ac1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -328,10 +328,13 @@ static void init_functions(void) is_win8_plus = pMFPutWaitingWorkItem != NULL; } -static void test_MFCreateMediaType(void) +static void test_media_type(void) { + IMFMediaType *mediatype, *mediatype2; + BOOL compressed; + DWORD flags; HRESULT hr; - IMFMediaType *mediatype; + GUID guid; if(0) { @@ -343,9 +346,89 @@ if(0) hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaType_GetMajorType(mediatype, &guid); +todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + compressed = FALSE; + hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); +todo_wine + ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); + ok(compressed, "Unexpected value %d.\n", compressed); + + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 0); +todo_wine + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + compressed = FALSE; + hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); +todo_wine + ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); + ok(compressed, "Unexpected value %d.\n", compressed); + + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1); +todo_wine + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + compressed = TRUE; + hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); +todo_wine { + ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); + ok(!compressed, "Unexpected value %d.\n", compressed); +} hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaType_GetMajorType(mediatype, &guid); +todo_wine { + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type.\n"); +} + /* IsEqual() */ + hr = MFCreateMediaType(&mediatype2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + flags = 0xdeadbeef; + hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(flags == 0, "Unexpected flags %#x.\n", flags); + + /* Different major types. */ + hr = IMFMediaType_SetGUID(mediatype2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); +todo_wine + ok(hr == S_OK, "Failed to set major type, hr %#x.\n", hr); + + flags = 0; + hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); +todo_wine { + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(flags == (MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), + "Unexpected flags %#x.\n", flags); +} + /* Same major types, different subtypes. */ + hr = IMFMediaType_SetGUID(mediatype2, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); +todo_wine + ok(hr == S_OK, "Failed to set major type, hr %#x.\n", hr); + + flags = 0; + hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA + | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), "Unexpected flags %#x.\n", flags); +} + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); +todo_wine + ok(hr == S_OK, "Failed to set subtype, hr %#x.\n", hr); + + flags = 0; + hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); +todo_wine { + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), + "Unexpected flags %#x.\n", flags); +} + IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); } @@ -1766,7 +1849,7 @@ START_TEST(mfplat) test_startup(); test_register(); - test_MFCreateMediaType(); + test_media_type(); test_MFCreateMediaEvent(); test_MFCreateAttributes(); test_sample(); diff --git a/include/mfapi.h b/include/mfapi.h index 2ad9f25..fd5fbeb 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -88,6 +88,9 @@ DEFINE_GUID(MF_MT_MAJOR_TYPE, 0x48eba18e, 0xf8c9, 0x4687, 0xbf, 0x1 DEFINE_GUID(MF_MT_PIXEL_ASPECT_RATIO, 0xc6376a1e, 0x8d0a, 0x4027, 0xbe, 0x45, 0x6d, 0x9a, 0x0a, 0xd3, 0x9b, 0xb6); DEFINE_GUID(MF_MT_SUBTYPE, 0xf7e34c9a, 0x42e8, 0x4714, 0xb7, 0x4b, 0xcb, 0x29, 0xd7, 0x2c, 0x35, 0xe5); DEFINE_GUID(MF_MT_ALL_SAMPLES_INDEPENDENT, 0xc9173739, 0x5e56, 0x461c, 0xb7, 0x13, 0x46, 0xfb, 0x99, 0x5c, 0xb9, 0x5f); +DEFINE_GUID(MF_MT_USER_DATA, 0xb6bc765f, 0x4c3b, 0x40a4, 0xbd, 0x51, 0x25, 0x35, 0xb6, 0x6f, 0xe0, 0x9d); +DEFINE_GUID(MF_MT_FRAME_RATE_RANGE_MIN, 0xd2e7558c, 0xdc1f, 0x403f, 0x9a, 0x72, 0xd2, 0x8b, 0xb1, 0xeb, 0x3b, 0x5e); +DEFINE_GUID(MF_MT_FRAME_RATE_RANGE_MAX, 0xe3371d41, 0xb4cf, 0x4a05, 0xbd, 0x4e, 0x20, 0xb8, 0x8b, 0xb2, 0xc4, 0xd6); DEFINE_GUID(MFT_CATEGORY_VIDEO_DECODER, 0xd6c02d4b, 0x6833, 0x45b4, 0x97, 0x1a, 0x05, 0xa4, 0xb0, 0x4b, 0xab, 0x91); DEFINE_GUID(MFT_CATEGORY_VIDEO_ENCODER, 0xf79eac7d, 0xe545, 0x4387, 0xbd, 0xee, 0xd6, 0x47, 0xd7, 0xbd, 0xe4, 0x2a);

1 0

Nikolay Sivov : mfreadwrite: Use source resolver when creating reader from bytestream.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 95ab51105b3eae4076ea304c33b87ce38566766e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ab51105b3eae4076ea304c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 09:07:45 2019 +0300 mfreadwrite: Use source resolver when creating reader from bytestream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/main.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index afefdb5..edc7ebd 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite -IMPORTS = mfuuid uuid +IMPORTS = mfuuid uuid mfplat C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 098100df..bcf79a8 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -254,9 +254,23 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, REFIID riid, void **out) { - /* FIXME: resolve bytestream to media source */ + IMFSourceResolver *resolver; + MF_OBJECT_TYPE obj_type; + IMFMediaSource *source; + HRESULT hr; + + if (FAILED(hr = MFCreateSourceResolver(&resolver))) + return hr; - return create_source_reader_from_source(NULL, attributes, riid, out); + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&source); + IMFSourceResolver_Release(resolver); + if (FAILED(hr)) + return hr; + + hr = create_source_reader_from_source(source, attributes, riid, out); + IMFMediaSource_Release(source); + return hr; } static HRESULT WINAPI sink_writer_QueryInterface(IMFSinkWriter *iface, REFIID riid, void **out)

1 0

Nikolay Sivov : mfreadwrite: Implement MFCreateSourceReaderFromURL().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 9bf4db1325d303a876bf282543289e15f9c698ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf4db1325d303a876bf2825… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 09:07:46 2019 +0300 mfreadwrite: Implement MFCreateSourceReaderFromURL(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 60 ++++++++++++++++++++++++++++++++++++++- dlls/mfreadwrite/mfreadwrite.spec | 2 +- include/mfreadwrite.idl | 1 + 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index bcf79a8..88903ce 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -273,6 +273,47 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib return hr; } +static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out) +{ + IMFSourceResolver *resolver; + IUnknown *object = NULL; + MF_OBJECT_TYPE obj_type; + IMFMediaSource *source; + HRESULT hr; + + if (FAILED(hr = MFCreateSourceResolver(&resolver))) + return hr; + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, + (IUnknown **)&object); + if (SUCCEEDED(hr)) + { + switch (obj_type) + { + case MF_OBJECT_BYTESTREAM: + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, (IMFByteStream *)object, NULL, + MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&source); + break; + case MF_OBJECT_MEDIASOURCE: + source = (IMFMediaSource *)object; + IMFMediaSource_AddRef(source); + break; + default: + WARN("Unknown object type %d.\n", obj_type); + hr = E_UNEXPECTED; + } + IUnknown_Release(object); + } + + IMFSourceResolver_Release(resolver); + if (FAILED(hr)) + return hr; + + hr = create_source_reader_from_source(source, attributes, riid, out); + IMFMediaSource_Release(source); + return hr; +} + static HRESULT WINAPI sink_writer_QueryInterface(IMFSinkWriter *iface, REFIID riid, void **out) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); @@ -480,6 +521,16 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt return create_source_reader_from_source(source, attributes, &IID_IMFSourceReader, (void **)reader); } +/*********************************************************************** + * MFCreateSourceReaderFromURL (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromURL(const WCHAR *url, IMFAttributes *attributes, IMFSourceReader **reader) +{ + TRACE("%s, %p, %p.\n", debugstr_w(url), attributes, reader); + + return create_source_reader_from_url(url, attributes, &IID_IMFSourceReader, (void **)reader); +} + static HRESULT WINAPI readwrite_factory_QueryInterface(IMFReadWriteClassFactory *iface, REFIID riid, void **out) { if (IsEqualIID(riid, &IID_IMFReadWriteClassFactory) || @@ -508,7 +559,14 @@ static ULONG WINAPI readwrite_factory_Release(IMFReadWriteClassFactory *iface) static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassFactory *iface, REFCLSID clsid, const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out) { - FIXME("%s, %s, %p, %s, %p.\n", debugstr_guid(clsid), debugstr_w(url), attributes, debugstr_guid(riid), out); + TRACE("%s, %s, %p, %s, %p.\n", debugstr_guid(clsid), debugstr_w(url), attributes, debugstr_guid(riid), out); + + if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) + { + return create_source_reader_from_url(url, attributes, &IID_IMFSourceReader, out); + } + + FIXME("Unsupported %s.\n", debugstr_guid(clsid)); return E_NOTIMPL; } diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index d8ed694..3a215a9 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -6,4 +6,4 @@ @ stub MFCreateSinkWriterFromURL @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) -@ stub MFCreateSourceReaderFromURL +@ stdcall MFCreateSourceReaderFromURL(wstr ptr ptr) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 82f67d4..2647127 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -151,3 +151,4 @@ cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *str cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) +cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromURL(const WCHAR *url, IMFAttributes *attributes, IMFSourceReader **reader);" )

1 0