Skip to content

W
wine-cw
Commit aa180417 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

windowscodecs: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarEsme Povirk <esme@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ceb06647
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 131 deletions
dlls/windowscodecs/Makefile.in
View file @ aa180417
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = windowscodecs.dll MODULE = windowscodecs.dll
IMPORTLIB = windowscodecs IMPORTLIB = windowscodecs
IMPORTS = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 IMPORTS = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
......
dlls/windowscodecs/bitmap.c
View file @ aa180417
...@@ -146,7 +146,7 @@ static ULONG WINAPI BitmapLockImpl_AddRef(IWICBitmapLock *iface) ...@@ -146,7 +146,7 @@ static ULONG WINAPI BitmapLockImpl_AddRef(IWICBitmapLock *iface)
BitmapLockImpl *This = impl_from_IWICBitmapLock(iface); BitmapLockImpl *This = impl_from_IWICBitmapLock(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -156,7 +156,7 @@ static ULONG WINAPI BitmapLockImpl_Release(IWICBitmapLock *iface) ...@@ -156,7 +156,7 @@ static ULONG WINAPI BitmapLockImpl_Release(IWICBitmapLock *iface)
BitmapLockImpl *This = impl_from_IWICBitmapLock(iface); BitmapLockImpl *This = impl_from_IWICBitmapLock(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -267,7 +267,7 @@ static ULONG WINAPI BitmapImpl_AddRef(IWICBitmap *iface) ...@@ -267,7 +267,7 @@ static ULONG WINAPI BitmapImpl_AddRef(IWICBitmap *iface)
BitmapImpl *This = impl_from_IWICBitmap(iface); BitmapImpl *This = impl_from_IWICBitmap(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -277,7 +277,7 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) ...@@ -277,7 +277,7 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface)
BitmapImpl *This = impl_from_IWICBitmap(iface); BitmapImpl *This = impl_from_IWICBitmap(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -369,7 +369,7 @@ static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, ...@@ -369,7 +369,7 @@ static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock,
BitmapLockImpl *result; BitmapLockImpl *result;
WICRect rc; 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) if (!(flags & (WICBitmapLockRead|WICBitmapLockWrite)) || !ppILock)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -596,7 +596,7 @@ static HRESULT WINAPI IMILBitmapImpl_unknown1(IMILBitmap *iface, void **ppv) ...@@ -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) static HRESULT WINAPI IMILBitmapImpl_Lock(IMILBitmap *iface, const WICRect *rc, DWORD flags, IWICBitmapLock **lock)
{ {
BitmapImpl *This = impl_from_IMILBitmap(iface); 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); return IWICBitmap_Lock(&This->IWICBitmap_iface, rc, flags, lock);
} }
......
dlls/windowscodecs/bmpdecode.c
View file @ aa180417
...@@ -858,7 +858,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) ...@@ -858,7 +858,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
} }
else /* struct is compatible with BITMAPINFOHEADER */ 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) switch(This->bih.bV5Compression)
{ {
case BI_RGB: case BI_RGB:
...@@ -932,7 +932,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) ...@@ -932,7 +932,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
{ {
This->read_data_func = BmpFrameDecode_ReadUncompressed; This->read_data_func = BmpFrameDecode_ReadUncompressed;
This->pixelformat = &GUID_WICPixelFormatUndefined; 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); This->bih.bV5BitCount, This->bih.bV5RedMask, This->bih.bV5GreenMask, This->bih.bV5BlueMask, This->bih.bV5AlphaMask);
} }
break; break;
...@@ -941,7 +941,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) ...@@ -941,7 +941,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
This->bitsperpixel = 0; This->bitsperpixel = 0;
This->read_data_func = BmpFrameDecode_ReadUnsupported; This->read_data_func = BmpFrameDecode_ReadUnsupported;
This->pixelformat = &GUID_WICPixelFormatUndefined; 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; break;
} }
} }
...@@ -996,7 +996,7 @@ static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface) ...@@ -996,7 +996,7 @@ static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface)
BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1006,7 +1006,7 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) ...@@ -1006,7 +1006,7 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface)
BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/bmpencode.c
View file @ aa180417
...@@ -110,7 +110,7 @@ static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface) ...@@ -110,7 +110,7 @@ static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface)
BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -120,7 +120,7 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) ...@@ -120,7 +120,7 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface)
BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -466,7 +466,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) ...@@ -466,7 +466,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface)
BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -476,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) ...@@ -476,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface)
BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/clipper.c
View file @ aa180417
...@@ -72,7 +72,7 @@ static ULONG WINAPI BitmapClipper_AddRef(IWICBitmapClipper *iface) ...@@ -72,7 +72,7 @@ static ULONG WINAPI BitmapClipper_AddRef(IWICBitmapClipper *iface)
BitmapClipper *This = impl_from_IWICBitmapClipper(iface); BitmapClipper *This = impl_from_IWICBitmapClipper(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -82,7 +82,7 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) ...@@ -82,7 +82,7 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface)
BitmapClipper *This = impl_from_IWICBitmapClipper(iface); BitmapClipper *This = impl_from_IWICBitmapClipper(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/clsfactory.c
View file @ aa180417
...@@ -112,7 +112,7 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface) ...@@ -112,7 +112,7 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface)
ClassFactoryImpl *This = impl_from_IClassFactory(iface); ClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -122,7 +122,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) ...@@ -122,7 +122,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface)
ClassFactoryImpl *This = impl_from_IClassFactory(iface); ClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -203,7 +203,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) ...@@ -203,7 +203,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
else else
ret = WIC_DllGetClassObject(rclsid, iid, ppv); ret = WIC_DllGetClassObject(rclsid, iid, ppv);
TRACE("<-- %08X\n", ret); TRACE("<-- %08lX\n", ret);
return ret; return ret;
} }
......
dlls/windowscodecs/colorcontext.c
View file @ aa180417
...@@ -72,7 +72,7 @@ static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface) ...@@ -72,7 +72,7 @@ static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface)
ColorContext *This = impl_from_IWICColorContext(iface); ColorContext *This = impl_from_IWICColorContext(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -82,7 +82,7 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) ...@@ -82,7 +82,7 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface)
ColorContext *This = impl_from_IWICColorContext(iface); ColorContext *This = impl_from_IWICColorContext(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/colortransform.c
View file @ aa180417
...@@ -70,7 +70,7 @@ static ULONG WINAPI ColorTransform_AddRef(IWICColorTransform *iface) ...@@ -70,7 +70,7 @@ static ULONG WINAPI ColorTransform_AddRef(IWICColorTransform *iface)
ColorTransform *This = impl_from_IWICColorTransform(iface); ColorTransform *This = impl_from_IWICColorTransform(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -80,7 +80,7 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) ...@@ -80,7 +80,7 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface)
ColorTransform *This = impl_from_IWICColorTransform(iface); ColorTransform *This = impl_from_IWICColorTransform(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/converter.c
View file @ aa180417
...@@ -1559,7 +1559,7 @@ static ULONG WINAPI FormatConverter_AddRef(IWICFormatConverter *iface) ...@@ -1559,7 +1559,7 @@ static ULONG WINAPI FormatConverter_AddRef(IWICFormatConverter *iface)
FormatConverter *This = impl_from_IWICFormatConverter(iface); FormatConverter *This = impl_from_IWICFormatConverter(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1569,7 +1569,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) ...@@ -1569,7 +1569,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface)
FormatConverter *This = impl_from_IWICFormatConverter(iface); FormatConverter *This = impl_from_IWICFormatConverter(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/ddsformat.c
View file @ aa180417
...@@ -780,7 +780,7 @@ static ULONG WINAPI DdsFrameDecode_AddRef(IWICBitmapFrameDecode *iface) ...@@ -780,7 +780,7 @@ static ULONG WINAPI DdsFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -790,7 +790,7 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) ...@@ -790,7 +790,7 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface)
DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) { if (ref == 0) {
if (This->pixel_data != This->block_data) HeapFree(GetProcessHeap(), 0, This->pixel_data); if (This->pixel_data != This->block_data) HeapFree(GetProcessHeap(), 0, This->pixel_data);
...@@ -1087,7 +1087,7 @@ static ULONG WINAPI DdsDecoder_AddRef(IWICBitmapDecoder *iface) ...@@ -1087,7 +1087,7 @@ static ULONG WINAPI DdsDecoder_AddRef(IWICBitmapDecoder *iface)
DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); DdsDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1097,7 +1097,7 @@ static ULONG WINAPI DdsDecoder_Release(IWICBitmapDecoder *iface) ...@@ -1097,7 +1097,7 @@ static ULONG WINAPI DdsDecoder_Release(IWICBitmapDecoder *iface)
DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); DdsDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1550,7 +1550,7 @@ static ULONG WINAPI DdsFrameEncode_AddRef(IWICBitmapFrameEncode *iface) ...@@ -1550,7 +1550,7 @@ static ULONG WINAPI DdsFrameEncode_AddRef(IWICBitmapFrameEncode *iface)
DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1560,7 +1560,7 @@ static ULONG WINAPI DdsFrameEncode_Release(IWICBitmapFrameEncode *iface) ...@@ -1560,7 +1560,7 @@ static ULONG WINAPI DdsFrameEncode_Release(IWICBitmapFrameEncode *iface)
DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1950,7 +1950,7 @@ static ULONG WINAPI DdsEncoder_AddRef(IWICBitmapEncoder *iface) ...@@ -1950,7 +1950,7 @@ static ULONG WINAPI DdsEncoder_AddRef(IWICBitmapEncoder *iface)
DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); DdsEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1960,7 +1960,7 @@ static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface) ...@@ -1960,7 +1960,7 @@ static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface)
DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); DdsEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) { if (ref == 0) {
This->lock.DebugInfo->Spare[0] = 0; This->lock.DebugInfo->Spare[0] = 0;
......
dlls/windowscodecs/decoder.c
View file @ aa180417
...@@ -74,7 +74,7 @@ static ULONG WINAPI CommonDecoder_AddRef(IWICBitmapDecoder *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI CommonDecoder_AddRef(IWICBitmapDecoder *iface)
CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); CommonDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -84,7 +84,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) ...@@ -84,7 +84,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface)
CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); CommonDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -296,7 +296,7 @@ static ULONG WINAPI CommonDecoderFrame_AddRef(IWICBitmapFrameDecode *iface) ...@@ -296,7 +296,7 @@ static ULONG WINAPI CommonDecoderFrame_AddRef(IWICBitmapFrameDecode *iface)
CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -306,7 +306,7 @@ static ULONG WINAPI CommonDecoderFrame_Release(IWICBitmapFrameDecode *iface) ...@@ -306,7 +306,7 @@ static ULONG WINAPI CommonDecoderFrame_Release(IWICBitmapFrameDecode *iface)
CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -762,7 +762,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, ...@@ -762,7 +762,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface,
if (SUCCEEDED(hr)) 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.width, result->decoder_frame.height,
result->decoder_frame.bpp, wine_dbgstr_guid(&result->decoder_frame.pixel_format), result->decoder_frame.bpp, wine_dbgstr_guid(&result->decoder_frame.pixel_format),
result->decoder_frame.dpix, result->decoder_frame.dpiy, result->decoder_frame.dpix, result->decoder_frame.dpiy,
......
dlls/windowscodecs/encoder.c
View file @ aa180417
...@@ -116,7 +116,7 @@ static ULONG WINAPI CommonEncoderFrame_AddRef(IWICBitmapFrameEncode *iface) ...@@ -116,7 +116,7 @@ static ULONG WINAPI CommonEncoderFrame_AddRef(IWICBitmapFrameEncode *iface)
CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface); CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -126,7 +126,7 @@ static ULONG WINAPI CommonEncoderFrame_Release(IWICBitmapFrameEncode *iface) ...@@ -126,7 +126,7 @@ static ULONG WINAPI CommonEncoderFrame_Release(IWICBitmapFrameEncode *iface)
CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface); CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -177,7 +177,7 @@ static HRESULT WINAPI CommonEncoderFrame_Initialize(IWICBitmapFrameEncode *iface ...@@ -177,7 +177,7 @@ static HRESULT WINAPI CommonEncoderFrame_Initialize(IWICBitmapFrameEncode *iface
options.filter = V_UI1(val); options.filter = V_UI1(val);
if (options.filter > WICPngFilterAdaptive) 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; options.filter = WICPngFilterUnspecified;
} }
break; break;
...@@ -310,7 +310,7 @@ static HRESULT WINAPI CommonEncoderFrame_SetPixelFormat(IWICBitmapFrameEncode *i ...@@ -310,7 +310,7 @@ static HRESULT WINAPI CommonEncoderFrame_SetPixelFormat(IWICBitmapFrameEncode *i
if (SUCCEEDED(hr)) 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; *pPixelFormat = pixel_format;
This->encoder_frame.pixel_format = pixel_format; This->encoder_frame.pixel_format = pixel_format;
This->encoder_frame.bpp = bpp; This->encoder_frame.bpp = bpp;
...@@ -528,7 +528,7 @@ static ULONG WINAPI CommonEncoder_AddRef(IWICBitmapEncoder *iface) ...@@ -528,7 +528,7 @@ static ULONG WINAPI CommonEncoder_AddRef(IWICBitmapEncoder *iface)
CommonEncoder *This = impl_from_IWICBitmapEncoder(iface); CommonEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -538,7 +538,7 @@ static ULONG WINAPI CommonEncoder_Release(IWICBitmapEncoder *iface) ...@@ -538,7 +538,7 @@ static ULONG WINAPI CommonEncoder_Release(IWICBitmapEncoder *iface)
CommonEncoder *This = impl_from_IWICBitmapEncoder(iface); CommonEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/fliprotate.c
View file @ aa180417
...@@ -74,7 +74,7 @@ static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface)
FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -84,7 +84,7 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) ...@@ -84,7 +84,7 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface)
FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/gifformat.c
View file @ aa180417
...@@ -646,7 +646,7 @@ static ULONG WINAPI GifFrameDecode_AddRef(IWICBitmapFrameDecode *iface) ...@@ -646,7 +646,7 @@ static ULONG WINAPI GifFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -656,7 +656,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface) ...@@ -656,7 +656,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface)
GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1045,7 +1045,7 @@ static ULONG WINAPI GifDecoder_AddRef(IWICBitmapDecoder *iface) ...@@ -1045,7 +1045,7 @@ static ULONG WINAPI GifDecoder_AddRef(IWICBitmapDecoder *iface)
GifDecoder *This = impl_from_IWICBitmapDecoder(iface); GifDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1055,7 +1055,7 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) ...@@ -1055,7 +1055,7 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface)
GifDecoder *This = impl_from_IWICBitmapDecoder(iface); GifDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1526,7 +1526,7 @@ static ULONG WINAPI GifFrameEncode_AddRef(IWICBitmapFrameEncode *iface) ...@@ -1526,7 +1526,7 @@ static ULONG WINAPI GifFrameEncode_AddRef(IWICBitmapFrameEncode *iface)
GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("%p -> %u\n", iface, ref); TRACE("%p -> %lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1535,7 +1535,7 @@ static ULONG WINAPI GifFrameEncode_Release(IWICBitmapFrameEncode *iface) ...@@ -1535,7 +1535,7 @@ static ULONG WINAPI GifFrameEncode_Release(IWICBitmapFrameEncode *iface)
GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("%p -> %u\n", iface, ref); TRACE("%p -> %lu\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -2171,7 +2171,7 @@ static ULONG WINAPI GifEncoder_AddRef(IWICBitmapEncoder *iface) ...@@ -2171,7 +2171,7 @@ static ULONG WINAPI GifEncoder_AddRef(IWICBitmapEncoder *iface)
GifEncoder *This = impl_from_IWICBitmapEncoder(iface); GifEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("%p -> %u\n", iface, ref); TRACE("%p -> %lu\n", iface, ref);
return ref; return ref;
} }
...@@ -2180,7 +2180,7 @@ static ULONG WINAPI GifEncoder_Release(IWICBitmapEncoder *iface) ...@@ -2180,7 +2180,7 @@ static ULONG WINAPI GifEncoder_Release(IWICBitmapEncoder *iface)
GifEncoder *This = impl_from_IWICBitmapEncoder(iface); GifEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("%p -> %u\n", iface, ref); TRACE("%p -> %lu\n", iface, ref);
if (!ref) if (!ref)
{ {
......
dlls/windowscodecs/icoformat.c
View file @ aa180417
...@@ -109,7 +109,7 @@ static ULONG WINAPI IcoFrameDecode_AddRef(IWICBitmapFrameDecode *iface) ...@@ -109,7 +109,7 @@ static ULONG WINAPI IcoFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -119,7 +119,7 @@ static ULONG WINAPI IcoFrameDecode_Release(IWICBitmapFrameDecode *iface) ...@@ -119,7 +119,7 @@ static ULONG WINAPI IcoFrameDecode_Release(IWICBitmapFrameDecode *iface)
IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -463,7 +463,7 @@ static ULONG WINAPI IcoDecoder_AddRef(IWICBitmapDecoder *iface) ...@@ -463,7 +463,7 @@ static ULONG WINAPI IcoDecoder_AddRef(IWICBitmapDecoder *iface)
IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); IcoDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -473,7 +473,7 @@ static ULONG WINAPI IcoDecoder_Release(IWICBitmapDecoder *iface) ...@@ -473,7 +473,7 @@ static ULONG WINAPI IcoDecoder_Release(IWICBitmapDecoder *iface)
IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); IcoDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -545,7 +545,7 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ...@@ -545,7 +545,7 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME); hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Stat() failed, hr %#x.\n", hr); WARN("Stat() failed, hr %#lx.\n", hr);
goto end; goto end;
} }
...@@ -714,7 +714,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, ...@@ -714,7 +714,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface,
hr = ReadIcoPng((IStream*)substream, result); hr = ReadIcoPng((IStream*)substream, result);
break; break;
default: default:
FIXME("Unrecognized ICO frame magic: %x\n", magic); FIXME("Unrecognized ICO frame magic: %lx\n", magic);
hr = E_FAIL; hr = E_FAIL;
break; break;
} }
...@@ -733,7 +733,7 @@ fail: ...@@ -733,7 +733,7 @@ fail:
HeapFree(GetProcessHeap(), 0, result); HeapFree(GetProcessHeap(), 0, result);
if (substream) IWICStream_Release(substream); if (substream) IWICStream_Release(substream);
if (SUCCEEDED(hr)) hr = E_FAIL; if (SUCCEEDED(hr)) hr = E_FAIL;
TRACE("<-- %x\n", hr); TRACE("<-- %lx\n", hr);
return hr; return hr;
} }
......
dlls/windowscodecs/imgfactory.c
View file @ aa180417
...@@ -83,7 +83,7 @@ static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory2 *iface) ...@@ -83,7 +83,7 @@ static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory2 *iface)
ImagingFactory *This = impl_from_IWICImagingFactory2(iface); ImagingFactory *This = impl_from_IWICImagingFactory2(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -93,7 +93,7 @@ static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory2 *iface) ...@@ -93,7 +93,7 @@ static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory2 *iface)
ImagingFactory *This = impl_from_IWICImagingFactory2(iface); ImagingFactory *This = impl_from_IWICImagingFactory2(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -109,7 +109,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( ...@@ -109,7 +109,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename(
IWICStream *stream; IWICStream *stream;
HRESULT hr; 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); debugstr_guid(pguidVendor), dwDesiredAccess, metadataOptions, ppIDecoder);
hr = StreamImpl_Create(&stream); hr = StreamImpl_Create(&stream);
...@@ -230,13 +230,13 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( ...@@ -230,13 +230,13 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(
BYTE data[4]; BYTE data[4];
ULONG bytesread; 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; seek.QuadPart = 0;
if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK) if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK)
{ {
if (IStream_Read(pIStream, data, 4, &bytesread) == 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; *ppIDecoder = NULL;
...@@ -251,7 +251,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle( ...@@ -251,7 +251,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle(
IWICStream *stream; IWICStream *stream;
HRESULT hr; 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); metadataOptions, ppIDecoder);
hr = StreamImpl_Create(&stream); hr = StreamImpl_Create(&stream);
...@@ -709,7 +709,7 @@ static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format) ...@@ -709,7 +709,7 @@ static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format)
} }
else else
{ {
FIXME("unrecognized bitfields %x,%x,%x\n", bmh.bV4RedMask, FIXME("unrecognized bitfields %lx,%lx,%lx\n", bmh.bV4RedMask,
bmh.bV4GreenMask, bmh.bV4BlueMask); bmh.bV4GreenMask, bmh.bV4BlueMask);
ret = FALSE; ret = FALSE;
} }
...@@ -981,7 +981,7 @@ failed: ...@@ -981,7 +981,7 @@ failed:
static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory2 *iface, static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory2 *iface,
DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) 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); return CreateComponentEnumerator(componentTypes, options, ppIEnumUnknown);
} }
...@@ -1249,7 +1249,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromReader(IWICComponent ...@@ -1249,7 +1249,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromReader(IWICComponent
static HRESULT WINAPI ComponentFactory_CreateMetadataReader(IWICComponentFactory *iface, static HRESULT WINAPI ComponentFactory_CreateMetadataReader(IWICComponentFactory *iface,
REFGUID format, const GUID *vendor, DWORD options, IStream *stream, IWICMetadataReader **reader) 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); options, stream, reader);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1267,7 +1267,7 @@ static HRESULT WINAPI ComponentFactory_CreateMetadataReaderFromContainer(IWICCom ...@@ -1267,7 +1267,7 @@ static HRESULT WINAPI ComponentFactory_CreateMetadataReaderFromContainer(IWICCom
BOOL matches; BOOL matches;
LARGE_INTEGER zero; 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); options, stream, reader);
if (!format || !stream || !reader) if (!format || !stream || !reader)
...@@ -1385,7 +1385,7 @@ start: ...@@ -1385,7 +1385,7 @@ start:
static HRESULT WINAPI ComponentFactory_CreateMetadataWriter(IWICComponentFactory *iface, static HRESULT WINAPI ComponentFactory_CreateMetadataWriter(IWICComponentFactory *iface,
REFGUID format, const GUID *vendor, DWORD options, IWICMetadataWriter **writer) 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; return E_NOTIMPL;
} }
......
dlls/windowscodecs/info.c
View file @ aa180417
...@@ -232,7 +232,7 @@ static ULONG WINAPI BitmapDecoderInfo_AddRef(IWICBitmapDecoderInfo *iface) ...@@ -232,7 +232,7 @@ static ULONG WINAPI BitmapDecoderInfo_AddRef(IWICBitmapDecoderInfo *iface)
BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref); ULONG ref = InterlockedIncrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -242,7 +242,7 @@ static ULONG WINAPI BitmapDecoderInfo_Release(IWICBitmapDecoderInfo *iface) ...@@ -242,7 +242,7 @@ static ULONG WINAPI BitmapDecoderInfo_Release(IWICBitmapDecoderInfo *iface)
BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref); ULONG ref = InterlockedDecrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -716,7 +716,7 @@ static ULONG WINAPI BitmapEncoderInfo_AddRef(IWICBitmapEncoderInfo *iface) ...@@ -716,7 +716,7 @@ static ULONG WINAPI BitmapEncoderInfo_AddRef(IWICBitmapEncoderInfo *iface)
BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref); ULONG ref = InterlockedIncrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -726,7 +726,7 @@ static ULONG WINAPI BitmapEncoderInfo_Release(IWICBitmapEncoderInfo *iface) ...@@ -726,7 +726,7 @@ static ULONG WINAPI BitmapEncoderInfo_Release(IWICBitmapEncoderInfo *iface)
BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref); ULONG ref = InterlockedDecrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1006,7 +1006,7 @@ static ULONG WINAPI FormatConverterInfo_AddRef(IWICFormatConverterInfo *iface) ...@@ -1006,7 +1006,7 @@ static ULONG WINAPI FormatConverterInfo_AddRef(IWICFormatConverterInfo *iface)
FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref); ULONG ref = InterlockedIncrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1016,7 +1016,7 @@ static ULONG WINAPI FormatConverterInfo_Release(IWICFormatConverterInfo *iface) ...@@ -1016,7 +1016,7 @@ static ULONG WINAPI FormatConverterInfo_Release(IWICFormatConverterInfo *iface)
FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref); ULONG ref = InterlockedDecrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1220,7 +1220,7 @@ static ULONG WINAPI PixelFormatInfo_AddRef(IWICPixelFormatInfo2 *iface) ...@@ -1220,7 +1220,7 @@ static ULONG WINAPI PixelFormatInfo_AddRef(IWICPixelFormatInfo2 *iface)
PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface);
ULONG ref = InterlockedIncrement(&This->base.ref); ULONG ref = InterlockedIncrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1230,7 +1230,7 @@ static ULONG WINAPI PixelFormatInfo_Release(IWICPixelFormatInfo2 *iface) ...@@ -1230,7 +1230,7 @@ static ULONG WINAPI PixelFormatInfo_Release(IWICPixelFormatInfo2 *iface)
PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface);
ULONG ref = InterlockedDecrement(&This->base.ref); ULONG ref = InterlockedDecrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -1531,7 +1531,7 @@ static ULONG WINAPI MetadataReaderInfo_AddRef(IWICMetadataReaderInfo *iface) ...@@ -1531,7 +1531,7 @@ static ULONG WINAPI MetadataReaderInfo_AddRef(IWICMetadataReaderInfo *iface)
MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface);
ULONG ref = InterlockedIncrement(&This->base.ref); ULONG ref = InterlockedIncrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -1540,7 +1540,7 @@ static ULONG WINAPI MetadataReaderInfo_Release(IWICMetadataReaderInfo *iface) ...@@ -1540,7 +1540,7 @@ static ULONG WINAPI MetadataReaderInfo_Release(IWICMetadataReaderInfo *iface)
MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface);
ULONG ref = InterlockedDecrement(&This->base.ref); ULONG ref = InterlockedDecrement(&This->base.ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -2180,7 +2180,7 @@ static ULONG WINAPI ComponentEnum_AddRef(IEnumUnknown *iface) ...@@ -2180,7 +2180,7 @@ static ULONG WINAPI ComponentEnum_AddRef(IEnumUnknown *iface)
ComponentEnum *This = impl_from_IEnumUnknown(iface); ComponentEnum *This = impl_from_IEnumUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -2191,7 +2191,7 @@ static ULONG WINAPI ComponentEnum_Release(IEnumUnknown *iface) ...@@ -2191,7 +2191,7 @@ static ULONG WINAPI ComponentEnum_Release(IEnumUnknown *iface)
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
ComponentEnumItem *cursor, *cursor2; ComponentEnumItem *cursor, *cursor2;
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -2217,7 +2217,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, ...@@ -2217,7 +2217,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt,
ComponentEnumItem *item; ComponentEnumItem *item;
HRESULT hr=S_OK; 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); EnterCriticalSection(&This->lock);
while (num_fetched<celt) while (num_fetched<celt)
...@@ -2245,7 +2245,7 @@ static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) ...@@ -2245,7 +2245,7 @@ static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt)
ULONG i; ULONG i;
HRESULT hr=S_OK; HRESULT hr=S_OK;
TRACE("(%p,%u)\n", iface, celt); TRACE("(%p,%lu)\n", iface, celt);
EnterCriticalSection(&This->lock); EnterCriticalSection(&This->lock);
for (i=0; i<celt; i++) for (i=0; i<celt; i++)
...@@ -2346,7 +2346,7 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn ...@@ -2346,7 +2346,7 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn
HRESULT hr=S_OK; HRESULT hr=S_OK;
CLSID clsid; 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); res = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &clsidkey);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
......
dlls/windowscodecs/libjpeg.c
View file @ aa180417
...@@ -413,7 +413,7 @@ static boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo) ...@@ -413,7 +413,7 @@ static boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo)
if (hr != S_OK || byteswritten == 0) if (hr != S_OK || byteswritten == 0)
{ {
ERR("Failed writing data, hr=%x\n", hr); ERR("Failed writing data, hr=%lx\n", hr);
return FALSE; return FALSE;
} }
...@@ -434,7 +434,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) ...@@ -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); sizeof(This->dest_buffer) - This->dest_mgr.free_in_buffer, &byteswritten);
if (hr != S_OK || byteswritten == 0) if (hr != S_OK || byteswritten == 0)
ERR("Failed writing data, hr=%x\n", hr); ERR("Failed writing data, hr=%lx\n", hr);
} }
} }
......
dlls/windowscodecs/libtiff.c
View file @ aa180417
...@@ -975,7 +975,7 @@ static HRESULT CDECL tiff_decoder_copy_pixels(struct decoder* iface, UINT frame, ...@@ -975,7 +975,7 @@ static HRESULT CDECL tiff_decoder_copy_pixels(struct decoder* iface, UINT frame,
if (FAILED(hr)) if (FAILED(hr))
{ {
TRACE("<-- 0x%x\n", hr); TRACE("<-- 0x%lx\n", hr);
return hr; return hr;
} }
} }
......
dlls/windowscodecs/metadatahandler.c
View file @ aa180417
...@@ -107,7 +107,7 @@ static ULONG WINAPI MetadataHandler_AddRef(IWICMetadataWriter *iface) ...@@ -107,7 +107,7 @@ static ULONG WINAPI MetadataHandler_AddRef(IWICMetadataWriter *iface)
MetadataHandler *This = impl_from_IWICMetadataWriter(iface); MetadataHandler *This = impl_from_IWICMetadataWriter(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -117,7 +117,7 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface) ...@@ -117,7 +117,7 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface)
MetadataHandler *This = impl_from_IWICMetadataWriter(iface); MetadataHandler *This = impl_from_IWICMetadataWriter(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -354,7 +354,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface, ...@@ -354,7 +354,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface,
MetadataItem *new_items=NULL; MetadataItem *new_items=NULL;
DWORD item_count=0; 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); EnterCriticalSection(&This->lock);
...@@ -376,7 +376,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface, ...@@ -376,7 +376,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface,
static HRESULT WINAPI MetadataHandler_SaveEx(IWICPersistStream *iface, static HRESULT WINAPI MetadataHandler_SaveEx(IWICPersistStream *iface,
IStream *pIStream, DWORD dwPersistOptions, BOOL fClearDirty) 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; return E_NOTIMPL;
} }
...@@ -462,7 +462,7 @@ static ULONG WINAPI MetadataHandlerEnum_AddRef(IWICEnumMetadataItem *iface) ...@@ -462,7 +462,7 @@ static ULONG WINAPI MetadataHandlerEnum_AddRef(IWICEnumMetadataItem *iface)
MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -472,7 +472,7 @@ static ULONG WINAPI MetadataHandlerEnum_Release(IWICEnumMetadataItem *iface) ...@@ -472,7 +472,7 @@ static ULONG WINAPI MetadataHandlerEnum_Release(IWICEnumMetadataItem *iface)
MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -492,7 +492,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, ...@@ -492,7 +492,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface,
HRESULT hr=S_FALSE; HRESULT hr=S_FALSE;
ULONG i; ULONG i;
TRACE("(%p,%i)\n", iface, celt); TRACE("(%p,%li)\n", iface, celt);
EnterCriticalSection(&This->parent->lock); EnterCriticalSection(&This->parent->lock);
...@@ -986,7 +986,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, ...@@ -986,7 +986,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
} }
break; break;
default: 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; break;
} }
return S_OK; return S_OK;
......
dlls/windowscodecs/metadataquery.c
View file @ aa180417
...@@ -74,7 +74,7 @@ static ULONG WINAPI mqr_AddRef(IWICMetadataQueryReader *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI mqr_AddRef(IWICMetadataQueryReader *iface)
{ {
QueryReader *This = impl_from_IWICMetadataQueryReader(iface); QueryReader *This = impl_from_IWICMetadataQueryReader(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", This, ref); TRACE("(%p) refcount=%lu\n", This, ref);
return ref; return ref;
} }
...@@ -82,7 +82,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) ...@@ -82,7 +82,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface)
{ {
QueryReader *This = impl_from_IWICMetadataQueryReader(iface); QueryReader *This = impl_from_IWICMetadataQueryReader(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", This, ref); TRACE("(%p) refcount=%lu\n", This, ref);
if (!ref) if (!ref)
{ {
IWICMetadataBlockReader_Release(This->block); IWICMetadataBlockReader_Release(This->block);
...@@ -210,7 +210,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc ...@@ -210,7 +210,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
hr = get_token(&next_elem, id, schema, idx); hr = get_token(&next_elem, id, schema, idx);
if (hr != S_OK) if (hr != S_OK)
{ {
TRACE("get_token error %#x\n", hr); TRACE("get_token error %#lx\n", hr);
return hr; return hr;
} }
elem->len = (end - start) + next_elem.len; elem->len = (end - start) + next_elem.len;
...@@ -286,7 +286,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc ...@@ -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); hr = get_token(&next_elem, &next_id, &next_schema, &next_idx);
if (hr != S_OK) if (hr != S_OK)
{ {
TRACE("get_token error %#x\n", hr); TRACE("get_token error %#lx\n", hr);
return hr; return hr;
} }
elem->len = (end - start + 1) + next_elem.len; elem->len = (end - start + 1) + next_elem.len;
...@@ -346,7 +346,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc ...@@ -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); hr = get_token(&next_elem, &next_id, &next_schema, &next_idx);
if (hr != S_OK) if (hr != S_OK)
{ {
TRACE("get_token error %#x\n", hr); TRACE("get_token error %#lx\n", hr);
PropVariantClear(id); PropVariantClear(id);
PropVariantClear(schema); PropVariantClear(schema);
return hr; return hr;
...@@ -491,7 +491,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW ...@@ -491,7 +491,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW
hr = get_token(&elem, &tk_id, &tk_schema, &index); hr = get_token(&elem, &tk_id, &tk_schema, &index);
if (hr != S_OK) if (hr != S_OK)
{ {
WARN("get_token error %#x\n", hr); WARN("get_token error %#lx\n", hr);
break; break;
} }
TRACE("parsed %d characters: %s, index %d\n", elem.len, wine_dbgstr_wn(elem.str, elem.len), index); 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) ...@@ -631,7 +631,7 @@ static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface)
struct string_enumerator *this = impl_from_IEnumString(iface); struct string_enumerator *this = impl_from_IEnumString(iface);
ULONG ref = InterlockedIncrement(&this->ref); ULONG ref = InterlockedIncrement(&this->ref);
TRACE("iface %p, ref %u.\n", iface, ref); TRACE("iface %p, ref %lu.\n", iface, ref);
return ref; return ref;
} }
...@@ -641,7 +641,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface) ...@@ -641,7 +641,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface)
struct string_enumerator *this = impl_from_IEnumString(iface); struct string_enumerator *this = impl_from_IEnumString(iface);
ULONG ref = InterlockedDecrement(&this->ref); ULONG ref = InterlockedDecrement(&this->ref);
TRACE("iface %p, ref %u.\n", iface, ref); TRACE("iface %p, ref %lu.\n", iface, ref);
if (!ref) if (!ref)
free(this); free(this);
...@@ -651,7 +651,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface) ...@@ -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) 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) if (!strings || !ret)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -669,7 +669,7 @@ static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) ...@@ -669,7 +669,7 @@ static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface)
static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG count) 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; return count ? S_FALSE : S_OK;
} }
...@@ -789,7 +789,7 @@ static ULONG WINAPI mqw_AddRef(IWICMetadataQueryWriter *iface) ...@@ -789,7 +789,7 @@ static ULONG WINAPI mqw_AddRef(IWICMetadataQueryWriter *iface)
QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface);
ULONG ref = InterlockedIncrement(&writer->ref); ULONG ref = InterlockedIncrement(&writer->ref);
TRACE("writer %p, refcount=%u\n", writer, ref); TRACE("writer %p, refcount=%lu\n", writer, ref);
return ref; return ref;
} }
...@@ -799,7 +799,7 @@ static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface) ...@@ -799,7 +799,7 @@ static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface)
QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface);
ULONG ref = InterlockedDecrement(&writer->ref); ULONG ref = InterlockedDecrement(&writer->ref);
TRACE("writer %p, refcount=%u.\n", writer, ref); TRACE("writer %p, refcount=%lu.\n", writer, ref);
if (!ref) if (!ref)
{ {
......
dlls/windowscodecs/palette.c
View file @ aa180417
...@@ -74,7 +74,7 @@ static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface)
PaletteImpl *This = impl_from_IWICPalette(iface); PaletteImpl *This = impl_from_IWICPalette(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -84,7 +84,7 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) ...@@ -84,7 +84,7 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface)
PaletteImpl *This = impl_from_IWICPalette(iface); PaletteImpl *This = impl_from_IWICPalette(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/propertybag.c
View file @ aa180417
...@@ -72,7 +72,7 @@ static ULONG WINAPI PropertyBag_AddRef(IPropertyBag2 *iface) ...@@ -72,7 +72,7 @@ static ULONG WINAPI PropertyBag_AddRef(IPropertyBag2 *iface)
PropertyBag *This = impl_from_IPropertyBag2(iface); PropertyBag *This = impl_from_IPropertyBag2(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -82,7 +82,7 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface) ...@@ -82,7 +82,7 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface)
PropertyBag *This = impl_from_IPropertyBag2(iface); PropertyBag *This = impl_from_IPropertyBag2(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -128,7 +128,7 @@ static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties, ...@@ -128,7 +128,7 @@ static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties,
ULONG i; ULONG i;
PropertyBag *This = impl_from_IPropertyBag2(iface); 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++) for (i=0; i < cProperties; i++)
{ {
...@@ -163,7 +163,7 @@ static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties, ...@@ -163,7 +163,7 @@ static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties,
ULONG i; ULONG i;
PropertyBag *This = impl_from_IPropertyBag2(iface); 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++) for (i=0; i < cProperties; i++)
{ {
...@@ -233,7 +233,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP ...@@ -233,7 +233,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP
ULONG i; ULONG i;
PropertyBag *This = impl_from_IPropertyBag2(iface); 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) if (iProperty >= This->prop_count && iProperty > 0)
return WINCODEC_ERR_VALUEOUTOFRANGE; return WINCODEC_ERR_VALUEOUTOFRANGE;
...@@ -260,7 +260,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP ...@@ -260,7 +260,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP
static HRESULT WINAPI PropertyBag_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName, static HRESULT WINAPI PropertyBag_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName,
DWORD dwHint, IUnknown *pUnkObject, IErrorLog *pErrLog) 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; return E_NOTIMPL;
} }
......
dlls/windowscodecs/scaler.c
View file @ aa180417
...@@ -89,7 +89,7 @@ static ULONG WINAPI BitmapScaler_AddRef(IWICBitmapScaler *iface) ...@@ -89,7 +89,7 @@ static ULONG WINAPI BitmapScaler_AddRef(IWICBitmapScaler *iface)
BitmapScaler *This = impl_from_IWICBitmapScaler(iface); BitmapScaler *This = impl_from_IWICBitmapScaler(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -99,7 +99,7 @@ static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface) ...@@ -99,7 +99,7 @@ static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface)
BitmapScaler *This = impl_from_IWICBitmapScaler(iface); BitmapScaler *This = impl_from_IWICBitmapScaler(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/windowscodecs/tgaformat.c
View file @ aa180417
...@@ -152,7 +152,7 @@ static ULONG WINAPI TgaDecoder_AddRef(IWICBitmapDecoder *iface) ...@@ -152,7 +152,7 @@ static ULONG WINAPI TgaDecoder_AddRef(IWICBitmapDecoder *iface)
TgaDecoder *This = impl_from_IWICBitmapDecoder(iface); TgaDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
return ref; return ref;
} }
...@@ -162,7 +162,7 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface) ...@@ -162,7 +162,7 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface)
TgaDecoder *This = impl_from_IWICBitmapDecoder(iface); TgaDecoder *This = impl_from_IWICBitmapDecoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%lu\n", iface, ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -222,7 +222,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ...@@ -222,7 +222,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Read(pIStream, &This->header, sizeof(tga_header), &bytesread); hr = IStream_Read(pIStream, &This->header, sizeof(tga_header), &bytesread);
if (SUCCEEDED(hr) && bytesread != sizeof(tga_header)) if (SUCCEEDED(hr) && bytesread != sizeof(tga_header))
{ {
TRACE("got only %u bytes\n", bytesread); TRACE("got only %lu bytes\n", bytesread);
hr = E_FAIL; hr = E_FAIL;
} }
if (FAILED(hr)) goto end; if (FAILED(hr)) goto end;
...@@ -294,7 +294,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ...@@ -294,7 +294,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread); hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread);
if (SUCCEEDED(hr) && bytesread != sizeof(tga_footer)) 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; hr = E_FAIL;
} }
...@@ -326,7 +326,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ...@@ -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); hr = IStream_Read(pIStream, &This->extension_area, sizeof(tga_extension_area), &bytesread);
if (SUCCEEDED(hr) && bytesread != sizeof(tga_extension_area)) 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; hr = E_FAIL;
} }
if (SUCCEEDED(hr) && This->extension_area.size < 495) if (SUCCEEDED(hr) && This->extension_area.size < 495)
...@@ -639,7 +639,7 @@ static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, ...@@ -639,7 +639,7 @@ static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface,
hr = IStream_Read(This->stream, colormap_data, This->colormap_length, &bytesread); hr = IStream_Read(This->stream, colormap_data, This->colormap_length, &bytesread);
if (SUCCEEDED(hr) && bytesread != This->colormap_length) 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; hr = E_FAIL;
} }
} }
......
dlls/windowscodecs/wincodecs_common.c
View file @ aa180417
...@@ -115,7 +115,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, ...@@ -115,7 +115,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface,
hr = WICConvertBitmapSource(format, source, &converted_source); hr = WICConvertBitmapSource(format, source, &converted_source);
if (FAILED(hr)) 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; return E_NOTIMPL;
} }
......
dlls/wmphoto/Makefile.in
View file @ aa180417
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wmphoto.dll MODULE = wmphoto.dll
IMPORTS = $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi IMPORTS = $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi
EXTRAINCL = $(JXR_PE_CFLAGS) EXTRAINCL = $(JXR_PE_CFLAGS)
......
dlls/wmphoto/main.c
View file @ aa180417
...@@ -129,7 +129,7 @@ HMODULE windowscodecs_module = 0; ...@@ -129,7 +129,7 @@ HMODULE windowscodecs_module = 0;
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) 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) switch (reason)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment