diff --git a/dlls/concrt140/Makefile.in b/dlls/concrt140/Makefile.in index 3b74c2e5b4b..aac1ed7b34a 100644 --- a/dlls/concrt140/Makefile.in +++ b/dlls/concrt140/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = concrt140.dll PARENTSRC = ../msvcrt diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 619fd59c5c4..ffdbb2ab7a1 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTDLL -D_CRTIMP= +EXTRADEFS = -D_CRTDLL -D_CRTIMP= MODULE = crtdll.dll IMPORTS = ntdll DELAYIMPORTS = advapi32 user32 diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 94962b962f3..a48ae314257 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 IMPORTS = ntdll diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 7d5ec65444a..26db1d46f7a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 IMPORTS = ntdll diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index c4cbb9ab5c2..d2957c2f1d3 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 IMPORTS = ntdll diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index ac08107c04e..4383c5ccb87 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 IMPORTS = ntdll diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index d0d265ef344..5a83c81c547 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 IMPORTS = ntdll diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b9cb3fd88d8..2153949b41e 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 IMPORTS = ntdll diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 876553d6c02..96176a12553 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 IMPORTS = ntdll diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index d6aa44dd7ce..e8a510d9937 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt IMPORTS = ntdll diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 6afe6e81489..e5a24f13855 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -527,7 +527,7 @@ DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_ctor_name, 12) scheduler_resource_allocation_error* __thiscall scheduler_resource_allocation_error_ctor_name( scheduler_resource_allocation_error *this, const char *name, HRESULT hr) { - TRACE("(%p %s %x)\n", this, wine_dbgstr_a(name), hr); + TRACE("(%p %s %lx)\n", this, wine_dbgstr_a(name), hr); __exception_ctor(&this->e, name, &scheduler_resource_allocation_error_vtable); this->hr = hr; return this; @@ -1101,7 +1101,7 @@ static void ThreadScheduler_dtor(ThreadScheduler *this) { int i; - if(this->ref != 0) WARN("ref = %d\n", this->ref); + if(this->ref != 0) WARN("ref = %ld\n", this->ref); SchedulerPolicy_dtor(&this->policy); for(i=0; ishutdown_count; i++) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 3e41887e88e..2c549c1e7a5 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -153,7 +153,7 @@ static BOOL handle_enhanced_keys(INPUT_RECORD *ir, unsigned char *ch1, unsigned } } - WARN("Unmapped char keyState=%x vk=%x\n", + WARN("Unmapped char keyState=%lx vk=%x\n", ir->Event.KeyEvent.dwControlKeyState, ir->Event.KeyEvent.wVirtualScanCode); return FALSE; } diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ac0bb50f0fb..a7140a9011f 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -272,7 +272,7 @@ int CDECL raise(int sig) */ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) { - TRACE("(%08x,%p)\n", ex, ptr); + TRACE("(%08lx,%p)\n", ex, ptr); /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ return msvcrt_exception_filter(ptr); } diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 23a027368ba..eb41af36d7e 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -368,7 +368,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG *rec = *prev_rec; rec->ExceptionFlags &= ~EH_UNWINDING; if(TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); @@ -538,7 +538,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) if (rec->ExceptionCode != CXX_EXCEPTION) { - TRACE( "non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode ); + TRACE( "non-c++ exception thrown in SEH handler: %lx\n", rec->ExceptionCode ); terminate(); } @@ -601,7 +601,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame *rec = *msvcrt_get_thread_data()->exc_record; rec->ExceptionFlags &= ~EH_UNWINDING; if(TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); @@ -633,7 +633,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame thread_data_t *data = msvcrt_get_thread_data(); exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n", + TRACE("handling C exception code %lx rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); if (data->se_translator) { @@ -866,7 +866,7 @@ int CDECL _except_handler2(PEXCEPTION_RECORD rec, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatcher) { - FIXME("exception %x flags=%x at %p handler=%p %p %p stub\n", + FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->Handler, context, dispatcher); return ExceptionContinueSearch; @@ -883,7 +883,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, EXCEPTION_POINTERS exceptPtrs; PSCOPETABLE pScopeTable; - TRACE("exception %x flags=%x at %p handler=%p %p %p semi-stub\n", + TRACE("exception %lx flags=%lx at %p handler=%p %p %p semi-stub\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->handler, context, dispatcher); @@ -952,7 +952,7 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), EXCEPTION_POINTERS exceptPtrs; const SCOPETABLE_V4 *scope_table = get_scopetable_v4( frame, *cookie ); - TRACE( "exception %x flags=%x at %p handler=%p %p %p cookie=%x scope table=%p cookies=%d/%x,%d/%x\n", + TRACE( "exception %lx flags=%lx at %p handler=%p %p %p cookie=%lx scope table=%p cookies=%d/%lx,%d/%lx\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->handler, context, dispatcher, *cookie, scope_table, scope_table->gs_cookie_offset, scope_table->gs_cookie_xor, @@ -1187,7 +1187,7 @@ int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, rec.Cause.Underflow = rec.Enable.Underflow & rec.Status.Underflow; rec.Cause.Inexact = rec.Enable.Inexact & rec.Status.Inexact; - TRACE("opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + TRACE("opcode: %lx\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); if(*(WORD*)ctx->ErrorOffset == 0x35dc) { /* fdiv m64fp */ if(exception_code==STATUS_FLOAT_DIVIDE_BY_ZERO || exception_code==STATUS_FLOAT_INVALID_OPERATION) { @@ -1213,7 +1213,7 @@ int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, return ret; } - FIXME("unsupported opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + FIXME("unsupported opcode: %lx\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7cbffc0d837..15ba21b0c44 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -350,7 +350,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) } __EXCEPT_CTX(cxx_rethrow_filter, &ctx) { - TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; if (untrans_rec) @@ -486,7 +486,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) if (rec->ExceptionCode != CXX_EXCEPTION) { - TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode); + TRACE("non-c++ exception thrown in SEH handler: %lx\n", rec->ExceptionCode); terminate(); } @@ -558,7 +558,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("nested exception detected\n"); unwindlevel = tryblock->end_level; orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); - TRACE("setting orig_frame to %lx\n", orig_frame); + TRACE("setting orig_frame to %I64x\n", orig_frame); } } } @@ -591,7 +591,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { - TRACE("handling C++ exception rec %p frame %lx descr %p\n", rec, frame, descr); + TRACE("handling C++ exception rec %p frame %I64x descr %p\n", rec, frame, descr); dump_exception_type(exc_type, rec->ExceptionInformation[3]); dump_function_descr(descr, dispatch->ImageBase); } @@ -601,7 +601,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, thread_data_t *data = msvcrt_get_thread_data(); exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %lx descr %p\n", + TRACE("handling C exception code %lx rec %p frame %I64x descr %p\n", rec->ExceptionCode, rec, frame, descr); if (data->se_translator) { @@ -647,7 +647,7 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { - TRACE( "%p %lx %p %p\n", rec, frame, context, dispatch ); + TRACE( "%p %I64x %p %p\n", rec, frame, context, dispatch ); return cxx_frame_handler( rec, frame, context, dispatch, rva_to_ptr(*(UINT*)dispatch->HandlerData, dispatch->ImageBase) ); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2666492956c..f62d7704eed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -822,7 +822,7 @@ int CDECL _access(const char *filename, int mode) { DWORD attr = GetFileAttributesA(filename); - TRACE("(%s,%d) %d\n",filename,mode,attr); + TRACE("(%s,%d) %ld\n", filename, mode, attr); if (!filename || attr == INVALID_FILE_ATTRIBUTES) { @@ -857,7 +857,7 @@ int CDECL _waccess(const wchar_t *filename, int mode) { DWORD attr = GetFileAttributesW(filename); - TRACE("(%s,%d) %d\n",debugstr_w(filename),mode,attr); + TRACE("(%s,%d) %ld\n", debugstr_w(filename), mode, attr); if (!filename || attr == INVALID_FILE_ATTRIBUTES) { @@ -928,10 +928,10 @@ int CDECL _wchmod(const wchar_t *path, int flags) */ int CDECL _unlink(const char *path) { - TRACE("%s\n",debugstr_a(path)); + TRACE("%s\n", debugstr_a(path)); if(DeleteFileA(path)) return 0; - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -941,10 +941,10 @@ int CDECL _unlink(const char *path) */ int CDECL _wunlink(const wchar_t *path) { - TRACE("(%s)\n",debugstr_w(path)); + TRACE("(%s)\n", debugstr_w(path)); if(DeleteFileW(path)) return 0; - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -972,7 +972,7 @@ int CDECL _commit(int fd) } else { - TRACE(":failed-last error (%d)\n",GetLastError()); + TRACE(":failed-last error (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); ret = -1; } @@ -1083,7 +1083,7 @@ int CDECL _close(int fd) ret = CloseHandle(info->handle) ? 0 : -1; msvcrt_free_fd(fd); if (ret) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-last error (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); } } @@ -1309,7 +1309,7 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence) return ofs.QuadPart; } release_ioinfo(info); - TRACE(":error-last error (%d)\n",GetLastError()); + TRACE(":error-last error (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -1369,18 +1369,18 @@ int CDECL _locking(int fd, int mode, __msvcrt_long nbytes) return -1; } - TRACE(":fd (%d) by 0x%08Ix mode %s\n", - fd,nbytes,(mode==_LK_UNLCK)?"_LK_UNLCK": - (mode==_LK_LOCK)?"_LK_LOCK": - (mode==_LK_NBLCK)?"_LK_NBLCK": - (mode==_LK_RLCK)?"_LK_RLCK": - (mode==_LK_NBRLCK)?"_LK_NBRLCK": - "UNKNOWN"); + TRACE(":fd (%d) by 0x%lx mode %s\n", + fd, nbytes, (mode == _LK_UNLCK) ? "_LK_UNLCK" : + (mode == _LK_LOCK) ? "_LK_LOCK" : + (mode == _LK_NBLCK) ? "_LK_NBLCK" : + (mode == _LK_RLCK) ? "_LK_RLCK" : + (mode == _LK_NBRLCK) ? "_LK_NBRLCK" : + "UNKNOWN"); if ((cur_locn = SetFilePointer(info->handle, 0L, NULL, FILE_CURRENT)) == INVALID_SET_FILE_POINTER) { release_ioinfo(info); - FIXME ("Seek failed\n"); + FIXME("Seek failed\n"); *_errno() = EINVAL; /* FIXME */ return -1; } @@ -1802,7 +1802,7 @@ int CDECL _fstat64(int fd, struct _stat64* buf) if ((status = NtQueryInformationFile( info->handle, &io, &basic_info, sizeof(basic_info), FileBasicInformation )) || (status = NtQueryInformationFile( info->handle, &io, &std_info, sizeof(std_info), FileStandardInformation ))) { - WARN(":failed-error %x\n",status); + WARN(":failed-error %lx\n", status); msvcrt_set_errno(ERROR_INVALID_PARAMETER); release_ioinfo(info); return -1; @@ -1816,7 +1816,8 @@ int CDECL _fstat64(int fd, struct _stat64* buf) RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; buf->st_nlink = std_info.NumberOfLinks; - TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",basic_info.FileAttributes, buf->st_mode); + TRACE(":dwFileAttributes = 0x%lx, mode set to 0x%x\n", + basic_info.FileAttributes, buf->st_mode); } release_ioinfo(info); return 0; @@ -2303,7 +2304,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-last error (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return *_errno(); } @@ -2547,7 +2548,7 @@ int CDECL _open_osfhandle(intptr_t handle, int oflags) flags |= split_oflags(oflags); fd = msvcrt_alloc_fd((HANDLE)handle, flags); - TRACE(":handle (%Iu) fd (%d) flags 0x%08x\n", handle, fd, flags); + TRACE(":handle (%Iu) fd (%d) flags 0x%08lx\n", handle, fd, flags); return fd; } @@ -2913,14 +2914,14 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) } else { - TRACE(":failed-last error (%d)\n",GetLastError()); + TRACE(":failed-last error (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } } if (count > 4) - TRACE("(%u), %s\n",num_read,debugstr_an(buf, num_read)); + TRACE("(%lu), %s\n", num_read, debugstr_an(buf, num_read)); return num_read; } @@ -2994,7 +2995,7 @@ int CDECL _stat64(const char* path, struct _stat64 * buf) unsigned short mode = ALL_S_IREAD; int plen; - TRACE(":file (%s) buf(%p)\n",path,buf); + TRACE(":file (%s) buf(%p)\n", path, buf); plen = strlen(path); while (plen && path[plen-1]==' ') @@ -3016,7 +3017,7 @@ int CDECL _stat64(const char* path, struct _stat64 * buf) if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) { - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n", GetLastError()); *_errno() = ENOENT; return -1; } @@ -3150,7 +3151,7 @@ int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf) unsigned short mode = ALL_S_IREAD; int plen; - TRACE(":file (%s) buf(%p)\n",debugstr_w(path),buf); + TRACE(":file (%s) buf(%p)\n", debugstr_w(path), buf); plen = wcslen(path); while (plen && path[plen-1]==' ') @@ -3172,7 +3173,7 @@ int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf) if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) { - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n", GetLastError()); *_errno() = ENOENT; return -1; } @@ -3316,14 +3317,14 @@ char * CDECL _tempnam(const char *dir, const char *prefix) if (tmp_dir) dir = tmp_dir; - TRACE("dir (%s) prefix (%s)\n",dir,prefix); + TRACE("dir (%s) prefix (%s)\n", dir, prefix); if (GetTempFileNameA(dir,prefix,0,tmpbuf)) { - TRACE("got name (%s)\n",tmpbuf); + TRACE("got name (%s)\n", tmpbuf); DeleteFileA(tmpbuf); return _strdup(tmpbuf); } - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n", GetLastError()); return NULL; } @@ -3337,14 +3338,14 @@ wchar_t * CDECL _wtempnam(const wchar_t *dir, const wchar_t *prefix) if (tmp_dir) dir = tmp_dir; - TRACE("dir (%s) prefix (%s)\n",debugstr_w(dir),debugstr_w(prefix)); + TRACE("dir (%s) prefix (%s)\n", debugstr_w(dir), debugstr_w(prefix)); if (GetTempFileNameW(dir,prefix,0,tmpbuf)) { - TRACE("got name (%s)\n",debugstr_w(tmpbuf)); + TRACE("got name (%s)\n", debugstr_w(tmpbuf)); DeleteFileW(tmpbuf); return _wcsdup(tmpbuf); } - TRACE("failed (%d)\n",GetLastError()); + TRACE("failed (%ld)\n", GetLastError()); return NULL; } @@ -3456,7 +3457,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) if (!WriteFile(hand, buf, count, &num_written, NULL) || num_written != count) { - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, + TRACE("WriteFile (fd %d, hand %p) failed-last error (%ld)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); num_written = -1; @@ -3584,7 +3585,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) if (num_written != j) { - TRACE("WriteFile/WriteConsoleW (fd %d, hand %p) failed-last error (%d)\n", fd, + TRACE("WriteFile/WriteConsoleW (fd %d, hand %p) failed-last error (%ld)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); release_ioinfo(info); @@ -4840,10 +4841,10 @@ int CDECL _putws(const wchar_t *s) */ int CDECL remove(const char *path) { - TRACE("(%s)\n",path); + TRACE("(%s)\n", path); if (DeleteFileA(path)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -4853,10 +4854,10 @@ int CDECL remove(const char *path) */ int CDECL _wremove(const wchar_t *path) { - TRACE("(%s)\n",debugstr_w(path)); + TRACE("(%s)\n", debugstr_w(path)); if (DeleteFileW(path)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -4866,10 +4867,10 @@ int CDECL _wremove(const wchar_t *path) */ int CDECL rename(const char *oldpath,const char *newpath) { - TRACE(":from %s to %s\n",oldpath,newpath); + TRACE(":from %s to %s\n", oldpath, newpath); if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } @@ -4879,10 +4880,10 @@ int CDECL rename(const char *oldpath,const char *newpath) */ int CDECL _wrename(const wchar_t *oldpath,const wchar_t *newpath) { - TRACE(":from %s to %s\n",debugstr_w(oldpath),debugstr_w(newpath)); + TRACE(":from %s to %s\n", debugstr_w(oldpath), debugstr_w(newpath)); if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) return 0; - TRACE(":failed (%d)\n",GetLastError()); + TRACE(":failed (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); return -1; } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3b3d027f466..924671e7047 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -854,7 +854,7 @@ int CDECL __crtLCMapStringA( WCHAR buf_out[32], *out = buf_out; int in_len, out_len, r; - TRACE("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + TRACE("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n", lcid, mapflags, src, srclen, dst, dstlen, codepage, xflag); in_len = MultiByteToWideChar(codepage, MB_ERR_INVALID_CHARS, src, srclen, NULL, 0); @@ -904,7 +904,7 @@ done: int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int srclen, wchar_t *dst, int dstlen, unsigned int codepage, int xflag) { - FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + FIXME("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n", lcid, mapflags, debugstr_w(src), srclen, dst, dstlen, codepage, xflag); return LCMapStringW(lcid, mapflags, src, srclen, dst, dstlen); @@ -916,7 +916,7 @@ int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1, const char *src2, int len2 ) { - FIXME("(lcid %x, flags %x, %s(%d), %s(%d), partial stub\n", + FIXME("(lcid %lx, flags %lx, %s(%d), %s(%d), partial stub\n", lcid, flags, debugstr_a(src1), len1, debugstr_a(src2), len2 ); /* FIXME: probably not entirely right */ return CompareStringA( lcid, flags, src1, len1, src2, len2 ); @@ -928,7 +928,7 @@ int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len int CDECL __crtCompareStringW( LCID lcid, DWORD flags, const wchar_t *src1, int len1, const wchar_t *src2, int len2 ) { - FIXME("(lcid %x, flags %x, %s(%d), %s(%d), partial stub\n", + FIXME("(lcid %lx, flags %lx, %s(%d), %s(%d), partial stub\n", lcid, flags, debugstr_w(src1), len1, debugstr_w(src2), len2 ); /* FIXME: probably not entirely right */ return CompareStringW( lcid, flags, src1, len1, src2, len2 ); @@ -939,7 +939,7 @@ int CDECL __crtCompareStringW( LCID lcid, DWORD flags, const wchar_t *src1, int */ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, wchar_t *buffer, int len ) { - FIXME("(lcid %x, type %x, %p(%d), partial stub\n", lcid, type, buffer, len ); + FIXME("(lcid %lx, type %lx, %p(%d), partial stub\n", lcid, type, buffer, len ); /* FIXME: probably not entirely right */ return GetLocaleInfoW( lcid, type, buffer, len ); } @@ -950,7 +950,7 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, wchar_t *buffer, int len */ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, wchar_t *buffer, int len ) { - TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len); + TRACE("(%s, %lx, %p, %d)\n", debugstr_w(locale), type, buffer, len); return GetLocaleInfoEx(locale, type, buffer, len); } #endif @@ -964,7 +964,7 @@ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, wchar_t *buffe BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, wchar_t *buffer, int len, WORD *out) { - FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n", + FIXME("(unk %lx, type %lx, wstr %p(%d), %p) partial stub\n", unk, type, buffer, len, out); return GetStringTypeW(type, buffer, len, out); diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 23dfb24ac5d..db8554668ad 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -89,7 +89,7 @@ static inline void msvcrt_free_tls_mem(void) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%u)\n", + TRACE("(%p, %s, %p) pid(%lx), tid(%lx), tls(%lu)\n", hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved, GetCurrentProcessId(), GetCurrentThreadId(), msvcrt_tls_index); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 33afe8d1d90..854403a71bf 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -10318,7 +10318,7 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, WORD operation; int raise = 0; - TRACE("(%x %x %lf %lf %x %p)\n", fpe, op, arg, res, cw, unk); + TRACE("(%lx %x %lf %lf %lx %p)\n", fpe, op, arg, res, cw, unk); #ifdef _WIN64 cw = ((cw >> 7) & 0x3f) | ((cw >> 3) & 0xc00); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 03af50d8b01..166af32cd27 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -325,7 +325,10 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) ret = MultiByteToWideChar(newcp, 0, bufA, charcount, bufW, charcount); if (ret != charcount) - ERR("MultiByteToWideChar of chars failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); + { + ERR("MultiByteToWideChar of chars failed for cp %d, ret=%d (exp %d), error=%ld\n", + newcp, ret, charcount, GetLastError()); + } GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); LCMapStringW(lcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); @@ -350,7 +353,10 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) ret = WideCharToMultiByte(newcp, 0, bufW, charcount, bufA, charcount, NULL, NULL); if (ret != charcount) - ERR("WideCharToMultiByte failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); + { + ERR("WideCharToMultiByte failed for cp %d, ret=%d (exp %d), error=%ld\n", + newcp, ret, charcount, GetLastError()); + } charcount = 0; for (i = 0; i < 256; i++) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 73fadfcbb74..16188394b98 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -516,7 +516,7 @@ int CDECL __crtGetShowWindowMode(void) STARTUPINFOW si; GetStartupInfoW(&si); - TRACE("flags=%x window=%d\n", si.dwFlags, si.wShowWindow); + TRACE("flags=%lx window=%d\n", si.dwFlags, si.wShowWindow); return si.dwFlags & STARTF_USESHOWWINDOW ? si.wShowWindow : SW_SHOWDEFAULT; } @@ -526,7 +526,7 @@ int CDECL __crtGetShowWindowMode(void) BOOL CDECL __crtInitializeCriticalSectionEx( CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) { - TRACE("(%p %x %x)\n", cs, spin_count, flags); + TRACE("(%p %lx %lx)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); } @@ -570,7 +570,7 @@ LONG CDECL __crtUnhandledException(EXCEPTION_POINTERS *ep) */ void CDECL __crtSleep(DWORD timeout) { - TRACE("(%u)\n", timeout); + TRACE("(%lu)\n", timeout); Sleep(timeout); } diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index e71b949a6d5..6aad9a22d47 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -164,7 +164,7 @@ uintptr_t CDECL _beginthread( (void*)start_address, &trampoline->module)) { trampoline->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); + WARN("failed to get module for the start_address: %lu\n", GetLastError()); } #endif @@ -230,7 +230,7 @@ uintptr_t CDECL _beginthreadex( (void*)start_address, &trampoline->module)) { trampoline->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); + WARN("failed to get module for the start_address: %lu\n", GetLastError()); } #endif diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 7f9151d4c3a..bd4f78729d0 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd IMPORTS = ntdll diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index e7d9951575e..bf7f62ada8a 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase IMPORTS = ntdll