marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfplat: Unify event method traces format. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Nikolay Sivov 2019-10-03 11:28:16 +03:00 committed by Alexandre Julliard
parent 41853aee79
commit 5ebf0b0b78
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dlls/mfplat/main.c
View File

@ -5585,7 +5585,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver)
return S_OK; return S_OK;
} }
typedef struct media_event struct media_event
{ {
struct attributes attributes; struct attributes attributes;
IMFMediaEvent IMFMediaEvent_iface; IMFMediaEvent IMFMediaEvent_iface;
@ -5594,28 +5594,28 @@ typedef struct media_event
GUID extended_type; GUID extended_type;
HRESULT status; HRESULT status;
PROPVARIANT value; PROPVARIANT value;
} mfmediaevent; };
static inline mfmediaevent *impl_from_IMFMediaEvent(IMFMediaEvent *iface) static inline struct media_event *impl_from_IMFMediaEvent(IMFMediaEvent *iface)
{ {
return CONTAINING_RECORD(iface, mfmediaevent, IMFMediaEvent_iface); return CONTAINING_RECORD(iface, struct media_event, IMFMediaEvent_iface);
} }
static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID riid, void **out) static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID riid, void **out)
{ {
mfmediaevent *This = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out);
if(IsEqualGUID(riid, &IID_IUnknown) || if(IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IMFAttributes) || IsEqualGUID(riid, &IID_IMFAttributes) ||
IsEqualGUID(riid, &IID_IMFMediaEvent)) IsEqualGUID(riid, &IID_IMFMediaEvent))
{ {
*out = &This->IMFMediaEvent_iface; *out = &event->IMFMediaEvent_iface;
} }
else else
{ {
FIXME("(%s, %p)\n", debugstr_guid(riid), out); FIXME("%s, %p.\n", debugstr_guid(riid), out);
*out = NULL; *out = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -5626,29 +5626,29 @@ static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID r
static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface) static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface)
{ {
mfmediaevent *This = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
ULONG ref = InterlockedIncrement(&This->attributes.ref); ULONG refcount = InterlockedIncrement(&event->attributes.ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("%p, refcount %u.\n", iface, refcount);
return ref; return refcount;
} }
static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface)
{ {
struct media_event *event = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
ULONG ref = InterlockedDecrement(&event->attributes.ref); ULONG refcount = InterlockedDecrement(&event->attributes.ref);
TRACE("(%p) ref=%u\n", iface, ref); TRACE("%p, refcount %u.\n", iface, refcount);
if (!ref) if (!refcount)
{ {
clear_attributes_object(&event->attributes); clear_attributes_object(&event->attributes);
PropVariantClear(&event->value); PropVariantClear(&event->value);
heap_free(event); heap_free(event);
} }
return ref; return refcount;
} }
static HRESULT WINAPI mfmediaevent_GetItem(IMFMediaEvent *iface, REFGUID key, PROPVARIANT *value) static HRESULT WINAPI mfmediaevent_GetItem(IMFMediaEvent *iface, REFGUID key, PROPVARIANT *value)
@ -5927,42 +5927,44 @@ static HRESULT WINAPI mfmediaevent_CopyAllItems(IMFMediaEvent *iface, IMFAttribu
static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType *type) static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType *type)
{ {
mfmediaevent *This = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
TRACE("%p, %p\n", This, type); TRACE("%p, %p.\n", iface, type);
*type = This->type; *type = event->type;
return S_OK; return S_OK;
} }
static HRESULT WINAPI mfmediaevent_GetExtendedType(IMFMediaEvent *iface, GUID *extended_type) static HRESULT WINAPI mfmediaevent_GetExtendedType(IMFMediaEvent *iface, GUID *extended_type)
{ {
mfmediaevent *This = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
TRACE("%p, %p\n", This, extended_type); TRACE("%p, %p.\n", iface, extended_type);
*extended_type = This->extended_type; *extended_type = event->extended_type;
return S_OK; return S_OK;
} }
static HRESULT WINAPI mfmediaevent_GetStatus(IMFMediaEvent *iface, HRESULT *status) static HRESULT WINAPI mfmediaevent_GetStatus(IMFMediaEvent *iface, HRESULT *status)
{ {
mfmediaevent *This = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
TRACE("%p, %p\n", This, status); TRACE("%p, %p.\n", iface, status);
*status = This->status; *status = event->status;
return S_OK; return S_OK;
} }
static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *value) static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *value)
{ {
mfmediaevent *This = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
PropVariantCopy(value, &This->value); TRACE("%p, %p.\n", iface, value);
PropVariantCopy(value, &event->value);
return S_OK; return S_OK;
} }
@ -6014,14 +6016,14 @@ static const IMFMediaEventVtbl mfmediaevent_vtbl =
HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value, HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value,
IMFMediaEvent **event) IMFMediaEvent **event)
{ {
mfmediaevent *object; struct media_event *object;
HRESULT hr; HRESULT hr;
TRACE("%s, %s, %08x, %s, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, TRACE("%s, %s, %#x, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status,
debugstr_propvar(value), event); debugstr_propvar(value), event);
object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); object = heap_alloc(sizeof(*object));
if(!object) if (!object)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
if (FAILED(hr = init_attributes_object(&object->attributes, 0))) if (FAILED(hr = init_attributes_object(&object->attributes, 0)))