From: Elizabeth Figura <zfigura@codeweavers.com> --- dlls/amstream/audiostream.c | 3 +-- dlls/amstream/ddrawstream.c | 3 +-- dlls/amstream/filter.c | 13 ++++++------- dlls/amstream/multimedia.c | 6 +++--- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 8e1c96b4b5e..29f52d1b6c1 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -1210,8 +1210,7 @@ static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, R { struct audio_stream *stream = impl_from_IPin(iface); - TRACE("stream %p, start %s, stop %s, rate %0.16e\n", - stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); + TRACE("stream %p, start %I64d, stop %I64d, rate %0.16e.\n", stream, start, stop, rate); EnterCriticalSection(&stream->cs); diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 55ab7ab25d4..fc4eba59470 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -1456,8 +1456,7 @@ static HRESULT WINAPI ddraw_sink_NewSegment(IPin *iface, REFERENCE_TIME start, R { struct ddraw_stream *stream = impl_from_IPin(iface); - TRACE("stream %p, start %s, stop %s, rate %0.16e\n", - stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); + TRACE("stream %p, start %I64d, stop %I64d, rate %0.16e.\n", stream, start, stop, rate); EnterCriticalSection(&stream->cs); diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 8a7e4fc372c..ae03cdee76d 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -345,7 +345,7 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start { struct filter *filter = impl_from_IMediaStreamFilter(iface); - TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + TRACE("iface %p, start %I64d.\n", iface, start); EnterCriticalSection(&filter->cs); @@ -728,7 +728,7 @@ static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME struct list *entry; HRESULT hr; - TRACE("filter %p, time %s.\n", iface, wine_dbgstr_longlong(time)); + TRACE("filter %p, time %I64d.\n", iface, time); EnterCriticalSection(&filter->cs); @@ -993,8 +993,8 @@ static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LO static HRESULT WINAPI filter_seeking_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, const GUID *target_format, LONGLONG source, const GUID *source_format) { - FIXME("iface %p, target %p, target_format %s, source 0x%s, source_format %s, stub!\n", iface, target, debugstr_guid(target_format), - wine_dbgstr_longlong(source), debugstr_guid(source_format)); + FIXME("iface %p, target %p, target_format %s, source %#I64x, source_format %s, stub!\n", + iface, target, debugstr_guid(target_format), source, debugstr_guid(source_format)); return E_NOTIMPL; } @@ -1006,9 +1006,8 @@ static HRESULT WINAPI filter_seeking_SetPositions(IMediaSeeking *iface, LONGLONG IMediaSeeking *seeking; HRESULT hr; - 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); + TRACE("iface %p, current %p, current_flags %#lx, stop %p, stop_flags %#lx.\n", + iface, current_ptr, current_flags, stop_ptr, stop_flags); EnterCriticalSection(&filter->cs); diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index dc855901c77..29203f0697a 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -200,11 +200,11 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(seek_time)); + TRACE("mmstream %p, seek_time %I64d.\n", mmstream, seek_time); - return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + return IMediaSeeking_SetPositions(mmstream->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *eos) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11021