[PATCH 5/5] strmbase: Build without -DWINE_NO_LONG_TYPES.
Zebediah Figura
zfigura at codeweavers.com
Mon Feb 7 23:22:48 CST 2022
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
libs/strmbase/Makefile.in | 1 -
libs/strmbase/dispatch.c | 4 ++--
libs/strmbase/filter.c | 14 +++++++-------
libs/strmbase/mediatype.c | 38 +++++++++++++++++++-------------------
libs/strmbase/pin.c | 10 +++++-----
libs/strmbase/pospass.c | 17 ++++++++++++-----
libs/strmbase/renderer.c | 2 +-
libs/strmbase/seeking.c | 7 +++++--
8 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/libs/strmbase/Makefile.in b/libs/strmbase/Makefile.in
index c9b4a9ebb5c..8b6ea8a3b43 100644
--- a/libs/strmbase/Makefile.in
+++ b/libs/strmbase/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
STATICLIB = libstrmbase.a
C_SRCS = \
diff --git a/libs/strmbase/dispatch.c b/libs/strmbase/dispatch.c
index 562c8c12ee6..061655d4693 100644
--- a/libs/strmbase/dispatch.c
+++ b/libs/strmbase/dispatch.c
@@ -46,7 +46,7 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret)
hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &typelib);
if (FAILED(hr))
{
- ERR("Failed to load typelib, hr %#x.\n", hr);
+ ERR("Failed to load typelib, hr %#lx.\n", hr);
return hr;
}
if (InterlockedCompareExchangePointer((void **)&control_typelib, typelib, NULL))
@@ -59,7 +59,7 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret)
hr = ITypeLib_GetTypeInfoOfGuid(control_typelib, control_tid_id[tid], &typeinfo);
if (FAILED(hr))
{
- ERR("Failed to get type info for %s, hr %#x.\n", debugstr_guid(control_tid_id[tid]), hr);
+ ERR("Failed to get type info for %s, hr %#lx.\n", debugstr_guid(control_tid_id[tid]), hr);
return hr;
}
if (InterlockedCompareExchangePointer((void **)(control_typeinfo + tid), typeinfo, NULL))
diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c
index 2cf874ac1f1..92b4f1cb4b6 100644
--- a/libs/strmbase/filter.c
+++ b/libs/strmbase/filter.c
@@ -87,7 +87,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;
}
@@ -96,7 +96,7 @@ static ULONG WINAPI enum_pins_Release(IEnumPins *iface)
struct enum_pins *enum_pins = impl_from_IEnumPins(iface);
ULONG refcount = InterlockedDecrement(&enum_pins->refcount);
- TRACE("%p decreasing refcount to %u.\n", enum_pins, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", enum_pins, refcount);
if (!refcount)
{
IBaseFilter_Release(&enum_pins->filter->IBaseFilter_iface);
@@ -110,7 +110,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)
return E_POINTER;
@@ -144,7 +144,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);
if (enum_pins->version != enum_pins->filter->pin_version)
return VFW_E_ENUM_OUT_OF_SYNC;
@@ -241,7 +241,7 @@ static ULONG WINAPI filter_inner_AddRef(IUnknown *iface)
struct strmbase_filter *filter = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&filter->refcount);
- TRACE("%p increasing refcount to %u.\n", filter, refcount);
+ TRACE("%p increasing refcount to %lu.\n", filter, refcount);
return refcount;
}
@@ -251,7 +251,7 @@ static ULONG WINAPI filter_inner_Release(IUnknown *iface)
struct strmbase_filter *filter = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&filter->refcount);
- TRACE("%p decreasing refcount to %u.\n", filter, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", filter, refcount);
if (!refcount)
filter->ops->filter_destroy(filter);
@@ -368,7 +368,7 @@ static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_
struct strmbase_filter *filter = impl_from_IBaseFilter(iface);
HRESULT hr = S_OK;
- TRACE("filter %p %s, timeout %u, state %p.\n", filter, debugstr_w(filter->name), timeout, state);
+ TRACE("filter %p %s, timeout %lu, state %p.\n", filter, debugstr_w(filter->name), timeout, state);
EnterCriticalSection(&filter->filter_cs);
diff --git a/libs/strmbase/mediatype.c b/libs/strmbase/mediatype.c
index 6f66999c390..33af6f2e636 100644
--- a/libs/strmbase/mediatype.c
+++ b/libs/strmbase/mediatype.c
@@ -60,7 +60,7 @@ static const char *debugstr_fourcc(DWORD fourcc)
char str[4] = {fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24};
if (isprint(str[0]) && isprint(str[1]) && isprint(str[2]) && isprint(str[3]))
return wine_dbgstr_an(str, 4);
- return wine_dbg_sprintf("%#x", fourcc);
+ return wine_dbg_sprintf("%#lx", fourcc);
}
void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
@@ -71,7 +71,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
mt, strmbase_debugstr_guid(&mt->majortype), strmbase_debugstr_guid(&mt->subtype));
if (mt->bFixedSizeSamples) TRACE(", fixed size samples");
if (mt->bTemporalCompression) TRACE(", temporal compression");
- if (mt->lSampleSize) TRACE(", sample size %d", mt->lSampleSize);
+ if (mt->lSampleSize) TRACE(", sample size %ld", mt->lSampleSize);
if (mt->pUnk) TRACE(", pUnk %p", mt->pUnk);
TRACE(", format type %s.\n", strmbase_debugstr_guid(&mt->formattype));
@@ -83,7 +83,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
{
WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat;
- TRACE("tag %#x, %u channels, sample rate %u, %u bytes/sec, alignment %u, %u bits/sample.\n",
+ TRACE("tag %#x, %u channels, sample rate %lu, %lu bytes/sec, alignment %u, %u bits/sample.\n",
wfx->wFormatTag, wfx->nChannels, wfx->nSamplesPerSec,
wfx->nAvgBytesPerSec, wfx->nBlockAlign, wfx->wBitsPerSample);
@@ -107,17 +107,17 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource));
if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget));
- if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate);
- if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate);
+ if (vih->dwBitRate) TRACE("bitrate %lu, ", vih->dwBitRate);
+ if (vih->dwBitErrorRate) TRACE("error rate %lu, ", vih->dwBitErrorRate);
TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame));
- TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u",
+ TRACE("size %ldx%ld, %u planes, %u bpp, compression %s, image size %lu",
vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes,
vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression),
vih->bmiHeader.biSizeImage);
if (vih->bmiHeader.biXPelsPerMeter || vih->bmiHeader.biYPelsPerMeter)
- TRACE(", resolution %dx%d", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter);
- if (vih->bmiHeader.biClrUsed) TRACE(", %d colours", vih->bmiHeader.biClrUsed);
- if (vih->bmiHeader.biClrImportant) TRACE(", %d important colours", vih->bmiHeader.biClrImportant);
+ TRACE(", resolution %ldx%ld", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter);
+ if (vih->bmiHeader.biClrUsed) TRACE(", %lu colours", vih->bmiHeader.biClrUsed);
+ if (vih->bmiHeader.biClrImportant) TRACE(", %lu important colours", vih->bmiHeader.biClrImportant);
TRACE(".\n");
}
else if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2) && mt->cbFormat >= sizeof(VIDEOINFOHEADER2))
@@ -126,13 +126,13 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource));
if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget));
- if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate);
- if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate);
+ if (vih->dwBitRate) TRACE("bitrate %lu, ", vih->dwBitRate);
+ if (vih->dwBitErrorRate) TRACE("error rate %lu, ", vih->dwBitErrorRate);
TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame));
- if (vih->dwInterlaceFlags) TRACE("interlace flags %#x, ", vih->dwInterlaceFlags);
- if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags);
- TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY);
- if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags);
+ if (vih->dwInterlaceFlags) TRACE("interlace flags %#lx, ", vih->dwInterlaceFlags);
+ if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#lx, ", vih->dwCopyProtectFlags);
+ TRACE("aspect ratio %lu/%lu, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY);
+ if (vih->u.dwControlFlags) TRACE("control flags %#lx, ", vih->u.dwControlFlags);
if (vih->u.dwControlFlags & AMCONTROL_COLORINFO_PRESENT)
{
const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->u.dwControlFlags;
@@ -141,14 +141,14 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt)
colorimetry->VideoChromaSubsampling, colorimetry->NominalRange, colorimetry->VideoTransferMatrix,
colorimetry->VideoLighting, colorimetry->VideoPrimaries, colorimetry->VideoTransferFunction);
}
- TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u",
+ TRACE("size %ldx%ld, %u planes, %u bpp, compression %s, image size %lu",
vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes,
vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression),
vih->bmiHeader.biSizeImage);
if (vih->bmiHeader.biXPelsPerMeter || vih->bmiHeader.biYPelsPerMeter)
- TRACE(", resolution %dx%d", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter);
- if (vih->bmiHeader.biClrUsed) TRACE(", %d colours", vih->bmiHeader.biClrUsed);
- if (vih->bmiHeader.biClrImportant) TRACE(", %d important colours", vih->bmiHeader.biClrImportant);
+ TRACE(", resolution %ldx%ld", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter);
+ if (vih->bmiHeader.biClrUsed) TRACE(", %lu colours", vih->bmiHeader.biClrUsed);
+ if (vih->bmiHeader.biClrImportant) TRACE(", %lu important colours", vih->bmiHeader.biClrImportant);
TRACE(".\n");
}
else
diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c
index 36784f60a23..1aecb7a8c98 100644
--- a/libs/strmbase/pin.c
+++ b/libs/strmbase/pin.c
@@ -97,7 +97,7 @@ static ULONG WINAPI enum_media_types_AddRef(IEnumMediaTypes *iface)
{
struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface);
ULONG refcount = InterlockedIncrement(&enummt->refcount);
- TRACE("%p increasing refcount to %u.\n", enummt, refcount);
+ TRACE("%p increasing refcount to %lu.\n", enummt, refcount);
return refcount;
}
@@ -106,7 +106,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface)
struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface);
ULONG refcount = InterlockedDecrement(&enummt->refcount);
- TRACE("%p decreasing refcount to %u.\n", enummt, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", enummt, refcount);
if (!refcount)
{
IPin_Release(&enummt->pin->IPin_iface);
@@ -123,7 +123,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count,
unsigned int i;
HRESULT hr;
- TRACE("enummt %p, count %u, mts %p, ret_count %p.\n", enummt, count, mts, ret_count);
+ TRACE("enummt %p, count %lu, mts %p, ret_count %p.\n", enummt, count, mts, ret_count);
if (!enummt->pin->ops->pin_get_media_type)
{
@@ -169,7 +169,7 @@ static HRESULT WINAPI enum_media_types_Skip(IEnumMediaTypes *iface, ULONG count)
{
struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface);
- TRACE("enummt %p, count %u.\n", enummt, count);
+ TRACE("enummt %p, count %lu.\n", enummt, count);
enummt->index += count;
@@ -758,7 +758,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This,
FreeMediaType(&This->pin.mt);
}
- TRACE(" -- %x\n", hr);
+ TRACE("Returning %#lx.\n", hr);
return hr;
}
diff --git a/libs/strmbase/pospass.c b/libs/strmbase/pospass.c
index 7478c0e67c5..03cb7783f97 100644
--- a/libs/strmbase/pospass.c
+++ b/libs/strmbase/pospass.c
@@ -296,7 +296,11 @@ static HRESULT WINAPI MediaSeekingPassThru_ConvertTimeFormat(IMediaSeeking * ifa
struct strmbase_passthrough *This = impl_from_IMediaSeeking(iface);
IMediaSeeking *seek;
HRESULT hr;
- TRACE("(%p/%p)->(%p,%s,%x%08x,%s)\n", iface, This, pTarget, debugstr_guid(pTargetFormat), (DWORD)(Source>>32), (DWORD)Source, debugstr_guid(pSourceFormat));
+
+ TRACE("iface %p, target %p, target_format %s, source %s, source_format %s.\n",
+ iface, pTarget, debugstr_guid(pTargetFormat),
+ wine_dbgstr_longlong(Source), debugstr_guid(pSourceFormat));
+
hr = get_connected(This, &IID_IMediaSeeking, (LPVOID*)&seek);
if (SUCCEEDED(hr)) {
hr = IMediaSeeking_ConvertTimeFormat(seek, pTarget, pTargetFormat, Source, pSourceFormat);
@@ -312,7 +316,10 @@ static HRESULT WINAPI MediaSeekingPassThru_SetPositions(IMediaSeeking * iface, L
struct strmbase_passthrough *This = impl_from_IMediaSeeking(iface);
IMediaSeeking *seek;
HRESULT hr;
- TRACE("(%p/%p)->(%p,%x,%p,%x)\n", iface, This, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
+
+ TRACE("iface %p, current %p, current_flags %#lx, stop %p, stop_flags %#lx.\n",
+ iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
+
hr = get_connected(This, &IID_IMediaSeeking, (LPVOID*)&seek);
if (SUCCEEDED(hr)) {
hr = IMediaSeeking_SetPositions(seek, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
@@ -457,7 +464,7 @@ static HRESULT WINAPI MediaPositionPassThru_GetTypeInfoCount(IMediaPosition *ifa
static HRESULT WINAPI MediaPositionPassThru_GetTypeInfo(IMediaPosition *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
- TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
+ TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaPosition_tid, typeinfo);
}
@@ -467,7 +474,7 @@ static HRESULT WINAPI MediaPositionPassThru_GetIDsOfNames(IMediaPosition *iface,
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
+ TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
@@ -484,7 +491,7 @@ static HRESULT WINAPI MediaPositionPassThru_Invoke(IMediaPosition *iface, DISPID
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
+ TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
diff --git a/libs/strmbase/renderer.c b/libs/strmbase/renderer.c
index da257555a19..dc421f499ed 100644
--- a/libs/strmbase/renderer.c
+++ b/libs/strmbase/renderer.c
@@ -526,7 +526,7 @@ static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter
struct strmbase_renderer *filter = impl_from_IQualityControl(iface);
HRESULT hr = S_FALSE;
- TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n",
+ TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
if (filter->qc_sink)
diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c
index 67ef660ba3d..b3991f0a5b3 100644
--- a/libs/strmbase/seeking.c
+++ b/libs/strmbase/seeking.c
@@ -220,7 +220,10 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG *
BOOL bChangeCurrent = FALSE, bChangeStop = FALSE;
LONGLONG llNewCurrent, llNewStop;
- TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags);
+ TRACE("iface %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", iface,
+ pCurrent ? debugstr_time(*pCurrent) : "<null>", dwCurrentFlags,
+ pStop ? debugstr_time(*pStop): "<null>", dwStopFlags);
+
EnterCriticalSection(&This->cs);
llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags);
@@ -231,7 +234,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG *
if (llNewStop != This->llStop)
bChangeStop = TRUE;
- TRACE("Old: %u, New: %u\n", (DWORD)(This->llCurrent/10000000), (DWORD)(llNewCurrent/10000000));
+ TRACE("Seeking from %s to %s.\n", debugstr_time(This->llCurrent), debugstr_time(llNewCurrent));
This->llCurrent = llNewCurrent;
This->llStop = llNewStop;
--
2.34.1
More information about the wine-devel
mailing list