[ros-diffs] [sserapion] 35826: - minor WIN64 fixes - Remove unneeded dependencies
sserapion at svn.reactos.org
sserapion at svn.reactos.org
Sun Aug 31 05:10:31 CEST 2008
Author: sserapion
Date: Sat Aug 30 22:10:30 2008
New Revision: 35826
URL: http://svn.reactos.org/svn/reactos?rev=35826&view=rev
Log:
- minor WIN64 fixes
- Remove unneeded dependencies
Modified:
branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c
branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild
branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild
branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild
branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c
branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c
branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c
branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c
Modified: branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -396,7 +396,11 @@
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 @@
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 :
Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="regedit" type="win32gui" installname="regedit.exe">
+<module name="regedit" type="win32gui" installname="regedit.exe" allowwarnings="true">
<include base="regedit">.</include>
<define name="UNICODE" />
<define name="_UNICODE" />
@@ -12,7 +12,6 @@
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
- <library>comdlg32</library>
<library>ole32</library>
<library>shell32</library>
<library>comctl32</library>
Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -1,10 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes">
+<module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes" allowwarnings="true">
<include base="taskmgr">.</include>
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
- <library>msvcrt</library>
<library>ntdll</library>
<library>kernel32</library>
<library>advapi32</library>
Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -10,7 +10,6 @@
<library>shell32</library>
<library>user32</library>
<library>gdi32</library>
- <library>msvcrt</library>
<library>advapi32</library>
<library>kernel32</library>
<library>comctl32</library>
Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -699,7 +699,7 @@
INFCONTEXT Context;
PWCHAR Value;
UINT ErrorLine;
- SIZE_T ReturnSize;
+ ULONG ReturnSize;
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -906,7 +906,7 @@
OBJECT_ATTRIBUTES ObjectAttributes;
SYSTEM_DEVICE_INFORMATION Sdi;
IO_STATUS_BLOCK Iosb;
- SIZE_T ReturnSize;
+ ULONG ReturnSize;
NTSTATUS Status;
ULONG DiskNumber;
WCHAR Buffer[MAX_PATH];
Modified: branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -503,7 +503,7 @@
}
cleanup:
- hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0);
+ hThread = (HANDLE)(ULONG_PTR)InterlockedExchange((LONG*)&hInstallationThread, 0);
if(hThread != NULL)
{
CloseHandle(hThread);
Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c?rev=35826&r1=35825&r2=35826&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Aug 30 22:10:30 2008
@@ -307,10 +307,10 @@
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);
}
More information about the Ros-diffs
mailing list