Some code clean-up.
This commit is contained in:
parent
655427d7a6
commit
75fad0f0fd
@ -3290,22 +3290,22 @@
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1442"/>
|
||||
<location filename="../../src/Global.cpp" line="1415"/>
|
||||
<source>Executable '%1' doesn't support Windows compatibility mode.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1384"/>
|
||||
<location filename="../../src/Global.cpp" line="1357"/>
|
||||
<source>Executable '%1' requires Qt v%2, but found Qt v%3.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1389"/>
|
||||
<location filename="../../src/Global.cpp" line="1362"/>
|
||||
<source>Executable '%1' was built for Qt '%2', but found Qt '%3'.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1401"/>
|
||||
<location filename="../../src/Global.cpp" line="1374"/>
|
||||
<source>Executable '%1' requires Windows XP or later.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
@ -3327,22 +3327,22 @@
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1442"/>
|
||||
<location filename="../../src/Global.cpp" line="1415"/>
|
||||
<source>Executable '%1' doesn't support Windows compatibility mode.</source>
|
||||
<translation type="unfinished">Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1384"/>
|
||||
<location filename="../../src/Global.cpp" line="1357"/>
|
||||
<source>Executable '%1' requires Qt v%2, but found Qt v%3.</source>
|
||||
<translation type="unfinished">Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1389"/>
|
||||
<location filename="../../src/Global.cpp" line="1362"/>
|
||||
<source>Executable '%1' was built for Qt '%2', but found Qt '%3'.</source>
|
||||
<translation type="unfinished">Plik wykonywalny "%1" został skompilowany dla Qt "%2", znaleziono "%3".</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1401"/>
|
||||
<location filename="../../src/Global.cpp" line="1374"/>
|
||||
<source>Executable '%1' requires Windows XP or later.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
@ -3310,22 +3310,22 @@
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1442"/>
|
||||
<location filename="../../src/Global.cpp" line="1415"/>
|
||||
<source>Executable '%1' doesn't support Windows compatibility mode.</source>
|
||||
<translation>EXE-filen '%1' stöder inte Windows kompatibilitetsläge.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1384"/>
|
||||
<location filename="../../src/Global.cpp" line="1357"/>
|
||||
<source>Executable '%1' requires Qt v%2, but found Qt v%3.</source>
|
||||
<translation>EXE-filen '%1' kräver Qt v%2, du har Qt v%3.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1389"/>
|
||||
<location filename="../../src/Global.cpp" line="1362"/>
|
||||
<source>Executable '%1' was built for Qt '%2', but found Qt '%3'.</source>
|
||||
<translation>EXE-filen '%1' är byggd för Qt '%2', du har Qt '%3'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1401"/>
|
||||
<location filename="../../src/Global.cpp" line="1374"/>
|
||||
<source>Executable '%1' requires Windows XP or later.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
@ -35,7 +35,7 @@
|
||||
#define VER_LAMEXP_MINOR_LO 9
|
||||
#define VER_LAMEXP_TYPE Alpha
|
||||
#define VER_LAMEXP_PATCH 4
|
||||
#define VER_LAMEXP_BUILD 1426
|
||||
#define VER_LAMEXP_BUILD 1427
|
||||
#define VER_LAMEXP_CONFG 1348
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -1060,29 +1060,22 @@ lamexp_cpu_t lamexp_detect_cpu_features(const QStringList &argv)
|
||||
*/
|
||||
static __forceinline bool lamexp_check_for_debugger(void)
|
||||
{
|
||||
if(IsDebuggerPresent())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
__try
|
||||
{
|
||||
CloseHandle((HANDLE) 0x7FFFFFFF);
|
||||
CloseHandle((HANDLE)((DWORD_PTR)-3));
|
||||
}
|
||||
__except(EXCEPTION_EXECUTE_HANDLER)
|
||||
__except(1)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
__try
|
||||
{
|
||||
DebugBreak();
|
||||
__debugbreak();
|
||||
}
|
||||
__except(EXCEPTION_EXECUTE_HANDLER)
|
||||
__except(1)
|
||||
{
|
||||
return false;
|
||||
return IsDebuggerPresent();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1099,7 +1092,7 @@ static unsigned int __stdcall lamexp_debug_thread_proc(LPVOID lpParameter)
|
||||
lamexp_fatal_exit(L"Not a debug build. Please unload debugger and try again!");
|
||||
return 666;
|
||||
}
|
||||
lamexp_sleep(1);
|
||||
lamexp_sleep(100);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1112,30 +1105,10 @@ static HANDLE lamexp_debug_thread_init()
|
||||
{
|
||||
lamexp_fatal_exit(L"Not a debug build. Please unload debugger and try again!");
|
||||
}
|
||||
|
||||
return (HANDLE) _beginthreadex(NULL, 0, lamexp_debug_thread_proc, NULL, 0, NULL);
|
||||
const uintptr_t h = _beginthreadex(NULL, 0, lamexp_debug_thread_proc, NULL, 0, NULL);
|
||||
return (HANDLE)(h^0xdeadbeef);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check for compatibility mode
|
||||
*/
|
||||
//static bool lamexp_check_compatibility_mode(const char *exportName, const QString &executableName)
|
||||
//{
|
||||
// QLibrary kernel32("kernel32.dll");
|
||||
//
|
||||
// if((exportName != NULL) && kernel32.load())
|
||||
// {
|
||||
// if(kernel32.resolve(exportName) != NULL)
|
||||
// {
|
||||
// qWarning("Function '%s' exported from 'kernel32.dll' -> Windows compatibility mode!", exportName);
|
||||
// qFatal("%s", QApplication::tr("Executable '%1' doesn't support Windows compatibility mode.").arg(executableName).toLatin1().constData());
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return true;
|
||||
//}
|
||||
|
||||
/*
|
||||
* Computus according to H. Lichtenberg
|
||||
*/
|
||||
@ -3257,7 +3230,7 @@ void lamexp_finalization(void)
|
||||
/*
|
||||
* Initialize debug thread
|
||||
*/
|
||||
static const HANDLE g_debug_thread = LAMEXP_DEBUG ? NULL : lamexp_debug_thread_init();
|
||||
static const HANDLE g_debug_thread1 = LAMEXP_DEBUG ? NULL : lamexp_debug_thread_init();
|
||||
|
||||
/*
|
||||
* Get number private bytes [debug only]
|
||||
|
Loading…
Reference in New Issue
Block a user