Skip to content

W
wine-winehq
Commit 54b1c5e0 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

version: Win64 printf format warning fixes.

parent dc3706ae
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 19 deletions
dlls/version/Makefile.in
View file @ 54b1c5e0
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = version.dll
IMPORTLIB = libversion.$(IMPLIBEXT)
IMPORTS = lz32 kernel32 ntdll
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
info.c \
......
dlls/version/info.c
View file @ 54b1c5e0
......@@ -69,7 +69,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
{
WORD mode = LOWORD(vffi->dwFileVersionMS);
WORD ver_rev = HIWORD(vffi->dwFileVersionLS);
TRACE("fileversion=%lu.%u.%u.%u (%s.major.minor.release), ",
TRACE("fileversion=%u.%u.%u.%u (%s.major.minor.release), ",
(vffi->dwFileVersionMS),
HIBYTE(ver_rev), LOBYTE(ver_rev), LOWORD(vffi->dwFileVersionLS),
(mode == 3) ? "Usermode" : ((mode <= 2) ? "Kernelmode" : "?") );
......@@ -84,7 +84,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
HIWORD(vffi->dwProductVersionMS),LOWORD(vffi->dwProductVersionMS),
HIWORD(vffi->dwProductVersionLS),LOWORD(vffi->dwProductVersionLS));
TRACE("flagmask=0x%lx, flags=0x%lx %s%s%s%s%s%s\n",
TRACE("flagmask=0x%x, flags=0x%x %s%s%s%s%s%s\n",
vffi->dwFileFlagsMask, vffi->dwFileFlags,
(vffi->dwFileFlags & VS_FF_DEBUG) ? "DEBUG," : "",
(vffi->dwFileFlags & VS_FF_PRERELEASE) ? "PRERELEASE," : "",
......@@ -105,7 +105,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
case VOS_NT:TRACE("NT,");break;
case VOS_UNKNOWN:
default:
TRACE("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break;
TRACE("UNKNOWN(0x%x),",vffi->dwFileOS&0xFFFF0000);break;
}
switch (LOWORD(vffi->dwFileOS))
......@@ -130,7 +130,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
{
if(versioned_printer) /* NT3.x/NT4.0 or old w2k Driver */
TRACE(",PRINTER");
TRACE(" (subtype=0x%lx)", vffi->dwFileSubtype);
TRACE(" (subtype=0x%x)", vffi->dwFileSubtype);
}
break;
case VFT_DRV:
......@@ -151,7 +151,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
case VFT2_DRV_VERSIONED_PRINTER:TRACE("VERSIONED_PRINTER");break;
case VFT2_UNKNOWN:
default:
TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break;
TRACE("UNKNOWN(0x%x)",vffi->dwFileSubtype);break;
}
break;
case VFT_FONT:
......@@ -161,18 +161,18 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
case VFT2_FONT_RASTER:TRACE("RASTER");break;
case VFT2_FONT_VECTOR:TRACE("VECTOR");break;
case VFT2_FONT_TRUETYPE:TRACE("TRUETYPE");break;
default:TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break;
default:TRACE("UNKNOWN(0x%x)",vffi->dwFileSubtype);break;
}
break;
case VFT_VXD:TRACE("filetype=VXD");break;
case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break;
case VFT_UNKNOWN:
default:
TRACE("filetype=Unknown(0x%lx)",vffi->dwFileType);break;
TRACE("filetype=Unknown(0x%x)",vffi->dwFileType);break;
}
TRACE("\n");
TRACE("filedate=0x%lx.0x%lx\n",vffi->dwFileDateMS,vffi->dwFileDateLS);
TRACE("filedate=0x%x.0x%x\n",vffi->dwFileDateMS,vffi->dwFileDateLS);
}
/***********************************************************************
......@@ -280,7 +280,7 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP
if ( vffi->dwSignature != VS_FFI_SIGNATURE )
{
WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
WARN("vffi->dwSignature is 0x%08x, but not 0x%08lx!\n",
vffi->dwSignature, VS_FFI_SIGNATURE );
len = 0xFFFFFFFF;
goto END;
......@@ -414,7 +414,7 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV
if ( vffi->dwSignature != VS_FFI_SIGNATURE )
{
WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
WARN("vffi->dwSignature is 0x%08x, but not 0x%08lx!\n",
vffi->dwSignature, VS_FFI_SIGNATURE );
len = 0xFFFFFFFF;
goto END;
......@@ -548,7 +548,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
DWORD len;
VS_VERSION_INFO_STRUCT32* vvis = (VS_VERSION_INFO_STRUCT32*)data;
TRACE("(%s,%ld,size=%ld,data=%p)\n",
TRACE("(%s,%d,size=%d,data=%p)\n",
debugstr_w(filename), handle, datasize, data );
if (!data)
......@@ -615,7 +615,7 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle,
UNICODE_STRING filenameW;
BOOL retval;
TRACE("(%s,%ld,size=%ld,data=%p)\n",
TRACE("(%s,%d,size=%d,data=%p)\n",
debugstr_a(filename), handle, datasize, data );
if(filename)
......
dlls/version/install.c
View file @ 54b1c5e0
......@@ -208,7 +208,7 @@ DWORD WINAPI VerFindFileA(
*lpuCurDirLen = curDirSizeReq;
}
TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
TRACE("ret = %u (%s%s%s) curdir=%s destdir=%s\n", retval,
(retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
(retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
(retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "",
......@@ -299,7 +299,7 @@ DWORD WINAPI VerFindFileW( UINT flags,LPWSTR lpszFilename,LPWSTR lpszWinDir,
*lpuCurDirLen = curDirSizeReq;
}
TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
TRACE("ret = %u (%s%s%s) curdir=%s destdir=%s\n", retval,
(retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
(retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
(retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "",
......@@ -338,7 +338,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) {
if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */
*vffi = (VS_FIXEDFILEINFO*)(buf+0x28);
if ((*vffi)->dwSignature != VS_FFI_SIGNATURE)
WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature);
WARN("Bad VS_FIXEDFILEINFO signature 0x%08x\n",(*vffi)->dwSignature);
return buf;
}
}
......
dlls/version/resource.c
View file @ 54b1c5e0
......@@ -403,7 +403,7 @@ DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
OFSTRUCT ofs;
DWORD reslen;
TRACE("(%s,type=0x%lx,id=0x%lx,off=%p)\n",
TRACE("(%s,type=0x%x,id=0x%x,off=%p)\n",
debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId,
lpszResId );
......@@ -440,7 +440,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
OFSTRUCT ofs;
DWORD reslen = dwResLen;
TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n",
TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n",
debugstr_a(lpszFileName), lpszResType, lpszResId,
dwFileOffset, dwResLen, lpvData );
......
dlls/version/ver16.c
View file @ 54b1c5e0
......@@ -44,7 +44,7 @@ DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
DWORD cbBuf, LPVOID lpvData )
{
TRACE("(%s, %08lx, %ld, %p)\n",
TRACE("(%s, %08x, %d, %p)\n",
debugstr_a(lpszFileName), handle, cbBuf, lpvData );
return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData );
......
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