[PATCH 04/21] dlls/windowscodecs, wmphoto: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Tue Feb 22 02:42:16 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/windowscodecs/Makefile.in | 1
dlls/windowscodecs/bitmap.c | 12 +++--
dlls/windowscodecs/bmpdecode.c | 10 ++--
dlls/windowscodecs/bmpencode.c | 8 ++-
dlls/windowscodecs/clipper.c | 4 +-
dlls/windowscodecs/clsfactory.c | 6 +--
dlls/windowscodecs/colorcontext.c | 4 +-
dlls/windowscodecs/colortransform.c | 4 +-
dlls/windowscodecs/converter.c | 4 +-
dlls/windowscodecs/ddsformat.c | 16 +++----
dlls/windowscodecs/decoder.c | 10 ++--
dlls/windowscodecs/encoder.c | 12 +++--
dlls/windowscodecs/fliprotate.c | 4 +-
dlls/windowscodecs/gifformat.c | 16 +++----
dlls/windowscodecs/icoformat.c | 14 +++---
dlls/windowscodecs/imgfactory.c | 22 +++++-----
dlls/windowscodecs/info.c | 30 +++++++------
dlls/windowscodecs/libjpeg.c | 4 +-
dlls/windowscodecs/libtiff.c | 2 -
dlls/windowscodecs/metadatahandler.c | 16 +++----
dlls/windowscodecs/metadataquery.c | 24 +++++-----
dlls/windowscodecs/palette.c | 4 +-
dlls/windowscodecs/propertybag.c | 12 +++--
dlls/windowscodecs/scaler.c | 4 +-
dlls/windowscodecs/stream.c | 76 +++++++++++++++++----------------
dlls/windowscodecs/tgaformat.c | 12 +++--
dlls/windowscodecs/wincodecs_common.c | 2 -
dlls/wmphoto/Makefile.in | 1
dlls/wmphoto/main.c | 2 -
29 files changed, 167 insertions(+), 169 deletions(-)
diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index cd4c428c54f..068730971e8 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = windowscodecs.dll
IMPORTLIB = windowscodecs
IMPORTS = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c
index bd09c74941b..28acbeef298 100644
--- a/dlls/windowscodecs/bitmap.c
+++ b/dlls/windowscodecs/bitmap.c
@@ -146,7 +146,7 @@ static ULONG WINAPI BitmapLockImpl_AddRef(IWICBitmapLock *iface)
BitmapLockImpl *This = impl_from_IWICBitmapLock(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -156,7 +156,7 @@ static ULONG WINAPI BitmapLockImpl_Release(IWICBitmapLock *iface)
BitmapLockImpl *This = impl_from_IWICBitmapLock(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -267,7 +267,7 @@ static ULONG WINAPI BitmapImpl_AddRef(IWICBitmap *iface)
BitmapImpl *This = impl_from_IWICBitmap(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -277,7 +277,7 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface)
BitmapImpl *This = impl_from_IWICBitmap(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -369,7 +369,7 @@ static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock,
BitmapLockImpl *result;
WICRect rc;
- TRACE("(%p,%s,%x,%p)\n", iface, debug_wic_rect(prcLock), flags, ppILock);
+ TRACE("(%p,%s,%lx,%p)\n", iface, debug_wic_rect(prcLock), flags, ppILock);
if (!(flags & (WICBitmapLockRead|WICBitmapLockWrite)) || !ppILock)
return E_INVALIDARG;
@@ -596,7 +596,7 @@ static HRESULT WINAPI IMILBitmapImpl_unknown1(IMILBitmap *iface, void **ppv)
static HRESULT WINAPI IMILBitmapImpl_Lock(IMILBitmap *iface, const WICRect *rc, DWORD flags, IWICBitmapLock **lock)
{
BitmapImpl *This = impl_from_IMILBitmap(iface);
- TRACE("(%p,%p,%08x,%p)\n", iface, rc, flags, lock);
+ TRACE("(%p,%p,%08lx,%p)\n", iface, rc, flags, lock);
return IWICBitmap_Lock(&This->IWICBitmap_iface, rc, flags, lock);
}
diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c
index 888f41a6138..b7ea464d125 100644
--- a/dlls/windowscodecs/bmpdecode.c
+++ b/dlls/windowscodecs/bmpdecode.c
@@ -858,7 +858,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
}
else /* struct is compatible with BITMAPINFOHEADER */
{
- TRACE("bitmap header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount);
+ TRACE("bitmap header=%li compression=%li depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount);
switch(This->bih.bV5Compression)
{
case BI_RGB:
@@ -932,7 +932,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
{
This->read_data_func = BmpFrameDecode_ReadUncompressed;
This->pixelformat = &GUID_WICPixelFormatUndefined;
- FIXME("unsupported bitfields type depth=%i red=%x green=%x blue=%x alpha=%x\n",
+ FIXME("unsupported bitfields type depth=%i red=%lx green=%lx blue=%lx alpha=%lx\n",
This->bih.bV5BitCount, This->bih.bV5RedMask, This->bih.bV5GreenMask, This->bih.bV5BlueMask, This->bih.bV5AlphaMask);
}
break;
@@ -941,7 +941,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
This->bitsperpixel = 0;
This->read_data_func = BmpFrameDecode_ReadUnsupported;
This->pixelformat = &GUID_WICPixelFormatUndefined;
- FIXME("unsupported bitmap type header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount);
+ FIXME("unsupported bitmap type header=%li compression=%li depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount);
break;
}
}
@@ -996,7 +996,7 @@ static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface)
BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1006,7 +1006,7 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface)
BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c
index e87d66a2e63..cd981ee9d3b 100644
--- a/dlls/windowscodecs/bmpencode.c
+++ b/dlls/windowscodecs/bmpencode.c
@@ -110,7 +110,7 @@ static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface)
BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -120,7 +120,7 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface)
BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -466,7 +466,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface)
BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -476,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface)
BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c
index 02e0d967f52..c89aee3af36 100644
--- a/dlls/windowscodecs/clipper.c
+++ b/dlls/windowscodecs/clipper.c
@@ -72,7 +72,7 @@ static ULONG WINAPI BitmapClipper_AddRef(IWICBitmapClipper *iface)
BitmapClipper *This = impl_from_IWICBitmapClipper(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -82,7 +82,7 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface)
BitmapClipper *This = impl_from_IWICBitmapClipper(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c
index c122f8c14bc..d69e5dc4a6d 100644
--- a/dlls/windowscodecs/clsfactory.c
+++ b/dlls/windowscodecs/clsfactory.c
@@ -112,7 +112,7 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface)
ClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -122,7 +122,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface)
ClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
HeapFree(GetProcessHeap(), 0, This);
@@ -203,7 +203,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
else
ret = WIC_DllGetClassObject(rclsid, iid, ppv);
- TRACE("<-- %08X\n", ret);
+ TRACE("<-- %08lX\n", ret);
return ret;
}
diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c
index 239fd0fb2c3..72e879fca84 100644
--- a/dlls/windowscodecs/colorcontext.c
+++ b/dlls/windowscodecs/colorcontext.c
@@ -72,7 +72,7 @@ static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface)
ColorContext *This = impl_from_IWICColorContext(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -82,7 +82,7 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface)
ColorContext *This = impl_from_IWICColorContext(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/colortransform.c b/dlls/windowscodecs/colortransform.c
index e8065950bc6..cc7f1258d14 100644
--- a/dlls/windowscodecs/colortransform.c
+++ b/dlls/windowscodecs/colortransform.c
@@ -70,7 +70,7 @@ static ULONG WINAPI ColorTransform_AddRef(IWICColorTransform *iface)
ColorTransform *This = impl_from_IWICColorTransform(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -80,7 +80,7 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface)
ColorTransform *This = impl_from_IWICColorTransform(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c
index c321627885b..a401d1cdc4a 100644
--- a/dlls/windowscodecs/converter.c
+++ b/dlls/windowscodecs/converter.c
@@ -1559,7 +1559,7 @@ static ULONG WINAPI FormatConverter_AddRef(IWICFormatConverter *iface)
FormatConverter *This = impl_from_IWICFormatConverter(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1569,7 +1569,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface)
FormatConverter *This = impl_from_IWICFormatConverter(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c
index 5a947a898b9..62cd0dc3f7c 100644
--- a/dlls/windowscodecs/ddsformat.c
+++ b/dlls/windowscodecs/ddsformat.c
@@ -780,7 +780,7 @@ static ULONG WINAPI DdsFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -790,7 +790,7 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface)
DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) {
if (This->pixel_data != This->block_data) HeapFree(GetProcessHeap(), 0, This->pixel_data);
@@ -1087,7 +1087,7 @@ static ULONG WINAPI DdsDecoder_AddRef(IWICBitmapDecoder *iface)
DdsDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1097,7 +1097,7 @@ static ULONG WINAPI DdsDecoder_Release(IWICBitmapDecoder *iface)
DdsDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1550,7 +1550,7 @@ static ULONG WINAPI DdsFrameEncode_AddRef(IWICBitmapFrameEncode *iface)
DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1560,7 +1560,7 @@ static ULONG WINAPI DdsFrameEncode_Release(IWICBitmapFrameEncode *iface)
DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1950,7 +1950,7 @@ static ULONG WINAPI DdsEncoder_AddRef(IWICBitmapEncoder *iface)
DdsEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1960,7 +1960,7 @@ static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface)
DdsEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) {
This->lock.DebugInfo->Spare[0] = 0;
diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c
index 2cd5a2d148f..769dc779f13 100644
--- a/dlls/windowscodecs/decoder.c
+++ b/dlls/windowscodecs/decoder.c
@@ -74,7 +74,7 @@ static ULONG WINAPI CommonDecoder_AddRef(IWICBitmapDecoder *iface)
CommonDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -84,7 +84,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface)
CommonDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -296,7 +296,7 @@ static ULONG WINAPI CommonDecoderFrame_AddRef(IWICBitmapFrameDecode *iface)
CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -306,7 +306,7 @@ static ULONG WINAPI CommonDecoderFrame_Release(IWICBitmapFrameDecode *iface)
CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -762,7 +762,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface,
if (SUCCEEDED(hr))
{
- TRACE("-> %ux%u, %u-bit pixelformat=%s res=%f,%f colors=%u contexts=%u\n",
+ TRACE("-> %ux%u, %u-bit pixelformat=%s res=%f,%f colors=%lu contexts=%lu\n",
result->decoder_frame.width, result->decoder_frame.height,
result->decoder_frame.bpp, wine_dbgstr_guid(&result->decoder_frame.pixel_format),
result->decoder_frame.dpix, result->decoder_frame.dpiy,
diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c
index a213e7d14d0..238ab2ae630 100644
--- a/dlls/windowscodecs/encoder.c
+++ b/dlls/windowscodecs/encoder.c
@@ -116,7 +116,7 @@ static ULONG WINAPI CommonEncoderFrame_AddRef(IWICBitmapFrameEncode *iface)
CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -126,7 +126,7 @@ static ULONG WINAPI CommonEncoderFrame_Release(IWICBitmapFrameEncode *iface)
CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -177,7 +177,7 @@ static HRESULT WINAPI CommonEncoderFrame_Initialize(IWICBitmapFrameEncode *iface
options.filter = V_UI1(val);
if (options.filter > WICPngFilterAdaptive)
{
- WARN("Unrecognized filter option value %u.\n", options.filter);
+ WARN("Unrecognized filter option value %lu.\n", options.filter);
options.filter = WICPngFilterUnspecified;
}
break;
@@ -310,7 +310,7 @@ static HRESULT WINAPI CommonEncoderFrame_SetPixelFormat(IWICBitmapFrameEncode *i
if (SUCCEEDED(hr))
{
- TRACE("<-- %s bpp=%i indexed=%i\n", wine_dbgstr_guid(&pixel_format), bpp, indexed);
+ TRACE("<-- %s bpp=%li indexed=%i\n", wine_dbgstr_guid(&pixel_format), bpp, indexed);
*pPixelFormat = pixel_format;
This->encoder_frame.pixel_format = pixel_format;
This->encoder_frame.bpp = bpp;
@@ -528,7 +528,7 @@ static ULONG WINAPI CommonEncoder_AddRef(IWICBitmapEncoder *iface)
CommonEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -538,7 +538,7 @@ static ULONG WINAPI CommonEncoder_Release(IWICBitmapEncoder *iface)
CommonEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c
index 842c342af23..55114a981e7 100644
--- a/dlls/windowscodecs/fliprotate.c
+++ b/dlls/windowscodecs/fliprotate.c
@@ -74,7 +74,7 @@ static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface)
FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -84,7 +84,7 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface)
FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c
index d84d16f277b..4bd0772810d 100644
--- a/dlls/windowscodecs/gifformat.c
+++ b/dlls/windowscodecs/gifformat.c
@@ -646,7 +646,7 @@ static ULONG WINAPI GifFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -656,7 +656,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface)
GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1045,7 +1045,7 @@ static ULONG WINAPI GifDecoder_AddRef(IWICBitmapDecoder *iface)
GifDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1055,7 +1055,7 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface)
GifDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1526,7 +1526,7 @@ static ULONG WINAPI GifFrameEncode_AddRef(IWICBitmapFrameEncode *iface)
GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p -> %u\n", iface, ref);
+ TRACE("%p -> %lu\n", iface, ref);
return ref;
}
@@ -1535,7 +1535,7 @@ static ULONG WINAPI GifFrameEncode_Release(IWICBitmapFrameEncode *iface)
GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p -> %u\n", iface, ref);
+ TRACE("%p -> %lu\n", iface, ref);
if (!ref)
{
@@ -2171,7 +2171,7 @@ static ULONG WINAPI GifEncoder_AddRef(IWICBitmapEncoder *iface)
GifEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p -> %u\n", iface, ref);
+ TRACE("%p -> %lu\n", iface, ref);
return ref;
}
@@ -2180,7 +2180,7 @@ static ULONG WINAPI GifEncoder_Release(IWICBitmapEncoder *iface)
GifEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p -> %u\n", iface, ref);
+ TRACE("%p -> %lu\n", iface, ref);
if (!ref)
{
diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c
index 391880be4bc..6127a73f392 100644
--- a/dlls/windowscodecs/icoformat.c
+++ b/dlls/windowscodecs/icoformat.c
@@ -109,7 +109,7 @@ static ULONG WINAPI IcoFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -119,7 +119,7 @@ static ULONG WINAPI IcoFrameDecode_Release(IWICBitmapFrameDecode *iface)
IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -463,7 +463,7 @@ static ULONG WINAPI IcoDecoder_AddRef(IWICBitmapDecoder *iface)
IcoDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -473,7 +473,7 @@ static ULONG WINAPI IcoDecoder_Release(IWICBitmapDecoder *iface)
IcoDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -545,7 +545,7 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME);
if (FAILED(hr))
{
- WARN("Stat() failed, hr %#x.\n", hr);
+ WARN("Stat() failed, hr %#lx.\n", hr);
goto end;
}
@@ -714,7 +714,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface,
hr = ReadIcoPng((IStream*)substream, result);
break;
default:
- FIXME("Unrecognized ICO frame magic: %x\n", magic);
+ FIXME("Unrecognized ICO frame magic: %lx\n", magic);
hr = E_FAIL;
break;
}
@@ -733,7 +733,7 @@ fail:
HeapFree(GetProcessHeap(), 0, result);
if (substream) IWICStream_Release(substream);
if (SUCCEEDED(hr)) hr = E_FAIL;
- TRACE("<-- %x\n", hr);
+ TRACE("<-- %lx\n", hr);
return hr;
}
diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c
index 7e10fc37875..c7e101e3d62 100644
--- a/dlls/windowscodecs/imgfactory.c
+++ b/dlls/windowscodecs/imgfactory.c
@@ -83,7 +83,7 @@ static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory2 *iface)
ImagingFactory *This = impl_from_IWICImagingFactory2(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -93,7 +93,7 @@ static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory2 *iface)
ImagingFactory *This = impl_from_IWICImagingFactory2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
HeapFree(GetProcessHeap(), 0, This);
@@ -109,7 +109,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename(
IWICStream *stream;
HRESULT hr;
- TRACE("(%p,%s,%s,%u,%u,%p)\n", iface, debugstr_w(wzFilename),
+ TRACE("(%p,%s,%s,%lu,%u,%p)\n", iface, debugstr_w(wzFilename),
debugstr_guid(pguidVendor), dwDesiredAccess, metadataOptions, ppIDecoder);
hr = StreamImpl_Create(&stream);
@@ -230,13 +230,13 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(
BYTE data[4];
ULONG bytesread;
- WARN("failed to load from a stream %#x\n", res);
+ WARN("failed to load from a stream %#lx\n", res);
seek.QuadPart = 0;
if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK)
{
if (IStream_Read(pIStream, data, 4, &bytesread) == S_OK)
- WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]);
+ WARN("first %li bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]);
}
}
*ppIDecoder = NULL;
@@ -251,7 +251,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle(
IWICStream *stream;
HRESULT hr;
- TRACE("(%p,%lx,%s,%u,%p)\n", iface, hFile, debugstr_guid(pguidVendor),
+ TRACE("(%p,%Ix,%s,%u,%p)\n", iface, hFile, debugstr_guid(pguidVendor),
metadataOptions, ppIDecoder);
hr = StreamImpl_Create(&stream);
@@ -709,7 +709,7 @@ static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format)
}
else
{
- FIXME("unrecognized bitfields %x,%x,%x\n", bmh.bV4RedMask,
+ FIXME("unrecognized bitfields %lx,%lx,%lx\n", bmh.bV4RedMask,
bmh.bV4GreenMask, bmh.bV4BlueMask);
ret = FALSE;
}
@@ -981,7 +981,7 @@ failed:
static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory2 *iface,
DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown)
{
- TRACE("(%p,%u,%u,%p)\n", iface, componentTypes, options, ppIEnumUnknown);
+ TRACE("(%p,%lu,%lu,%p)\n", iface, componentTypes, options, ppIEnumUnknown);
return CreateComponentEnumerator(componentTypes, options, ppIEnumUnknown);
}
@@ -1249,7 +1249,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromReader(IWICComponent
static HRESULT WINAPI ComponentFactory_CreateMetadataReader(IWICComponentFactory *iface,
REFGUID format, const GUID *vendor, DWORD options, IStream *stream, IWICMetadataReader **reader)
{
- FIXME("%p,%s,%s,%x,%p,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor),
+ FIXME("%p,%s,%s,%lx,%p,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor),
options, stream, reader);
return E_NOTIMPL;
}
@@ -1267,7 +1267,7 @@ static HRESULT WINAPI ComponentFactory_CreateMetadataReaderFromContainer(IWICCom
BOOL matches;
LARGE_INTEGER zero;
- TRACE("%p,%s,%s,%x,%p,%p\n", iface, debugstr_guid(format), debugstr_guid(vendor),
+ TRACE("%p,%s,%s,%lx,%p,%p\n", iface, debugstr_guid(format), debugstr_guid(vendor),
options, stream, reader);
if (!format || !stream || !reader)
@@ -1385,7 +1385,7 @@ start:
static HRESULT WINAPI ComponentFactory_CreateMetadataWriter(IWICComponentFactory *iface,
REFGUID format, const GUID *vendor, DWORD options, IWICMetadataWriter **writer)
{
- FIXME("%p,%s,%s,%x,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, writer);
+ FIXME("%p,%s,%s,%lx,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, writer);
return E_NOTIMPL;
}
diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
index 7a9ecf52b5a..3b674a3e2f1 100644
--- a/dlls/windowscodecs/info.c
+++ b/dlls/windowscodecs/info.c
@@ -232,7 +232,7 @@ static ULONG WINAPI BitmapDecoderInfo_AddRef(IWICBitmapDecoderInfo *iface)
BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -242,7 +242,7 @@ static ULONG WINAPI BitmapDecoderInfo_Release(IWICBitmapDecoderInfo *iface)
BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -716,7 +716,7 @@ static ULONG WINAPI BitmapEncoderInfo_AddRef(IWICBitmapEncoderInfo *iface)
BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -726,7 +726,7 @@ static ULONG WINAPI BitmapEncoderInfo_Release(IWICBitmapEncoderInfo *iface)
BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1006,7 +1006,7 @@ static ULONG WINAPI FormatConverterInfo_AddRef(IWICFormatConverterInfo *iface)
FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1016,7 +1016,7 @@ static ULONG WINAPI FormatConverterInfo_Release(IWICFormatConverterInfo *iface)
FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1220,7 +1220,7 @@ static ULONG WINAPI PixelFormatInfo_AddRef(IWICPixelFormatInfo2 *iface)
PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface);
ULONG ref = InterlockedIncrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1230,7 +1230,7 @@ static ULONG WINAPI PixelFormatInfo_Release(IWICPixelFormatInfo2 *iface)
PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface);
ULONG ref = InterlockedDecrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -1531,7 +1531,7 @@ static ULONG WINAPI MetadataReaderInfo_AddRef(IWICMetadataReaderInfo *iface)
MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -1540,7 +1540,7 @@ static ULONG WINAPI MetadataReaderInfo_Release(IWICMetadataReaderInfo *iface)
MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (!ref)
{
@@ -2180,7 +2180,7 @@ static ULONG WINAPI ComponentEnum_AddRef(IEnumUnknown *iface)
ComponentEnum *This = impl_from_IEnumUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -2191,7 +2191,7 @@ static ULONG WINAPI ComponentEnum_Release(IEnumUnknown *iface)
ULONG ref = InterlockedDecrement(&This->ref);
ComponentEnumItem *cursor, *cursor2;
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -2217,7 +2217,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt,
ComponentEnumItem *item;
HRESULT hr=S_OK;
- TRACE("(%p,%u,%p,%p)\n", iface, celt, rgelt, pceltFetched);
+ TRACE("(%p,%lu,%p,%p)\n", iface, celt, rgelt, pceltFetched);
EnterCriticalSection(&This->lock);
while (num_fetched<celt)
@@ -2245,7 +2245,7 @@ static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt)
ULONG i;
HRESULT hr=S_OK;
- TRACE("(%p,%u)\n", iface, celt);
+ TRACE("(%p,%lu)\n", iface, celt);
EnterCriticalSection(&This->lock);
for (i=0; i<celt; i++)
@@ -2346,7 +2346,7 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn
HRESULT hr=S_OK;
CLSID clsid;
- if (options) FIXME("ignoring flags %x\n", options);
+ if (options) FIXME("ignoring flags %lx\n", options);
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &clsidkey);
if (res != ERROR_SUCCESS)
diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c
index bca7a1f277d..8611269d04b 100644
--- a/dlls/windowscodecs/libjpeg.c
+++ b/dlls/windowscodecs/libjpeg.c
@@ -413,7 +413,7 @@ static boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo)
if (hr != S_OK || byteswritten == 0)
{
- ERR("Failed writing data, hr=%x\n", hr);
+ ERR("Failed writing data, hr=%lx\n", hr);
return FALSE;
}
@@ -434,7 +434,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo)
sizeof(This->dest_buffer) - This->dest_mgr.free_in_buffer, &byteswritten);
if (hr != S_OK || byteswritten == 0)
- ERR("Failed writing data, hr=%x\n", hr);
+ ERR("Failed writing data, hr=%lx\n", hr);
}
}
diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c
index 202eb7cc083..c4676601c2c 100644
--- a/dlls/windowscodecs/libtiff.c
+++ b/dlls/windowscodecs/libtiff.c
@@ -975,7 +975,7 @@ static HRESULT CDECL tiff_decoder_copy_pixels(struct decoder* iface, UINT frame,
if (FAILED(hr))
{
- TRACE("<-- 0x%x\n", hr);
+ TRACE("<-- 0x%lx\n", hr);
return hr;
}
}
diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index 128514f6a31..b0b682b6d9b 100644
--- a/dlls/windowscodecs/metadatahandler.c
+++ b/dlls/windowscodecs/metadatahandler.c
@@ -107,7 +107,7 @@ static ULONG WINAPI MetadataHandler_AddRef(IWICMetadataWriter *iface)
MetadataHandler *This = impl_from_IWICMetadataWriter(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -117,7 +117,7 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface)
MetadataHandler *This = impl_from_IWICMetadataWriter(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -354,7 +354,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface,
MetadataItem *new_items=NULL;
DWORD item_count=0;
- TRACE("(%p,%p,%s,%x)\n", iface, pIStream, debugstr_guid(pguidPreferredVendor), dwPersistOptions);
+ TRACE("(%p,%p,%s,%lx)\n", iface, pIStream, debugstr_guid(pguidPreferredVendor), dwPersistOptions);
EnterCriticalSection(&This->lock);
@@ -376,7 +376,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface,
static HRESULT WINAPI MetadataHandler_SaveEx(IWICPersistStream *iface,
IStream *pIStream, DWORD dwPersistOptions, BOOL fClearDirty)
{
- FIXME("(%p,%p,%x,%i): stub\n", iface, pIStream, dwPersistOptions, fClearDirty);
+ FIXME("(%p,%p,%lx,%i): stub\n", iface, pIStream, dwPersistOptions, fClearDirty);
return E_NOTIMPL;
}
@@ -462,7 +462,7 @@ static ULONG WINAPI MetadataHandlerEnum_AddRef(IWICEnumMetadataItem *iface)
MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -472,7 +472,7 @@ static ULONG WINAPI MetadataHandlerEnum_Release(IWICEnumMetadataItem *iface)
MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -492,7 +492,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface,
HRESULT hr=S_FALSE;
ULONG i;
- TRACE("(%p,%i)\n", iface, celt);
+ TRACE("(%p,%li)\n", iface, celt);
EnterCriticalSection(&This->parent->lock);
@@ -986,7 +986,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
}
break;
default:
- FIXME("loading field of type %d, count %u is not implemented\n", type, count);
+ FIXME("loading field of type %d, count %lu is not implemented\n", type, count);
break;
}
return S_OK;
diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c
index ed80d26d54f..c4df29a2a01 100644
--- a/dlls/windowscodecs/metadataquery.c
+++ b/dlls/windowscodecs/metadataquery.c
@@ -74,7 +74,7 @@ static ULONG WINAPI mqr_AddRef(IWICMetadataQueryReader *iface)
{
QueryReader *This = impl_from_IWICMetadataQueryReader(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", This, ref);
+ TRACE("(%p) refcount=%lu\n", This, ref);
return ref;
}
@@ -82,7 +82,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface)
{
QueryReader *This = impl_from_IWICMetadataQueryReader(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", This, ref);
+ TRACE("(%p) refcount=%lu\n", This, ref);
if (!ref)
{
IWICMetadataBlockReader_Release(This->block);
@@ -210,7 +210,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
hr = get_token(&next_elem, id, schema, idx);
if (hr != S_OK)
{
- TRACE("get_token error %#x\n", hr);
+ TRACE("get_token error %#lx\n", hr);
return hr;
}
elem->len = (end - start) + next_elem.len;
@@ -286,7 +286,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
hr = get_token(&next_elem, &next_id, &next_schema, &next_idx);
if (hr != S_OK)
{
- TRACE("get_token error %#x\n", hr);
+ TRACE("get_token error %#lx\n", hr);
return hr;
}
elem->len = (end - start + 1) + next_elem.len;
@@ -346,7 +346,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
hr = get_token(&next_elem, &next_id, &next_schema, &next_idx);
if (hr != S_OK)
{
- TRACE("get_token error %#x\n", hr);
+ TRACE("get_token error %#lx\n", hr);
PropVariantClear(id);
PropVariantClear(schema);
return hr;
@@ -491,7 +491,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW
hr = get_token(&elem, &tk_id, &tk_schema, &index);
if (hr != S_OK)
{
- WARN("get_token error %#x\n", hr);
+ WARN("get_token error %#lx\n", hr);
break;
}
TRACE("parsed %d characters: %s, index %d\n", elem.len, wine_dbgstr_wn(elem.str, elem.len), index);
@@ -631,7 +631,7 @@ static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface)
struct string_enumerator *this = impl_from_IEnumString(iface);
ULONG ref = InterlockedIncrement(&this->ref);
- TRACE("iface %p, ref %u.\n", iface, ref);
+ TRACE("iface %p, ref %lu.\n", iface, ref);
return ref;
}
@@ -641,7 +641,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface)
struct string_enumerator *this = impl_from_IEnumString(iface);
ULONG ref = InterlockedDecrement(&this->ref);
- TRACE("iface %p, ref %u.\n", iface, ref);
+ TRACE("iface %p, ref %lu.\n", iface, ref);
if (!ref)
free(this);
@@ -651,7 +651,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface)
static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG count, LPOLESTR *strings, ULONG *ret)
{
- FIXME("iface %p, count %u, strings %p, ret %p stub.\n", iface, count, strings, ret);
+ FIXME("iface %p, count %lu, strings %p, ret %p stub.\n", iface, count, strings, ret);
if (!strings || !ret)
return E_INVALIDARG;
@@ -669,7 +669,7 @@ static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface)
static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG count)
{
- FIXME("iface %p, count %u stub.\n", iface, count);
+ FIXME("iface %p, count %lu stub.\n", iface, count);
return count ? S_FALSE : S_OK;
}
@@ -789,7 +789,7 @@ static ULONG WINAPI mqw_AddRef(IWICMetadataQueryWriter *iface)
QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface);
ULONG ref = InterlockedIncrement(&writer->ref);
- TRACE("writer %p, refcount=%u\n", writer, ref);
+ TRACE("writer %p, refcount=%lu\n", writer, ref);
return ref;
}
@@ -799,7 +799,7 @@ static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface)
QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface);
ULONG ref = InterlockedDecrement(&writer->ref);
- TRACE("writer %p, refcount=%u.\n", writer, ref);
+ TRACE("writer %p, refcount=%lu.\n", writer, ref);
if (!ref)
{
diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c
index 051a5944eb2..5d00a291df5 100644
--- a/dlls/windowscodecs/palette.c
+++ b/dlls/windowscodecs/palette.c
@@ -74,7 +74,7 @@ static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface)
PaletteImpl *This = impl_from_IWICPalette(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -84,7 +84,7 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface)
PaletteImpl *This = impl_from_IWICPalette(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c
index 71b26309140..5e62a214c33 100644
--- a/dlls/windowscodecs/propertybag.c
+++ b/dlls/windowscodecs/propertybag.c
@@ -72,7 +72,7 @@ static ULONG WINAPI PropertyBag_AddRef(IPropertyBag2 *iface)
PropertyBag *This = impl_from_IPropertyBag2(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -82,7 +82,7 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface)
PropertyBag *This = impl_from_IPropertyBag2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -128,7 +128,7 @@ static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties,
ULONG i;
PropertyBag *This = impl_from_IPropertyBag2(iface);
- TRACE("(%p,%u,%p,%p,%p,%p)\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError);
+ TRACE("(%p,%lu,%p,%p,%p,%p)\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError);
for (i=0; i < cProperties; i++)
{
@@ -163,7 +163,7 @@ static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties,
ULONG i;
PropertyBag *This = impl_from_IPropertyBag2(iface);
- TRACE("(%p,%u,%p,%p)\n", iface, cProperties, pPropBag, pvarValue);
+ TRACE("(%p,%lu,%p,%p)\n", iface, cProperties, pPropBag, pvarValue);
for (i=0; i < cProperties; i++)
{
@@ -233,7 +233,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP
ULONG i;
PropertyBag *This = impl_from_IPropertyBag2(iface);
- TRACE("(%p,%u,%u,%p,%p)\n", iface, iProperty, cProperties, pPropBag, pcProperties);
+ TRACE("(%p,%lu,%lu,%p,%p)\n", iface, iProperty, cProperties, pPropBag, pcProperties);
if (iProperty >= This->prop_count && iProperty > 0)
return WINCODEC_ERR_VALUEOUTOFRANGE;
@@ -260,7 +260,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP
static HRESULT WINAPI PropertyBag_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName,
DWORD dwHint, IUnknown *pUnkObject, IErrorLog *pErrLog)
{
- FIXME("(%p,%s,%u,%p,%p): stub\n", iface, debugstr_w(pstrName), dwHint, pUnkObject, pErrLog);
+ FIXME("(%p,%s,%lu,%p,%p): stub\n", iface, debugstr_w(pstrName), dwHint, pUnkObject, pErrLog);
return E_NOTIMPL;
}
diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c
index cb4490c8136..f8f81c0a990 100644
--- a/dlls/windowscodecs/scaler.c
+++ b/dlls/windowscodecs/scaler.c
@@ -89,7 +89,7 @@ static ULONG WINAPI BitmapScaler_AddRef(IWICBitmapScaler *iface)
BitmapScaler *This = impl_from_IWICBitmapScaler(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -99,7 +99,7 @@ static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface)
BitmapScaler *This = impl_from_IWICBitmapScaler(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c
index 68b9148bd5e..a1138c8626a 100644
--- a/dlls/windowscodecs/stream.c
+++ b/dlls/windowscodecs/stream.c
@@ -76,7 +76,7 @@ static ULONG WINAPI StreamOnMemory_AddRef(IStream *iface)
StreamOnMemory *This = StreamOnMemory_from_IStream(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -86,7 +86,7 @@ static ULONG WINAPI StreamOnMemory_Release(IStream *iface)
StreamOnMemory *This = StreamOnMemory_from_IStream(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) {
This->lock.DebugInfo->Spare[0] = 0;
@@ -102,7 +102,7 @@ static HRESULT WINAPI StreamOnMemory_Read(IStream *iface,
StreamOnMemory *This = StreamOnMemory_from_IStream(iface);
ULONG uBytesRead;
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead);
if (!pv) return E_INVALIDARG;
@@ -123,7 +123,7 @@ static HRESULT WINAPI StreamOnMemory_Write(IStream *iface,
StreamOnMemory *This = StreamOnMemory_from_IStream(iface);
HRESULT hr;
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbWritten);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbWritten);
if (!pv) return E_INVALIDARG;
@@ -149,7 +149,7 @@ static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface,
LARGE_INTEGER NewPosition;
HRESULT hr=S_OK;
- TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
+ TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
EnterCriticalSection(&This->lock);
if (dwOrigin == STREAM_SEEK_SET) NewPosition.QuadPart = dlibMove.QuadPart;
@@ -192,7 +192,7 @@ static HRESULT WINAPI StreamOnMemory_CopyTo(IStream *iface,
static HRESULT WINAPI StreamOnMemory_Commit(IStream *iface,
DWORD grfCommitFlags)
{
- TRACE("(%p, %#x)\n", iface, grfCommitFlags);
+ TRACE("(%p, %#lx)\n", iface, grfCommitFlags);
return S_OK;
}
@@ -207,7 +207,7 @@ static HRESULT WINAPI StreamOnMemory_Revert(IStream *iface)
static HRESULT WINAPI StreamOnMemory_LockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
- TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
return E_NOTIMPL;
}
@@ -216,7 +216,7 @@ static HRESULT WINAPI StreamOnMemory_LockRegion(IStream *iface,
static HRESULT WINAPI StreamOnMemory_UnlockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
- TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
return E_NOTIMPL;
}
@@ -225,7 +225,7 @@ static HRESULT WINAPI StreamOnMemory_Stat(IStream *iface,
STATSTG *pstatstg, DWORD grfStatFlag)
{
StreamOnMemory *This = StreamOnMemory_from_IStream(iface);
- TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag);
+ TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag);
if (!pstatstg) return E_INVALIDARG;
@@ -310,7 +310,7 @@ static ULONG WINAPI StreamOnFileHandle_AddRef(IStream *iface)
StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -320,7 +320,7 @@ static ULONG WINAPI StreamOnFileHandle_Release(IStream *iface)
StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) {
IWICStream_Release(This->stream);
@@ -335,7 +335,7 @@ static HRESULT WINAPI StreamOnFileHandle_Read(IStream *iface,
void *pv, ULONG cb, ULONG *pcbRead)
{
StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface);
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead);
return IWICStream_Read(This->stream, pv, cb, pcbRead);
}
@@ -343,7 +343,7 @@ static HRESULT WINAPI StreamOnFileHandle_Read(IStream *iface,
static HRESULT WINAPI StreamOnFileHandle_Write(IStream *iface,
void const *pv, ULONG cb, ULONG *pcbWritten)
{
- ERR("(%p, %p, %u, %p)\n", iface, pv, cb, pcbWritten);
+ ERR("(%p, %p, %lu, %p)\n", iface, pv, cb, pcbWritten);
return HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED);
}
@@ -351,7 +351,7 @@ static HRESULT WINAPI StreamOnFileHandle_Seek(IStream *iface,
LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface);
- TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
+ TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
return IWICStream_Seek(This->stream, dlibMove, dwOrigin, plibNewPosition);
}
@@ -373,7 +373,7 @@ static HRESULT WINAPI StreamOnFileHandle_CopyTo(IStream *iface,
static HRESULT WINAPI StreamOnFileHandle_Commit(IStream *iface,
DWORD grfCommitFlags)
{
- TRACE("(%p, %#x)\n", iface, grfCommitFlags);
+ TRACE("(%p, %#lx)\n", iface, grfCommitFlags);
return S_OK;
}
@@ -386,7 +386,7 @@ static HRESULT WINAPI StreamOnFileHandle_Revert(IStream *iface)
static HRESULT WINAPI StreamOnFileHandle_LockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
- TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
return E_NOTIMPL;
}
@@ -394,7 +394,7 @@ static HRESULT WINAPI StreamOnFileHandle_LockRegion(IStream *iface,
static HRESULT WINAPI StreamOnFileHandle_UnlockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
- TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
return E_NOTIMPL;
}
@@ -403,7 +403,7 @@ static HRESULT WINAPI StreamOnFileHandle_Stat(IStream *iface,
STATSTG *pstatstg, DWORD grfStatFlag)
{
StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface);
- TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag);
+ TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag);
return IWICStream_Stat(This->stream, pstatstg, grfStatFlag);
}
@@ -485,7 +485,7 @@ static ULONG WINAPI StreamOnStreamRange_AddRef(IStream *iface)
StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -495,7 +495,7 @@ static ULONG WINAPI StreamOnStreamRange_Release(IStream *iface)
StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) {
This->lock.DebugInfo->Spare[0] = 0;
@@ -515,7 +515,7 @@ static HRESULT WINAPI StreamOnStreamRange_Read(IStream *iface,
ULARGE_INTEGER OldPosition;
LARGE_INTEGER SetPosition;
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead);
if (!pv) return E_INVALIDARG;
@@ -558,7 +558,7 @@ static HRESULT WINAPI StreamOnStreamRange_Write(IStream *iface,
ULARGE_INTEGER OldPosition;
LARGE_INTEGER SetPosition;
ULONG uBytesWritten=0;
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbWritten);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbWritten);
if (!pv) return E_INVALIDARG;
@@ -600,7 +600,7 @@ static HRESULT WINAPI StreamOnStreamRange_Seek(IStream *iface,
ULARGE_INTEGER NewPosition, actual_size;
HRESULT hr=S_OK;
STATSTG statstg;
- TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
+ TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
EnterCriticalSection(&This->lock);
actual_size = This->max_size;
@@ -655,7 +655,7 @@ static HRESULT WINAPI StreamOnStreamRange_Commit(IStream *iface,
DWORD grfCommitFlags)
{
StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface);
- TRACE("(%p, %#x)\n", This, grfCommitFlags);
+ TRACE("(%p, %#lx)\n", This, grfCommitFlags);
return IStream_Commit(This->stream, grfCommitFlags);
}
@@ -670,7 +670,7 @@ static HRESULT WINAPI StreamOnStreamRange_Revert(IStream *iface)
static HRESULT WINAPI StreamOnStreamRange_LockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
- TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
return E_NOTIMPL;
}
@@ -679,7 +679,7 @@ static HRESULT WINAPI StreamOnStreamRange_LockRegion(IStream *iface,
static HRESULT WINAPI StreamOnStreamRange_UnlockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
- TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
return E_NOTIMPL;
}
@@ -689,7 +689,7 @@ static HRESULT WINAPI StreamOnStreamRange_Stat(IStream *iface,
{
StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface);
HRESULT hr;
- TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag);
+ TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag);
if (!pstatstg) return E_INVALIDARG;
@@ -781,7 +781,7 @@ static ULONG WINAPI IWICStreamImpl_AddRef(IWICStream *iface)
IWICStreamImpl *This = impl_from_IWICStream(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -791,7 +791,7 @@ static ULONG WINAPI IWICStreamImpl_Release(IWICStream *iface)
IWICStreamImpl *This = impl_from_IWICStream(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) {
if (This->pStream) IStream_Release(This->pStream);
@@ -804,7 +804,7 @@ static HRESULT WINAPI IWICStreamImpl_Read(IWICStream *iface,
void *pv, ULONG cb, ULONG *pcbRead)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
return IStream_Read(This->pStream, pv, cb, pcbRead);
@@ -814,7 +814,7 @@ static HRESULT WINAPI IWICStreamImpl_Write(IWICStream *iface,
void const *pv, ULONG cb, ULONG *pcbWritten)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbWritten);
+ TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbWritten);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
return IStream_Write(This->pStream, pv, cb, pcbWritten);
@@ -824,7 +824,7 @@ static HRESULT WINAPI IWICStreamImpl_Seek(IWICStream *iface,
LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart),
+ TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart),
dwOrigin, plibNewPosition);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
@@ -855,7 +855,7 @@ static HRESULT WINAPI IWICStreamImpl_Commit(IWICStream *iface,
DWORD grfCommitFlags)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %#x)\n", This, grfCommitFlags);
+ TRACE("(%p, %#lx)\n", This, grfCommitFlags);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
return IStream_Commit(This->pStream, grfCommitFlags);
@@ -874,7 +874,7 @@ static HRESULT WINAPI IWICStreamImpl_LockRegion(IWICStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %s, %s, %d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", This, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
@@ -885,7 +885,7 @@ static HRESULT WINAPI IWICStreamImpl_UnlockRegion(IWICStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %s, %s, %d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart),
+ TRACE("(%p, %s, %s, %ld)\n", This, wine_dbgstr_longlong(libOffset.QuadPart),
wine_dbgstr_longlong(cb.QuadPart), dwLockType);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
@@ -896,7 +896,7 @@ static HRESULT WINAPI IWICStreamImpl_Stat(IWICStream *iface,
STATSTG *pstatstg, DWORD grfStatFlag)
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
- TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag);
+ TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag);
if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED;
return IStream_Stat(This->pStream, pstatstg, grfStatFlag);
@@ -942,7 +942,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface,
DWORD dwMode;
IStream *stream;
- TRACE("(%p, %s, %u)\n", iface, debugstr_w(wzFileName), dwDesiredAccess);
+ TRACE("(%p, %s, %lu)\n", iface, debugstr_w(wzFileName), dwDesiredAccess);
if (This->pStream) return WINCODEC_ERR_WRONGSTATE;
@@ -989,7 +989,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface,
{
IWICStreamImpl *This = impl_from_IWICStream(iface);
StreamOnMemory *pObject;
- TRACE("(%p, %p, %u)\n", iface, pbBuffer, cbBufferSize);
+ TRACE("(%p, %p, %lu)\n", iface, pbBuffer, cbBufferSize);
if (!pbBuffer) return E_INVALIDARG;
if (This->pStream) return WINCODEC_ERR_WRONGSTATE;
diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c
index 7d76582c0fb..f545cc6cffb 100644
--- a/dlls/windowscodecs/tgaformat.c
+++ b/dlls/windowscodecs/tgaformat.c
@@ -152,7 +152,7 @@ static ULONG WINAPI TgaDecoder_AddRef(IWICBitmapDecoder *iface)
TgaDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
return ref;
}
@@ -162,7 +162,7 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface)
TgaDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) refcount=%u\n", iface, ref);
+ TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0)
{
@@ -222,7 +222,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Read(pIStream, &This->header, sizeof(tga_header), &bytesread);
if (SUCCEEDED(hr) && bytesread != sizeof(tga_header))
{
- TRACE("got only %u bytes\n", bytesread);
+ TRACE("got only %lu bytes\n", bytesread);
hr = E_FAIL;
}
if (FAILED(hr)) goto end;
@@ -294,7 +294,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread);
if (SUCCEEDED(hr) && bytesread != sizeof(tga_footer))
{
- TRACE("got only %u footer bytes\n", bytesread);
+ TRACE("got only %lu footer bytes\n", bytesread);
hr = E_FAIL;
}
@@ -326,7 +326,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Read(pIStream, &This->extension_area, sizeof(tga_extension_area), &bytesread);
if (SUCCEEDED(hr) && bytesread != sizeof(tga_extension_area))
{
- TRACE("got only %u extension area bytes\n", bytesread);
+ TRACE("got only %lu extension area bytes\n", bytesread);
hr = E_FAIL;
}
if (SUCCEEDED(hr) && This->extension_area.size < 495)
@@ -639,7 +639,7 @@ static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface,
hr = IStream_Read(This->stream, colormap_data, This->colormap_length, &bytesread);
if (SUCCEEDED(hr) && bytesread != This->colormap_length)
{
- WARN("expected %i bytes in colormap, got %i\n", This->colormap_length, bytesread);
+ WARN("expected %li bytes in colormap, got %li\n", This->colormap_length, bytesread);
hr = E_FAIL;
}
}
diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c
index 1b146908be9..1eb7994f944 100644
--- a/dlls/windowscodecs/wincodecs_common.c
+++ b/dlls/windowscodecs/wincodecs_common.c
@@ -115,7 +115,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface,
hr = WICConvertBitmapSource(format, source, &converted_source);
if (FAILED(hr))
{
- ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr);
+ ERR("Failed to convert source, target format %s, %#lx\n", debugstr_guid(format), hr);
return E_NOTIMPL;
}
diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in
index 3cdd523668e..cb095120e94 100644
--- a/dlls/wmphoto/Makefile.in
+++ b/dlls/wmphoto/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wmphoto.dll
IMPORTS = $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi
EXTRAINCL = $(JXR_PE_CFLAGS)
diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c
index 6de6119d212..6765688be75 100644
--- a/dlls/wmphoto/main.c
+++ b/dlls/wmphoto/main.c
@@ -129,7 +129,7 @@ HMODULE windowscodecs_module = 0;
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
- TRACE("instance %p, reason %d, reserved %p\n", instance, reason, reserved);
+ TRACE("instance %p, reason %ld, reserved %p\n", instance, reason, reserved);
switch (reason)
{
More information about the wine-devel
mailing list