[ros-diffs] [sserapion] 36261: Re-add code mistakenly removed in last sync to trunk. Remove explorer from build.(for now)

Author: sserapion
Date: Mon Sep 15 11:17:42 2008
New Revision: 36261

URL: http://svn.reactos.org/svn/reactos?rev=36261&view=rev
Log:
Re-add code mistakenly removed in last sync to trunk.
Remove explorer from build.(for now)

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/shell/shell.rbuild

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/…
==============================================================================
--- 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] Mon Sep 15 11:17:42 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/…
==============================================================================
--- 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] Mon Sep 15 11:17:42 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/shell/shell.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] Mon Sep 15
11:17:42 2008
@@ -4,9 +4,6 @@
 	<directory name="cmd">
 		<xi:include href="cmd/cmd.rbuild" />
 	</directory>
-	<directory name="explorer">
-		<xi:include href="explorer/explorer.rbuild" />
-	</directory>
 	<directory name="explorer-new">
 		<xi:include href="explorer-new/explorer.rbuild" />
 	</directory>