Nikolay Sivov : mfplat: Unify event method traces format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ebf0b0b78ea4b47b8e4eb10beb035cd513d18ee
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5ebf0b0b78ea4b47b8e4eb10b...

Author: Nikolay Sivov 
Date:   Thu Oct  3 11:28:16 2019 +0300

mfplat: Unify event method traces format.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/mfplat/main.c | 64 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 30810daa44..6be9a194d4 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -5585,7 +5585,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver)
     return S_OK;
 }

-typedef struct media_event
+struct media_event
 {
     struct attributes attributes;
     IMFMediaEvent IMFMediaEvent_iface;
@@ -5594,28 +5594,28 @@ typedef struct media_event
     GUID extended_type;
     HRESULT status;
     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)
 {
-    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) ||
        IsEqualGUID(riid, &IID_IMFAttributes) ||
        IsEqualGUID(riid, &IID_IMFMediaEvent))
     {
-        *out = &This->IMFMediaEvent_iface;
+        *out = &event->IMFMediaEvent_iface;
     }
     else
     {
-        FIXME("(%s, %p)\n", debugstr_guid(riid), out);
+        FIXME("%s, %p.\n", debugstr_guid(riid), out);
         *out = NULL;
         return E_NOINTERFACE;
     }
@@ -5626,29 +5626,29 @@ static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID r

static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface)
 {
-    mfmediaevent *This = impl_from_IMFMediaEvent(iface);
-    ULONG ref = InterlockedIncrement(&This->attributes.ref);
+    struct media_event *event = impl_from_IMFMediaEvent(iface);
+    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)
 {
     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);
         PropVariantClear(&event->value);
         heap_free(event);
     }

-    return ref;
+    return refcount;
 }

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)
 {
-    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;
 }

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;
 }

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;
 }

static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *value)
 {
-    mfmediaevent *This = impl_from_IMFMediaEvent(iface);
+    struct media_event *event = impl_from_IMFMediaEvent(iface);
+
+    TRACE("%p, %p.\n", iface, value);

-    PropVariantCopy(value, &This->value);
+    PropVariantCopy(value, &event->value);

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,
         IMFMediaEvent **event)
 {
-    mfmediaevent *object;
+    struct media_event *object;
     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);

-    object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) );
-    if(!object)
+    object = heap_alloc(sizeof(*object));
+    if (!object)
         return E_OUTOFMEMORY;

if (FAILED(hr = init_attributes_object(&object->attributes, 0)))