[PATCH 1/6] mf: Add a stub for sample grabber activation object.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 436 ++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/mf_private.h | 27 +++ dlls/mf/samplegrabber.c | 83 ++++++++ dlls/mf/tests/mf.c | 110 ++++++++++ include/mfidl.idl | 26 ++- 7 files changed, 683 insertions(+), 2 deletions(-) create mode 100644 dlls/mf/mf_private.h create mode 100644 dlls/mf/samplegrabber.c diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 221ef42ec9..2eb9b346d9 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = mfplat mfuuid C_SRCS = \ main.c \ + samplegrabber.c \ session.c \ topology.c diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 77081e2a57..c2e5eb45d2 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -35,6 +35,8 @@ #include "mfapi.h" #include "mferror.h" +#include "mf_private.h" + #include "wine/debug.h" #include "wine/heap.h" #include "wine/unicode.h" @@ -44,6 +46,440 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static HINSTANCE mf_instance; +struct activate_object +{ + IMFActivate IMFActivate_iface; + LONG refcount; + IMFAttributes *attributes; + IUnknown *object; + const struct activate_funcs *funcs; + void *context; +}; + +static struct activate_object *impl_from_IMFActivate(IMFActivate *iface) +{ + return CONTAINING_RECORD(iface, struct activate_object, IMFActivate_iface); +} + +static HRESULT WINAPI activate_object_QueryInterface(IMFActivate *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFActivate) || + IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFActivate_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI activate_object_AddRef(IMFActivate *iface) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + ULONG refcount = InterlockedIncrement(&activate->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI activate_object_Release(IMFActivate *iface) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + ULONG refcount = InterlockedDecrement(&activate->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + activate->funcs->free_private(activate->context); + if (activate->object) + IUnknown_Release(activate->object); + IMFAttributes_Release(activate->attributes); + heap_free(activate); + } + + return refcount; +} + +static HRESULT WINAPI activate_object_GetItem(IMFActivate *iface, REFGUID key, PROPVARIANT *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetItem(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_GetItemType(IMFActivate *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), type); + + return IMFAttributes_GetItemType(activate->attributes, key, type); +} + +static HRESULT WINAPI activate_object_CompareItem(IMFActivate *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, result); + + return IMFAttributes_CompareItem(activate->attributes, key, value, result); +} + +static HRESULT WINAPI activate_object_Compare(IMFActivate *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %p, %d, %p.\n", iface, theirs, type, result); + + return IMFAttributes_Compare(activate->attributes, theirs, type, result); +} + +static HRESULT WINAPI activate_object_GetUINT32(IMFActivate *iface, REFGUID key, UINT32 *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT32(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_GetUINT64(IMFActivate *iface, REFGUID key, UINT64 *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT64(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_GetDouble(IMFActivate *iface, REFGUID key, double *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetDouble(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_GetGUID(IMFActivate *iface, REFGUID key, GUID *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetGUID(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_GetStringLength(IMFActivate *iface, REFGUID key, UINT32 *length) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), length); + + return IMFAttributes_GetStringLength(activate->attributes, key, length); +} + +static HRESULT WINAPI activate_object_GetString(IMFActivate *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), value, size, length); + + return IMFAttributes_GetString(activate->attributes, key, value, size, length); +} + +static HRESULT WINAPI activate_object_GetAllocatedString(IMFActivate *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, length); + + return IMFAttributes_GetAllocatedString(activate->attributes, key, value, length); +} + +static HRESULT WINAPI activate_object_GetBlobSize(IMFActivate *iface, REFGUID key, UINT32 *size) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), size); + + return IMFAttributes_GetBlobSize(activate->attributes, key, size); +} + +static HRESULT WINAPI activate_object_GetBlob(IMFActivate *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), buf, bufsize, blobsize); + + return IMFAttributes_GetBlob(activate->attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI activate_object_GetAllocatedBlob(IMFActivate *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_GetAllocatedBlob(activate->attributes, key, buf, size); +} + +static HRESULT WINAPI activate_object_GetUnknown(IMFActivate *iface, REFGUID key, REFIID riid, void **ppv) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(key), debugstr_guid(riid), ppv); + + return IMFAttributes_GetUnknown(activate->attributes, key, riid, ppv); +} + +static HRESULT WINAPI activate_object_SetItem(IMFActivate *iface, REFGUID key, REFPROPVARIANT value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetItem(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_DeleteItem(IMFActivate *iface, REFGUID key) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s.\n", iface, debugstr_guid(key)); + + return IMFAttributes_DeleteItem(activate->attributes, key); +} + +static HRESULT WINAPI activate_object_DeleteAllItems(IMFActivate *iface) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_DeleteAllItems(activate->attributes); +} + +static HRESULT WINAPI activate_object_SetUINT32(IMFActivate *iface, REFGUID key, UINT32 value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %d.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetUINT32(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_SetUINT64(IMFActivate *iface, REFGUID key, UINT64 value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); + + return IMFAttributes_SetUINT64(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_SetDouble(IMFActivate *iface, REFGUID key, double value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetDouble(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_SetGUID(IMFActivate *iface, REFGUID key, REFGUID value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_guid(value)); + + return IMFAttributes_SetGUID(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_SetString(IMFActivate *iface, REFGUID key, const WCHAR *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_w(value)); + + return IMFAttributes_SetString(activate->attributes, key, value); +} + +static HRESULT WINAPI activate_object_SetBlob(IMFActivate *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %d.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_SetBlob(activate->attributes, key, buf, size); +} + +static HRESULT WINAPI activate_object_SetUnknown(IMFActivate *iface, REFGUID key, IUnknown *unknown) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), unknown); + + return IMFAttributes_SetUnknown(activate->attributes, key, unknown); +} + +static HRESULT WINAPI activate_object_LockStore(IMFActivate *iface) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_LockStore(activate->attributes); +} + +static HRESULT WINAPI activate_object_UnlockStore(IMFActivate *iface) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_UnlockStore(activate->attributes); +} + +static HRESULT WINAPI activate_object_GetCount(IMFActivate *iface, UINT32 *count) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %p.\n", iface, count); + + return IMFAttributes_GetCount(activate->attributes, count); +} + +static HRESULT WINAPI activate_object_GetItemByIndex(IMFActivate *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return IMFAttributes_GetItemByIndex(activate->attributes, index, key, value); +} + +static HRESULT WINAPI activate_object_CopyAllItems(IMFActivate *iface, IMFAttributes *dest) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %p.\n", iface, dest); + + return IMFAttributes_CopyAllItems(activate->attributes, dest); +} + +static HRESULT WINAPI activate_object_ActivateObject(IMFActivate *iface, REFIID riid, void **obj) +{ + struct activate_object *activate = impl_from_IMFActivate(iface); + IUnknown *object; + HRESULT hr; + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (!activate->object) + { + if (FAILED(hr = activate->funcs->create_object(activate->context, &object))) + return hr; + + if (!InterlockedCompareExchangePointer((void **)&activate->object, object, NULL)) + IUnknown_Release(object); + } + + return IUnknown_QueryInterface(activate->object, riid, obj); +} + +static HRESULT WINAPI activate_object_ShutdownObject(IMFActivate *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI activate_object_DetachObject(IMFActivate *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFActivateVtbl activate_object_vtbl = +{ + activate_object_QueryInterface, + activate_object_AddRef, + activate_object_Release, + activate_object_GetItem, + activate_object_GetItemType, + activate_object_CompareItem, + activate_object_Compare, + activate_object_GetUINT32, + activate_object_GetUINT64, + activate_object_GetDouble, + activate_object_GetGUID, + activate_object_GetStringLength, + activate_object_GetString, + activate_object_GetAllocatedString, + activate_object_GetBlobSize, + activate_object_GetBlob, + activate_object_GetAllocatedBlob, + activate_object_GetUnknown, + activate_object_SetItem, + activate_object_DeleteItem, + activate_object_DeleteAllItems, + activate_object_SetUINT32, + activate_object_SetUINT64, + activate_object_SetDouble, + activate_object_SetGUID, + activate_object_SetString, + activate_object_SetBlob, + activate_object_SetUnknown, + activate_object_LockStore, + activate_object_UnlockStore, + activate_object_GetCount, + activate_object_GetItemByIndex, + activate_object_CopyAllItems, + activate_object_ActivateObject, + activate_object_ShutdownObject, + activate_object_DetachObject, +}; + +HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) +{ + struct activate_object *object; + HRESULT hr; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFActivate_iface.lpVtbl = &activate_object_vtbl; + object->refcount = 1; + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + object->funcs = funcs; + object->context = context; + + *ret = &object->IMFActivate_iface; + + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 9e3f6caef8..6131495225 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -51,7 +51,7 @@ @ stub MFCreateRemoteDesktopPlugin @ stub MFCreateSAMIByteStreamPlugin @ stub MFCreateSampleCopierMFT -@ stub MFCreateSampleGrabberSinkActivate +@ stdcall MFCreateSampleGrabberSinkActivate(ptr ptr ptr) @ stub MFCreateSecureHttpSchemePlugin @ stub MFCreateSequencerSegmentOffset @ stdcall MFCreateSequencerSource(ptr ptr) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h new file mode 100644 index 0000000000..b5b4e84bba --- /dev/null +++ b/dlls/mf/mf_private.h @@ -0,0 +1,27 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mfidl.h" + +struct activate_funcs +{ + HRESULT (*create_object)(void *context, IUnknown **object); + void (*free_private)(void *context); +}; + +HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) DECLSPEC_HIDDEN; diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c new file mode 100644 index 0000000000..1ffa3ba0b0 --- /dev/null +++ b/dlls/mf/samplegrabber.c @@ -0,0 +1,83 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "mfidl.h" +#include "mf_private.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct sample_grabber_activate_context +{ + IMFMediaType *media_type; + IMFSampleGrabberSinkCallback *callback; +}; + +static void sample_grabber_free_private(void *user_context) +{ + struct sample_grabber_activate_context *context = user_context; + IMFMediaType_Release(context->media_type); + IMFSampleGrabberSinkCallback_Release(context->callback); + heap_free(context); +} + +static HRESULT sample_grabber_create_object(void *user_context, IUnknown **obj) +{ + FIXME("%p, %p.\n", user_context, obj); + + return E_NOTIMPL; +} + +static const struct activate_funcs sample_grabber_activate_funcs = +{ + sample_grabber_create_object, + sample_grabber_free_private, +}; + +/*********************************************************************** + * MFCreateSampleGrabberSinkActivate (mf.@) + */ +HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type, IMFSampleGrabberSinkCallback *callback, + IMFActivate **activate) +{ + struct sample_grabber_activate_context *context; + HRESULT hr; + + TRACE("%p, %p, %p.\n", media_type, callback, activate); + + if (!media_type || !callback || !activate) + return E_POINTER; + + context = heap_alloc_zero(sizeof(*context)); + if (!context) + return E_OUTOFMEMORY; + + context->media_type = media_type; + IMFMediaType_AddRef(context->media_type); + context->callback = callback; + IMFSampleGrabberSinkCallback_AddRef(context->callback); + + if (FAILED(hr = create_activation_object(context, &sample_grabber_activate_funcs, activate))) + sample_grabber_free_private(context); + + return hr; +} diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 80dc990254..059062f698 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -940,6 +940,115 @@ todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static HRESULT WINAPI grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFSampleGrabberSinkCallback) || + IsEqualIID(riid, &IID_IMFClockStateSink) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFSampleGrabberSinkCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI grabber_callback_AddRef(IMFSampleGrabberSinkCallback *iface) +{ + return 2; +} + +static ULONG WINAPI grabber_callback_Release(IMFSampleGrabberSinkCallback *iface) +{ + return 1; +} + +static HRESULT WINAPI grabber_callback_OnClockStart(IMFSampleGrabberSinkCallback *iface, MFTIME time, LONGLONG offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnClockStop(IMFSampleGrabberSinkCallback *iface, MFTIME time) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnClockPause(IMFSampleGrabberSinkCallback *iface, MFTIME time) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnClockRestart(IMFSampleGrabberSinkCallback *iface, MFTIME time) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnClockSetRate(IMFSampleGrabberSinkCallback *iface, MFTIME time, float rate) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnSetPresentationClock(IMFSampleGrabberSinkCallback *iface, + IMFPresentationClock *clock) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnProcessSample(IMFSampleGrabberSinkCallback *iface, REFGUID major_type, + DWORD sample_flags, LONGLONG sample_time, LONGLONG sample_duration, const BYTE *buffer, DWORD sample_size) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI grabber_callback_OnShutdown(IMFSampleGrabberSinkCallback *iface) +{ + return E_NOTIMPL; +} + +static const IMFSampleGrabberSinkCallbackVtbl grabber_callback_vtbl = +{ + grabber_callback_QueryInterface, + grabber_callback_AddRef, + grabber_callback_Release, + grabber_callback_OnClockStart, + grabber_callback_OnClockStop, + grabber_callback_OnClockPause, + grabber_callback_OnClockRestart, + grabber_callback_OnClockSetRate, + grabber_callback_OnSetPresentationClock, + grabber_callback_OnProcessSample, + grabber_callback_OnShutdown, +}; + +static IMFSampleGrabberSinkCallback grabber_callback = { &grabber_callback_vtbl }; + +static void test_sample_grabber(void) +{ + IMFMediaType *media_type; + IMFActivate *activate; + ULONG refcount; + HRESULT hr; + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(NULL, NULL, &activate); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(NULL, &grabber_callback, &activate); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + refcount = IMFMediaType_Release(media_type); + ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + + IMFActivate_Release(activate); +} + START_TEST(mf) { test_topology(); @@ -949,4 +1058,5 @@ START_TEST(mf) test_media_session(); test_MFShutdownObject(); test_presentation_clock(); + test_sample_grabber(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 64d39db77e..2f2f17c04a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -463,8 +463,30 @@ interface IMFSequencerSource : IUnknown HRESULT UpdateTopologyFlags( [in] MFSequencerElementId id, [in] DWORD flags ); +} + +interface IMFPresentationClock; + +[ + object, + uuid(8c7b80bf-ee42-4b59-b1df-55668e1bdca8), + local +] +interface IMFSampleGrabberSinkCallback : IMFClockStateSink +{ + HRESULT OnSetPresentationClock( + [in] IMFPresentationClock *clock); -}; + HRESULT OnProcessSample( + [in] REFGUID major_type, + [in] DWORD sample_flags, + [in] LONGLONG sample_time, + [in] LONGLONG sample_duration, + [in] const BYTE *buffer, + [in] DWORD sample_size); + + HRESULT OnShutdown(); +} cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) @@ -472,6 +494,8 @@ cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFBy cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor **descriptors,") cpp_quote(" IMFPresentationDescriptor **presentation_desc);") +cpp_quote("HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type,") +cpp_quote(" IMFSampleGrabberSinkCallback *callback, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") -- 2.20.1
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- include/mfidl.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 803944d376..74b609b0c2 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -556,11 +556,20 @@ const char *debugstr_attr(const GUID *guid) { #define X(g) { &(g), #g } X(MF_READWRITE_MMCSS_CLASS), + X(MF_TOPONODE_MARKIN_HERE), + X(MF_TOPONODE_MARKOUT_HERE), + X(MF_TOPONODE_DECODER), + X(MF_TOPOLOGY_PROJECTSTART), + X(MF_TOPOLOGY_PROJECTSTOP), X(MF_SINK_WRITER_ENCODER_CONFIG), + X(MF_TOPOLOGY_NO_MARKIN_MARKOUT), X(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS), + X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), X(MF_MT_ALPHA_MODE), + X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), + X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MF_MT_WRAPPED_TYPE), X(MF_MT_AVG_BITRATE), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), @@ -581,8 +590,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), + X(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH), + X(MF_TOPONODE_WORKQUEUE_MMCSS_PRIORITY), X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID), + X(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS), X(MF_MT_AUDIO_FLOAT_SAMPLES_PER_SECOND), X(MFSampleExtension_ForwardedDecodeUnits), X(MF_EVENT_SOURCE_TOPOLOGY_CANCELED), @@ -598,10 +610,12 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), X(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE), + X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TIME), + X(MF_TOPOLOGY_PLAYBACK_FRAMERATE), X(MF_SOURCE_READER_D3D11_BIND_FLAGS), X(MF_MT_AUDIO_FOLDDOWN_MATRIX), X(MF_MT_AUDIO_WMADRC_PEAKREF), @@ -632,14 +646,19 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_3D_FIRST_IS_LEFT), X(MF_PD_ADAPTIVE_STREAMING), X(MFSampleExtension_Timestamp), + X(MF_TOPONODE_PRIMARYOUTPUT), X(MF_MT_SUBTYPE), + X(MF_TOPONODE_STREAMID), + X(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE), X(MF_SD_MUTUALLY_EXCLUSIVE), X(MF_SD_STREAM_NAME), + X(MF_TOPONODE_RATELESS), X(MF_EVENT_STREAM_METADATA_CONTENT_KEYIDS), + X(MF_TOPONODE_DISABLE_PREROLL), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), - X(MF_SINK_WRITER_D3D_MANAGER), X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_SINK_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), @@ -653,9 +672,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), + X(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY), X(MFSampleExtension_ForwardedDecodeUnitType), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), + X(MF_TOPONODE_TRANSFORM_OBJECTID), X(MF_DEVSOURCE_ATTRIBUTE_MEDIA_TYPE), X(MF_EVENT_MFT_INPUT_STREAM_ID), X(MF_READWRITE_MMCSS_PRIORITY), @@ -672,22 +693,44 @@ const char *debugstr_attr(const GUID *guid) X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), + X(MF_TOPOLOGY_RESOLUTION_STATUS), X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION), X(MF_MT_AUDIO_SAMPLES_PER_SECOND), X(MF_MT_FRAME_RATE), + X(MF_TOPONODE_FLUSH), + X(MF_TOPONODE_DRAIN), + X(MF_TOPONODE_MEDIASTART), + X(MF_TOPONODE_MEDIASTOP), X(MF_SOURCE_READER_MEDIASOURCE_CONFIG), + X(MF_TOPONODE_SOURCE), + X(MF_TOPONODE_PRESENTATION_DESCRIPTOR), + X(MF_TOPONODE_D3DAWARE), X(MF_MT_COMPRESSED), + X(MF_TOPONODE_STREAM_DESCRIPTOR), + X(MF_TOPONODE_ERRORCODE), + X(MF_TOPONODE_SEQUENCE_ELEMENTID), X(MF_EVENT_MFT_CONTEXT), X(MF_MT_FORWARD_CUSTOM_SEI), + X(MF_TOPONODE_CONNECT_METHOD), X(MF_MT_DEPTH_VALUE_UNIT), X(MF_MT_AUDIO_NUM_CHANNELS), + X(MF_TOPOLOGY_DXVA_MODE), + X(MF_TOPONODE_LOCKED), + X(MF_TOPONODE_WORKQUEUE_ID), + X(MF_TOPONODE_WORKQUEUE_MMCSS_CLASS), + X(MF_TOPONODE_DECRYPTOR), X(MF_EVENT_DO_THINNING), + X(MF_TOPONODE_DISCARDABLE), + X(MF_TOPOLOGY_HARDWARE_MODE), X(MF_SOURCE_READER_DISABLE_DXVA), X(MF_MT_FORWARD_CUSTOM_NALU), + X(MF_TOPONODE_ERROR_MAJORTYPE), X(MF_MT_SECURE), + X(MF_TOPONODE_ERROR_SUBTYPE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE), X(MF_MT_VIDEO_3D_LEFT_IS_BASE), + X(MF_TOPONODE_WORKQUEUE_MMCSS_TASKID), #undef X }; struct guid_def *ret = NULL; diff --git a/include/mfidl.idl b/include/mfidl.idl index 2f2f17c04a..702434aa2d 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -688,3 +688,48 @@ cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS, 0x cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID, 0x14dd9a1c, 0x7cff, 0x41be, 0xb1, 0xb9, 0xba, 0x1a, 0xc6, 0xec, 0xb5, 0x71);") cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID, 0x8ac3587a, 0x4ae7, 0x42d8, 0x99, 0xe0, 0x0a, 0x60, 0x13, 0xee, 0xf9, 0x0f);") + +cpp_quote("EXTERN_GUID(MF_TOPONODE_CONNECT_METHOD, 0x494bbcf1, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_D3DAWARE, 0x494bbced, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_DECODER, 0x494bbd02, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_DECRYPTOR, 0x494bbcfa, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_DISABLE_PREROLL, 0x14932f9e, 0x9087, 0x4bb4, 0x84, 0x12, 0x51, 0x67, 0x14, 0x5c, 0xbe, 0x04);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_DISCARDABLE, 0x494bbcfb, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_DRAIN, 0x494bbce9, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_ERROR_MAJORTYPE, 0x494bbcfd, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_ERROR_SUBTYPE, 0x494bbcfe, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_ERRORCODE, 0x494bbcee, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_FLUSH, 0x494bbce8, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_LOCKED, 0x494bbcf7, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_MARKIN_HERE, 0x494bbd00, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_MARKOUT_HERE, 0x494bbd01, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_MEDIASTART, 0x835c58ea, 0xe075, 0x4bc7, 0xbc, 0xba, 0x4d, 0xe0, 0x00, 0xdf, 0x9a, 0xe6);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_MEDIASTOP, 0x835c58eb, 0xe075, 0x4bc7, 0xbc, 0xba, 0x4d, 0xe0, 0x00, 0xdf, 0x9a, 0xe6);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, 0x14932f9c, 0x9087, 0x4bb4, 0x84, 0x12, 0x51, 0x67, 0x14, 0x5c, 0xbe, 0x04);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_PRESENTATION_DESCRIPTOR, 0x835c58ed, 0xe075, 0x4bc7, 0xbc, 0xba, 0x4d, 0xe0, 0x00, 0xdf, 0x9a, 0xe6);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_PRIMARYOUTPUT, 0x6304ef99, 0x16b2, 0x4ebe, 0x9d, 0x67, 0xe4, 0xc5, 0x39, 0xb3, 0xa2, 0x59);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_RATELESS, 0x14932f9d, 0x9087, 0x4bb4, 0x84, 0x12, 0x51, 0x67, 0x14, 0x5c, 0xbe, 0x04);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_SEQUENCE_ELEMENTID, 0x835c58ef, 0xe075, 0x4bc7, 0xbc, 0xba, 0x4d, 0xe0, 0x00, 0xdf, 0x9a, 0xe6);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_SOURCE, 0x835c58ec, 0xe075, 0x4bc7, 0xbc, 0xba, 0x4d, 0xe0, 0x00, 0xdf, 0x9a, 0xe6);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_STREAM_DESCRIPTOR, 0x835c58ee, 0xe075, 0x4bc7, 0xbc, 0xba, 0x4d, 0xe0, 0x00, 0xdf, 0x9a, 0xe6);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_STREAMID, 0x14932f9b, 0x9087, 0x4bb4, 0x84, 0x12, 0x51, 0x67, 0x14, 0x5c, 0xbe, 0x04);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_TRANSFORM_OBJECTID, 0x88dcc0c9, 0x293e, 0x4e8b, 0x9a, 0xeb, 0xa, 0xd6, 0x4c, 0xc0, 0x16, 0xb0);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_WORKQUEUE_ID, 0x494bbcf8, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY, 0xa1ff99be, 0x5e97, 0x4a53, 0xb4, 0x94, 0x56, 0x8c, 0x64, 0x2c, 0x0f, 0xf3);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_WORKQUEUE_MMCSS_CLASS, 0x494bbcf9, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_WORKQUEUE_MMCSS_PRIORITY, 0x5001f840, 0x2816, 0x48f4, 0x93, 0x64, 0xad, 0x1e, 0xf6, 0x61, 0xa1, 0x23);") +cpp_quote("EXTERN_GUID(MF_TOPONODE_WORKQUEUE_MMCSS_TASKID, 0x494bbcff, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") + +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_DXVA_MODE, 0x1e8d34f6, 0xf5ab, 0x4e23, 0xbb, 0x88, 0x87, 0x4a, 0xa3, 0xa1, 0xa7, 0x4d);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED, 0xd529950b, 0xd484, 0x4527, 0xa9, 0xcd, 0xb1, 0x90, 0x95, 0x32, 0xb5, 0xb0);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK, 0x1967731f, 0xcd78, 0x42fc, 0xb0, 0x26, 0x09, 0x92, 0xa5, 0x6e, 0x56, 0x93);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, 0x6248c36d, 0x5d0b, 0x4f40, 0xa0, 0xbb, 0xb0, 0xb3, 0x05, 0xf7, 0x76, 0x98);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_HARDWARE_MODE, 0xd2d362fd, 0x4e4f, 0x4191, 0xa5, 0x79, 0xc6, 0x18, 0xb6, 0x67, 0x06, 0xaf);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_NO_MARKIN_MARKOUT, 0x7ed3f804, 0x86bb, 0x4b3f, 0xb7, 0xe4, 0x7c, 0xb4, 0x3a, 0xfd, 0x4b, 0x80);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_PLAYBACK_FRAMERATE, 0xc164737a, 0xc2b1, 0x4553, 0x83, 0xbb, 0x5a, 0x52, 0x60, 0x72, 0x44, 0x8f);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_PLAYBACK_MAX_DIMS, 0x5715cf19, 0x5768, 0x44aa, 0xad, 0x6e, 0x87, 0x21, 0xf1, 0xb0, 0xf9, 0xbb);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_PROJECTSTART, 0x7ed3f802, 0x86bb, 0x4b3f, 0xb7, 0xe4, 0x7c, 0xb4, 0x3a, 0xfd, 0x4b, 0x80);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_PROJECTSTOP, 0x7ed3f803, 0x86bb, 0x4b3f, 0xb7, 0xe4, 0x7c, 0xb4, 0x3a, 0xfd, 0x4b, 0x80);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_RESOLUTION_STATUS, 0x494bbcde, 0xb031, 0x4e38, 0x97, 0xc4, 0xd5, 0x42, 0x2d, 0xd6, 0x18, 0xdc);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH, 0xc8cc113f, 0x7951, 0x4548, 0xaa, 0xd6, 0x9e, 0xd6, 0x20, 0x2e, 0x62, 0xb3);") +cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x41a6, 0x4b79, 0x89, 0x7a, 0x1a, 0xb0, 0xe5, 0x2b, 0x4a, 0x1b);") -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=51860 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 83 +++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 78 ++++++++++++++++++++++++++++++++++-- 3 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index f233cff3fc..bdb493cc60 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf mfplat +IMPORTS = mf mfplat mfuuid C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 059062f698..cea5f98f6e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -27,6 +27,12 @@ #include "winbase.h" #include "initguid.h" +#include "ole2.h" + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mferror.h" #include "mfidl.h" @@ -35,11 +41,45 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_unk_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI test_unk_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl test_unk_vtbl = +{ + test_unk_QueryInterface, + test_unk_AddRef, + test_unk_Release, +}; + static void test_topology(void) { IMFCollection *collection, *collection2; + IUnknown test_unk2 = { &test_unk_vtbl }; + IUnknown test_unk = { &test_unk_vtbl }; IMFTopologyNode *node, *node2, *node3; IMFTopology *topology, *topology2; + UINT32 attr_count; + IUnknown *object; DWORD size; WORD count; HRESULT hr; @@ -302,6 +342,49 @@ static void test_topology(void) ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); hr = IMFTopology_AddNode(topology, node); ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + /* Associated object. */ + hr = IMFTopologyNode_SetObject(node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetObject(node, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!object, "Unexpected object %p.\n", object); + + hr = IMFTopologyNode_SetObject(node, &test_unk); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == S_OK, "Failed to get object, hr %#x.\n", hr); + ok(object == &test_unk, "Unexpected object %p.\n", object); + IUnknown_Release(object); + + hr = IMFTopologyNode_SetObject(node, &test_unk2); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetCount(node, &attr_count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(attr_count == 0, "Unexpected attribute count %u.\n", attr_count); + + hr = IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &MF_TOPONODE_TRANSFORM_OBJECTID); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!object, "Unexpected object %p.\n", object); + + hr = IMFTopologyNode_GetCount(node, &attr_count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(attr_count == 1, "Unexpected attribute count %u.\n", attr_count); + IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 543e08fb24..e01444b8ce 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -25,7 +25,13 @@ #include "windef.h" #include "winbase.h" + #include "initguid.h" +#include "ole2.h" +#include "ocidl.h" + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mferror.h" #include "mfidl.h" @@ -54,6 +60,8 @@ struct topology_node IMFAttributes *attributes; MF_TOPOLOGY_TYPE node_type; TOPOID id; + IUnknown *object; + CRITICAL_SECTION cs; }; struct topology_loader @@ -755,7 +763,10 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) if (!refcount) { + if (node->object) + IUnknown_Release(node->object); IMFAttributes_Release(node->attributes); + DeleteCriticalSection(&node->cs); heap_free(node); } @@ -1038,16 +1049,74 @@ static HRESULT WINAPI topology_node_CopyAllItems(IMFTopologyNode *iface, IMFAttr static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) { - FIXME("(%p)->(%p)\n", iface, object); + static const GUID *iids[3] = { &IID_IPersist, &IID_IPersistStorage, &IID_IPersistPropertyBag }; + struct topology_node *node = impl_from_IMFTopologyNode(iface); + IPersist *persist = NULL; + BOOL has_object_id; + GUID object_id; + unsigned int i; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + has_object_id = IMFAttributes_GetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id) == S_OK; + + if (object && !has_object_id) + { + for (i = 0; i < ARRAY_SIZE(iids); ++i) + { + persist = NULL; + if (SUCCEEDED(hr = IUnknown_QueryInterface(object, iids[i], (void **)&persist))) + break; + } + + if (persist) + { + if (FAILED(hr = IPersist_GetClassID(persist, &object_id))) + { + IPersist_Release(persist); + persist = NULL; + } + } + } + + EnterCriticalSection(&node->cs); + + if (node->object) + IUnknown_Release(node->object); + node->object = object; + if (node->object) + IUnknown_AddRef(node->object); + + if (persist) + IMFAttributes_SetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id); + + LeaveCriticalSection(&node->cs); + + if (persist) + IPersist_Release(persist); + + return S_OK; } static HRESULT WINAPI topology_node_GetObject(IMFTopologyNode *iface, IUnknown **object) { - FIXME("(%p)->(%p)\n", iface, object); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + if (!object) + return E_POINTER; + + EnterCriticalSection(&node->cs); + + *object = node->object; + if (*object) + IUnknown_AddRef(*object); + + LeaveCriticalSection(&node->cs); + + return *object ? S_OK : E_FAIL; } static HRESULT WINAPI topology_node_GetNodeType(IMFTopologyNode *iface, MF_TOPOLOGY_TYPE *node_type) @@ -1243,6 +1312,7 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } object->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); + InitializeCriticalSection(&object->cs); *node = &object->IMFTopologyNode_iface; -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=51861 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 0d912a7afe..b0b5ccc42a 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -483,7 +483,7 @@ static HRESULT WINAPI sample_SetGUID(IMFSample *iface, REFGUID key, REFGUID valu { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&sample->attributes, key, value); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 74b609b0c2..8efe6802b6 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5705,7 +5705,7 @@ static HRESULT WINAPI mfmediaevent_SetGUID(IMFMediaEvent *iface, REFGUID key, RE { struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&event->attributes, key, value); } diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e522e90f01..e23ebd1fb9 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -324,7 +324,7 @@ static HRESULT WINAPI mediatype_SetGUID(IMFMediaType *iface, REFGUID key, REFGUI { struct media_type *media_type = impl_from_IMFMediaType(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&media_type->attributes, key, value); } @@ -871,7 +871,7 @@ static HRESULT WINAPI stream_descriptor_SetGUID(IMFStreamDescriptor *iface, REFG { struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&stream_desc->attributes, key, value); } @@ -1450,7 +1450,7 @@ static HRESULT WINAPI presentation_descriptor_SetGUID(IMFPresentationDescriptor { struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); return attributes_SetGUID(&presentation_desc->attributes, key, value); } -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=51863 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8efe6802b6..0e21497d4d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2660,13 +2660,30 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end return S_OK; } -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) { - mfbytestream *This = impl_from_IMFByteStream(iface); + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER position; + HRESULT hr = S_OK; + BOOL ret; + + TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + EnterCriticalSection(&stream->cs); - return E_NOTIMPL; + position.QuadPart = stream->position; + if ((ret = SetFilePointerEx(stream->hfile, position, NULL, FILE_BEGIN))) + { + if ((ret = ReadFile(stream->hfile, buffer, size, read_len, NULL))) + stream->position += *read_len; + } + + if (!ret) + hr = HRESULT_FROM_WIN32(GetLastError()); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG size, IMFAsyncCallback *callback, @@ -2744,7 +2761,7 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } -static const IMFByteStreamVtbl mfbytestream_vtbl = +static const IMFByteStreamVtbl bytestream_file_vtbl = { bytestream_QueryInterface, bytestream_AddRef, @@ -2755,7 +2772,7 @@ static const IMFByteStreamVtbl mfbytestream_vtbl = mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, mfbytestream_IsEndOfStream, - mfbytestream_Read, + bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead, mfbytestream_Write, @@ -3209,16 +3226,14 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { DWORD capabilities = MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK; - struct bytestream *object; - DWORD fileaccessmode = 0; + DWORD filecreation_disposition = 0, fileaccessmode = 0, fileattributes = 0; DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; + struct bytestream *object; FILETIME writetime; HANDLE file; HRESULT hr; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("%d, %d, %#x, %s, %p.\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { @@ -3279,7 +3294,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open heap_free(object); return hr; } - object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->IMFByteStream_iface.lpVtbl = &bytestream_file_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; object->IMFGetService_iface.lpVtbl = &bytestream_file_getservice_vtbl; object->read_callback.lpVtbl = &bytestream_file_read_callback_vtbl; -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=51864 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0e21497d4d..61521ce779 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2648,16 +2648,25 @@ static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWOR return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { - mfbytestream *This = impl_from_IMFByteStream(iface); + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER position, length; + HRESULT hr = S_OK; - FIXME("%p, %p\n", This, endstream); + TRACE("%p, %p.\n", iface, ret); - if(endstream) - *endstream = TRUE; + EnterCriticalSection(&stream->cs); - return S_OK; + position.QuadPart = 0; + if (SetFilePointerEx(stream->hfile, position, &length, FILE_END)) + *ret = stream->position >= length.QuadPart; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) @@ -2771,7 +2780,7 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = mfbytestream_SetLength, mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, + bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead, -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=51865 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=51859 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/mf/main.c:35 Task: Patch failed to apply
participants (2)
-
Marvin -
Nikolay Sivov