Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Removed some obsolete compatibility code in lamexp_detect_cpu_features().

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-10-16 03:29:43 +02:00
parent d206eccac9
commit d0e994b347
2 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Dialog_Processing.cpp
View File

@ -316,14 +316,6 @@ ProcessingDialog::~ProcessingDialog(void)
} }
} }
//while(!m_threadList.isEmpty())
//{
// ProcessThread *thread = m_threadList.takeFirst();
// thread->terminate();
// thread->wait(15000);
// delete thread;
//}
if(m_threadPool) if(m_threadPool)
{ {
if(!m_threadPool->waitForDone(100)) if(!m_threadPool->waitForDone(100))

35
src/Global.cpp
View File

@ -754,10 +754,6 @@ void lamexp_init_console(const QStringList &argv)
lamexp_cpu_t lamexp_detect_cpu_features(const QStringList &argv) lamexp_cpu_t lamexp_detect_cpu_features(const QStringList &argv)
{ {
typedef BOOL (WINAPI *IsWow64ProcessFun)(__in HANDLE hProcess, __out PBOOL Wow64Process); typedef BOOL (WINAPI *IsWow64ProcessFun)(__in HANDLE hProcess, __out PBOOL Wow64Process);
typedef VOID (WINAPI *GetNativeSystemInfoFun)(__out LPSYSTEM_INFO lpSystemInfo);
static IsWow64ProcessFun IsWow64ProcessPtr = NULL;
static GetNativeSystemInfoFun GetNativeSystemInfoPtr = NULL;
lamexp_cpu_t features; lamexp_cpu_t features;
SYSTEM_INFO systemInfo; SYSTEM_INFO systemInfo;
@ -816,36 +812,23 @@ lamexp_cpu_t lamexp_detect_cpu_features(const QStringList &argv)
if(strlen(features.brand) < 1) strncpy_s(features.brand, 0x40, "Unknown", _TRUNCATE); if(strlen(features.brand) < 1) strncpy_s(features.brand, 0x40, "Unknown", _TRUNCATE);
if(strlen(features.vendor) < 1) strncpy_s(features.vendor, 0x40, "Unknown", _TRUNCATE); if(strlen(features.vendor) < 1) strncpy_s(features.vendor, 0x40, "Unknown", _TRUNCATE);
#if !defined(_M_X64 ) && !defined(_M_IA64) #if (!(defined(_M_X64) || defined(_M_IA64)))
if(!IsWow64ProcessPtr || !GetNativeSystemInfoPtr) QLibrary Kernel32Lib("kernel32.dll");
if(IsWow64ProcessFun IsWow64ProcessPtr = (IsWow64ProcessFun) Kernel32Lib.resolve("IsWow64Process"))
{ {
QLibrary Kernel32Lib("kernel32.dll"); BOOL x64flag = FALSE;
IsWow64ProcessPtr = (IsWow64ProcessFun) Kernel32Lib.resolve("IsWow64Process"); if(IsWow64ProcessPtr(GetCurrentProcess(), &x64flag))
GetNativeSystemInfoPtr = (GetNativeSystemInfoFun) Kernel32Lib.resolve("GetNativeSystemInfo");
}
if(IsWow64ProcessPtr)
{
BOOL x64 = FALSE;
if(IsWow64ProcessPtr(GetCurrentProcess(), &x64))
{ {
features.x64 = x64; features.x64 = (x64flag == TRUE);
} }
} }
if(GetNativeSystemInfoPtr)
{
GetNativeSystemInfoPtr(&systemInfo);
}
else
{
GetSystemInfo(&systemInfo);
}
features.count = qBound(1UL, systemInfo.dwNumberOfProcessors, 64UL);
#else #else
GetNativeSystemInfo(&systemInfo);
features.count = systemInfo.dwNumberOfProcessors;
features.x64 = true; features.x64 = true;
#endif #endif
GetNativeSystemInfo(&systemInfo);
features.count = qBound(1UL, systemInfo.dwNumberOfProcessors, 64UL);
if(argv.count() > 0) if(argv.count() > 0)
{ {
bool flag = false; bool flag = false;