mirror of
https://github.com/reactos/reactos.git
synced 2025-01-03 21:09:19 +00:00
- Partial revert of 42973 for the systeminfo utility -- the issue was fixed in 42930
- GCC 4.1.3 doesn't support %I64 -- compile the code conditionally svn path=/trunk/; revision=42975
This commit is contained in:
parent
6ca346d8d4
commit
125b919b06
3 changed files with 11 additions and 2 deletions
|
@ -875,7 +875,12 @@ EnumSymbolsProc(
|
|||
}
|
||||
else
|
||||
{
|
||||
#if defined(__GNUC__) && \
|
||||
(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400)
|
||||
printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%llx\n",
|
||||
#else
|
||||
printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%I64x\n",
|
||||
#endif
|
||||
pSymInfo->Name, pSymInfo->TypeIndex, pSymInfo->Flags, pSymInfo->Value);
|
||||
//if (pSymInfo->Flags & SYMFLAG_FUNCTION)
|
||||
{
|
||||
|
|
|
@ -36,7 +36,12 @@ ImageSymToVa(HANDLE hProcess, PSYMBOL_INFO pSym, PBYTE pModule, PCSTR Name)
|
|||
printf("SymGetSymFromName64() failed: %ld\n", GetLastError());
|
||||
return 0;
|
||||
}
|
||||
#if defined(__GNUC__) && \
|
||||
(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400)
|
||||
printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address);
|
||||
#else
|
||||
printf("looking up adress for %s: 0x%I64x\n", Name, pSym->Address);
|
||||
#endif
|
||||
|
||||
NtHeaders = ImageNtHeader(pModule);
|
||||
p = ImageRvaToVa(NtHeaders, pModule, pSym->Address - pSym->ModBase, NULL);
|
||||
|
|
|
@ -358,8 +358,7 @@ AllSysInfo(VOID)
|
|||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
char str[] = "/?";
|
||||
if (argc > 1 && !strcmp(argv[1], str))
|
||||
if (argc > 1 && !strcmp(argv[1], "/?"))
|
||||
{
|
||||
Usage();
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue