From 0e6058df9e6ce929e7ad8f43cc6074d9cb7b9bdf Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 21 Oct 2011 16:17:22 +0200 Subject: [PATCH] Moved Windows 8 64-Bit hack to a better place. MPress will not be fixed soon for Windows 8, so we will have to keep that hack for a while... --- etc/Translation/Blank.ts | 6 +++--- etc/Translation/LameXP_PL.ts | 6 +++--- src/Config.h | 2 +- src/Global.cpp | 15 ++------------- src/Global.h | 1 + src/Thread_Initialization.cpp | 11 +++++++++++ 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index e3240d5d..ff94f34f 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -2709,17 +2709,17 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. - + Executable '%1' requires Qt v%2, but found Qt v%3. - + Executable '%1' requires Windows 2000 or later. diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 697d8ef9..7935b76a 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -2709,17 +2709,17 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows. - + Executable '%1' requires Qt v%2, but found Qt v%3. Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3. - + Executable '%1' requires Windows 2000 or later. Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego. diff --git a/src/Config.h b/src/Config.h index dbe6290d..4ca79990 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 6 -#define VER_LAMEXP_BUILD 748 +#define VER_LAMEXP_BUILD 750 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Global.cpp b/src/Global.cpp index 3ddcf8da..0397c850 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -320,7 +320,7 @@ const QDate &lamexp_version_date(void) /* * Get the native operating system version */ -static DWORD lamexp_get_os_version(void) +DWORD lamexp_get_os_version(void) { OSVERSIONINFO osVerInfo; memset(&osVerInfo, 0, sizeof(OSVERSIONINFO)); @@ -621,19 +621,8 @@ lamexp_cpu_t lamexp_detect_cpu_features(int argc, char **argv) features.count = systemInfo.dwNumberOfProcessors; features.x64 = true; #endif - - //Hack to disable x64 on the Windows 8 Developer Preview - if(features.x64) - { - DWORD osVerNo = lamexp_get_os_version(); - if((HIWORD(osVerNo) == 6) && (LOWORD(osVerNo) == 2)) - { - qWarning("Windows 8 (x64) detected. Going to disable all x64 support for now!\n"); - features.x64 = false; - } - } - if(argv) + if((argv != NULL) && (argc > 0)) { bool flag = false; for(int i = 0; i < argc; i++) diff --git a/src/Global.h b/src/Global.h index 44c37a70..71b512ff 100644 --- a/src/Global.h +++ b/src/Global.h @@ -83,6 +83,7 @@ unsigned int lamexp_toolver_neroaac(void); unsigned int lamexp_toolver_fhgaacenc(void); const char *lamexp_website_url(void); const char *lamexp_support_url(void); +DWORD lamexp_get_os_version(void); //Public functions void lamexp_init_console(int argc, char* argv[]); diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 91ab24b9..8b86d714 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -74,6 +74,17 @@ void InitializationThread::run() cpuSupport = m_cpuFeatures.x64 ? CPU_TYPE_X64_GEN : CPU_TYPE_X86_GEN; } + //Hack to disable x64 on the Windows 8 Developer Preview + if(cpuSupport & CPU_TYPE_X64_ALL) + { + DWORD osVerNo = lamexp_get_os_version(); + if((HIWORD(osVerNo) == 6) && (LOWORD(osVerNo) == 2)) + { + qWarning("Windows 8 (x64) developer preview detected. Going to disable all x64 support!\n"); + cpuSupport = (cpuSupport == CPU_TYPE_X64_SSE) ? CPU_TYPE_X86_SSE : CPU_TYPE_X86_GEN; + } + } + //Print selected CPU type switch(cpuSupport) { -- 2.11.4.GIT