StelLogger.cpp   StelLogger.cpp 
skipping to change at line 133 skipping to change at line 133
i++; i++;
} }
} }
} }
#endif #endif
// Aargh Windows API // Aargh Windows API
#elif defined Q_OS_WIN #elif defined Q_OS_WIN
// Hopefully doesn't throw a linker error on earlier systems. Not li ke // Hopefully doesn't throw a linker error on earlier systems. Not li ke
// I'm gonna test it or anything. // I'm gonna test it or anything.
if (QSysInfo::WindowsVersion >= QSysInfo::WV_2000) if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP)
{ {
#ifdef __LP64__
MEMORYSTATUSEX statex; MEMORYSTATUSEX statex;
statex.dwLength = sizeof (statex);
GlobalMemoryStatusEx(&statex); GlobalMemoryStatusEx(&statex);
writeLog(QString("Total physical memory: %1 MB (unreliable)" writeLog(QString("Total physical memory: %1 MB").arg(statex.
).arg(statex.ullTotalPhys/(1024<<10))); ullTotalPhys/(1024<<10)));
writeLog(QString("Total virtual memory: %1 MB (unreliable)") writeLog(QString("Available physical memory: %1 MB").arg(sta
.arg(statex.ullTotalVirtual/(1024<<10))); tex.ullAvailPhys/(1024<<10)));
writeLog(QString("Physical memory in use: %1%").arg(statex.d wMemoryLoad)); writeLog(QString("Physical memory in use: %1%").arg(statex.d wMemoryLoad));
#else #ifndef _WIN64
MEMORYSTATUS statex; // This always reports about 8TB on Win64, not really useful
GlobalMemoryStatus(&statex); to show.
writeLog(QString("Total memory: %1 MB (unreliable)").arg(sta writeLog(QString("Total virtual memory: %1 MB").arg(statex.u
tex.dwTotalPhys/(1024<<10))); llTotalVirtual/(1024<<10)));
writeLog(QString("Total virtual memory: %1 MB (unreliable)") writeLog(QString("Available virtual memory: %1 MB").arg(stat
.arg(statex.dwTotalVirtual/(1024<<10))); ex.ullAvailVirtual/(1024<<10)));
writeLog(QString("Physical memory in use: %1%").arg(statex.d #endif
wMemoryLoad));
#endif
} }
else else
writeLog("Windows version too old to get memory info."); writeLog("Windows version too old to get memory info.");
HKEY hKey = NULL; HKEY hKey = NULL;
DWORD dwType = REG_DWORD; DWORD dwType = REG_DWORD;
DWORD numVal = 0; DWORD numVal = 0;
DWORD dwSize = sizeof(numVal); DWORD dwSize = sizeof(numVal);
// iterate over the processors listed in the registry // iterate over the processors listed in the registry
 End of changes. 5 change blocks. 
16 lines changed or deleted 14 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/