Skip to content

W
wine-cw
Commit 4837234e authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

mfplat: Improve method traces.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 60f61066
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 23 deletions
dlls/mfplat/buffer.c
View file @ 4837234e
...@@ -311,7 +311,7 @@ static HRESULT WINAPI sample_CompareItem(IMFSample *iface, REFGUID key, REFPROPV ...@@ -311,7 +311,7 @@ static HRESULT WINAPI sample_CompareItem(IMFSample *iface, REFGUID key, REFPROPV
{ {
struct sample *sample = impl_from_IMFSample(iface); struct sample *sample = impl_from_IMFSample(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return attributes_CompareItem(&sample->attributes, key, value, result); return attributes_CompareItem(&sample->attributes, key, value, result);
} }
...@@ -429,7 +429,7 @@ static HRESULT WINAPI sample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIA ...@@ -429,7 +429,7 @@ static HRESULT WINAPI sample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIA
{ {
struct sample *sample = impl_from_IMFSample(iface); struct sample *sample = impl_from_IMFSample(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return attributes_SetItem(&sample->attributes, key, value); return attributes_SetItem(&sample->attributes, key, value);
} }
......
dlls/mfplat/main.c
View file @ 4837234e
...@@ -1621,7 +1621,7 @@ static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key ...@@ -1621,7 +1621,7 @@ static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key
{ {
struct attributes *attributes = impl_from_IMFAttributes(iface); struct attributes *attributes = impl_from_IMFAttributes(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return attributes_CompareItem(attributes, key, value, result); return attributes_CompareItem(attributes, key, value, result);
} }
...@@ -1741,7 +1741,7 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE ...@@ -1741,7 +1741,7 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE
{ {
struct attributes *attributes = impl_from_IMFAttributes(iface); struct attributes *attributes = impl_from_IMFAttributes(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return attributes_SetItem(attributes, key, value); return attributes_SetItem(attributes, key, value);
} }
...@@ -3779,11 +3779,12 @@ static HRESULT WINAPI bytestream_wrapper_events_EndGetEvent(IMFMediaEventGenerat ...@@ -3779,11 +3779,12 @@ static HRESULT WINAPI bytestream_wrapper_events_EndGetEvent(IMFMediaEventGenerat
return IMFMediaEventGenerator_EndGetEvent(wrapper->event_generator, result, event); return IMFMediaEventGenerator_EndGetEvent(wrapper->event_generator, result, event);
} }
static HRESULT WINAPI bytestream_wrapper_events_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) static HRESULT WINAPI bytestream_wrapper_events_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType type,
REFGUID ext_type, HRESULT hr, const PROPVARIANT *value)
{ {
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFMediaEventGenerator(iface); struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFMediaEventGenerator(iface);
TRACE("%p, %d, %s, %#x, %p.\n", iface, type, debugstr_guid(ext_type), hr, value); TRACE("%p, %d, %s, %#x, %s.\n", iface, type, debugstr_guid(ext_type), hr, debugstr_propvar(value));
return IMFMediaEventGenerator_QueueEvent(wrapper->event_generator, type, ext_type, hr, value); return IMFMediaEventGenerator_QueueEvent(wrapper->event_generator, type, ext_type, hr, value);
} }
...@@ -3900,11 +3901,12 @@ static HRESULT WINAPI bytestream_wrapper_propstore_GetValue(IPropertyStore *ifac ...@@ -3900,11 +3901,12 @@ static HRESULT WINAPI bytestream_wrapper_propstore_GetValue(IPropertyStore *ifac
return IPropertyStore_GetValue(wrapper->propstore, key, value); return IPropertyStore_GetValue(wrapper->propstore, key, value);
} }
static HRESULT WINAPI bytestream_wrapper_propstore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, const PROPVARIANT *value) static HRESULT WINAPI bytestream_wrapper_propstore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key,
const PROPVARIANT *value)
{ {
struct bytestream_wrapper *wrapper = impl_wrapper_from_IPropertyStore(iface); struct bytestream_wrapper *wrapper = impl_wrapper_from_IPropertyStore(iface);
TRACE("%p, %p, %p.\n", iface, key, value); TRACE("%p, %p, %s.\n", iface, key, debugstr_propvar(value));
return IPropertyStore_SetValue(wrapper->propstore, key, value); return IPropertyStore_SetValue(wrapper->propstore, key, value);
} }
...@@ -3966,11 +3968,12 @@ static HRESULT WINAPI bytestream_wrapper_attributes_GetItemType(IMFAttributes *i ...@@ -3966,11 +3968,12 @@ static HRESULT WINAPI bytestream_wrapper_attributes_GetItemType(IMFAttributes *i
return IMFAttributes_GetItemType(wrapper->attributes, key, type); return IMFAttributes_GetItemType(wrapper->attributes, key, type);
} }
static HRESULT WINAPI bytestream_wrapper_attributes_CompareItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) static HRESULT WINAPI bytestream_wrapper_attributes_CompareItem(IMFAttributes *iface, REFGUID key,
REFPROPVARIANT value, BOOL *result)
{ {
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFAttributes(iface); struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFAttributes(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return IMFAttributes_CompareItem(wrapper->attributes, key, value, result); return IMFAttributes_CompareItem(wrapper->attributes, key, value, result);
} }
...@@ -4090,7 +4093,7 @@ static HRESULT WINAPI bytestream_wrapper_attributes_SetItem(IMFAttributes *iface ...@@ -4090,7 +4093,7 @@ static HRESULT WINAPI bytestream_wrapper_attributes_SetItem(IMFAttributes *iface
{ {
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFAttributes(iface); struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFAttributes(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return IMFAttributes_SetItem(wrapper->attributes, key, value); return IMFAttributes_SetItem(wrapper->attributes, key, value);
} }
...@@ -5451,7 +5454,7 @@ static HRESULT WINAPI mfmediaevent_CompareItem(IMFMediaEvent *iface, REFGUID key ...@@ -5451,7 +5454,7 @@ static HRESULT WINAPI mfmediaevent_CompareItem(IMFMediaEvent *iface, REFGUID key
{ {
struct media_event *event = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return attributes_CompareItem(&event->attributes, key, value, result); return attributes_CompareItem(&event->attributes, key, value, result);
} }
...@@ -5572,7 +5575,7 @@ static HRESULT WINAPI mfmediaevent_SetItem(IMFMediaEvent *iface, REFGUID key, RE ...@@ -5572,7 +5575,7 @@ static HRESULT WINAPI mfmediaevent_SetItem(IMFMediaEvent *iface, REFGUID key, RE
{ {
struct media_event *event = impl_from_IMFMediaEvent(iface); struct media_event *event = impl_from_IMFMediaEvent(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return attributes_SetItem(&event->attributes, key, value); return attributes_SetItem(&event->attributes, key, value);
} }
...@@ -5789,13 +5792,14 @@ static const IMFMediaEventVtbl mfmediaevent_vtbl = ...@@ -5789,13 +5792,14 @@ static const IMFMediaEventVtbl mfmediaevent_vtbl =
/*********************************************************************** /***********************************************************************
* MFCreateMediaEvent (mfplat.@) * MFCreateMediaEvent (mfplat.@)
*/ */
HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value,
const PROPVARIANT *value, IMFMediaEvent **event) IMFMediaEvent **event)
{ {
mfmediaevent *object; mfmediaevent *object;
HRESULT hr; HRESULT hr;
TRACE("%s, %s, %08x, %p, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, value, event); TRACE("%s, %s, %08x, %p, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status,
debugstr_propvar(value), event);
object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) );
if(!object) if(!object)
...@@ -6069,7 +6073,8 @@ static HRESULT WINAPI eventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, M ...@@ -6069,7 +6073,8 @@ static HRESULT WINAPI eventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, M
IMFMediaEvent *event; IMFMediaEvent *event;
HRESULT hr; HRESULT hr;
TRACE("%p, %s, %s, %#x, %p\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, value); TRACE("%p, %s, %s, %#x, %s\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status,
debugstr_propvar(value));
if (FAILED(hr = MFCreateMediaEvent(event_type, extended_type, status, value, &event))) if (FAILED(hr = MFCreateMediaEvent(event_type, extended_type, status, value, &event)))
return hr; return hr;
......
dlls/mfplat/mediatype.c
View file @ 4837234e
...@@ -149,7 +149,7 @@ static HRESULT WINAPI mediatype_CompareItem(IMFMediaType *iface, REFGUID key, RE ...@@ -149,7 +149,7 @@ static HRESULT WINAPI mediatype_CompareItem(IMFMediaType *iface, REFGUID key, RE
{ {
struct media_type *media_type = impl_from_IMFMediaType(iface); struct media_type *media_type = impl_from_IMFMediaType(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return attributes_CompareItem(&media_type->attributes, key, value, result); return attributes_CompareItem(&media_type->attributes, key, value, result);
} }
...@@ -270,7 +270,7 @@ static HRESULT WINAPI mediatype_SetItem(IMFMediaType *iface, REFGUID key, REFPRO ...@@ -270,7 +270,7 @@ static HRESULT WINAPI mediatype_SetItem(IMFMediaType *iface, REFGUID key, REFPRO
{ {
struct media_type *media_type = impl_from_IMFMediaType(iface); struct media_type *media_type = impl_from_IMFMediaType(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return attributes_SetItem(&media_type->attributes, key, value); return attributes_SetItem(&media_type->attributes, key, value);
} }
...@@ -695,7 +695,7 @@ static HRESULT WINAPI stream_descriptor_CompareItem(IMFStreamDescriptor *iface, ...@@ -695,7 +695,7 @@ static HRESULT WINAPI stream_descriptor_CompareItem(IMFStreamDescriptor *iface,
{ {
struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return attributes_CompareItem(&stream_desc->attributes, key, value, result); return attributes_CompareItem(&stream_desc->attributes, key, value, result);
} }
...@@ -817,7 +817,7 @@ static HRESULT WINAPI stream_descriptor_SetItem(IMFStreamDescriptor *iface, REFG ...@@ -817,7 +817,7 @@ static HRESULT WINAPI stream_descriptor_SetItem(IMFStreamDescriptor *iface, REFG
{ {
struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return attributes_SetItem(&stream_desc->attributes, key, value); return attributes_SetItem(&stream_desc->attributes, key, value);
} }
...@@ -1271,7 +1271,7 @@ static HRESULT WINAPI presentation_descriptor_CompareItem(IMFPresentationDescrip ...@@ -1271,7 +1271,7 @@ static HRESULT WINAPI presentation_descriptor_CompareItem(IMFPresentationDescrip
{ {
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result);
return attributes_CompareItem(&presentation_desc->attributes, key, value, result); return attributes_CompareItem(&presentation_desc->attributes, key, value, result);
} }
...@@ -1396,7 +1396,7 @@ static HRESULT WINAPI presentation_descriptor_SetItem(IMFPresentationDescriptor ...@@ -1396,7 +1396,7 @@ static HRESULT WINAPI presentation_descriptor_SetItem(IMFPresentationDescriptor
{ {
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value));
return attributes_SetItem(&presentation_desc->attributes, key, value); return attributes_SetItem(&presentation_desc->attributes, key, value);
} }
......
dlls/mfplat/mfplat_private.h
View file @ 4837234e
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#undef INITGUID #undef INITGUID
#include <guiddef.h> #include <guiddef.h>
#include "mfapi.h" #include "mfapi.h"
...@@ -23,6 +25,7 @@ ...@@ -23,6 +25,7 @@
#include "mferror.h" #include "mferror.h"
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/debug.h"
struct attribute struct attribute
{ {
...@@ -114,3 +117,33 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co ...@@ -114,3 +117,33 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co
return TRUE; return TRUE;
} }
static inline const char *debugstr_propvar(const PROPVARIANT *v)
{
if (!v)
return "(null)";
switch (v->vt)
{
case VT_EMPTY:
return wine_dbg_sprintf("%p {VT_EMPTY}", v);
case VT_NULL:
return wine_dbg_sprintf("%p {VT_NULL}", v);
case VT_UI4:
return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->u.ulVal);
case VT_UI8:
return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->u.uhVal.QuadPart));
case VT_R8:
return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->u.dblVal);
case VT_CLSID:
return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_guid(v->u.puuid));
case VT_LPWSTR:
return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->u.pwszVal));
case VT_VECTOR | VT_UI1:
return wine_dbg_sprintf("%p {VT_VECTOR|VT_UI1: %p}", v, v->u.caub.pElems);
case VT_UNKNOWN:
return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, v->u.punkVal);
default:
return wine_dbg_sprintf("%p {vt %#x}", v, v->vt);
}
}
dlls/mfplat/queue.c
View file @ 4837234e
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/list.h" #include "wine/list.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment