Michael Stefaniuc : iccvid: Win64 printf format warning fixes.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Oct 6 06:25:10 CDT 2006
Module: wine
Branch: master
Commit: 47f822eeaabe850dc893269afc54419db49a80e8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f822eeaabe850dc893269afc54419db49a80e8
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Oct 5 22:06:51 2006 +0200
iccvid: Win64 printf format warning fixes.
---
dlls/iccvid/Makefile.in | 1 -
dlls/iccvid/iccvid.c | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in
index 3bd7053..c81a913 100644
--- a/dlls/iccvid/Makefile.in
+++ b/dlls/iccvid/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = iccvid.dll
IMPORTS = user32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
iccvid.c
diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
index 9db21a7..1bb9b1d 100644
--- a/dlls/iccvid/iccvid.c
+++ b/dlls/iccvid/iccvid.c
@@ -728,8 +728,8 @@ static void ICCVID_dump_BITMAPINFO(const
TRACE(
"planes = %d\n"
"bpp = %d\n"
- "height = %ld\n"
- "width = %ld\n"
+ "height = %d\n"
+ "width = %d\n"
"compr = %s\n",
bmi->bmiHeader.biPlanes,
bmi->bmiHeader.biBitCount,
@@ -744,7 +744,7 @@ static inline int ICCVID_CheckMask(RGBQU
COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue);
COLORREF realGreenMask = MAKECOLOUR32(bmiColors[2].rgbRed, bmiColors[2].rgbGreen, bmiColors[2].rgbBlue);
- TRACE("\nbmiColors[0] = 0x%08lx\nbmiColors[1] = 0x%08lx\nbmiColors[2] = 0x%08lx\n",
+ TRACE("\nbmiColors[0] = 0x%08x\nbmiColors[1] = 0x%08x\nbmiColors[2] = 0x%08x\n",
realRedMask, realBlueMask, realGreenMask);
if ((realRedMask == redMask) &&
@@ -868,7 +868,7 @@ static LRESULT ICCVID_Decompress( ICCVID
{
LONG width, height;
- TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size);
+ TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size);
if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
return ICERR_BADPARAM;
@@ -886,7 +886,7 @@ static LRESULT ICCVID_DecompressEx( ICCV
{
LONG width, height;
- TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size);
+ TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size);
if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
return ICERR_BADPARAM;
@@ -1017,7 +1017,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_
BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
{
- TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);
+ TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved);
switch (dwReason)
{
More information about the wine-cvs
mailing list