msvfw32: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Thu Oct 12 14:34:41 CDT 2006
---
dlls/msvfw32/Makefile.in | 1 -
dlls/msvfw32/drawdib.c | 24 +++++++++---------
dlls/msvfw32/mciwnd.c | 8 +++---
dlls/msvfw32/msvideo16.c | 12 ++++-----
dlls/msvfw32/msvideo_main.c | 58 ++++++++++++++++++++++---------------------
5 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 9b5f31d..47fb416 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = msvfw32.dll
IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
IMPORTS = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
mciwnd.c \
diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c
index 7984c59..134c325 100644
--- a/dlls/msvfw32/drawdib.c
+++ b/dlls/msvfw32/drawdib.c
@@ -182,10 +182,10 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
BOOL ret = TRUE;
WINE_HDD *whdd;
- TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08lx)\n",
+ TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08x)\n",
hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, (DWORD)wFlags);
- TRACE("lpbi: %ld,%ld/%ld,%d,%d,%ld,%ld,%ld,%ld,%ld,%ld\n",
+ TRACE("lpbi: %d,%d/%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes,
lpbi->biBitCount, lpbi->biCompression, lpbi->biSizeImage,
lpbi->biXPelsPerMeter, lpbi->biYPelsPerMeter, lpbi->biClrUsed,
@@ -206,7 +206,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
whdd->hic = ICOpen(ICTYPE_VIDEO, lpbi->biCompression, ICMODE_DECOMPRESS);
if (!whdd->hic)
{
- WARN("Could not open IC. biCompression == 0x%08lx\n", lpbi->biCompression);
+ WARN("Could not open IC. biCompression == 0x%08x\n", lpbi->biCompression);
ret = FALSE;
}
@@ -234,8 +234,8 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
if (ICDecompressBegin(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK)
ret = FALSE;
- TRACE("biSizeImage == %ld\n", whdd->lpbiOut->biSizeImage);
- TRACE("biCompression == %ld\n", whdd->lpbiOut->biCompression);
+ TRACE("biSizeImage == %d\n", whdd->lpbiOut->biSizeImage);
+ TRACE("biCompression == %d\n", whdd->lpbiOut->biCompression);
TRACE("biBitCount == %d\n", whdd->lpbiOut->biBitCount);
}
}
@@ -254,7 +254,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
/*whdd->lpvbuf = HeapAlloc(GetProcessHeap(), 0, whdd->lpbiOut->biSizeImage);*/
whdd->hMemDC = CreateCompatibleDC(hdc);
- TRACE("Creating: %ld, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits);
+ TRACE("Creating: %d, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits);
whdd->hDib = CreateDIBSection(whdd->hMemDC, (BITMAPINFO *)whdd->lpbiOut, DIB_RGB_COLORS, &(whdd->lpvbits), 0, 0);
if (whdd->hDib)
{
@@ -263,7 +263,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
else
{
ret = FALSE;
- TRACE("Error: %ld\n", GetLastError());
+ TRACE("Error: %d\n", GetLastError());
}
whdd->hOldDib = SelectObject(whdd->hMemDC, whdd->hDib);
}
@@ -304,7 +304,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HD
WINE_HDD *whdd;
BOOL ret = TRUE;
- TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08lx)\n",
+ TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n",
hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, (DWORD)wFlags);
whdd = MSVIDEO_GetHddPtr(hdd);
@@ -313,7 +313,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HD
TRACE("whdd=%p\n", whdd);
if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW | DDF_BACKGROUNDPAL))
- FIXME("wFlags == 0x%08lx not handled\n", (DWORD)wFlags);
+ FIXME("wFlags == 0x%08x not handled\n", (DWORD)wFlags);
if (!lpBits)
{
@@ -352,7 +352,7 @@ #undef CHANGED
{
DWORD flags = 0;
- TRACE("Compression == 0x%08lx\n", lpbi->biCompression);
+ TRACE("Compression == 0x%08x\n", lpbi->biCompression);
if (wFlags & DDF_NOTKEYFRAME)
flags |= ICDECOMPRESS_NOTKEYFRAME;
@@ -382,7 +382,7 @@ #undef CHANGED
* DrawDibStart [MSVFW32.@]
*/
BOOL VFWAPI DrawDibStart(HDRAWDIB hdd, DWORD rate) {
- FIXME("(%p, %ld), stub\n", hdd, rate);
+ FIXME("(%p, %d), stub\n", hdd, rate);
return TRUE;
}
@@ -431,7 +431,7 @@ BOOL VFWAPI DrawDibSetPalette(HDRAWDIB h
*/
LPVOID VFWAPI DrawDibGetBuffer(HDRAWDIB hdd, LPBITMAPINFOHEADER lpbi, DWORD dwSize, DWORD dwFlags)
{
- FIXME("(%p, %p, 0x%08lx, 0x%08lx), stub\n", hdd, lpbi, dwSize, dwFlags);
+ FIXME("(%p, %p, 0x%08x, 0x%08x), stub\n", hdd, lpbi, dwSize, dwFlags);
return NULL;
}
diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c
index 46a5877..c8c611f 100644
--- a/dlls/msvfw32/mciwnd.c
+++ b/dlls/msvfw32/mciwnd.c
@@ -104,7 +104,7 @@ BOOL VFWAPIV MCIWndRegisterClass(void)
HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle, LPCWSTR szFile)
{
- TRACE("%p %p %lx %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile));
+ TRACE("%p %p %x %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile));
MCIWndRegisterClass();
@@ -753,7 +753,7 @@ end_of_mci_open:
MCIWND_notify_error(mwi);
return 0;
}
- TRACE("MCIWNDM_GETLENGTH: %ld\n", mci_status.dwReturn);
+ TRACE("MCIWNDM_GETLENGTH: %d\n", mci_status.dwReturn);
return mci_status.dwReturn;
}
@@ -770,7 +770,7 @@ end_of_mci_open:
MCIWND_notify_error(mwi);
return 0;
}
- TRACE("MCIWNDM_GETSTART: %ld\n", mci_status.dwReturn);
+ TRACE("MCIWNDM_GETSTART: %d\n", mci_status.dwReturn);
return mci_status.dwReturn;
}
@@ -1066,7 +1066,7 @@ #endif
return 0;
case MCIWNDM_GETSTYLES:
- TRACE("MCIWNDM_GETSTYLES: %08lx\n", mwi->dwStyle & 0xffff);
+ TRACE("MCIWNDM_GETSTYLES: %08x\n", mwi->dwStyle & 0xffff);
return mwi->dwStyle & 0xffff;
case MCIWNDM_GETDEVICEA:
diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c
index c812592..57e9e43 100644
--- a/dlls/msvfw32/msvideo16.c
+++ b/dlls/msvfw32/msvideo16.c
@@ -155,7 +155,7 @@ LRESULT VFWAPIV ICMessage16( HIC16 hic,
lpData = HeapAlloc(GetProcessHeap(), 0, cb);
- TRACE("0x%08lx, %u, %u, ...)\n", (DWORD) hic, msg, cb);
+ TRACE("0x%08x, %u, %u, ...)\n", (DWORD) hic, msg, cb);
for (i = 0; i < cb / sizeof(WORD); i++)
{
@@ -176,7 +176,7 @@ LRESULT VFWAPI ICGetInfo16(HIC16 hic, IC
{
LRESULT ret;
- TRACE("(0x%08lx,%p,%ld)\n", (DWORD) hic, picinfo, cb);
+ TRACE("(0x%08x,%p,%d)\n", (DWORD) hic, picinfo, cb);
ret = ICSendMessage16(hic, ICM_GETINFO, (DWORD) picinfo, cb);
TRACE(" -> 0x%08lx\n", ret);
return ret;
@@ -207,7 +207,7 @@ DWORD VFWAPIV ICCompress16(HIC16 hic, DW
ICCOMPRESS iccmp;
SEGPTR seg_iccmp;
- TRACE("(0x%08lx,%ld,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags,
+ TRACE("(0x%08x,%d,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags,
lpbiOutput, lpData, lpbiInput, lpBits);
iccmp.dwFlags = dwFlags;
@@ -241,7 +241,7 @@ DWORD VFWAPIV ICDecompress16(HIC16 hic,
SEGPTR segptr;
DWORD ret;
- TRACE("(0x%08lx,%ld,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat,
+ TRACE("(0x%08x,%d,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat,
lpData, lpbi, lpBits);
icd.dwFlags = dwFlags;
@@ -280,7 +280,7 @@ DWORD VFWAPIV ICDrawBegin16(HIC16 hic,
ICDRAWBEGIN16 icdb;
SEGPTR seg_icdb;
- TRACE ("(0x%08lx,%ld,0x%08lx,0x%08lx,0x%08lx,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n",
+ TRACE ("(0x%08x,%d,0x%08x,0x%08x,0x%08x,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n",
(DWORD) hic, dwFlags, (DWORD) hpal, (DWORD) hwnd, (DWORD) hdc,
xDst, yDst, dxDst, dyDst, lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate,
dwScale);
@@ -319,7 +319,7 @@ DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD
ICDRAW icd;
SEGPTR seg_icd;
- TRACE("(0x%08lx,0x%08lx,%p,%p,%ld,%ld)\n", (DWORD) hic, dwFlags,
+ TRACE("(0x%08x,0x%08x,%p,%p,%d,%d)\n", (DWORD) hic, dwFlags,
lpFormat, lpData, cbData, lTime);
icd.dwFlags = dwFlags;
icd.lpFormat = lpFormat;
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index 623afdc..1cfdf16 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -82,7 +82,7 @@ HMODULE MSVFW32_hModule;
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
{
- TRACE("%p,%lx,%p\n", hinst, reason, reserved);
+ TRACE("%p,%x,%p\n", hinst, reason, reserved);
switch(reason)
{
@@ -205,7 +205,7 @@ static BOOL ICInfo_enum_handler(const ch
*/
BOOL VFWAPI ICInfo( DWORD fccType, DWORD fccHandler, ICINFO *lpicinfo)
{
- TRACE("(%s,%s/%08lx,%p)\n",
+ TRACE("(%s,%s/%08x,%p)\n",
wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), fccHandler, lpicinfo);
lpicinfo->fccType = fccType;
@@ -394,7 +394,7 @@ HIC MSVIDEO_OpenFunction(DWORD fccType,
ICOPEN icopen;
WINE_HIC* whic;
- TRACE("(%s,%s,%d,%p,%08lx)\n",
+ TRACE("(%s,%s,%d,%p,%08x)\n",
wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler, lpfnHandler16);
icopen.dwSize = sizeof(ICOPEN);
@@ -462,7 +462,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO
LRESULT ret;
WINE_HIC* whic = MSVIDEO_GetHicPtr(hic);
- TRACE("(%p,%p,%ld)\n", hic, picinfo, cb);
+ TRACE("(%p,%p,%d)\n", hic, picinfo, cb);
whic = MSVIDEO_GetHicPtr(hic);
if (!whic) return ICERR_BADHANDLE;
@@ -607,11 +607,11 @@ HIC VFWAPI ICGetDisplayFormat(
ICDecompressGetFormat(tmphic,lpbiIn,lpbiOut);
if (lpbiOut->biCompression != 0) {
- FIXME("Ooch, how come decompressor outputs compressed data (%ld)??\n",
+ FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n",
lpbiOut->biCompression);
}
if (lpbiOut->biSize < sizeof(*lpbiOut)) {
- FIXME("Ooch, size of output BIH is too small (%ld)\n",
+ FIXME("Ooch, size of output BIH is too small (%d)\n",
lpbiOut->biSize);
lpbiOut->biSize = sizeof(*lpbiOut);
}
@@ -649,7 +649,7 @@ ICCompress(
{
ICCOMPRESS iccmp;
- TRACE("(%p,%ld,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits);
+ TRACE("(%p,%d,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits);
iccmp.dwFlags = dwFlags;
@@ -677,9 +677,9 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWOR
ICDECOMPRESS icd;
DWORD ret;
- TRACE("(%p,%ld,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits);
+ TRACE("(%p,%d,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits);
- TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]);
+ TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]);
icd.dwFlags = dwFlags;
icd.lpbiInput = lpbiFormat;
@@ -690,9 +690,9 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWOR
icd.ckid = 0;
ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS));
- TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]);
+ TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]);
- TRACE("-> %ld\n",ret);
+ TRACE("-> %d\n",ret);
return ret;
}
@@ -739,7 +739,7 @@ static BOOL enum_compressors(HWND list,
{
if (ICCompressQuery(hic, pcv->lpbiIn, NULL) != ICERR_OK)
{
- TRACE("fccHandler %s doesn't support input DIB format %ld\n",
+ TRACE("fccHandler %s doesn't support input DIB format %d\n",
wine_dbgstr_fcc(icinfo.fccHandler), pcv->lpbiIn->bmiHeader.biCompression);
ICClose(hic);
continue;
@@ -1087,7 +1087,7 @@ #define XX(x) case x: TRACE("(%p,"#x",0x
XX(ICM_DECOMPRESSEX_END);
XX(ICM_SET_STATUS_PROC);
default:
- FIXME("(%p,0x%08lx,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2);
+ FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2);
}
#undef XX
@@ -1138,7 +1138,7 @@ DWORD VFWAPIV ICDrawBegin(
ICDRAWBEGIN icdb;
- TRACE("(%p,%ld,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n",
+ TRACE("(%p,%d,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n",
hic, dwFlags, hpal, hwnd, hdc, xDst, yDst, dxDst, dyDst,
lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate, dwScale);
@@ -1166,7 +1166,7 @@ DWORD VFWAPIV ICDrawBegin(
DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) {
ICDRAW icd;
- TRACE("(%p,%ld,%p,%p,%ld,%ld)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime);
+ TRACE("(%p,%d,%p,%p,%d,%d)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime);
icd.dwFlags = dwFlags;
icd.lpFormat = lpFormat;
@@ -1225,7 +1225,7 @@ HANDLE VFWAPI ICImageCompress(
LPBITMAPINFO lpbiOut, LONG lQuality,
LONG* plSize)
{
- FIXME("(%p,%08x,%p,%p,%p,%ld,%p)\n",
+ FIXME("(%p,%08x,%p,%p,%p,%d,%p)\n",
hic, uiFlags, lpbiIn, lpBits, lpbiOut, lQuality, plSize);
return NULL;
@@ -1329,7 +1329,7 @@ HANDLE VFWAPI ICImageDecompress(
goto err;
bInDecompress = TRUE;
- TRACE( "cbHdr %ld, biSizeImage %ld\n", cbHdr, biSizeImage );
+ TRACE( "cbHdr %d, biSizeImage %d\n", cbHdr, biSizeImage );
hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_ZEROINIT, cbHdr + biSizeImage );
if ( hMem == NULL )
@@ -1374,7 +1374,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVA
if (pc->cbState != sizeof(ICCOMPRESS))
{
- ERR("Invalid cbState %li\n", pc->cbState);
+ ERR("Invalid cbState %i\n", pc->cbState);
return NULL;
}
@@ -1404,7 +1404,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVA
*pfKey = FALSE;
*plSize = icComp->lpbiOutput->biSizeImage;
- TRACE(" -- 0x%08lx\n", ret);
+ TRACE(" -- 0x%08x\n", ret);
if (ret == ICERR_OK)
{
LPVOID oldprev, oldout;
@@ -1428,7 +1428,7 @@ void VFWAPI ICSeqCompressFrameEnd(PCOMPV
DWORD ret;
TRACE("(%p)\n", pc);
ret = ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0);
- TRACE(" -- %lx\n", ret);
+ TRACE(" -- %x\n", ret);
HeapFree(GetProcessHeap(), 0, pc->lpbiIn);
HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev);
HeapFree(GetProcessHeap(), 0, pc->lpBitsOut);
@@ -1475,19 +1475,19 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOM
return FALSE;
}
TRACE("Compvars:\n"
- "\tpc:\n"
- "\tsize: %li\n"
- "\tflags: %li\n"
- "\thic: %p\n"
- "\ttype: %lx\n"
- "\thandler: %lx\n"
- "\tin/out: %p/%p\n"
- "key/data/quality: %li/%li/%li\n",
+ "\tpc:\n"
+ "\tsize: %i\n"
+ "\tflags: %i\n"
+ "\thic: %p\n"
+ "\ttype: %x\n"
+ "\thandler: %x\n"
+ "\tin/out: %p/%p\n"
+ "key/data/quality: %i/%i/%i\n",
pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, pc->fccHandler,
pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ);
ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut);
- TRACE(" -- %lx\n", ret);
+ TRACE(" -- %x\n", ret);
if (ret == ICERR_OK)
{
ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState;
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061012/63463b5c/attachment.pgp
More information about the wine-patches
mailing list