From: Alex Henrie alexhenrie24@gmail.com
--- dlls/wmvcore/async_reader.c | 12 ++++++------ dlls/wmvcore/wmvcore_private.h | 21 --------------------- 2 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 3a8556a5f0a..ec4b1c999d4 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -275,8 +275,8 @@ static void async_reader_deliver_sample(struct async_reader *reader, struct samp HRESULT hr;
TRACE("reader %p, output %lu, stream %u, pts %s, duration %s, flags %#lx, buffer %p.\n", - reader, sample->output, sample->stream, debugstr_time(sample->pts), - debugstr_time(sample->duration), sample->flags, sample->buffer); + reader, sample->output, sample->stream, debugstr_reftime(sample->pts), + debugstr_reftime(sample->duration), sample->flags, sample->buffer);
if (FAILED(hr = IWMSyncReader2_GetReadStreamSamples(reader->reader, sample->stream, &read_compressed))) @@ -685,7 +685,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, HRESULT hr;
TRACE("reader %p, start %s, duration %s, rate %.8e, context %p.\n", - reader, debugstr_time(start), debugstr_time(duration), rate, context); + reader, debugstr_reftime(start), debugstr_reftime(duration), rate, context);
if (rate != 1.0f) FIXME("Ignoring rate %.8e.\n", rate); @@ -799,7 +799,7 @@ static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QW { struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
- TRACE("reader %p, time %s.\n", reader, debugstr_time(time)); + TRACE("reader %p, time %s.\n", reader, debugstr_reftime(time));
EnterCriticalSection(&reader->callback_cs);
@@ -1860,7 +1860,7 @@ static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME struct async_reader *reader = impl_from_IReferenceClock(iface);
FIXME("reader %p, basetime %s, streamtime %s, event %#Ix, cookie %p, stub!\n", - reader, debugstr_time(basetime), debugstr_time(streamtime), event, cookie); + reader, debugstr_reftime(basetime), debugstr_reftime(streamtime), event, cookie);
return E_NOTIMPL; } @@ -1871,7 +1871,7 @@ static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_ struct async_reader *reader = impl_from_IReferenceClock(iface);
FIXME("reader %p, starttime %s, period %s, semaphore %#Ix, cookie %p, stub!\n", - reader, debugstr_time(starttime), debugstr_time(period), semaphore, cookie); + reader, debugstr_reftime(starttime), debugstr_reftime(period), semaphore, cookie);
return E_NOTIMPL; } diff --git a/dlls/wmvcore/wmvcore_private.h b/dlls/wmvcore/wmvcore_private.h index a5225d79da9..81ecdf953a2 100644 --- a/dlls/wmvcore/wmvcore_private.h +++ b/dlls/wmvcore/wmvcore_private.h @@ -27,24 +27,3 @@ #include "wine/debug.h"
HRESULT WINAPI winegstreamer_create_wm_sync_reader(IUnknown *outer, void **out); - -static inline const char *debugstr_time(LONGLONG time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -}