From c6fcad10c49cf0d1e5075db0dcd8294a41bbd2fd Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sun, 19 Aug 2012 14:34:04 +0200
Subject: [PATCH] Slightly tweaked initialization checks.

---
 src/Config.h   |  2 +-
 src/Global.cpp | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Config.h b/src/Config.h
index bded25b3..1114df59 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					5
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					4
-#define VER_LAMEXP_BUILD					1090
+#define VER_LAMEXP_BUILD					1091
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Global.cpp b/src/Global.cpp
index 39d7a41f..aa426c7b 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -2180,17 +2180,17 @@ QStringList lamexp_available_codepages(bool noAliases)
 /*
  * Entry point checks
  */
-static bool lamexp_entry_check(void);
-static bool g_lamexp_entry_check = false;
-static bool g_lamexp_entry_check_result = lamexp_entry_check();
-static bool lamexp_entry_check(void)
+static DWORD lamexp_entry_check(void);
+static DWORD g_lamexp_entry_check_result = lamexp_entry_check();
+static DWORD g_lamexp_entry_check_flag = 0x789E09B2;
+static DWORD lamexp_entry_check(void)
 {
-	if(!g_lamexp_entry_check)
+	volatile DWORD retVal = 0xA199B5AF;
+	if(g_lamexp_entry_check_flag != 0x8761F64D)
 	{
-		FatalAppExit(0, L"Application initialization has failed!");
+		FatalAppExit(0, L"Application initialization has failed, take care!");
 		TerminateProcess(GetCurrentProcess(), -1);
 	}
-	volatile bool retVal = true;
 	return retVal;
 }
 
@@ -2203,14 +2203,18 @@ extern "C"
 	
 	int lamexp_entry_point(void)
 	{
-		/*MessageBoxA(NULL, "lamexp_entry_point", NULL, MB_TOPMOST);*/
-		
 		if((!LAMEXP_DEBUG) && lamexp_check_for_debugger())
 		{
 			FatalAppExit(0, L"Not a debug build. Please unload debugger and try again!");
 			TerminateProcess(GetCurrentProcess(), -1);
 		}
-		
+
+		if(g_lamexp_entry_check_flag != 0x789E09B2)
+		{
+			FatalAppExit(0, L"Application initialization has failed, take care!");
+			TerminateProcess(GetCurrentProcess(), -1);
+		}
+
 		//Zero *before* constructors are called
 		LAMEXP_ZERO_MEMORY(g_lamexp_argv);
 		LAMEXP_ZERO_MEMORY(g_lamexp_tools);
@@ -2220,7 +2224,7 @@ extern "C"
 		LAMEXP_ZERO_MEMORY(g_lamexp_ipc_ptr);
 
 		//Make sure we will pass the check
-		g_lamexp_entry_check = true;
+		g_lamexp_entry_check_flag = ~g_lamexp_entry_check_flag;
 
 		//Now initialize the C Runtime library!
 		return WinMainCRTStartup();