Skip to content

W
wine-winehq
Commit ef825f49 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

mf: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ffc4d9b8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 131 deletions
dlls/mf/Makefile.in
View file @ ef825f49
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mf.dll
IMPORTLIB = mf
IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids
......
dlls/mf/clock.c
View file @ ef825f49
......@@ -158,7 +158,7 @@ static ULONG WINAPI sink_notification_AddRef(IUnknown *iface)
struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&notification->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -168,7 +168,7 @@ static ULONG WINAPI sink_notification_Release(IUnknown *iface)
struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&notification->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -253,7 +253,7 @@ static ULONG WINAPI present_clock_AddRef(IMFPresentationClock *iface)
struct presentation_clock *clock = impl_from_IMFPresentationClock(iface);
ULONG refcount = InterlockedIncrement(&clock->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -265,7 +265,7 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface)
struct clock_timer *timer, *timer2;
struct clock_sink *sink, *sink2;
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -312,7 +312,7 @@ static HRESULT WINAPI present_clock_GetCorrelatedTime(IMFPresentationClock *ifac
struct presentation_clock *clock = impl_from_IMFPresentationClock(iface);
HRESULT hr = MF_E_CLOCK_NO_TIME_SOURCE;
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(&clock->cs);
if (clock->time_source)
......@@ -335,7 +335,7 @@ static HRESULT WINAPI present_clock_GetState(IMFPresentationClock *iface, DWORD
{
struct presentation_clock *clock = impl_from_IMFPresentationClock(iface);
TRACE("%p, %#x, %p.\n", iface, reserved, state);
TRACE("%p, %#lx, %p.\n", iface, reserved, state);
EnterCriticalSection(&clock->cs);
*state = clock->state;
......@@ -816,7 +816,7 @@ static HRESULT present_clock_schedule_timer(struct presentation_clock *clock, DW
{
if (FAILED(hr = IMFPresentationTimeSource_GetCorrelatedTime(clock->time_source, 0, &clocktime, &systime)))
{
WARN("Failed to get clock time, hr %#x.\n", hr);
WARN("Failed to get clock time, hr %#lx.\n", hr);
return hr;
}
time -= clocktime;
......@@ -885,7 +885,7 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags,
struct clock_timer *clock_timer;
HRESULT hr;
TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key);
TRACE("%p, %#lx, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key);
if (!(clock_timer = calloc(1, sizeof(*clock_timer))))
return E_OUTOFMEMORY;
......
dlls/mf/copier.c
View file @ ef825f49
......@@ -72,7 +72,7 @@ static ULONG WINAPI sample_copier_transform_AddRef(IMFTransform *iface)
struct sample_copier *transform = impl_from_IMFTransform(iface);
ULONG refcount = InterlockedIncrement(&transform->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -82,7 +82,7 @@ static ULONG WINAPI sample_copier_transform_Release(IMFTransform *iface)
struct sample_copier *transform = impl_from_IMFTransform(iface);
ULONG refcount = InterlockedDecrement(&transform->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -120,7 +120,7 @@ static HRESULT WINAPI sample_copier_transform_GetStreamCount(IMFTransform *iface
static HRESULT WINAPI sample_copier_transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs,
DWORD output_size, DWORD *outputs)
{
TRACE("%p, %u, %p, %u, %p.\n", iface, input_size, inputs, output_size, outputs);
TRACE("%p, %lu, %p, %lu, %p.\n", iface, input_size, inputs, output_size, outputs);
return E_NOTIMPL;
}
......@@ -129,7 +129,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputStreamInfo(IMFTransform *i
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
TRACE("%p, %u, %p.\n", iface, id, info);
TRACE("%p, %lu, %p.\n", iface, id, info);
memset(info, 0, sizeof(*info));
......@@ -145,7 +145,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputStreamInfo(IMFTransform *
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
TRACE("%p, %u, %p.\n", iface, id, info);
TRACE("%p, %lu, %p.\n", iface, id, info);
memset(info, 0, sizeof(*info));
......@@ -171,7 +171,7 @@ static HRESULT WINAPI sample_copier_transform_GetAttributes(IMFTransform *iface,
static HRESULT WINAPI sample_copier_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id,
IMFAttributes **attributes)
{
TRACE("%p, %u, %p.\n", iface, id, attributes);
TRACE("%p, %lu, %p.\n", iface, id, attributes);
return E_NOTIMPL;
}
......@@ -179,21 +179,21 @@ static HRESULT WINAPI sample_copier_transform_GetInputStreamAttributes(IMFTransf
static HRESULT WINAPI sample_copier_transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id,
IMFAttributes **attributes)
{
TRACE("%p, %u, %p.\n", iface, id, attributes);
TRACE("%p, %lu, %p.\n", iface, id, attributes);
return E_NOTIMPL;
}
static HRESULT WINAPI sample_copier_transform_DeleteInputStream(IMFTransform *iface, DWORD id)
{
TRACE("%p, %u.\n", iface, id);
TRACE("%p, %lu.\n", iface, id);
return E_NOTIMPL;
}
static HRESULT WINAPI sample_copier_transform_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids)
{
TRACE("%p, %u, %p.\n", iface, streams, ids);
TRACE("%p, %lu, %p.\n", iface, streams, ids);
return E_NOTIMPL;
}
......@@ -204,7 +204,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputAvailableType(IMFTransform
static const GUID *types[] = { &MFMediaType_Video, &MFMediaType_Audio };
HRESULT hr;
TRACE("%p, %u, %u, %p.\n", iface, id, index, type);
TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type);
if (id)
return MF_E_INVALIDSTREAMNUMBER;
......@@ -225,7 +225,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputAvailableType(IMFTransfor
IMFMediaType *cloned_type = NULL;
HRESULT hr = S_OK;
TRACE("%p, %u, %u, %p.\n", iface, id, index, type);
TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type);
EnterCriticalSection(&transform->cs);
if (transform->buffer_type)
......@@ -326,7 +326,7 @@ static HRESULT WINAPI sample_copier_transform_SetInputType(IMFTransform *iface,
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);
TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
return sample_copier_set_media_type(transform, TRUE, id, type, flags);
}
......@@ -335,7 +335,7 @@ static HRESULT WINAPI sample_copier_transform_SetOutputType(IMFTransform *iface,
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);
TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
return sample_copier_set_media_type(transform, FALSE, id, type, flags);
}
......@@ -371,7 +371,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputCurrentType(IMFTransform *
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
TRACE("%p, %u, %p.\n", iface, id, type);
TRACE("%p, %lu, %p.\n", iface, id, type);
return sample_copier_get_current_type(transform, id, SAMPLE_COPIER_INPUT_TYPE_SET, type);
}
......@@ -380,7 +380,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputCurrentType(IMFTransform
{
struct sample_copier *transform = impl_from_IMFTransform(iface);
TRACE("%p, %u, %p.\n", iface, id, type);
TRACE("%p, %lu, %p.\n", iface, id, type);
return sample_copier_get_current_type(transform, id, SAMPLE_COPIER_OUTPUT_TYPE_SET, type);
}
......@@ -390,7 +390,7 @@ static HRESULT WINAPI sample_copier_transform_GetInputStatus(IMFTransform *iface
struct sample_copier *transform = impl_from_IMFTransform(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, id, flags);
TRACE("%p, %lu, %p.\n", iface, id, flags);
if (id)
return MF_E_INVALIDSTREAMNUMBER;
......@@ -431,7 +431,7 @@ static HRESULT WINAPI sample_copier_transform_SetOutputBounds(IMFTransform *ifac
static HRESULT WINAPI sample_copier_transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event)
{
FIXME("%p, %u, %p.\n", iface, id, event);
FIXME("%p, %lu, %p.\n", iface, id, event);
return E_NOTIMPL;
}
......@@ -463,7 +463,7 @@ static HRESULT WINAPI sample_copier_transform_ProcessInput(IMFTransform *iface,
struct sample_copier *transform = impl_from_IMFTransform(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags);
TRACE("%p, %lu, %p, %#lx.\n", iface, id, sample, flags);
if (id)
return MF_E_INVALIDSTREAMNUMBER;
......@@ -492,7 +492,7 @@ static HRESULT WINAPI sample_copier_transform_ProcessOutput(IMFTransform *iface,
HRESULT hr = S_OK;
LONGLONG time;
TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status);
TRACE("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, buffers, status);
EnterCriticalSection(&transform->cs);
if (!(transform->flags & SAMPLE_COPIER_OUTPUT_TYPE_SET))
......
dlls/mf/evr.c
View file @ ef825f49
......@@ -267,7 +267,7 @@ static ULONG WINAPI video_stream_sink_AddRef(IMFStreamSink *iface)
struct video_stream *stream = impl_from_IMFStreamSink(iface);
ULONG refcount = InterlockedIncrement(&stream->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -296,7 +296,7 @@ static HRESULT WINAPI video_stream_sink_GetEvent(IMFStreamSink *iface, DWORD fla
{
struct video_stream *stream = impl_from_IMFStreamSink(iface);
TRACE("%p, %#x, %p.\n", iface, flags, event);
TRACE("%p, %#lx, %p.\n", iface, flags, event);
return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event);
}
......@@ -325,7 +325,7 @@ static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEv
{
struct video_stream *stream = impl_from_IMFStreamSink(iface);
TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
TRACE("%p, %ld, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value);
}
......@@ -403,7 +403,7 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS
hr = MF_E_NO_CLOCK;
else if (FAILED(hr = IMFSample_GetSampleTime(sample, &timestamp)))
{
WARN("No sample timestamp, hr %#x.\n", hr);
WARN("No sample timestamp, hr %#lx.\n", hr);
}
else if (stream->parent->state == EVR_STATE_RUNNING || stream->flags & EVR_STREAM_PREROLLING)
{
......@@ -551,7 +551,7 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHan
static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index,
IMFMediaType **type)
{
TRACE("%p, %u, %p.\n", iface, index, type);
TRACE("%p, %lu, %p.\n", iface, index, type);
return MF_E_NO_MORE_TYPES;
}
......@@ -1153,7 +1153,7 @@ static ULONG WINAPI video_renderer_sink_AddRef(IMFMediaSink *iface)
{
struct video_renderer *renderer = impl_from_IMFMediaSink(iface);
ULONG refcount = InterlockedIncrement(&renderer->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1162,7 +1162,7 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface)
struct video_renderer *renderer = impl_from_IMFMediaSink(iface);
ULONG refcount = InterlockedDecrement(&renderer->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1230,7 +1230,7 @@ static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO
struct video_renderer *renderer = impl_from_IMFMediaSink(iface);
HRESULT hr;
TRACE("%p, %#x, %p, %p.\n", iface, id, media_type, stream_sink);
TRACE("%p, %#lx, %p, %p.\n", iface, id, media_type, stream_sink);
/* Rely on mixer for stream id validation. */
......@@ -1254,7 +1254,7 @@ static HRESULT WINAPI video_renderer_sink_RemoveStreamSink(IMFMediaSink *iface,
HRESULT hr;
size_t i;
TRACE("%p, %#x.\n", iface, id);
TRACE("%p, %#lx.\n", iface, id);
/* Rely on mixer for stream id validation. */
......@@ -1309,7 +1309,7 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa
struct video_renderer *renderer = impl_from_IMFMediaSink(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, stream);
TRACE("%p, %lu, %p.\n", iface, index, stream);
EnterCriticalSection(&renderer->cs);
if (renderer->flags & EVR_SHUT_DOWN)
......@@ -1335,7 +1335,7 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface,
HRESULT hr = S_OK;
size_t i;
TRACE("%p, %#x, %p.\n", iface, id, stream);
TRACE("%p, %#lx, %p.\n", iface, id, stream);
EnterCriticalSection(&renderer->cs);
if (renderer->flags & EVR_SHUT_DOWN)
......@@ -1747,7 +1747,7 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface,
IMFTransform_AddRef(mixer);
else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer)))
{
WARN("Failed to create default mixer object, hr %#x.\n", hr);
WARN("Failed to create default mixer object, hr %#lx.\n", hr);
return hr;
}
......@@ -1755,7 +1755,7 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface,
IMFVideoPresenter_AddRef(presenter);
else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter)))
{
WARN("Failed to create default presenter, hr %#x.\n", hr);
WARN("Failed to create default presenter, hr %#lx.\n", hr);
IMFTransform_Release(mixer);
return hr;
}
......@@ -1810,7 +1810,7 @@ static HRESULT WINAPI video_renderer_events_GetEvent(IMFMediaEventGenerator *ifa
{
struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface);
TRACE("%p, %#x, %p.\n", iface, flags, event);
TRACE("%p, %#lx, %p.\n", iface, flags, event);
return IMFMediaEventQueue_GetEvent(renderer->event_queue, flags, event);
}
......@@ -1840,7 +1840,7 @@ static HRESULT WINAPI video_renderer_events_QueueEvent(IMFMediaEventGenerator *i
{
struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface);
TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
return IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, event_type, ext_type, hr, value);
}
......@@ -2143,7 +2143,7 @@ static HRESULT WINAPI video_renderer_service_lookup_LookupService(IMFTopologySer
struct video_renderer *renderer = impl_from_IMFTopologyServiceLookup(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %u, %s, %s, %p, %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid),
TRACE("%p, %u, %lu, %s, %s, %p, %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid),
objects, num_objects);
EnterCriticalSection(&renderer->cs);
......@@ -2237,7 +2237,7 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L
HRESULT hr = S_OK;
unsigned int idx;
TRACE("%p, %d, %ld, %ld.\n", iface, event, param1, param2);
TRACE("%p, %ld, %Id, %Id.\n", iface, event, param1, param2);
EnterCriticalSection(&renderer->cs);
......@@ -2275,7 +2275,7 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L
}
else
{
WARN("Unhandled event %d.\n", event);
WARN("Unhandled event %ld.\n", event);
hr = MF_E_UNEXPECTED;
}
......
dlls/mf/main.c
View file @ ef825f49
......@@ -73,7 +73,7 @@ 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);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -83,7 +83,7 @@ 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);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -597,7 +597,7 @@ static ULONG WINAPI file_scheme_handler_AddRef(IMFSchemeHandler *iface)
struct file_scheme_handler *handler = impl_from_IMFSchemeHandler(iface);
ULONG refcount = InterlockedIncrement(&handler->refcount);
TRACE("%p, refcount %u.\n", handler, refcount);
TRACE("%p, refcount %lu.\n", handler, refcount);
return refcount;
}
......@@ -608,7 +608,7 @@ static ULONG WINAPI file_scheme_handler_Release(IMFSchemeHandler *iface)
ULONG refcount = InterlockedDecrement(&handler->refcount);
struct file_scheme_handler_result *result, *next;
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -665,7 +665,7 @@ static ULONG WINAPI create_object_context_AddRef(IUnknown *iface)
struct create_object_context *context = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&context->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -675,7 +675,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface)
struct create_object_context *context = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&context->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -703,7 +703,7 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if
IMFAsyncResult *caller, *item;
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 (cancel_cookie)
*cancel_cookie = NULL;
......@@ -1238,7 +1238,7 @@ static ULONG WINAPI simple_type_handler_AddRef(IMFMediaTypeHandler *iface)
struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface);
ULONG refcount = InterlockedIncrement(&handler->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1248,7 +1248,7 @@ static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface)
struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface);
ULONG refcount = InterlockedDecrement(&handler->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1304,7 +1304,7 @@ static HRESULT WINAPI simple_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandle
{
struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface);
TRACE("%p, %u, %p.\n", iface, index, type);
TRACE("%p, %lu, %p.\n", iface, index, type);
if (index > 0)
return MF_E_NO_MORE_TYPES;
......
dlls/mf/quality.c
View file @ ef825f49
......@@ -86,7 +86,7 @@ static ULONG WINAPI standard_quality_manager_AddRef(IMFQualityManager *iface)
struct quality_manager *manager = impl_from_IMFQualityManager(iface);
ULONG refcount = InterlockedIncrement(&manager->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -96,7 +96,7 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface)
struct quality_manager *manager = impl_from_IMFQualityManager(iface);
ULONG refcount = InterlockedDecrement(&manager->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -178,7 +178,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualit
static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node,
LONG input_index, IMFSample *sample)
{
TRACE("%p, %p, %d, %p stub.\n", iface, node, input_index, sample);
TRACE("%p, %p, %ld, %p stub.\n", iface, node, input_index, sample);
return E_NOTIMPL;
}
......@@ -186,7 +186,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityMana
static HRESULT WINAPI standard_quality_manager_NotifyProcessOutput(IMFQualityManager *iface, IMFTopologyNode *node,
LONG output_index, IMFSample *sample)
{
TRACE("%p, %p, %d, %p stub.\n", iface, node, output_index, sample);
TRACE("%p, %p, %ld, %p stub.\n", iface, node, output_index, sample);
return E_NOTIMPL;
}
......
dlls/mf/samplegrabber.c
View file @ ef825f49
......@@ -206,7 +206,7 @@ static HRESULT WINAPI sample_grabber_stream_GetEvent(IMFStreamSink *iface, DWORD
{
struct sample_grabber *grabber = impl_from_IMFStreamSink(iface);
TRACE("%p, %#x, %p.\n", iface, flags, event);
TRACE("%p, %#lx, %p.\n", iface, flags, event);
if (grabber->is_shut_down)
return MF_E_STREAMSINK_REMOVED;
......@@ -245,7 +245,7 @@ static HRESULT WINAPI sample_grabber_stream_QueueEvent(IMFStreamSink *iface, Med
{
struct sample_grabber *grabber = impl_from_IMFStreamSink(iface);
TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
if (grabber->is_shut_down)
return MF_E_STREAMSINK_REMOVED;
......@@ -614,7 +614,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMe
static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index,
IMFMediaType **media_type)
{
TRACE("%p, %u, %p.\n", iface, index, media_type);
TRACE("%p, %lu, %p.\n", iface, index, media_type);
if (!media_type)
return E_POINTER;
......@@ -741,14 +741,14 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba
if (!sample_reported)
{
if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered)))
WARN("Failed to report a sample, hr %#x.\n", hr);
WARN("Failed to report a sample, hr %#lx.\n", hr);
stream_release_pending_item(item);
sample_reported = TRUE;
}
else
{
if (FAILED(hr = stream_schedule_sample(grabber, item)))
WARN("Failed to schedule a sample, hr %#x.\n", hr);
WARN("Failed to schedule a sample, hr %#lx.\n", hr);
break;
}
}
......@@ -814,7 +814,7 @@ static ULONG WINAPI sample_grabber_sink_AddRef(IMFMediaSink *iface)
struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
ULONG refcount = InterlockedIncrement(&grabber->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -834,7 +834,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface)
struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
ULONG refcount = InterlockedDecrement(&grabber->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -888,7 +888,7 @@ static HRESULT WINAPI sample_grabber_sink_AddStreamSink(IMFMediaSink *iface, DWO
{
struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink);
TRACE("%p, %#lx, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink);
return grabber->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED;
}
......@@ -897,7 +897,7 @@ static HRESULT WINAPI sample_grabber_sink_RemoveStreamSink(IMFMediaSink *iface,
{
struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
TRACE("%p, %#x.\n", iface, stream_sink_id);
TRACE("%p, %#lx.\n", iface, stream_sink_id);
return grabber->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED;
}
......@@ -922,7 +922,7 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkByIndex(IMFMediaSink *ifa
struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, stream);
TRACE("%p, %lu, %p.\n", iface, index, stream);
if (grabber->is_shut_down)
return MF_E_SHUTDOWN;
......@@ -950,7 +950,7 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface,
struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
HRESULT hr = S_OK;
TRACE("%p, %#x, %p.\n", iface, stream_sink_id, stream);
TRACE("%p, %#lx, %p.\n", iface, stream_sink_id, stream);
EnterCriticalSection(&grabber->cs);
......@@ -1233,7 +1233,7 @@ static HRESULT WINAPI sample_grabber_events_GetEvent(IMFMediaEventGenerator *ifa
{
struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface);
TRACE("%p, %#x, %p.\n", iface, flags, event);
TRACE("%p, %#lx, %p.\n", iface, flags, event);
return IMFMediaEventQueue_GetEvent(grabber->event_queue, flags, event);
}
......@@ -1263,7 +1263,7 @@ static HRESULT WINAPI sample_grabber_events_QueueEvent(IMFMediaEventGenerator *i
{
struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface);
TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
return IMFMediaEventQueue_QueueEventParamVar(grabber->event_queue, event_type, ext_type, hr, value);
}
......
dlls/mf/topology.c
View file @ ef825f49
......@@ -174,7 +174,7 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface)
struct topology *topology = impl_from_IMFTopology(iface);
ULONG refcount = InterlockedIncrement(&topology->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -267,7 +267,7 @@ static ULONG WINAPI topology_Release(IMFTopology *iface)
struct topology *topology = impl_from_IMFTopology(iface);
ULONG refcount = InterlockedDecrement(&topology->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -702,7 +702,7 @@ static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src)
{
if (FAILED(hr = create_topology_node(src_topology->nodes.nodes[i]->node_type, &node)))
{
WARN("Failed to create a node, hr %#x.\n", hr);
WARN("Failed to create a node, hr %#lx.\n", hr);
break;
}
......@@ -931,7 +931,7 @@ static ULONG WINAPI topology_node_AddRef(IMFTopologyNode *iface)
struct topology_node *node = impl_from_IMFTopologyNode(iface);
ULONG refcount = InterlockedIncrement(&node->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -942,7 +942,7 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface)
ULONG refcount = InterlockedDecrement(&node->refcount);
unsigned int i;
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1441,7 +1441,7 @@ static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD
struct topology_node *node = impl_from_IMFTopologyNode(iface);
struct topology_node *connection = unsafe_impl_from_IMFTopologyNode(peer);
TRACE("%p, %u, %p, %u.\n", iface, output_index, peer, input_index);
TRACE("%p, %lu, %p, %lu.\n", iface, output_index, peer, input_index);
if (!connection)
{
......@@ -1456,7 +1456,7 @@ static HRESULT WINAPI topology_node_DisconnectOutput(IMFTopologyNode *iface, DWO
{
struct topology_node *node = impl_from_IMFTopologyNode(iface);
TRACE("%p, %u.\n", iface, output_index);
TRACE("%p, %lu.\n", iface, output_index);
return topology_node_disconnect_output(node, output_index);
}
......@@ -1467,7 +1467,7 @@ static HRESULT WINAPI topology_node_GetInput(IMFTopologyNode *iface, DWORD input
struct topology_node *node = impl_from_IMFTopologyNode(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p, %p.\n", iface, input_index, ret, output_index);
TRACE("%p, %lu, %p, %p.\n", iface, input_index, ret, output_index);
EnterCriticalSection(&node->cs);
......@@ -1498,7 +1498,7 @@ static HRESULT WINAPI topology_node_GetOutput(IMFTopologyNode *iface, DWORD outp
struct topology_node *node = impl_from_IMFTopologyNode(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p, %p.\n", iface, output_index, ret, input_index);
TRACE("%p, %lu, %p, %p.\n", iface, output_index, ret, input_index);
EnterCriticalSection(&node->cs);
......@@ -1528,7 +1528,7 @@ static HRESULT WINAPI topology_node_SetOutputPrefType(IMFTopologyNode *iface, DW
struct topology_node *node = impl_from_IMFTopologyNode(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, mediatype);
TRACE("%p, %lu, %p.\n", iface, index, mediatype);
EnterCriticalSection(&node->cs);
......@@ -1562,7 +1562,7 @@ static HRESULT WINAPI topology_node_GetOutputPrefType(IMFTopologyNode *iface, DW
struct topology_node *node = impl_from_IMFTopologyNode(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, mediatype);
TRACE("%p, %lu, %p.\n", iface, index, mediatype);
EnterCriticalSection(&node->cs);
......@@ -1581,7 +1581,7 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO
struct topology_node *node = impl_from_IMFTopologyNode(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, mediatype);
TRACE("%p, %lu, %p.\n", iface, index, mediatype);
EnterCriticalSection(&node->cs);
......@@ -1622,7 +1622,7 @@ static HRESULT WINAPI topology_node_GetInputPrefType(IMFTopologyNode *iface, DWO
struct topology_node *node = impl_from_IMFTopologyNode(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, mediatype);
TRACE("%p, %lu, %p.\n", iface, index, mediatype);
EnterCriticalSection(&node->cs);
......@@ -1833,7 +1833,7 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO
UINT32 primary_output;
HRESULT hr;
TRACE("%p, %u, %d, %p.\n", node, stream, output, type);
TRACE("%p, %lu, %d, %p.\n", node, stream, output, type);
if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type)))
return hr;
......@@ -1916,7 +1916,7 @@ static ULONG WINAPI topology_loader_AddRef(IMFTopoLoader *iface)
struct topology_loader *loader = impl_from_IMFTopoLoader(iface);
ULONG refcount = InterlockedIncrement(&loader->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1926,7 +1926,7 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface)
struct topology_loader *loader = impl_from_IMFTopoLoader(iface);
ULONG refcount = InterlockedDecrement(&loader->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
free(loader);
......@@ -2456,16 +2456,16 @@ static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, DWO
return hr;
if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &input_type)))
WARN("Failed to get upstream media type hr %#x.\n", hr);
WARN("Failed to get upstream media type hr %#lx.\n", hr);
if (SUCCEEDED(hr) && FAILED(hr = MFGetTopoNodeCurrentType(downstream_node, downstream_input, FALSE, &output_type)))
WARN("Failed to get downstream media type hr %#x.\n", hr);
WARN("Failed to get downstream media type hr %#lx.\n", hr);
if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)))
WARN("Input type wasn't accepted, hr %#x.\n", hr);
WARN("Input type wasn't accepted, hr %#lx.\n", hr);
if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0)))
WARN("Output type wasn't accepted, hr %#x.\n", hr);
WARN("Output type wasn't accepted, hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
......@@ -2558,7 +2558,7 @@ static void topology_loader_resolve_complete(struct topoloader_context *context)
IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0);
if (FAILED(hr = topology_loader_connect_d3d_aware_input(context, node)))
WARN("Failed to connect D3D-aware input, hr %#x.\n", hr);
WARN("Failed to connect D3D-aware input, hr %#lx.\n", hr);
}
else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE)
{
......@@ -2642,7 +2642,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in
if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE)
{
if (FAILED(hr = topology_loader_clone_node(&context, node, NULL, 0)))
WARN("Failed to clone source node, hr %#x.\n", hr);
WARN("Failed to clone source node, hr %#lx.\n", hr);
}
IMFTopologyNode_Release(node);
......@@ -2652,7 +2652,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in
{
if (FAILED(hr = topology_loader_resolve_nodes(&context, &layer_size)))
{
WARN("Failed to resolve for marker %u, hr %#x.\n", context.marker, hr);
WARN("Failed to resolve for marker %u, hr %#lx.\n", context.marker, hr);
break;
}
......@@ -2734,7 +2734,7 @@ static ULONG WINAPI seq_source_AddRef(IMFSequencerSource *iface)
struct seq_source *seq_source = impl_from_IMFSequencerSource(iface);
ULONG refcount = InterlockedIncrement(&seq_source->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -2744,7 +2744,7 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface)
struct seq_source *seq_source = impl_from_IMFSequencerSource(iface);
ULONG refcount = InterlockedDecrement(&seq_source->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
free(seq_source);
......@@ -2755,14 +2755,14 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface)
static HRESULT WINAPI seq_source_AppendTopology(IMFSequencerSource *iface, IMFTopology *topology,
DWORD flags, MFSequencerElementId *id)
{
FIXME("%p, %p, %x, %p.\n", iface, topology, flags, id);
FIXME("%p, %p, %lx, %p.\n", iface, topology, flags, id);
return E_NOTIMPL;
}
static HRESULT WINAPI seq_source_DeleteTopology(IMFSequencerSource *iface, MFSequencerElementId id)
{
FIXME("%p, %#x.\n", iface, id);
FIXME("%p, %#lx.\n", iface, id);
return E_NOTIMPL;
}
......@@ -2778,14 +2778,14 @@ static HRESULT WINAPI seq_source_GetPresentationContext(IMFSequencerSource *ifac
static HRESULT WINAPI seq_source_UpdateTopology(IMFSequencerSource *iface, MFSequencerElementId id,
IMFTopology *topology)
{
FIXME("%p, %#x, %p.\n", iface, id, topology);
FIXME("%p, %#lx, %p.\n", iface, id, topology);
return E_NOTIMPL;
}
static HRESULT WINAPI seq_source_UpdateTopologyFlags(IMFSequencerSource *iface, MFSequencerElementId id, DWORD flags)
{
FIXME("%p, %#x, %#x.\n", iface, id, flags);
FIXME("%p, %#lx, %#lx.\n", iface, id, flags);
return E_NOTIMPL;
}
......
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