marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imagehlp: Win64 printf format warning fixes.

oldstable
Michael Stefaniuc 2006-10-08 18:58:00 +02:00 committed by Alexandre Julliard
parent 86bb053cf8
commit 56c90105b7
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/imagehlp/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DWINE_NO_LONG_AS_INT EXTRADEFS = -D_IMAGEHLP_SOURCE_
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

4
dlls/imagehlp/access.c
View File

@ -174,7 +174,7 @@ BOOL WINAPI MapAndLoad(
hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL))) hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL)))
{ {
DWORD dwLastError = GetLastError(); DWORD dwLastError = GetLastError();
WARN("CreateFileMapping: Error = %ld\n", dwLastError); WARN("CreateFileMapping: Error = %d\n", dwLastError);
SetLastError(dwLastError); SetLastError(dwLastError);
goto Error; goto Error;
} }
@ -185,7 +185,7 @@ BOOL WINAPI MapAndLoad(
hFileMapping, FILE_MAP_READ, 0, 0, 0))) hFileMapping, FILE_MAP_READ, 0, 0, 0)))
{ {
DWORD dwLastError = GetLastError(); DWORD dwLastError = GetLastError();
WARN("MapViewOfFile: Error = %ld\n", dwLastError); WARN("MapViewOfFile: Error = %d\n", dwLastError);
SetLastError(dwLastError); SetLastError(dwLastError);
goto Error; goto Error;
} }

16
dlls/imagehlp/integrity.c
View File

@ -79,7 +79,7 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle,
sd = &nt_hdr.OptionalHeader. sd = &nt_hdr.OptionalHeader.
DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY];
TRACE("size = %lx addr = %lx\n", sd->Size, sd->VirtualAddress); TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress);
*pdwSize = sd->Size; *pdwSize = sd->Size;
*pdwOfs = sd->VirtualAddress; *pdwOfs = sd->VirtualAddress;
@ -134,7 +134,7 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num,
*pdwOfs = sd_VirtualAddr + offset; *pdwOfs = sd_VirtualAddr + offset;
*pdwSize = len; *pdwSize = len;
TRACE("len = %lx addr = %lx\n", len, sd_VirtualAddr + offset); TRACE("len = %x addr = %x\n", len, sd_VirtualAddr + offset);
return TRUE; return TRUE;
} }
@ -166,7 +166,7 @@ BOOL WINAPI ImageEnumerateCertificates(
const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate;
BOOL r; BOOL r;
TRACE("%p %hd %p %p %ld\n", TRACE("%p %hd %p %p %d\n",
handle, TypeFilter, CertificateCount, Indices, IndexCount); handle, TypeFilter, CertificateCount, Indices, IndexCount);
if( Indices ) if( Indices )
@ -194,7 +194,7 @@ BOOL WINAPI ImageEnumerateCertificates(
if( count != cert_hdr_size ) if( count != cert_hdr_size )
return FALSE; return FALSE;
TRACE("Size = %08lx id = %08hx\n", TRACE("Size = %08x id = %08hx\n",
hdr.dwLength, hdr.wCertificateType ); hdr.dwLength, hdr.wCertificateType );
/* check the certificate is not too big or too small */ /* check the certificate is not too big or too small */
@ -227,7 +227,7 @@ BOOL WINAPI ImageGetCertificateData(
{ {
DWORD r, offset, ofs, size, count; DWORD r, offset, ofs, size, count;
TRACE("%p %ld %p %p\n", handle, Index, Certificate, RequiredLength); TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength);
if( !IMAGEHLP_GetCertificateOffset( handle, Index, &ofs, &size ) ) if( !IMAGEHLP_GetCertificateOffset( handle, Index, &ofs, &size ) )
return FALSE; return FALSE;
@ -271,7 +271,7 @@ BOOL WINAPI ImageGetCertificateHeader(
DWORD r, offset, ofs, size, count; DWORD r, offset, ofs, size, count;
const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate; const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate;
TRACE("%p %ld %p\n", handle, index, pCert); TRACE("%p %d %p\n", handle, index, pCert);
if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) ) if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) )
return FALSE; return FALSE;
@ -301,7 +301,7 @@ BOOL WINAPI ImageGetDigestStream(
HANDLE FileHandle, DWORD DigestLevel, HANDLE FileHandle, DWORD DigestLevel,
DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle) DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle)
{ {
FIXME("(%p, %ld, %p, %p): stub\n", FIXME("(%p, %d, %p, %p): stub\n",
FileHandle, DigestLevel, DigestFunction, DigestHandle FileHandle, DigestLevel, DigestFunction, DigestHandle
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -313,7 +313,7 @@ BOOL WINAPI ImageGetDigestStream(
*/ */
BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index)
{ {
FIXME("(%p, %ld): stub\n", FileHandle, Index); FIXME("(%p, %d): stub\n", FileHandle, Index);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }

10
dlls/imagehlp/modify.c
View File

@ -49,7 +49,7 @@ BOOL WINAPI BindImageEx(
DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath, DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath,
PIMAGEHLP_STATUS_ROUTINE StatusRoutine) PIMAGEHLP_STATUS_ROUTINE StatusRoutine)
{ {
FIXME("(%ld, %s, %s, %s, %p): stub\n", FIXME("(%d, %s, %s, %s, %p): stub\n",
Flags, debugstr_a(ImageName), debugstr_a(DllPath), Flags, debugstr_a(ImageName), debugstr_a(DllPath),
debugstr_a(SymbolPath), StatusRoutine debugstr_a(SymbolPath), StatusRoutine
); );
@ -95,7 +95,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
DWORD CalcSum; DWORD CalcSum;
DWORD HdrSum; DWORD HdrSum;
FIXME("(%p, %ld, %p, %p): stub\n", FIXME("(%p, %d, %p, %p): stub\n",
BaseAddress, FileLength, HeaderSum, CheckSum BaseAddress, FileLength, HeaderSum, CheckSum
); );
@ -278,7 +278,7 @@ BOOL WINAPI ReBaseImage(
ULONG *NewImageBase, ULONG TimeStamp) ULONG *NewImageBase, ULONG TimeStamp)
{ {
FIXME( FIXME(
"(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n", "(%s, %s, %d, %d, %d, %d, %p, %p, %p, %p, %d): stub\n",
debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase, debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase,
fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize, fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize,
OldImageBase, NewImageSize, NewImageBase, TimeStamp OldImageBase, NewImageSize, NewImageBase, TimeStamp
@ -316,7 +316,7 @@ BOOL WINAPI SplitSymbols(
LPSTR ImageName, LPSTR SymbolsPath, LPSTR ImageName, LPSTR SymbolsPath,
LPSTR SymbolFilePath, DWORD Flags) LPSTR SymbolFilePath, DWORD Flags)
{ {
FIXME("(%s, %s, %s, %ld): stub\n", FIXME("(%s, %s, %s, %d): stub\n",
debugstr_a(ImageName), debugstr_a(SymbolsPath), debugstr_a(ImageName), debugstr_a(SymbolsPath),
debugstr_a(SymbolFilePath), Flags debugstr_a(SymbolFilePath), Flags
); );
@ -346,7 +346,7 @@ BOOL WINAPI UpdateDebugInfoFileEx(
LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath, LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath,
PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum) PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum)
{ {
FIXME("(%s, %s, %s, %p, %ld): stub\n", FIXME("(%s, %s, %s, %p, %d): stub\n",
debugstr_a(ImageFileName), debugstr_a(SymbolPath), debugstr_a(ImageFileName), debugstr_a(SymbolPath),
debugstr_a(DebugFilePath), NtHeaders, OldChecksum debugstr_a(DebugFilePath), NtHeaders, OldChecksum
); );