Skip to content

W
wine-cw
Commit 6520ee04 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

msvcrt: Win64 printf format warning fixes.

parent f9593bfe
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
dlls/msvcrt/Makefile.in
View file @ 6520ee04
EXTRADEFS = -D_MT -DWINE_NO_LONG_AS_INT
EXTRADEFS = -D_MT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
......
dlls/msvcrt/cppexcept.c
View file @ 6520ee04
......@@ -396,7 +396,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
else
{
exc_type = NULL;
TRACE("handling C exception code %lx rec %p frame %p trylevel %d descr %p nested_frame %p\n",
TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n",
rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame );
}
......
dlls/msvcrt/except.c
View file @ 6520ee04
......@@ -161,7 +161,7 @@ int CDECL _except_handler2(PEXCEPTION_RECORD rec,
PCONTEXT context,
EXCEPTION_REGISTRATION_RECORD** dispatcher)
{
FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n",
FIXME("exception %x flags=%x at %p handler=%p %p %p stub\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
frame->Handler, context, dispatcher);
return ExceptionContinueSearch;
......@@ -180,7 +180,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec,
EXCEPTION_POINTERS exceptPtrs;
PSCOPETABLE pScopeTable;
TRACE("exception %lx flags=%lx at %p handler=%p %p %p semi-stub\n",
TRACE("exception %x flags=%x at %p handler=%p %p %p semi-stub\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
frame->handler, context, dispatcher);
......@@ -539,7 +539,7 @@ MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func)
*/
int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
{
TRACE("(%08lx,%p)\n", ex, ptr);
TRACE("(%08x,%p)\n", ex, ptr);
/* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */
return msvcrt_exception_filter(ptr);
}
dlls/msvcrt/file.c
View file @ 6520ee04
......@@ -449,7 +449,7 @@ int CDECL _access(const char *filename, int mode)
{
DWORD attr = GetFileAttributesA(filename);
TRACE("(%s,%d) %ld\n",filename,mode,attr);
TRACE("(%s,%d) %d\n",filename,mode,attr);
if (!filename || attr == INVALID_FILE_ATTRIBUTES)
{
......@@ -471,7 +471,7 @@ int CDECL _waccess(const MSVCRT_wchar_t *filename, int mode)
{
DWORD attr = GetFileAttributesW(filename);
TRACE("(%s,%d) %ld\n",debugstr_w(filename),mode,attr);
TRACE("(%s,%d) %d\n",debugstr_w(filename),mode,attr);
if (!filename || attr == INVALID_FILE_ATTRIBUTES)
{
......@@ -532,7 +532,7 @@ int CDECL _unlink(const char *path)
TRACE("%s\n",debugstr_a(path));
if(DeleteFileA(path))
return 0;
TRACE("failed (%ld)\n",GetLastError());
TRACE("failed (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -545,7 +545,7 @@ int CDECL _wunlink(const MSVCRT_wchar_t *path)
TRACE("(%s)\n",debugstr_w(path));
if(DeleteFileW(path))
return 0;
TRACE("failed (%ld)\n",GetLastError());
TRACE("failed (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -610,7 +610,7 @@ int CDECL _close(int fd)
ret = -1;
else if (!CloseHandle(hand))
{
WARN(":failed-last error (%ld)\n",GetLastError());
WARN(":failed-last error (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
ret = -1;
}
......@@ -644,7 +644,7 @@ int CDECL _commit(int fd)
*/
return 0;
}
TRACE(":failed-last error (%ld)\n",GetLastError());
TRACE(":failed-last error (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -816,7 +816,7 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence)
return ret.QuadPart;
}
TRACE(":error-last error (%ld)\n",GetLastError());
TRACE(":error-last error (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -850,7 +850,7 @@ int CDECL _locking(int fd, int mode, LONG nbytes)
return -1;
}
TRACE(":fd (%d) by 0x%08lx mode %s\n",
TRACE(":fd (%d) by 0x%08x mode %s\n",
fd,nbytes,(mode==MSVCRT__LK_UNLCK)?"_LK_UNLCK":
(mode==MSVCRT__LK_LOCK)?"_LK_LOCK":
(mode==MSVCRT__LK_NBLCK)?"_LK_NBLCK":
......@@ -1129,7 +1129,7 @@ int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf)
memset(buf, 0, sizeof(struct MSVCRT__stati64));
if (!GetFileInformationByHandle(hand, &hfi))
{
WARN(":failed-last error (%ld)\n",GetLastError());
WARN(":failed-last error (%d)\n",GetLastError());
msvcrt_set_errno(ERROR_INVALID_PARAMETER);
return -1;
}
......@@ -1144,7 +1144,7 @@ int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf)
buf->st_mode |= S_IFIFO;
else
buf->st_mode |= S_IFREG;
TRACE(":dwFileAttributes = 0x%lx, mode set to 0x%x\n",hfi.dwFileAttributes,
TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes,
buf->st_mode);
buf->st_nlink = hfi.nNumberOfLinks;
buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow;
......@@ -1457,7 +1457,7 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... )
hand = CreateFileA(path, access, sharing, &sa, creation, attrib, 0);
if (hand == INVALID_HANDLE_VALUE) {
WARN(":failed-last error (%ld)\n",GetLastError());
WARN(":failed-last error (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -1655,12 +1655,12 @@ static int read_i(int fd, void *buf, unsigned int count)
}
else
{
TRACE(":failed-last error (%ld)\n",GetLastError());
TRACE(":failed-last error (%d)\n",GetLastError());
return -1;
}
if (count > 4)
TRACE("(%lu), %s\n",num_read,debugstr_an(buf, num_read));
TRACE("(%u), %s\n",num_read,debugstr_an(buf, num_read));
return num_read;
}
......@@ -1707,7 +1707,7 @@ int CDECL MSVCRT__stati64(const char* path, struct MSVCRT__stati64 * buf)
if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi))
{
TRACE("failed (%ld)\n",GetLastError());
TRACE("failed (%d)\n",GetLastError());
msvcrt_set_errno(ERROR_FILE_NOT_FOUND);
return -1;
}
......@@ -1786,7 +1786,7 @@ int CDECL MSVCRT__wstati64(const MSVCRT_wchar_t* path, struct MSVCRT__stati64 *
if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi))
{
TRACE("failed (%ld)\n",GetLastError());
TRACE("failed (%d)\n",GetLastError());
msvcrt_set_errno(ERROR_FILE_NOT_FOUND);
return -1;
}
......@@ -1880,7 +1880,7 @@ char * CDECL _tempnam(const char *dir, const char *prefix)
DeleteFileA(tmpbuf);
return _strdup(tmpbuf);
}
TRACE("failed (%ld)\n",GetLastError());
TRACE("failed (%d)\n",GetLastError());
return NULL;
}
......@@ -1898,7 +1898,7 @@ MSVCRT_wchar_t * CDECL _wtempnam(const MSVCRT_wchar_t *dir, const MSVCRT_wchar_t
DeleteFileW(tmpbuf);
return _wcsdup(tmpbuf);
}
TRACE("failed (%ld)\n",GetLastError());
TRACE("failed (%d)\n",GetLastError());
return NULL;
}
......@@ -1973,7 +1973,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count)
if (WriteFile(hand, buf, count, &num_written, NULL)
&& (num_written == count))
return num_written;
TRACE("WriteFile (fd %d, hand %p) failed-last error (%ld)\n", fd,
TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd,
hand, GetLastError());
*MSVCRT__errno() = MSVCRT_ENOSPC;
}
......@@ -2017,7 +2017,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count)
if ((WriteFile(hand, p, count+nr_lf, &num_written, NULL) == 0 ) || (num_written != count+nr_lf))
{
TRACE("WriteFile (fd %d, hand %p) failed-last error (%ld), num_written %ld\n",
TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n",
fd, hand, GetLastError(), num_written);
*MSVCRT__errno() = MSVCRT_ENOSPC;
if(nr_lf)
......@@ -2571,7 +2571,7 @@ MSVCRT_FILE* CDECL MSVCRT_freopen(const char *path, const char *mode,MSVCRT_FILE
else if (msvcrt_init_fp(file, fd, stream_flags) == -1)
{
file->_flag = 0;
WARN(":failed-last error (%ld)\n",GetLastError());
WARN(":failed-last error (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
file = NULL;
}
......@@ -2776,7 +2776,7 @@ int CDECL MSVCRT_remove(const char *path)
TRACE("(%s)\n",path);
if (DeleteFileA(path))
return 0;
TRACE(":failed (%ld)\n",GetLastError());
TRACE(":failed (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -2789,7 +2789,7 @@ int CDECL _wremove(const MSVCRT_wchar_t *path)
TRACE("(%s)\n",debugstr_w(path));
if (DeleteFileW(path))
return 0;
TRACE(":failed (%ld)\n",GetLastError());
TRACE(":failed (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -2802,7 +2802,7 @@ int CDECL MSVCRT_rename(const char *oldpath,const char *newpath)
TRACE(":from %s to %s\n",oldpath,newpath);
if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED))
return 0;
TRACE(":failed (%ld)\n",GetLastError());
TRACE(":failed (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......@@ -2815,7 +2815,7 @@ int CDECL _wrename(const MSVCRT_wchar_t *oldpath,const MSVCRT_wchar_t *newpath)
TRACE(":from %s to %s\n",debugstr_w(oldpath),debugstr_w(newpath));
if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED))
return 0;
TRACE(":failed (%ld)\n",GetLastError());
TRACE(":failed (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1;
}
......
dlls/msvcrt/locale.c
View file @ 6520ee04
......@@ -433,7 +433,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale)
lcid = MSVCRT_locale_to_LCID(&lc);
TRACE(":found LCID %ld\n",lcid);
TRACE(":found LCID %d\n",lcid);
if (lcid == 0)
{
......@@ -580,7 +580,7 @@ int CDECL __crtLCMapStringA(
LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst,
int dstlen, unsigned int codepage, int xflag
) {
FIXME("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n",
FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n",
lcid,mapflags,src,srclen,dst,dstlen,codepage,xflag);
/* FIXME: A bit incorrect. But msvcrt itself just converts its
* arguments to wide strings and then calls LCMapStringW
......
dlls/msvcrt/main.c
View file @ 6520ee04
......@@ -37,7 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
thread_data_t *tls;
TRACE("(%p, %s, %p) pid(%lx), tid(%lx), tls(%ld)\n",
TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%ld)\n",
hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved,
GetCurrentProcessId(), GetCurrentThreadId(),
(long)msvcrt_tls_index);
......
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