February 2019 - Wine-commits

Zebediah Figura : quartz/filesource: Return a default media type from FileAsyncReaderPin_GetMediaType().
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 529af770510a2354dfd31f20e57a285dbc703d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=529af770510a2354dfd31f20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:42:58 2019 -0600 quartz/filesource: Return a default media type from FileAsyncReaderPin_GetMediaType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 39 ++++++++++++++++++++++------------- dlls/quartz/tests/filesource.c | 46 +++++++++++++++++------------------------- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 44794df..6b8bfa3 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -37,6 +37,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; +static const AM_MEDIA_TYPE default_mt = +{ + {0xe436eb83,0x524f,0x11ce,{0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70}}, /* MEDIATYPE_Stream */ + {0,0,0,{0,0,0,0,0,0,0,0}}, + TRUE, + FALSE, + 1, + {0,0,0,{0,0,0,0,0,0,0,0}}, + NULL, + 0, + NULL +}; + typedef struct AsyncReader { BaseFilter filter; @@ -618,19 +631,11 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if (!pmt) { - This->pmt->bFixedSizeSamples = TRUE; - This->pmt->bTemporalCompression = FALSE; - This->pmt->cbFormat = 0; - This->pmt->pbFormat = NULL; - This->pmt->pUnk = NULL; - This->pmt->lSampleSize = 1; - This->pmt->formattype = GUID_NULL; - hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); - if (FAILED(hr)) + CopyMediaType(This->pmt, &default_mt); + if (FAILED(GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL))) { This->pmt->majortype = MEDIATYPE_Stream; This->pmt->subtype = MEDIASUBTYPE_NULL; - hr = S_OK; } } else @@ -763,14 +768,20 @@ static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *pin, const AM_M return S_FALSE; } -static HRESULT WINAPI FileAsyncReaderPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI FileAsyncReaderPin_GetMediaType(BasePin *iface, int index, AM_MEDIA_TYPE *mt) { FileAsyncReader *This = impl_from_BasePin(iface); - if (iPosition < 0) + AsyncReader *filter = impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter); + + if (index < 0) return E_INVALIDARG; - if (iPosition > 0) + else if (index > 1) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(pmt, impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter)->pmt); + + if (index == 0) + CopyMediaType(mt, filter->pmt); + else if (index == 1) + CopyMediaType(mt, &default_mt); return S_OK; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 2e287f7..7330a83 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -257,15 +257,11 @@ static void test_file_source_filter(void) CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - mt = file_mt; - mt.subtype = GUID_NULL; - ok(!memcmp(pmt, &mt, sizeof(*pmt)), "Media types did not match.\n"); - CoTaskMemFree(pmt); - } + mt = file_mt; + mt.subtype = GUID_NULL; + ok(!memcmp(pmt, &mt, sizeof(*pmt)), "Media types did not match.\n"); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -339,26 +335,22 @@ todo_wine CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s.\n", - wine_dbgstr_guid(&pmt->majortype)); - ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s.\n", - wine_dbgstr_guid(&pmt->subtype)); - ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); - ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); - ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", - wine_dbgstr_guid(&pmt->formattype)); - ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - ok(!pmt->cbFormat, "Got format size %#x.\n", pmt->cbFormat); - ok(!pmt->pbFormat, "Got format %p.\n", pmt->pbFormat); - - hr = IPin_QueryAccept(pin, pmt); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - } + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(!pmt->cbFormat, "Got format size %#x.\n", pmt->cbFormat); + ok(!pmt->pbFormat, "Got format %p.\n", pmt->pbFormat); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests/filesource: Add some tests for pin interfaces.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 59d46d62e678ec0894f6fb19b0ddaba524525f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59d46d62e678ec0894f6fb19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:42:59 2019 -0600 quartz/tests/filesource: Add some tests for pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 7330a83..d485211 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -97,7 +97,9 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { + const WCHAR *filename = load_resource(avifile); IBaseFilter *filter = create_file_source(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IFileSourceFilter, TRUE); @@ -115,6 +117,19 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + load_file(filter, filename); + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IAsyncReader, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); IBaseFilter_Release(filter); }

1 0

Zebediah Figura : quartz/tests/filesource: Add some tests for filter state.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 9e7b8a2f2f76bc678063c7796d272cb387adba5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e7b8a2f2f76bc678063c779… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:43:00 2019 -0600 quartz/tests/filesource: Add some tests for filter state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index d485211..ddf0709 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -602,6 +602,70 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_filter_state(void) +{ + IBaseFilter *filter = create_file_source(); + IMediaControl *control; + IFilterGraph2 *graph; + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %d.\n", state); + + hr = IMediaControl_Run(control); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_GetState(filter, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %d.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_GetState(filter, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %d.\n", state); + + hr = IMediaControl_Pause(control); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_GetState(filter, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %d.\n", state); + + hr = IMediaControl_Run(control); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_GetState(filter, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %d.\n", state); + + hr = IMediaControl_Pause(control); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_GetState(filter, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %d.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_GetState(filter, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %d.\n", state); + + IMediaControl_Release(control); + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filesource) { CoInitialize(NULL); @@ -610,6 +674,7 @@ START_TEST(filesource) test_enum_pins(); test_find_pin(); test_pin_info(); + test_filter_state(); test_file_source_filter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests/filesource: Add tests for IAsyncReader_SyncRead().
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 5e16cf4c3989e896c6a605c98ed0cffa362c39b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e16cf4c3989e896c6a605c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:43:01 2019 -0600 quartz/tests/filesource: Add tests for IAsyncReader_SyncRead(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index ddf0709..7f25596 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -666,6 +666,84 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_async_reader(void) +{ + IBaseFilter *filter = create_file_source(); + IFileSourceFilter *filesource; + LONGLONG length, available; + WCHAR filename[MAX_PATH]; + IAsyncReader *reader; + BYTE buffer[20]; + DWORD written; + HANDLE file; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + int i; + + GetTempPathW(ARRAY_SIZE(filename), filename); + lstrcatW(filename, avifile); + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file, error %u.\n", GetLastError()); + for (i = 0; i < 600; i++) + { + BYTE b = i % 111; + WriteFile(file, &b, 1, &written, NULL); + } + CloseHandle(file); + + IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_QueryInterface(pin, &IID_IAsyncReader, (void **)&reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_Length(reader, &length, &available); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(length == 600, "Got length %s.\n", wine_dbgstr_longlong(length)); + ok(available == 600, "Got available length %s.\n", wine_dbgstr_longlong(available)); + + memset(buffer, 0xcc, sizeof(buffer)); + hr = IAsyncReader_SyncRead(reader, 0, 10, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == i % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + hr = IAsyncReader_SyncRead(reader, 0, 10, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == i % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + hr = IAsyncReader_SyncRead(reader, 10, 10, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == (10 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + hr = IAsyncReader_SyncRead(reader, 590, 20, buffer); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == (590 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + for (; i < 20; i++) + ok(buffer[i] == 0xcc, "Got wrong byte %02x at %u.\n", buffer[i], i); + + memset(buffer, 0xcc, sizeof(buffer)); + hr = IAsyncReader_SyncRead(reader, 600, 10, buffer); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]); + + IAsyncReader_Release(reader); + IPin_Release(pin); + IFileSourceFilter_Release(filesource); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filesource) { CoInitialize(NULL); @@ -676,6 +754,7 @@ START_TEST(filesource) test_pin_info(); test_filter_state(); test_file_source_filter(); + test_async_reader(); CoUninitialize(); }

1 0

Nikolay Sivov : mfreadwrite: Add CreateInstanceFromObject() stub for source reader.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 50cef89646ca838175ce45eb05c9fedcf45a6f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50cef89646ca838175ce45eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:49 2019 +0300 mfreadwrite: Add CreateInstanceFromObject() stub for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 98 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 77dbd7b..dcacd9a 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -28,10 +28,14 @@ #include "ole2.h" #include "rpcproxy.h" #include "mfreadwrite.h" +#include "mfidl.h" #include "wine/debug.h" +#include "wine/heap.h" DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); +DEFINE_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4); +DEFINE_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90); WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -52,15 +56,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } - -HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, - IMFSourceReader **reader) -{ - FIXME("%p %p %p stub.\n", source, attributes, reader); - - return E_NOTIMPL; -} - HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; @@ -228,21 +223,52 @@ struct IMFSourceReaderVtbl srcreader_vtbl = src_reader_GetPresentationAttribute }; -HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, IMFSourceReader **reader) +static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, + REFIID riid, void **out) { srcreader *object; + HRESULT hr; - TRACE("%p, %p, %p\n", stream, attributes, reader); - - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); - if(!object) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - object->ref = 1; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->ref = 1; - *reader = &object->IMFSourceReader_iface; - return S_OK; + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + IMFSourceReader_Release(&object->IMFSourceReader_iface); + return hr; +} + +static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, + REFIID riid, void **out) +{ + /* FIXME: resolve bytestream to media source */ + + return create_source_reader_from_source(NULL, attributes, riid, out); +} + +/*********************************************************************** + * MFCreateSourceReaderFromByteStream (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + TRACE("%p, %p, %p.\n", stream, attributes, reader); + + return create_source_reader_from_stream(stream, attributes, &IID_IMFSourceReader, (void **)reader); +} + +/*********************************************************************** + * MFCreateSourceReaderFromMediaSource (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + TRACE("%p, %p, %p.\n", source, attributes, reader); + + return create_source_reader_from_source(source, attributes, &IID_IMFSourceReader, (void **)reader); } static HRESULT WINAPI readwrite_factory_QueryInterface(IMFReadWriteClassFactory *iface, REFIID riid, void **out) @@ -281,9 +307,43 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassF static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteClassFactory *iface, REFCLSID clsid, IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) { - FIXME("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + HRESULT hr; - return E_NOTIMPL; + TRACE("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + + if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) + { + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; + + hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); + + if (stream) + hr = create_source_reader_from_stream(stream, attributes, riid, out); + else if (source) + hr = create_source_reader_from_source(source, attributes, riid, out); + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; + } + else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) + { + FIXME("MFSinkWriter is not supported.\n"); + *out = NULL; + return E_NOTIMPL; + } + else + { + WARN("Unsupported class %s.\n", debugstr_guid(clsid)); + *out = NULL; + return E_FAIL; + } } static const IMFReadWriteClassFactoryVtbl readwrite_factory_vtbl =

1 0

Nikolay Sivov : mf: Assign node id on creation.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: e88a2535127b2bed36f3f98f63d5eb95b7087103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e88a2535127b2bed36f3f98f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:50 2019 +0300 mf: Assign node id on creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 8 ++++---- dlls/mf/topology.c | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d6091cb..38bf48e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -57,11 +57,10 @@ static void test_topology(void) ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); hr = IMFTopologyNode_GetTopoNodeID(node, &id); -todo_wine ok(hr == S_OK, "Failed to get node id, hr %#x.\n", hr); + ok(((id >> 32) == GetCurrentProcessId()) && !!(id & 0xffff), "Unexpected node id %s.\n", wine_dbgstr_longlong(id)); hr = IMFTopologyNode_SetTopoNodeID(node2, id); -todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); count = 1; @@ -96,7 +95,6 @@ todo_wine { /* Change node id, add it again. */ hr = IMFTopologyNode_SetTopoNodeID(node, ++id); -todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); hr = IMFTopology_GetNodeByID(topology, id, &node2); @@ -148,7 +146,6 @@ todo_wine { hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); hr = IMFTopologyNode_SetTopoNodeID(node2, id); -todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); hr = IMFTopology_RemoveNode(topology, node2); todo_wine @@ -179,6 +176,9 @@ todo_wine { todo_wine ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + hr = IMFTopologyNode_SetTopoNodeID(node, 123); + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + IMFTopologyNode_Release(node); IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 308a1e3..54e9faf 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static LONG next_node_id; + struct topology { IMFTopology IMFTopology_iface; @@ -45,6 +47,7 @@ struct topology_node LONG refcount; IMFAttributes *attributes; MF_TOPOLOGY_TYPE node_type; + TOPOID id; }; struct seq_source @@ -887,16 +890,24 @@ static HRESULT WINAPI topology_node_GetNodeType(IMFTopologyNode *iface, MF_TOPOL static HRESULT WINAPI topology_node_GetTopoNodeID(IMFTopologyNode *iface, TOPOID *id) { - FIXME("(%p)->(%p)\n", iface, id); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, id); + + *id = node->id; + + return S_OK; } static HRESULT WINAPI topology_node_SetTopoNodeID(IMFTopologyNode *iface, TOPOID id) { - FIXME("(%p)->(%s)\n", iface, wine_dbgstr_longlong(id)); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", iface, wine_dbgstr_longlong(id)); + + node->id = id; + + return S_OK; } static HRESULT WINAPI topology_node_GetInputCount(IMFTopologyNode *iface, DWORD *count) @@ -1058,6 +1069,7 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode heap_free(object); return hr; } + object->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); *node = &object->IMFTopologyNode_iface;

1 0

Nikolay Sivov : mf/tests: Add another test for duplicate node ids.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: d2794fe6b738a1ce64bfae95a402c8f2f3ed76a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2794fe6b738a1ce64bfae95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:51 2019 +0300 mf/tests: Add another test for duplicate node ids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 38bf48e..e8051eb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -35,7 +35,7 @@ static void test_topology(void) { - IMFTopologyNode *node, *node2; + IMFTopologyNode *node, *node2, *node3; IMFTopology *topology; WORD count; HRESULT hr; @@ -180,6 +180,39 @@ todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); IMFTopologyNode_Release(node); + + /* Change id for attached node. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, node); +todo_wine + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, node2); +todo_wine + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetTopoNodeID(node, &id); + ok(hr == S_OK, "Failed to get node id, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetTopoNodeID(node2, id); + ok(hr == S_OK, "Failed to get node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(topology, id, &node3); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node3 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node3); + + IMFTopologyNode_Release(node); + IMFTopologyNode_Release(node2); + IMFTopology_Release(topology); }

1 0

Nikolay Sivov : mfplat: Implement MFCreateCollection().
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: a606abf245e22936eb771dcfc8f4e7d7eb78de41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a606abf245e22936eb771dcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:52 2019 +0300 mfplat: Implement MFCreateCollection(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 253 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 103 ++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 358 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a606abf245e22936eb77…

1 0

Nikolay Sivov : mf: Implement topology node handling.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 82e51117c333f3adf8369948dc152bcf7108d303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82e51117c333f3adf8369948… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:53 2019 +0300 mf: Implement topology node handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 57 +++++++++----------------- dlls/mf/topology.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 121 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82e51117c333f3adf836…

1 0

Gijs Vermeulen : mfplat: Implement MFHeap[Alloc|Free].
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 40af5dfdd3f62b685dc4ae62595fb398a82d23e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40af5dfdd3f62b685dc4ae62… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Feb 22 10:36:54 2019 +0300 mfplat: Implement MFHeap[Alloc|Free]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 18 ++++++++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- dlls/mfplat/tests/mfplat.c | 21 +++++++++++++++++++++ include/mfapi.h | 10 ++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e9b0abb..a38c03b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4124,3 +4124,21 @@ HRESULT WINAPI MFCreateCollection(IMFCollection **collection) return S_OK; } + +/*********************************************************************** + * MFHeapAlloc (mfplat.@) + */ +void *WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type) +{ + TRACE("%lu, %#x, %s, %d, %#x.\n", size, flags, debugstr_a(file), line, type); + return HeapAlloc(GetProcessHeap(), flags, size); +} + +/*********************************************************************** + * MFHeapFree (mfplat.@) + */ +void WINAPI MFHeapFree(void *p) +{ + TRACE("%p\n", p); + HeapFree(GetProcessHeap(), 0, p); +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index b35b335..c4e0b2a 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -103,8 +103,8 @@ @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass @ stub MFGetWorkQueueMMCSSTaskId -@ stub MFHeapAlloc -@ stub MFHeapFree +@ stdcall MFHeapAlloc(long long str long long) +@ stdcall MFHeapFree(ptr) @ stub MFInitAMMediaTypeFromMFMediaType @ stub MFInitAttributesFromBlob @ stub MFInitMediaTypeFromAMMediaType diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d0ae80a..609faa5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -41,6 +41,8 @@ static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *s static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); +static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); +static void (WINAPI *pMFHeapFree)(void *p); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -314,6 +316,8 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFCreateMemoryBuffer); + X(MFHeapAlloc); + X(MFHeapFree); #undef X } @@ -1015,6 +1019,22 @@ static void test_MFCreateCollection(void) IMFCollection_Release(collection); } +static void test_MFHeapAlloc(void) +{ + void *res; + + if (!pMFHeapAlloc) + { + win_skip("MFHeapAlloc() is not available.\n"); + return; + } + + res = pMFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); + ok(res != NULL, "MFHeapAlloc failed.\n"); + + pMFHeapFree(res); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1035,6 +1055,7 @@ START_TEST(mfplat) test_allocate_queue(); test_MFCopyImage(); test_MFCreateCollection(); + test_MFHeapAlloc(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 5797db1..7c47213 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -68,6 +68,14 @@ typedef struct tagMFASYNCRESULT HANDLE hEvent; } MFASYNCRESULT; +typedef enum _EAllocationType +{ + eAllocationTypeDynamic, + eAllocationTypeRT, + eAllocationTypePageable, + eAllocationTypeIgnore +} EAllocationType; + DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); @@ -94,6 +102,8 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); +void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); +void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes,

1 0