Module: wine Branch: master Commit: 4407218329048972f5efc0242eab8ecd07da76a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4407218329048972f5efc0242e...
Author: Michael Stefaniuc mstefani@redhat.de Date: Sun Oct 8 18:58:10 2006 +0200
msrle32: Win64 printf format warning fixes.
---
dlls/msrle32/Makefile.in | 1 - dlls/msrle32/msrle32.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 14687c6..eef540b 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msrle32.dll IMPORTS = winmm user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = msrle32.c
diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 28da739..c1e5463 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1024,7 +1024,7 @@ static LRESULT MSRLE32_DecompressRLE8(Co break; default: /* absolute mode */ if (pixel_ptr/bytes_per_pixel + code1 > lpbi->biWidth) { - WARN("aborted absolute: (%d=%d/%d+%d) > %ld\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); + WARN("aborted absolute: (%d=%d/%d+%d) > %d\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); return ICERR_ERROR; } extra_byte = code1 & 0x01; @@ -1052,7 +1052,7 @@ static LRESULT MSRLE32_DecompressRLE8(Co } else { /* coded mode */ if (pixel_ptr/bytes_per_pixel + code0 > lpbi->biWidth) { - WARN("aborted coded: (%d=%d/%d+%d) > %ld\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); + WARN("aborted coded: (%d=%d/%d+%d) > %d\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); return ICERR_ERROR; }
@@ -1100,7 +1100,7 @@ static CodecInfo* Open(LPICOPEN icinfo)
if (icinfo->fccType != ICTYPE_VIDEO) return NULL;
- TRACE("(%p = {%lu,0x%08lX(%4.4s),0x%08lX(%4.4s),0x%lX,0x%lX,...})\n", icinfo, + TRACE("(%p = {%u,0x%08X(%4.4s),0x%08X(%4.4s),0x%X,0x%X,...})\n", icinfo, icinfo->dwSize, icinfo->fccType, (char*)&icinfo->fccType, icinfo->fccHandler, (char*)&icinfo->fccHandler, icinfo->dwVersion,icinfo->dwFlags); @@ -1115,7 +1115,7 @@ static CodecInfo* Open(LPICOPEN icinfo) icinfo->fccHandler = FOURCC_MRLE; break; default: - WARN("unknown FOURCC = 0x%08lX(%4.4s) !\n", + WARN("unknown FOURCC = 0x%08X(%4.4s) !\n", icinfo->fccHandler,(char*)&icinfo->fccHandler); return NULL; } @@ -1422,7 +1422,7 @@ static LRESULT Compress(CodecInfo *pi, I { int i;
- TRACE("(%p,%p,%lu)\n",pi,lpic,dwSize); + TRACE("(%p,%p,%u)\n",pi,lpic,dwSize);
/* pre-condition */ assert(pi != NULL); @@ -1434,7 +1434,7 @@ static LRESULT Compress(CodecInfo *pi, I !lpic->lpbiInput || !lpic->lpInput) return ICERR_BADPARAM;
- TRACE("lpic={0x%lX,%p,%p,%p,%p,%p,%p,%ld,%lu,%lu,%p,%p}\n",lpic->dwFlags,lpic->lpbiOutput,lpic->lpOutput,lpic->lpbiInput,lpic->lpInput,lpic->lpckid,lpic->lpdwFlags,lpic->lFrameNum,lpic->dwFrameSize,lpic->dwQuality,lpic->lpbiPrev,lpic->lpPrev); + TRACE("lpic={0x%X,%p,%p,%p,%p,%p,%p,%d,%u,%u,%p,%p}\n",lpic->dwFlags,lpic->lpbiOutput,lpic->lpOutput,lpic->lpbiInput,lpic->lpInput,lpic->lpckid,lpic->lpdwFlags,lpic->lFrameNum,lpic->dwFrameSize,lpic->dwQuality,lpic->lpbiPrev,lpic->lpPrev);
if (! pi->bCompress) { LRESULT hr = CompressBegin(pi, lpic->lpbiInput, lpic->lpbiOutput); @@ -1458,13 +1458,13 @@ static LRESULT Compress(CodecInfo *pi, I } else if ((lpic->dwFlags & ICCOMPRESS_KEYFRAME) == 0) { LPWORD pTmp;
- WARN(": prev=%ld cur=%ld gone back? -- untested\n",pi->nPrevFrame,lpic->lFrameNum); + WARN(": prev=%d cur=%d gone back? -- untested\n",pi->nPrevFrame,lpic->lFrameNum); if (lpic->lpbiPrev == NULL || lpic->lpPrev == NULL) return ICERR_GOTOKEYFRAME; /* Need a keyframe if you go back */ if (CompressQuery(pi, lpic->lpbiPrev, lpic->lpbiOutput) != ICERR_OK) return ICERR_BADFORMAT;
- WARN(": prev=%ld cur=%ld compute swapped -- untested\n",pi->nPrevFrame,lpic->lFrameNum); + WARN(": prev=%d cur=%d compute swapped -- untested\n",pi->nPrevFrame,lpic->lFrameNum); computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev);
/* swap buffers for current and previous frame */ @@ -1697,7 +1697,7 @@ static LRESULT DecompressBegin(CodecInfo
static LRESULT Decompress(CodecInfo *pi, ICDECOMPRESS *pic, DWORD dwSize) { - TRACE("(%p,%p,%lu)\n",pi,pic,dwSize); + TRACE("(%p,%p,%u)\n",pi,pic,dwSize);
/* pre-condition */ assert(pi != NULL); @@ -1892,7 +1892,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWOR /* DllMain - library initialization code */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%ld,%p)\n",(LPVOID)hModule,dwReason,lpReserved); + TRACE("(%p,%d,%p)\n",(LPVOID)hModule,dwReason,lpReserved);
switch (dwReason) { case DLL_PROCESS_ATTACH: