X-Git-Url: http://git.osdn.net/view?p=mutilities%2FMUtilities.git;a=blobdiff_plain;f=src%2FCPUFeatures_Win32.cpp;h=a994e7ce7b5952eb8ebdd83a0e563c26ad3eb28e;hp=b791adc978ca8703f138088e994545fe006b055d;hb=39adf6e7c0330316d7bf0ef96505e460039f996d;hpb=5f2cd705264d729159b442c46e1b719e0c1447f5 diff --git a/src/CPUFeatures_Win32.cpp b/src/CPUFeatures_Win32.cpp index b791adc..a994e7c 100644 --- a/src/CPUFeatures_Win32.cpp +++ b/src/CPUFeatures_Win32.cpp @@ -118,24 +118,11 @@ MUtils::CPUFetaures::cpu_info_t MUtils::CPUFetaures::detect(void) } //Detect 64-Bit processors -#if (!(defined(_M_X64) || defined(_M_IA64))) - const IsWow64ProcessFun isWow64ProcessPtr = MUtils::Win32Utils::resolve(QLatin1String("kernel32"), QLatin1String("IsWow64Process")); - if(isWow64ProcessPtr) + if (OS::os_architecture() == OS::ARCH_X64) { - BOOL x64flag = FALSE; - if(isWow64ProcessPtr(GetCurrentProcess(), &x64flag)) - { - if (x64flag) - { - features.x64 = true; - features.features |= FLAGS_X64; /*x86_64 implies SSE2*/ - } - } + features.x64 = true; + features.features |= FLAGS_X64; /*x86_64 implies SSE2*/ } -#else - features.x64 = true; - features.features |= FLAGS_X64; -#endif //Make sure that (at least) the MMX flag has been set! if (!(features.features & FLAG_MMX))