diff --git a/reactos/base/applications/network/tracert/tracert.c b/reactos/base/applications/network/tracert/tracert.c index f852bfd1fef..0377d80b17d 100644 --- a/reactos/base/applications/network/tracert/tracert.c +++ b/reactos/base/applications/network/tracert/tracert.c @@ -396,7 +396,11 @@ DecodeResponse(PAPPINFO pInfo) DebugPrint(_T("Rouge packet: header id, process id %d"), TTLExceedHdr->OrigIcmpHeader.id, GetCurrentProcessId()); return -1; } +#ifndef _WIN64 _tprintf(_T("%3lld ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#else + _tprintf(_T("%3I64d ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#endif return 0; case ECHO_REPLY : @@ -407,7 +411,11 @@ DecodeResponse(PAPPINFO pInfo) DebugPrint(_T("Rouge packet: header id %d, process id %d"), IcmpHdr->icmpheader.id, GetCurrentProcessId()); return -1; } +#ifndef _WIN64 _tprintf(_T("%3lld ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#else + _tprintf(_T("%3I64d ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#endif return 1; case DEST_UNREACHABLE : diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild index fdd1bd78caa..43dbf2fc8ee 100644 --- a/reactos/base/applications/regedit/regedit.rbuild +++ b/reactos/base/applications/regedit/regedit.rbuild @@ -1,7 +1,7 @@ - + . @@ -12,7 +12,6 @@ user32 gdi32 advapi32 - comdlg32 ole32 shell32 comctl32 diff --git a/reactos/base/applications/taskmgr/taskmgr.rbuild b/reactos/base/applications/taskmgr/taskmgr.rbuild index 4b9022bbaa4..758b27d53ec 100644 --- a/reactos/base/applications/taskmgr/taskmgr.rbuild +++ b/reactos/base/applications/taskmgr/taskmgr.rbuild @@ -1,10 +1,9 @@ - + . 0x0501 0x0501 - msvcrt ntdll kernel32 advapi32 diff --git a/reactos/base/applications/wordpad/wordpad.rbuild b/reactos/base/applications/wordpad/wordpad.rbuild index 586227095c7..a06949b8db8 100644 --- a/reactos/base/applications/wordpad/wordpad.rbuild +++ b/reactos/base/applications/wordpad/wordpad.rbuild @@ -10,7 +10,6 @@ shell32 user32 gdi32 - msvcrt advapi32 kernel32 comctl32 diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index a40728bb76c..26ece1e3823 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -699,7 +699,7 @@ SetupStartPage(PINPUT_RECORD Ir) INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - SIZE_T ReturnSize; + ULONG ReturnSize; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c index c78597e9cd1..e4807836c19 100644 --- a/reactos/base/setup/usetup/partlist.c +++ b/reactos/base/setup/usetup/partlist.c @@ -906,7 +906,7 @@ CreatePartitionList (SHORT Left, OBJECT_ATTRIBUTES ObjectAttributes; SYSTEM_DEVICE_INFORMATION Sdi; IO_STATUS_BLOCK Iosb; - SIZE_T ReturnSize; + ULONG ReturnSize; NTSTATUS Status; ULONG DiskNumber; WCHAR Buffer[MAX_PATH]; diff --git a/reactos/base/setup/vmwinst/vmwinst.c b/reactos/base/setup/vmwinst/vmwinst.c index 0269195eeba..db1f63b49f6 100644 --- a/reactos/base/setup/vmwinst/vmwinst.c +++ b/reactos/base/setup/vmwinst/vmwinst.c @@ -503,7 +503,7 @@ done: } cleanup: - hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = (HANDLE)(ULONG_PTR)InterlockedExchange((LONG*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread); diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index 84c1e959069..10e5b86e8d0 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -307,10 +307,10 @@ static BOOL RunFile(LPTSTR filename) ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); + TRACE ("RunFile: ShellExecuteA/W returned %d\n", ret); FreeLibrary(hShell32); - return (((DWORD)ret) > 32); + return (PtrToUlong(ret) > 32); }