iccvid: Win64 printf format warning fixes.

This commit is contained in:
Michael Stefaniuc 2006-10-05 22:06:51 +02:00 committed by Alexandre Julliard
parent 223b92fc67
commit 47f822eeaa
2 changed files with 6 additions and 7 deletions

View File

@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = iccvid.dll MODULE = iccvid.dll
IMPORTS = user32 kernel32 IMPORTS = user32 kernel32
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
iccvid.c iccvid.c

View File

@ -728,8 +728,8 @@ static void ICCVID_dump_BITMAPINFO(const BITMAPINFO * bmi)
TRACE( TRACE(
"planes = %d\n" "planes = %d\n"
"bpp = %d\n" "bpp = %d\n"
"height = %ld\n" "height = %d\n"
"width = %ld\n" "width = %d\n"
"compr = %s\n", "compr = %s\n",
bmi->bmiHeader.biPlanes, bmi->bmiHeader.biPlanes,
bmi->bmiHeader.biBitCount, bmi->bmiHeader.biBitCount,
@ -744,7 +744,7 @@ static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLOR
COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue); COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue);
COLORREF realGreenMask = MAKECOLOUR32(bmiColors[2].rgbRed, bmiColors[2].rgbGreen, bmiColors[2].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); realRedMask, realBlueMask, realGreenMask);
if ((realRedMask == redMask) && if ((realRedMask == redMask) &&
@ -868,7 +868,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si
{ {
LONG width, height; 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) ) if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
return ICERR_BADPARAM; return ICERR_BADPARAM;
@ -886,7 +886,7 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR
{ {
LONG width, height; 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) ) if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
return ICERR_BADPARAM; return ICERR_BADPARAM;
@ -1017,7 +1017,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) 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) switch (dwReason)
{ {