Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/amstream/Makefile.in | 1 - dlls/amstream/audiodata.c | 8 ++++---- dlls/amstream/audiostream.c | 38 +++++++++++++++++++------------------- dlls/amstream/ddrawstream.c | 40 ++++++++++++++++++++-------------------- dlls/amstream/filter.c | 18 +++++++++--------- dlls/amstream/multimedia.c | 16 ++++++++-------- 6 files changed, 60 insertions(+), 61 deletions(-)
diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index debfcecd182..35356a06a8c 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = amstream.dll IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw
diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index c4e32e9b179..1f8c0c44064 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -64,7 +64,7 @@ static ULONG WINAPI IAudioDataImpl_AddRef(IAudioData* iface) AMAudioDataImpl *This = impl_from_IAudioData(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, This->ref); + TRACE("(%p)->(): new ref = %lu\n", iface, This->ref);
return ref; } @@ -74,7 +74,7 @@ static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) AMAudioDataImpl *This = impl_from_IAudioData(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, This->ref); + TRACE("(%p)->(): new ref = %lu\n", iface, This->ref);
if (!ref) { @@ -94,7 +94,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY { AMAudioDataImpl *This = impl_from_IAudioData(iface);
- TRACE("(%p)->(%u,%p,%x)\n", iface, size, data, flags); + TRACE("(%p)->(%lu,%p,%lx)\n", iface, size, data, flags);
if (!size) { @@ -154,7 +154,7 @@ static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_val { AMAudioDataImpl *This = impl_from_IAudioData(iface);
- TRACE("(%p)->(%u)\n", iface, data_valid); + TRACE("(%p)->(%lu)\n", iface, data_valid);
if (data_valid > This->size) { diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index bb86cfdaf69..a043390f5b1 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -188,7 +188,7 @@ static ULONG WINAPI audio_sample_AddRef(IAudioStreamSample *iface) { struct audio_sample *sample = impl_from_IAudioStreamSample(iface); ULONG refcount = InterlockedIncrement(&sample->ref); - TRACE("%p increasing refcount to %u.\n", sample, refcount); + TRACE("%p increasing refcount to %lu.\n", sample, refcount); return refcount; }
@@ -196,7 +196,7 @@ static ULONG WINAPI audio_sample_Release(IAudioStreamSample *iface) { struct audio_sample *sample = impl_from_IAudioStreamSample(iface); ULONG refcount = InterlockedDecrement(&sample->ref); - TRACE("%p decreasing refcount to %u.\n", sample, refcount); + TRACE("%p decreasing refcount to %lu.\n", sample, refcount); if (!refcount) { IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); @@ -257,7 +257,7 @@ static HRESULT WINAPI audio_sample_Update(IAudioStreamSample *iface, DWORD length; HRESULT hr;
- TRACE("sample %p, flags %#x, event %p, apc_func %p, apc_data %#x.\n", + TRACE("sample %p, flags %#lx, event %p, apc_func %p, apc_data %#lx.\n", sample, flags, event, apc_func, apc_data);
hr = IAudioData_GetInfo(sample->audio_data, &length, &pointer, NULL); @@ -281,7 +281,7 @@ static HRESULT WINAPI audio_sample_Update(IAudioStreamSample *iface,
if (flags & ~SSUPDATE_ASYNC) { - FIXME("Unsupported flags %#x.\n", flags); + FIXME("Unsupported flags %#lx.\n", flags); return E_NOTIMPL; }
@@ -328,11 +328,11 @@ static HRESULT WINAPI audio_sample_CompletionStatus(IAudioStreamSample *iface, D struct audio_sample *sample = impl_from_IAudioStreamSample(iface); HRESULT hr;
- TRACE("sample %p, flags %#x, milliseconds %u.\n", sample, flags, milliseconds); + TRACE("sample %p, flags %#lx, milliseconds %lu.\n", sample, flags, milliseconds);
if (flags) { - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); return E_NOTIMPL; }
@@ -449,7 +449,7 @@ static ULONG WINAPI audio_IAMMediaStream_AddRef(IAMMediaStream *iface) struct audio_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %lu\n", iface, This, ref);
return ref; } @@ -459,7 +459,7 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) struct audio_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %lu\n", iface, This, ref);
if (!ref) { @@ -507,7 +507,7 @@ static HRESULT WINAPI audio_IAMMediaStream_SetSameFormat(IAMMediaStream *iface, { struct audio_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags); + FIXME("(%p/%p)->(%p,%lx) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags);
return S_FALSE; } @@ -517,7 +517,7 @@ static HRESULT WINAPI audio_IAMMediaStream_AllocateSample(IAMMediaStream *iface, { struct audio_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, flags, sample); + FIXME("(%p/%p)->(%lx,%p) stub!\n", This, iface, flags, sample);
return S_FALSE; } @@ -527,7 +527,7 @@ static HRESULT WINAPI audio_IAMMediaStream_CreateSharedSample(IAMMediaStream *if { struct audio_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, existing_sample, flags, sample); + FIXME("(%p/%p)->(%p,%lx,%p) stub!\n", This, iface, existing_sample, flags, sample);
return S_FALSE; } @@ -536,7 +536,7 @@ static HRESULT WINAPI audio_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface { struct audio_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%x) stub!\n", This, iface, flags); + FIXME("(%p/%p)->(%lx) stub!\n", This, iface, flags);
return S_FALSE; } @@ -547,7 +547,7 @@ static HRESULT WINAPI audio_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn { struct audio_stream *stream = impl_from_IAMMediaStream(iface);
- TRACE("stream %p, source_object %p, flags %x, purpose_id %s, stream_type %u.\n", stream, source_object, flags, + TRACE("stream %p, source_object %p, flags %lx, purpose_id %s, stream_type %u.\n", stream, source_object, flags, debugstr_guid(purpose_id), stream_type);
if (!purpose_id) @@ -762,7 +762,7 @@ static HRESULT WINAPI audio_IAudioMediaStream_CreateSample(IAudioMediaStream *if { struct audio_stream *This = impl_from_IAudioMediaStream(iface);
- TRACE("(%p/%p)->(%p,%u,%p)\n", iface, This, audio_data, flags, sample); + TRACE("(%p/%p)->(%p,%lu,%p)\n", iface, This, audio_data, flags, sample);
if (!audio_data) return E_POINTER; @@ -820,7 +820,7 @@ static ULONG WINAPI enum_media_types_AddRef(IEnumMediaTypes *iface) { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); ULONG refcount = InterlockedIncrement(&enum_media_types->refcount); - TRACE("%p increasing refcount to %u.\n", enum_media_types, refcount); + TRACE("%p increasing refcount to %lu.\n", enum_media_types, refcount); return refcount; }
@@ -828,7 +828,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); - TRACE("%p decreasing refcount to %u.\n", enum_media_types, refcount); + TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) heap_free(enum_media_types); return refcount; @@ -849,7 +849,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, .cbSize = 0, };
- TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); + TRACE("iface %p, count %lu, mts %p, ret_count %p.\n", iface, count, mts, ret_count);
if (!ret_count) return E_POINTER; @@ -881,7 +881,7 @@ static HRESULT WINAPI enum_media_types_Skip(IEnumMediaTypes *iface, ULONG count) { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
- TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count);
enum_media_types->index += count; return S_OK; @@ -1364,7 +1364,7 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * static HRESULT WINAPI audio_meminput_ReceiveMultiple(IMemInputPin *iface, IMediaSample **samples, LONG count, LONG *processed) { - FIXME("iface %p, samples %p, count %u, processed %p, stub!\n", iface, samples, count, processed); + FIXME("iface %p, samples %p, count %lu, processed %p, stub!\n", iface, samples, count, processed); return E_NOTIMPL; }
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index af4492fe3e8..7b0c92c5f61 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -212,7 +212,7 @@ static ULONG WINAPI ddraw_IAMMediaStream_AddRef(IAMMediaStream *iface) struct ddraw_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %lu\n", iface, This, ref);
return ref; } @@ -222,7 +222,7 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedDecrement(&stream->ref);
- TRACE("%p decreasing refcount to %u.\n", stream, ref); + TRACE("%p decreasing refcount to %lu.\n", stream, ref);
if (!ref) { @@ -272,7 +272,7 @@ static HRESULT WINAPI ddraw_IAMMediaStream_SetSameFormat(IAMMediaStream *iface, { struct ddraw_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags); + FIXME("(%p/%p)->(%p,%lx) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags);
return S_FALSE; } @@ -282,7 +282,7 @@ static HRESULT WINAPI ddraw_IAMMediaStream_AllocateSample(IAMMediaStream *iface, { struct ddraw_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, flags, sample); + FIXME("(%p/%p)->(%lx,%p) stub!\n", This, iface, flags, sample);
return S_FALSE; } @@ -292,7 +292,7 @@ static HRESULT WINAPI ddraw_IAMMediaStream_CreateSharedSample(IAMMediaStream *if { struct ddraw_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, existing_sample, flags, sample); + FIXME("(%p/%p)->(%p,%lx,%p) stub!\n", This, iface, existing_sample, flags, sample);
return S_FALSE; } @@ -301,7 +301,7 @@ static HRESULT WINAPI ddraw_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface { struct ddraw_stream *This = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%x) stub!\n", This, iface, flags); + FIXME("(%p/%p)->(%lx) stub!\n", This, iface, flags);
return S_FALSE; } @@ -313,7 +313,7 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); HRESULT hr;
- TRACE("stream %p, source_object %p, flags %x, purpose_id %s, stream_type %u.\n", stream, source_object, flags, + TRACE("stream %p, source_object %p, flags %lx, purpose_id %s, stream_type %u.\n", stream, source_object, flags, debugstr_guid(purpose_id), stream_type);
if (!purpose_id) @@ -327,7 +327,7 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn
if (source_object && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) - FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr); + FIXME("Stream object doesn't implement IDirectDraw interface, hr %#lx.\n", hr);
if (!source_object) { @@ -549,7 +549,7 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr if (format->dwSize != sizeof(DDSURFACEDESC)) return E_INVALIDARG;
- TRACE("flags %#x, pixel format flags %#x, bit count %u, size %ux%u.\n", + TRACE("flags %#lx, pixel format flags %#lx, bit count %lu, size %lux%lu.\n", format->dwFlags, format->ddpfPixelFormat.dwFlags, format->ddpfPixelFormat.u1.dwRGBBitCount, format->dwWidth, format->dwHeight);
@@ -711,7 +711,7 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMedia struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); HRESULT hr;
- TRACE("stream %p, surface %p, rect %s, flags %#x, sample %p.\n", + TRACE("stream %p, surface %p, rect %s, flags %#lx, sample %p.\n", stream, surface, wine_dbgstr_rect(rect), flags, sample);
if (!surface && rect) @@ -805,7 +805,7 @@ static ULONG WINAPI enum_media_types_AddRef(IEnumMediaTypes *iface) { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); ULONG refcount = InterlockedIncrement(&enum_media_types->refcount); - TRACE("%p increasing refcount to %u.\n", enum_media_types, refcount); + TRACE("%p increasing refcount to %lu.\n", enum_media_types, refcount); return refcount; }
@@ -813,7 +813,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); - TRACE("%p decreasing refcount to %u.\n", enum_media_types, refcount); + TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) heap_free(enum_media_types); return refcount; @@ -823,7 +823,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
- TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); + TRACE("iface %p, count %lu, mts %p, ret_count %p.\n", iface, count, mts, ret_count);
if (!ret_count) return E_POINTER; @@ -849,7 +849,7 @@ static HRESULT WINAPI enum_media_types_Skip(IEnumMediaTypes *iface, ULONG count) { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface);
- TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count);
enum_media_types->index += count;
@@ -1430,7 +1430,7 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * static HRESULT WINAPI ddraw_meminput_ReceiveMultiple(IMemInputPin *iface, IMediaSample **samples, LONG count, LONG *processed) { - FIXME("iface %p, samples %p, count %u, processed %p, stub!\n", iface, samples, count, processed); + FIXME("iface %p, samples %p, count %lu, processed %p, stub!\n", iface, samples, count, processed); return E_NOTIMPL; }
@@ -1515,7 +1515,7 @@ static ULONG WINAPI ddraw_sample_AddRef(IDirectDrawStreamSample *iface) struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); ULONG ref = InterlockedIncrement(&sample->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p)->(): new ref = %lu\n", iface, ref);
return ref; } @@ -1525,7 +1525,7 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); ULONG ref = InterlockedDecrement(&sample->ref);
- TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p)->(): new ref = %lu\n", iface, ref);
if (!ref) { @@ -1592,7 +1592,7 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, { struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface);
- TRACE("sample %p, flags %#x, event %p, apc_func %p, apc_data %#x.\n", + TRACE("sample %p, flags %#lx, event %p, apc_func %p, apc_data %#lx.\n", sample, flags, event, apc_func, apc_data);
if (event && apc_func) @@ -1650,7 +1650,7 @@ static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *ifa struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); HRESULT hr;
- TRACE("sample %p, flags %#x, milliseconds %u.\n", sample, flags, milliseconds); + TRACE("sample %p, flags %#lx, milliseconds %lu.\n", sample, flags, milliseconds);
EnterCriticalSection(&sample->parent->cs);
@@ -1791,7 +1791,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw IDirectDraw_Release(ddraw); if (FAILED(hr)) { - ERR("failed to create surface, 0x%08x\n", hr); + ERR("failed to create surface, 0x%08lx\n", hr); IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); return hr; } diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index c419bb73de7..f5a855d6a96 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -61,7 +61,7 @@ static ULONG WINAPI enum_pins_AddRef(IEnumPins *iface) { struct enum_pins *enum_pins = impl_from_IEnumPins(iface); ULONG refcount = InterlockedIncrement(&enum_pins->refcount); - TRACE("%p increasing refcount to %u.\n", enum_pins, refcount); + TRACE("%p increasing refcount to %lu.\n", enum_pins, refcount); return refcount; }
@@ -71,7 +71,7 @@ static ULONG WINAPI enum_pins_Release(IEnumPins *iface) ULONG refcount = InterlockedDecrement(&enum_pins->refcount); unsigned int i;
- TRACE("%p decreasing refcount to %u.\n", enum_pins, refcount); + TRACE("%p decreasing refcount to %lu.\n", enum_pins, refcount); if (!refcount) { for (i = 0; i < enum_pins->count; ++i) @@ -87,7 +87,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, struct enum_pins *enum_pins = impl_from_IEnumPins(iface); unsigned int i;
- TRACE("iface %p, count %u, pins %p, ret_count %p.\n", iface, count, pins, ret_count); + TRACE("iface %p, count %lu, pins %p, ret_count %p.\n", iface, count, pins, ret_count);
if (!pins || (count > 1 && !ret_count)) return E_POINTER; @@ -106,7 +106,7 @@ static HRESULT WINAPI enum_pins_Skip(IEnumPins *iface, ULONG count) { struct enum_pins *enum_pins = impl_from_IEnumPins(iface);
- TRACE("iface %p, count %u.\n", iface, count); + TRACE("iface %p, count %lu.\n", iface, count);
enum_pins->index += count;
@@ -222,7 +222,7 @@ static ULONG WINAPI filter_AddRef(IMediaStreamFilter *iface) struct filter *filter = impl_from_IMediaStreamFilter(iface); ULONG refcount = InterlockedIncrement(&filter->refcount);
- TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; } @@ -233,7 +233,7 @@ static ULONG WINAPI filter_Release(IMediaStreamFilter *iface) ULONG refcount = InterlockedDecrement(&filter->refcount); unsigned int i;
- TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) { @@ -363,7 +363,7 @@ static HRESULT WINAPI filter_GetState(IMediaStreamFilter *iface, DWORD timeout, { struct filter *filter = impl_from_IMediaStreamFilter(iface);
- TRACE("iface %p, timeout %u, state %p.\n", iface, timeout, state); + TRACE("iface %p, timeout %lu, state %p.\n", iface, timeout, state);
if (!state) return E_POINTER; @@ -593,7 +593,7 @@ static HRESULT WINAPI filter_EnumMediaStreams(IMediaStreamFilter *iface, LONG in { struct filter *filter = impl_from_IMediaStreamFilter(iface);
- TRACE("filter %p, index %d, stream %p.\n", filter, index, stream); + TRACE("filter %p, index %ld, stream %p.\n", filter, index, stream);
if (index >= filter->nb_streams) return S_FALSE; @@ -1004,7 +1004,7 @@ static HRESULT WINAPI filter_seeking_SetPositions(IMediaSeeking *iface, LONGLONG IMediaSeeking *seeking; HRESULT hr;
- TRACE("iface %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", iface, + TRACE("iface %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", iface, current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags, stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags);
diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 827f9ef0363..70c0210840f 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -132,7 +132,7 @@ static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *if { struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface);
- TRACE("mmstream %p, index %d, stream %p.\n", mmstream, index, stream); + TRACE("mmstream %p, index %ld, stream %p.\n", mmstream, index, stream);
return IMediaStreamFilter_EnumMediaStreams(mmstream->filter, index, stream); } @@ -269,7 +269,7 @@ static HRESULT WINAPI multimedia_stream_Initialize(IAMMultiMediaStream *iface, struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); HRESULT hr;
- TRACE("mmstream %p, type %u, flags %#x, graph %p.\n", mmstream, type, flags, graph); + TRACE("mmstream %p, type %u, flags %#lx, graph %p.\n", mmstream, type, flags, graph);
if (graph && mmstream->graph) { @@ -343,7 +343,7 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac IAMMediaStream* pStream; IMediaStream *stream;
- TRACE("mmstream %p, stream_object %p, id %s, flags %#x, ret_stream %p.\n", + TRACE("mmstream %p, stream_object %p, id %s, flags %#lx, ret_stream %p.\n", This, stream_object, debugstr_guid(PurposeId), dwFlags, ret_stream);
if (IMediaStreamFilter_GetMediaStream(This->filter, PurposeId, &stream) == S_OK) @@ -436,7 +436,7 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, IPin *ipin; PIN_DIRECTION pin_direction;
- TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(filename), flags); + TRACE("(%p/%p)->(%s,%lx)\n", This, iface, debugstr_w(filename), flags);
if (!filename) return E_POINTER; @@ -481,7 +481,7 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, } else { - FIXME("Failed to get IFilterGraph2 interface, hr %#x.\n", ret); + FIXME("Failed to get IFilterGraph2 interface, hr %#lx.\n", ret); ret = IGraphBuilder_Render(This->graph, This->ipin); } } @@ -514,7 +514,7 @@ static HRESULT WINAPI multimedia_stream_OpenMoniker(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface);
- FIXME("(%p/%p)->(%p,%p,%x) stub!\n", This, iface, pCtx, pMoniker, dwFlags); + FIXME("(%p/%p)->(%p,%p,%lx) stub!\n", This, iface, pCtx, pMoniker, dwFlags);
return E_NOTIMPL; } @@ -523,7 +523,7 @@ static HRESULT WINAPI multimedia_stream_Render(IAMMultiMediaStream *iface, DWORD { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface);
- FIXME("(%p/%p)->(%x) partial stub!\n", This, iface, dwFlags); + FIXME("(%p/%p)->(%lx) partial stub!\n", This, iface, dwFlags);
if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG; @@ -571,7 +571,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) if (FAILED(hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) { - ERR("Failed to create stream filter, hr %#x.\n", hr); + ERR("Failed to create stream filter, hr %#lx.\n", hr); heap_free(object); return hr; }