- minor WIN64 fixes

- Remove unneeded dependencies 

svn path=/branches/ros-amd64-bringup/; revision=35826
This commit is contained in:
Samuel Serapion
2008-08-31 03:10:30 +00:00
parent 811714c03b
commit 2f59177f5f
8 changed files with 15 additions and 10 deletions
@@ -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 :
@@ -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>
@@ -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>
@@ -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>
+1 -1
View File
@@ -699,7 +699,7 @@ SetupStartPage(PINPUT_RECORD Ir)
INFCONTEXT Context;
PWCHAR Value;
UINT ErrorLine;
SIZE_T ReturnSize;
ULONG ReturnSize;
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
+1 -1
View File
@@ -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];
+1 -1
View File
@@ -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);
+2 -2
View File
@@ -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);
}