[PATCH 07/21] dlls/mfplat: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Mon Feb 14 02:27:26 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/mfplat/Makefile.in | 1
dlls/mfplat/buffer.c | 28 ++++----
dlls/mfplat/main.c | 144 +++++++++++++++++++++---------------------
dlls/mfplat/mediatype.c | 36 +++++------
dlls/mfplat/mfplat_private.h | 4 +
dlls/mfplat/queue.c | 8 +-
dlls/mfplat/sample.c | 26 ++++----
7 files changed, 123 insertions(+), 124 deletions(-)
diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in
index f4ef8e5649c..4515d652c58 100644
--- a/dlls/mfplat/Makefile.in
+++ b/dlls/mfplat/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mfplat.dll
IMPORTLIB = mfplat
IMPORTS = advapi32 ole32 mfuuid propsys rtworkq kernelbase
diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index e9990f85853..a912c61a3ac 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -146,7 +146,7 @@ static ULONG WINAPI memory_buffer_AddRef(IMFMediaBuffer *iface)
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
ULONG refcount = InterlockedIncrement(&buffer->refcount);
- TRACE("%p, refcount %u.\n", buffer, refcount);
+ TRACE("%p, refcount %lu.\n", buffer, refcount);
return refcount;
}
@@ -156,7 +156,7 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface)
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
ULONG refcount = InterlockedDecrement(&buffer->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -221,7 +221,7 @@ static HRESULT WINAPI memory_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWOR
{
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
- TRACE("%p, %u.\n", iface, current_length);
+ TRACE("%p, %lu.\n", iface, current_length);
if (current_length > buffer->max_length)
return E_INVALIDARG;
@@ -443,7 +443,7 @@ static HRESULT WINAPI d3d9_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface
{
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
- TRACE("%p, %u.\n", iface, current_length);
+ TRACE("%p, %lu.\n", iface, current_length);
buffer->current_length = current_length;
@@ -595,14 +595,14 @@ static HRESULT WINAPI memory_2d_buffer_GetContiguousLength(IMF2DBuffer2 *iface,
static HRESULT WINAPI memory_2d_buffer_ContiguousCopyTo(IMF2DBuffer2 *iface, BYTE *dest_buffer, DWORD dest_length)
{
- FIXME("%p, %p, %u.\n", iface, dest_buffer, dest_length);
+ FIXME("%p, %p, %lu.\n", iface, dest_buffer, dest_length);
return E_NOTIMPL;
}
static HRESULT WINAPI memory_2d_buffer_ContiguousCopyFrom(IMF2DBuffer2 *iface, const BYTE *src_buffer, DWORD src_length)
{
- FIXME("%p, %p, %u.\n", iface, src_buffer, src_length);
+ FIXME("%p, %p, %lu.\n", iface, src_buffer, src_length);
return E_NOTIMPL;
}
@@ -889,7 +889,7 @@ static HRESULT dxgi_surface_buffer_create_readback_texture(struct buffer *buffer
texture_desc.MiscFlags = 0;
texture_desc.MipLevels = 1;
if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &buffer->dxgi_surface.rb_texture)))
- WARN("Failed to create readback texture, hr %#x.\n", hr);
+ WARN("Failed to create readback texture, hr %#lx.\n", hr);
ID3D11Device_Release(device);
@@ -914,7 +914,7 @@ static HRESULT dxgi_surface_buffer_map(struct buffer *buffer)
if (FAILED(hr = ID3D11DeviceContext_Map(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture,
0, D3D11_MAP_READ_WRITE, 0, &buffer->dxgi_surface.map_desc)))
{
- WARN("Failed to map readback texture, hr %#x.\n", hr);
+ WARN("Failed to map readback texture, hr %#lx.\n", hr);
}
ID3D11DeviceContext_Release(immediate_context);
@@ -1016,7 +1016,7 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface
{
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
- TRACE("%p, %u.\n", iface, current_length);
+ TRACE("%p, %lu.\n", iface, current_length);
buffer->current_length = current_length;
@@ -1438,7 +1438,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re
if (FAILED(hr = IUnknown_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture)))
{
- WARN("Failed to get texture interface, hr %#x.\n", hr);
+ WARN("Failed to get texture interface, hr %#lx.\n", hr);
return hr;
}
@@ -1490,7 +1490,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re
*/
HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer)
{
- TRACE("%u, %p.\n", max_length, buffer);
+ TRACE("%lu, %p.\n", max_length, buffer);
return create_1d_buffer(max_length, MF_1_BYTE_ALIGNMENT, buffer);
}
@@ -1500,7 +1500,7 @@ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer)
*/
HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer)
{
- TRACE("%u, %u, %p.\n", max_length, alignment, buffer);
+ TRACE("%lu, %lu, %p.\n", max_length, alignment, buffer);
return create_1d_buffer(max_length, alignment, buffer);
}
@@ -1510,7 +1510,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM
*/
HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer)
{
- TRACE("%u, %u, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer);
+ TRACE("%lu, %lu, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer);
return create_2d_buffer(width, height, fourcc, bottom_up, buffer);
}
@@ -1558,7 +1558,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO
HRESULT hr;
GUID major;
- TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer);
+ TRACE("%p, %s, %lu, %lu, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer);
if (!media_type)
return E_INVALIDARG;
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 72dd0915447..1992776595d 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -180,7 +180,7 @@ static ULONG WINAPI transform_activate_AddRef(IMFActivate *iface)
struct transform_activate *activate = impl_from_IMFActivate(iface);
ULONG refcount = InterlockedIncrement(&activate->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -190,7 +190,7 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface)
struct transform_activate *activate = impl_from_IMFActivate(iface);
ULONG refcount = InterlockedDecrement(&activate->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -1193,7 +1193,7 @@ static HRESULT mft_enum(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF
if (FAILED(hr = MFGetPluginControl(&plugin_control)))
{
- WARN("Failed to get plugin control instance, hr %#x.\n", hr);
+ WARN("Failed to get plugin control instance, hr %#lx.\n", hr);
return hr;
}
@@ -1516,7 +1516,7 @@ static HRESULT mft_get_attributes(HKEY hkey, IMFAttributes **ret)
if (!RegQueryValueExW(hkey, L"Attributes", NULL, NULL, blob, &size))
{
if (FAILED(hr = MFInitAttributesFromBlob(attributes, blob, size)))
- WARN("Failed to initialize attributes, hr %#x.\n", hr);
+ WARN("Failed to initialize attributes, hr %#lx.\n", hr);
}
free(blob);
@@ -1588,7 +1588,7 @@ HRESULT WINAPI MFStartup(ULONG version, DWORD flags)
#define MF_VERSION_XP MAKELONG( MF_API_VERSION, 1 )
#define MF_VERSION_WIN7 MAKELONG( MF_API_VERSION, 2 )
- TRACE("%#x, %#x.\n", version, flags);
+ TRACE("%#lx, %#lx.\n", version, flags);
if (version != MF_VERSION_XP && version != MF_VERSION_WIN7)
return MF_E_BAD_STARTUP_VERSION;
@@ -1615,7 +1615,7 @@ HRESULT WINAPI MFShutdown(void)
*/
HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines)
{
- TRACE("%p, %d, %p, %d, %u, %u.\n", dest, deststride, src, srcstride, width, lines);
+ TRACE("%p, %ld, %p, %ld, %lu, %lu.\n", dest, deststride, src, srcstride, width, lines);
while (lines--)
{
@@ -2309,7 +2309,7 @@ static const char *debugstr_eventid(DWORD event)
};
struct event_id *ret = bsearch(&event, event_ids, ARRAY_SIZE(event_ids), sizeof(*event_ids), debug_event_id);
- return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbg_sprintf("%u", event);
+ return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbg_sprintf("%lu", event);
}
static inline struct attributes *impl_from_IMFAttributes(IMFAttributes *iface)
@@ -2339,7 +2339,7 @@ static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface)
struct attributes *attributes = impl_from_IMFAttributes(iface);
ULONG refcount = InterlockedIncrement(&attributes->ref);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
return refcount;
}
@@ -2349,7 +2349,7 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface)
struct attributes *attributes = impl_from_IMFAttributes(iface);
ULONG refcount = InterlockedDecrement(&attributes->ref);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
if (!refcount)
{
@@ -3727,7 +3727,7 @@ static ULONG WINAPI async_stream_op_AddRef(IUnknown *iface)
struct async_stream_op *op = impl_async_stream_op_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&op->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
return refcount;
}
@@ -3737,7 +3737,7 @@ static ULONG WINAPI async_stream_op_Release(IUnknown *iface)
struct async_stream_op *op = impl_async_stream_op_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&op->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
if (!refcount)
{
@@ -3899,7 +3899,7 @@ static ULONG WINAPI bytestream_AddRef(IMFByteStream *iface)
struct bytestream *stream = impl_from_IMFByteStream(iface);
ULONG refcount = InterlockedIncrement(&stream->attributes.ref);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
return refcount;
}
@@ -3910,7 +3910,7 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface)
ULONG refcount = InterlockedDecrement(&stream->attributes.ref);
struct async_stream_op *cur, *cur2;
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
if (!refcount)
{
@@ -4027,7 +4027,7 @@ static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, U
HRESULT hr = S_OK;
BOOL ret;
- TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len);
+ TRACE("%p, %p, %lu, %p.\n", iface, buffer, size, read_len);
EnterCriticalSection(&stream->cs);
@@ -4051,7 +4051,7 @@ static HRESULT WINAPI bytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULO
{
struct bytestream *stream = impl_from_IMFByteStream(iface);
- TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state);
+ TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state);
return bytestream_create_io_request(stream, ASYNC_STREAM_OP_READ, data, size, callback, state);
}
@@ -4067,7 +4067,7 @@ static HRESULT WINAPI bytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *r
static HRESULT WINAPI bytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written)
{
- FIXME("%p, %p, %u, %p\n", iface, data, count, written);
+ FIXME("%p, %p, %lu, %p\n", iface, data, count, written);
return E_NOTIMPL;
}
@@ -4077,7 +4077,7 @@ static HRESULT WINAPI bytestream_BeginWrite(IMFByteStream *iface, const BYTE *da
{
struct bytestream *stream = impl_from_IMFByteStream(iface);
- TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state);
+ TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state);
return bytestream_create_io_request(stream, ASYNC_STREAM_OP_WRITE, data, size, callback, state);
}
@@ -4094,7 +4094,7 @@ static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *
static HRESULT WINAPI bytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset,
DWORD flags, QWORD *current)
{
- FIXME("%p, %u, %s, 0x%08x, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current);
+ FIXME("%p, %u, %s, 0x%08lx, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current);
return E_NOTIMPL;
}
@@ -4217,7 +4217,7 @@ static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer,
LARGE_INTEGER position;
HRESULT hr;
- TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len);
+ TRACE("%p, %p, %lu, %p.\n", iface, buffer, size, read_len);
EnterCriticalSection(&stream->cs);
@@ -4239,7 +4239,7 @@ static HRESULT WINAPI bytestream_stream_Write(IMFByteStream *iface, const BYTE *
LARGE_INTEGER position;
HRESULT hr;
- TRACE("%p, %p, %u, %p.\n", iface, buffer, size, written);
+ TRACE("%p, %p, %lu, %p.\n", iface, buffer, size, written);
EnterCriticalSection(&stream->cs);
@@ -4261,7 +4261,7 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_
struct bytestream *stream = impl_from_IMFByteStream(iface);
HRESULT hr = S_OK;
- TRACE("%p, %u, %s, %#x, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current);
+ TRACE("%p, %u, %s, %#lx, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current);
EnterCriticalSection(&stream->cs);
@@ -4831,7 +4831,7 @@ static ULONG WINAPI bytestream_wrapper_AddRef(IMFByteStream *iface)
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
ULONG refcount = InterlockedIncrement(&wrapper->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
return refcount;
}
@@ -4841,7 +4841,7 @@ static ULONG WINAPI bytestream_wrapper_Release(IMFByteStream *iface)
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
ULONG refcount = InterlockedDecrement(&wrapper->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
if (!refcount)
{
@@ -4939,7 +4939,7 @@ static HRESULT WINAPI bytestream_wrapper_Read(IMFByteStream *iface, BYTE *data,
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
- TRACE("%p, %p, %u, %p.\n", iface, data, count, byte_read);
+ TRACE("%p, %p, %lu, %p.\n", iface, data, count, byte_read);
return wrapper->is_closed ? MF_E_INVALIDREQUEST :
IMFByteStream_Read(wrapper->stream, data, count, byte_read);
@@ -4950,7 +4950,7 @@ static HRESULT WINAPI bytestream_wrapper_BeginRead(IMFByteStream *iface, BYTE *d
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
- TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state);
+ TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state);
return wrapper->is_closed ? MF_E_INVALIDREQUEST :
IMFByteStream_BeginRead(wrapper->stream, data, size, callback, state);
@@ -4970,7 +4970,7 @@ static HRESULT WINAPI bytestream_wrapper_Write(IMFByteStream *iface, const BYTE
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
- TRACE("%p, %p, %u, %p.\n", iface, data, count, written);
+ TRACE("%p, %p, %lu, %p.\n", iface, data, count, written);
return wrapper->is_closed ? MF_E_INVALIDREQUEST :
IMFByteStream_Write(wrapper->stream, data, count, written);
@@ -4981,7 +4981,7 @@ static HRESULT WINAPI bytestream_wrapper_BeginWrite(IMFByteStream *iface, const
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
- TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state);
+ TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state);
return wrapper->is_closed ? MF_E_INVALIDREQUEST :
IMFByteStream_BeginWrite(wrapper->stream, data, size, callback, state);
@@ -5002,7 +5002,7 @@ static HRESULT WINAPI bytestream_wrapper_Seek(IMFByteStream *iface, MFBYTESTREAM
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface);
- TRACE("%p, %u, %s, %#x, %p.\n", iface, seek, wine_dbgstr_longlong(offset), flags, current);
+ TRACE("%p, %u, %s, %#lx, %p.\n", iface, seek, wine_dbgstr_longlong(offset), flags, current);
return wrapper->is_closed ? MF_E_INVALIDREQUEST :
IMFByteStream_Seek(wrapper->stream, seek, offset, flags, current);
@@ -5223,7 +5223,7 @@ static HRESULT WINAPI bytestream_wrapper_events_GetEvent(IMFMediaEventGenerator
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFMediaEventGenerator(iface);
- TRACE("%p, %#x, %p.\n", iface, flags, event);
+ TRACE("%p, %#lx, %p.\n", iface, flags, event);
return IMFMediaEventGenerator_GetEvent(wrapper->event_generator, flags, event);
}
@@ -5251,7 +5251,7 @@ static HRESULT WINAPI bytestream_wrapper_events_QueueEvent(IMFMediaEventGenerato
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFMediaEventGenerator(iface);
- TRACE("%p, %d, %s, %#x, %s.\n", iface, type, debugstr_guid(ext_type), hr, debugstr_propvar(value));
+ TRACE("%p, %ld, %s, %#lx, %s.\n", iface, type, debugstr_guid(ext_type), hr, debugstr_propvar(value));
return IMFMediaEventGenerator_QueueEvent(wrapper->event_generator, type, ext_type, hr, value);
}
@@ -5354,7 +5354,7 @@ static HRESULT WINAPI bytestream_wrapper_propstore_GetAt(IPropertyStore *iface,
{
struct bytestream_wrapper *wrapper = impl_wrapper_from_IPropertyStore(iface);
- TRACE("%p, %u, %p.\n", iface, prop, key);
+ TRACE("%p, %lu, %p.\n", iface, prop, key);
return IPropertyStore_GetAt(wrapper->propstore, prop, key);
}
@@ -5800,39 +5800,39 @@ static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface)
static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type,
const WCHAR *selector, CLSID *clsid)
{
- FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid);
+ FIXME("(%ld %s %p)\n", plugin_type, debugstr_w(selector), clsid);
return E_NOTIMPL;
}
static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type,
DWORD index, WCHAR **selector, CLSID *clsid)
{
- FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid);
+ FIXME("(%ld %ld %p %p)\n", plugin_type, index, selector, clsid);
return E_NOTIMPL;
}
static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type,
const WCHAR *selector, const CLSID *clsid)
{
- FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid));
+ FIXME("(%ld %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid));
return E_NOTIMPL;
}
static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid)
{
- FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid));
+ FIXME("(%ld %s)\n", plugin_type, debugstr_guid(clsid));
return E_NOTIMPL;
}
static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid)
{
- FIXME("(%d %d %p)\n", plugin_type, index, clsid);
+ FIXME("(%ld %ld %p)\n", plugin_type, index, clsid);
return E_NOTIMPL;
}
static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled)
{
- FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled);
+ FIXME("(%ld %s %x)\n", plugin_type, debugstr_guid(clsid), disabled);
return E_NOTIMPL;
}
@@ -6384,7 +6384,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags,
HRESULT hr = MF_E_UNSUPPORTED_SCHEME;
unsigned int i;
- TRACE("%s, %#x, %p.\n", debugstr_w(scheme), flags, handler);
+ TRACE("%s, %#lx, %p.\n", debugstr_w(scheme), flags, handler);
*handler = NULL;
@@ -6554,7 +6554,7 @@ static ULONG WINAPI source_resolver_AddRef(IMFSourceResolver *iface)
struct source_resolver *resolver = impl_from_IMFSourceResolver(iface);
ULONG refcount = InterlockedIncrement(&resolver->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
return refcount;
}
@@ -6565,7 +6565,7 @@ static ULONG WINAPI source_resolver_Release(IMFSourceResolver *iface)
ULONG refcount = InterlockedDecrement(&resolver->refcount);
struct resolver_queued_result *result, *result2;
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
if (!refcount)
{
@@ -6592,7 +6592,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromURL(IMFSourceResolver *ifa
RTWQASYNCRESULT *data;
HRESULT hr;
- TRACE("%p, %s, %#x, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, obj_type, object);
+ TRACE("%p, %s, %#lx, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, obj_type, object);
if (!url || !obj_type || !object)
return E_POINTER;
@@ -6633,7 +6633,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv
RTWQASYNCRESULT *data;
HRESULT hr;
- TRACE("%p, %p, %s, %#x, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, obj_type, object);
+ TRACE("%p, %p, %s, %#lx, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, obj_type, object);
if (!stream || !obj_type || !object)
return E_POINTER;
@@ -6674,7 +6674,7 @@ static HRESULT WINAPI source_resolver_BeginCreateObjectFromURL(IMFSourceResolver
IRtwqAsyncResult *result;
HRESULT hr;
- TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state);
+ TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state);
if (FAILED(hr = resolver_get_scheme_handler(url, flags, &handler)))
return hr;
@@ -6718,7 +6718,7 @@ static HRESULT WINAPI source_resolver_BeginCreateObjectFromByteStream(IMFSourceR
IRtwqAsyncResult *result;
HRESULT hr;
- TRACE("%p, %p, %s, %#x, %p, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, cancel_cookie,
+ TRACE("%p, %p, %s, %#lx, %p, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, cancel_cookie,
callback, state);
if (FAILED(hr = resolver_get_bytestream_handler(stream, url, flags, &handler)))
@@ -6864,7 +6864,7 @@ static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface)
struct media_event *event = impl_from_IMFMediaEvent(iface);
ULONG refcount = InterlockedIncrement(&event->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -6874,7 +6874,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface)
struct media_event *event = impl_from_IMFMediaEvent(iface);
ULONG refcount = InterlockedDecrement(&event->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -7254,7 +7254,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR
struct media_event *object;
HRESULT hr;
- TRACE("%s, %s, %#x, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status,
+ TRACE("%s, %s, %#lx, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status,
debugstr_propvar(value), event);
object = malloc(sizeof(*object));
@@ -7363,7 +7363,7 @@ static ULONG WINAPI eventqueue_AddRef(IMFMediaEventQueue *iface)
struct event_queue *queue = impl_from_IMFMediaEventQueue(iface);
ULONG refcount = InterlockedIncrement(&queue->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -7373,7 +7373,7 @@ static ULONG WINAPI eventqueue_Release(IMFMediaEventQueue *iface)
struct event_queue *queue = impl_from_IMFMediaEventQueue(iface);
ULONG refcount = InterlockedDecrement(&queue->refcount);
- TRACE("%p, refcount %u.\n", queue, refcount);
+ TRACE("%p, refcount %lu.\n", queue, refcount);
if (!refcount)
{
@@ -7538,7 +7538,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, M
IMFMediaEvent *event;
HRESULT hr;
- TRACE("%p, %s, %s, %#x, %s\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status,
+ TRACE("%p, %s, %s, %#lx, %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)))
@@ -7557,7 +7557,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamUnk(IMFMediaEventQueue *iface, M
PROPVARIANT value;
HRESULT hr;
- TRACE("%p, %s, %s, %#x, %p.\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, unk);
+ TRACE("%p, %s, %s, %#lx, %p.\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, unk);
value.vt = VT_UNKNOWN;
value.punkVal = unk;
@@ -7680,7 +7680,7 @@ static ULONG WINAPI collection_AddRef(IMFCollection *iface)
struct collection *collection = impl_from_IMFCollection(iface);
ULONG refcount = InterlockedIncrement(&collection->refcount);
- TRACE("%p, %d.\n", collection, refcount);
+ TRACE("%p, %ld.\n", collection, refcount);
return refcount;
}
@@ -7690,7 +7690,7 @@ static ULONG WINAPI collection_Release(IMFCollection *iface)
struct collection *collection = impl_from_IMFCollection(iface);
ULONG refcount = InterlockedDecrement(&collection->refcount);
- TRACE("%p, %d.\n", collection, refcount);
+ TRACE("%p, %ld.\n", collection, refcount);
if (!refcount)
{
@@ -7720,7 +7720,7 @@ static HRESULT WINAPI collection_GetElement(IMFCollection *iface, DWORD idx, IUn
{
struct collection *collection = impl_from_IMFCollection(iface);
- TRACE("%p, %u, %p.\n", iface, idx, element);
+ TRACE("%p, %lu, %p.\n", iface, idx, element);
if (!element)
return E_POINTER;
@@ -7757,7 +7757,7 @@ static HRESULT WINAPI collection_RemoveElement(IMFCollection *iface, DWORD idx,
struct collection *collection = impl_from_IMFCollection(iface);
size_t count;
- TRACE("%p, %u, %p.\n", iface, idx, element);
+ TRACE("%p, %lu, %p.\n", iface, idx, element);
if (!element)
return E_POINTER;
@@ -7780,7 +7780,7 @@ static HRESULT WINAPI collection_InsertElementAt(IMFCollection *iface, DWORD idx
struct collection *collection = impl_from_IMFCollection(iface);
size_t i;
- TRACE("%p, %u, %p.\n", iface, idx, element);
+ TRACE("%p, %lu, %p.\n", iface, idx, element);
if (!mf_array_reserve((void **)&collection->elements, &collection->capacity, idx + 1,
sizeof(*collection->elements)))
@@ -7858,7 +7858,7 @@ HRESULT WINAPI MFCreateCollection(IMFCollection **collection)
*/
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);
+ TRACE("%Iu, %#lx, %s, %d, %#x.\n", size, flags, debugstr_a(file), line, type);
return HeapAlloc(GetProcessHeap(), flags, size);
}
@@ -7903,7 +7903,7 @@ static ULONG WINAPI system_clock_AddRef(IMFClock *iface)
struct system_clock *clock = impl_from_IMFClock(iface);
ULONG refcount = InterlockedIncrement(&clock->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -7913,7 +7913,7 @@ static ULONG WINAPI system_clock_Release(IMFClock *iface)
struct system_clock *clock = impl_from_IMFClock(iface);
ULONG refcount = InterlockedDecrement(&clock->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
free(clock);
@@ -7934,7 +7934,7 @@ static HRESULT WINAPI system_clock_GetClockCharacteristics(IMFClock *iface, DWOR
static HRESULT WINAPI system_clock_GetCorrelatedTime(IMFClock *iface, DWORD reserved, LONGLONG *clock_time,
MFTIME *system_time)
{
- TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time);
+ TRACE("%p, %#lx, %p, %p.\n", iface, reserved, clock_time, system_time);
*clock_time = *system_time = MFGetSystemTime();
@@ -7952,7 +7952,7 @@ static HRESULT WINAPI system_clock_GetContinuityKey(IMFClock *iface, DWORD *key)
static HRESULT WINAPI system_clock_GetState(IMFClock *iface, DWORD reserved, MFCLOCK_STATE *state)
{
- TRACE("%p, %#x, %p.\n", iface, reserved, state);
+ TRACE("%p, %#lx, %p.\n", iface, reserved, state);
*state = MFCLOCK_STATE_RUNNING;
@@ -8032,7 +8032,7 @@ static ULONG WINAPI system_time_source_AddRef(IMFPresentationTimeSource *iface)
struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface);
ULONG refcount = InterlockedIncrement(&source->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -8042,7 +8042,7 @@ static ULONG WINAPI system_time_source_Release(IMFPresentationTimeSource *iface)
struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface);
ULONG refcount = InterlockedDecrement(&source->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -8070,7 +8070,7 @@ static HRESULT WINAPI system_time_source_GetCorrelatedTime(IMFPresentationTimeSo
struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface);
HRESULT hr;
- TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time);
+ TRACE("%p, %#lx, %p, %p.\n", iface, reserved, clock_time, system_time);
EnterCriticalSection(&source->cs);
if (SUCCEEDED(hr = IMFClock_GetCorrelatedTime(source->clock, 0, clock_time, system_time)))
@@ -8102,7 +8102,7 @@ static HRESULT WINAPI system_time_source_GetState(IMFPresentationTimeSource *ifa
{
struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface);
- TRACE("%p, %#x, %p.\n", iface, reserved, state);
+ TRACE("%p, %#lx, %p.\n", iface, reserved, state);
EnterCriticalSection(&source->cs);
*state = source->state;
@@ -8405,7 +8405,7 @@ static ULONG WINAPI async_create_file_callback_AddRef(IRtwqAsyncCallback *iface)
struct async_create_file *async = impl_from_create_file_IRtwqAsyncCallback(iface);
ULONG refcount = InterlockedIncrement(&async->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -8415,7 +8415,7 @@ static ULONG WINAPI async_create_file_callback_Release(IRtwqAsyncCallback *iface
struct async_create_file *async = impl_from_create_file_IRtwqAsyncCallback(iface);
ULONG refcount = InterlockedDecrement(&async->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -8702,7 +8702,7 @@ static ULONG WINAPI property_store_AddRef(IPropertyStore *iface)
struct property_store *store = impl_from_IPropertyStore(iface);
ULONG refcount = InterlockedIncrement(&store->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
return refcount;
}
@@ -8712,7 +8712,7 @@ static ULONG WINAPI property_store_Release(IPropertyStore *iface)
struct property_store *store = impl_from_IPropertyStore(iface);
ULONG refcount = InterlockedDecrement(&store->refcount);
- TRACE("%p, refcount %d.\n", iface, refcount);
+ TRACE("%p, refcount %ld.\n", iface, refcount);
if (!refcount)
{
@@ -8743,7 +8743,7 @@ static HRESULT WINAPI property_store_GetAt(IPropertyStore *iface, DWORD index, P
{
struct property_store *store = impl_from_IPropertyStore(iface);
- TRACE("%p, %u, %p.\n", iface, index, key);
+ TRACE("%p, %lu, %p.\n", iface, index, key);
EnterCriticalSection(&store->cs);
@@ -8935,7 +8935,7 @@ static ULONG WINAPI dxgi_device_manager_AddRef(IMFDXGIDeviceManager *iface)
struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface);
ULONG refcount = InterlockedIncrement(&manager->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -8945,7 +8945,7 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface)
struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface);
ULONG refcount = InterlockedDecrement(&manager->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index b77db17189f..a63ae6eafaf 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -138,7 +138,7 @@ static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface)
struct media_type *media_type = impl_from_IMFMediaType(iface);
ULONG refcount = InterlockedIncrement(&media_type->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -148,7 +148,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface)
struct media_type *media_type = impl_from_IMFMediaType(iface);
ULONG refcount = InterlockedDecrement(&media_type->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -977,7 +977,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia
CoTaskMemFree(media_type->video_format);
if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size)))
- WARN("Failed to create format description, hr %#x.\n", hr);
+ WARN("Failed to create format description, hr %#lx.\n", hr);
return media_type->video_format;
}
@@ -985,7 +985,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia
static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation,
void **data, LONG stride)
{
- FIXME("%p, %s, %p, %d.\n", iface, debugstr_guid(&representation), data, stride);
+ FIXME("%p, %s, %p, %ld.\n", iface, debugstr_guid(&representation), data, stride);
return E_NOTIMPL;
}
@@ -1379,7 +1379,7 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT
if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format,
&size, MFWaveFormatExConvertFlag_Normal)))
{
- WARN("Failed to create wave format description, hr %#x.\n", hr);
+ WARN("Failed to create wave format description, hr %#lx.\n", hr);
}
return media_type->audio_format;
@@ -1496,7 +1496,7 @@ static ULONG WINAPI stream_descriptor_AddRef(IMFStreamDescriptor *iface)
struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface);
ULONG refcount = InterlockedIncrement(&stream_desc->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -1507,7 +1507,7 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface)
ULONG refcount = InterlockedDecrement(&stream_desc->attributes.ref);
unsigned int i;
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -1953,7 +1953,7 @@ static HRESULT WINAPI mediatype_handler_GetMediaTypeByIndex(IMFMediaTypeHandler
{
struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface);
- TRACE("%p, %u, %p.\n", iface, index, type);
+ TRACE("%p, %lu, %p.\n", iface, index, type);
if (index >= stream_desc->media_types_count)
return MF_E_NO_MORE_TYPES;
@@ -2044,7 +2044,7 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count,
unsigned int i;
HRESULT hr;
- TRACE("%d, %d, %p, %p.\n", identifier, count, types, descriptor);
+ TRACE("%ld, %ld, %p, %p.\n", identifier, count, types, descriptor);
if (!count)
return E_INVALIDARG;
@@ -2102,7 +2102,7 @@ static ULONG WINAPI presentation_descriptor_AddRef(IMFPresentationDescriptor *if
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
ULONG refcount = InterlockedIncrement(&presentation_desc->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -2113,7 +2113,7 @@ static ULONG WINAPI presentation_descriptor_Release(IMFPresentationDescriptor *i
ULONG refcount = InterlockedDecrement(&presentation_desc->attributes.ref);
unsigned int i;
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -2431,7 +2431,7 @@ static HRESULT WINAPI presentation_descriptor_GetStreamDescriptorByIndex(IMFPres
{
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
- TRACE("%p, %u, %p, %p.\n", iface, index, selected, descriptor);
+ TRACE("%p, %lu, %p, %p.\n", iface, index, selected, descriptor);
if (index >= presentation_desc->count)
return E_INVALIDARG;
@@ -2450,7 +2450,7 @@ static HRESULT WINAPI presentation_descriptor_SelectStream(IMFPresentationDescri
{
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
- TRACE("%p, %u.\n", iface, index);
+ TRACE("%p, %lu.\n", iface, index);
if (index >= presentation_desc->count)
return E_INVALIDARG;
@@ -2466,7 +2466,7 @@ static HRESULT WINAPI presentation_descriptor_DeselectStream(IMFPresentationDesc
{
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
- TRACE("%p, %u.\n", iface, index);
+ TRACE("%p, %lu.\n", iface, index);
if (index >= presentation_desc->count)
return E_INVALIDARG;
@@ -2578,7 +2578,7 @@ HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor *
unsigned int i;
HRESULT hr;
- TRACE("%u, %p, %p.\n", count, descriptors, out);
+ TRACE("%lu, %p, %p.\n", count, descriptors, out);
if (!count)
return E_INVALIDARG;
@@ -2683,7 +2683,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s
struct uncompressed_video_format *format;
GUID subtype;
- TRACE("%s, %u, %p.\n", debugstr_fourcc(fourcc), width, stride);
+ TRACE("%s, %lu, %p.\n", debugstr_fourcc(fourcc), width, stride);
memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype));
subtype.Data1 = fourcc;
@@ -2750,7 +2750,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si
unsigned int stride;
GUID subtype;
- TRACE("%s, %u, %u, %p.\n", debugstr_fourcc(fourcc), width, height, size);
+ TRACE("%s, %lu, %lu, %p.\n", debugstr_fourcc(fourcc), width, height, size);
memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype));
subtype.Data1 = fourcc;
@@ -3511,7 +3511,7 @@ HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD h
{
unsigned int transfer_function;
- TRACE("%p, %u, %u, %#x.\n", format, width, height, d3dformat);
+ TRACE("%p, %lu, %lu, %#lx.\n", format, width, height, d3dformat);
if (!format)
return E_INVALIDARG;
diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h
index b646d9e7cbb..dc29545df73 100644
--- a/dlls/mfplat/mfplat_private.h
+++ b/dlls/mfplat/mfplat_private.h
@@ -128,7 +128,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *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->ulVal);
+ return wine_dbg_sprintf("%p {VT_UI4: %ld}", v, v->ulVal);
case VT_UI8:
return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart));
case VT_I8:
@@ -178,7 +178,7 @@ static inline const char *debugstr_fourcc(DWORD format)
return wine_dbg_sprintf("%s", wine_dbgstr_an(formats[i].name, -1));
}
- return wine_dbg_sprintf("%#x", format);
+ return wine_dbg_sprintf("%#lx", format);
}
return wine_dbgstr_an((char *)&format, 4);
diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c
index 42bceb5811d..6ee0df37dce 100644
--- a/dlls/mfplat/queue.c
+++ b/dlls/mfplat/queue.c
@@ -41,7 +41,7 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *
IRtwqAsyncResult *result;
HRESULT hr;
- TRACE("%#x, %p, %p.\n", queue, callback, state);
+ TRACE("%#lx, %p, %p.\n", queue, callback, state);
if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
return hr;
@@ -61,7 +61,7 @@ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *call
IRtwqAsyncResult *result;
HRESULT hr;
- TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state);
+ TRACE("%#lx, %ld, %p, %p.\n", queue, priority, callback, state);
if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
return hr;
@@ -78,7 +78,7 @@ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *call
*/
HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result)
{
- TRACE("%#x, %p\n", queue, result);
+ TRACE("%#lx, %p\n", queue, result);
return RtwqPutWorkItem(queue, 0, (IRtwqAsyncResult *)result);
}
@@ -88,7 +88,7 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result)
*/
HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result)
{
- TRACE("%#x, %d, %p\n", queue, priority, result);
+ TRACE("%#lx, %ld, %p\n", queue, priority, result);
return RtwqPutWorkItem(queue, priority, (IRtwqAsyncResult *)result);
}
diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c
index 099db498f2d..8ef80eb5f24 100644
--- a/dlls/mfplat/sample.c
+++ b/dlls/mfplat/sample.c
@@ -150,7 +150,7 @@ static ULONG WINAPI sample_AddRef(IMFSample *iface)
struct sample *sample = impl_from_IMFSample(iface);
ULONG refcount = InterlockedIncrement(&sample->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -171,7 +171,7 @@ static ULONG WINAPI sample_Release(IMFSample *iface)
struct sample *sample = impl_from_IMFSample(iface);
ULONG refcount = InterlockedDecrement(&sample->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
release_sample_object(sample);
@@ -194,14 +194,14 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface)
/* Call could fail if queue system is not initialized, it's not critical. */
if (FAILED(hr = RtwqInvokeCallback(tracked_result)))
- WARN("Failed to invoke tracking callback, hr %#x.\n", hr);
+ WARN("Failed to invoke tracking callback, hr %#lx.\n", hr);
IRtwqAsyncResult_Release(tracked_result);
}
LeaveCriticalSection(&sample->attributes.cs);
refcount = InterlockedDecrement(&sample->attributes.ref);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
release_sample_object(sample);
@@ -497,7 +497,7 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags)
{
struct sample *sample = impl_from_IMFSample(iface);
- TRACE("%p, %#x.\n", iface, flags);
+ TRACE("%p, %#lx.\n", iface, flags);
EnterCriticalSection(&sample->attributes.cs);
sample->flags = flags;
@@ -589,7 +589,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF
struct sample *sample = impl_from_IMFSample(iface);
HRESULT hr = S_OK;
- TRACE("%p, %u, %p.\n", iface, index, buffer);
+ TRACE("%p, %lu, %p.\n", iface, index, buffer);
EnterCriticalSection(&sample->attributes.cs);
if (index < sample->buffer_count)
@@ -741,7 +741,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index)
struct sample *sample = impl_from_IMFSample(iface);
HRESULT hr = S_OK;
- TRACE("%p, %u.\n", iface, index);
+ TRACE("%p, %lu.\n", iface, index);
EnterCriticalSection(&sample->attributes.cs);
if (index < sample->buffer_count)
@@ -1097,7 +1097,7 @@ static ULONG WINAPI sample_allocator_AddRef(IMFVideoSampleAllocatorEx *iface)
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
ULONG refcount = InterlockedIncrement(&allocator->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -1167,7 +1167,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface)
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
ULONG refcount = InterlockedDecrement(&allocator->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -1265,7 +1265,7 @@ static HRESULT sample_allocator_get_surface_service(struct sample_allocator *all
if (FAILED(hr = IDirect3DDeviceManager9_GetVideoService(allocator->d3d9_device_manager, service->hdevice,
&IID_IDirectXVideoProcessorService, (void **)&service->dxva_service)))
{
- WARN("Failed to get DXVA processor service, hr %#x.\n", hr);
+ WARN("Failed to get DXVA processor service, hr %#lx.\n", hr);
IDirect3DDeviceManager9_CloseDeviceHandle(allocator->d3d9_device_manager, service->hdevice);
}
}
@@ -1277,7 +1277,7 @@ static HRESULT sample_allocator_get_surface_service(struct sample_allocator *all
if (FAILED(hr = IMFDXGIDeviceManager_GetVideoService(allocator->dxgi_device_manager, service->hdevice,
&IID_ID3D11Device, (void **)&service->d3d11_device)))
{
- WARN("Failed to get D3D11 device, hr %#x.\n", hr);
+ WARN("Failed to get D3D11 device, hr %#lx.\n", hr);
IMFDXGIDeviceManager_CloseDeviceHandle(allocator->dxgi_device_manager, service->hdevice);
}
}
@@ -1487,7 +1487,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocator(IMFVideoSampleA
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
HRESULT hr;
- TRACE("%p, %u, %p.\n", iface, sample_count, media_type);
+ TRACE("%p, %lu, %p.\n", iface, sample_count, media_type);
if (!sample_count)
return E_INVALIDARG;
@@ -1584,7 +1584,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocatorEx(IMFVideoSampl
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
HRESULT hr;
- TRACE("%p, %u, %u, %p, %p.\n", iface, initial_sample_count, max_sample_count, attributes, media_type);
+ TRACE("%p, %lu, %lu, %p, %p.\n", iface, initial_sample_count, max_sample_count, attributes, media_type);
EnterCriticalSection(&allocator->cs);
More information about the wine-devel
mailing list