From: lordmulder <mulder2@gmx.de>
Date: Sun, 24 Apr 2011 21:18:00 +0000 (+0200)
Subject: Re-compiled FAAD v2.7 with Visual Studio 2010.
X-Git-Tag: Release_403~219
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8843e5af8e614c250a20a93f689b137b96452b0;p=lamexp%2FLameXP.git

Re-compiled FAAD v2.7 with Visual Studio 2010.
---

diff --git a/res/tools/faad.exe b/res/tools/faad.exe
index 3d851a12..44814748 100644
Binary files a/res/tools/faad.exe and b/res/tools/faad.exe differ
diff --git a/src/Global.cpp b/src/Global.cpp
index e7a9ef57..6b62b275 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -203,6 +203,10 @@ static const char *g_lamexp_imageformats[] = {"png", "jpg", "gif", "ico", "svg",
 //Global locks
 static QMutex g_lamexp_message_mutex;
 
+//Main thread ID
+static const DWORD g_main_thread_id = GetCurrentThreadId();
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // GLOBAL FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////
@@ -300,9 +304,16 @@ const QDate &lamexp_version_date(void)
  */
 LONG WINAPI lamexp_exception_handler(__in struct _EXCEPTION_POINTERS *ExceptionInfo)
 {
+	if(GetCurrentThreadId() != g_main_thread_id)
+	{
+		HANDLE mainThread = OpenThread(THREAD_TERMINATE, FALSE, g_main_thread_id);
+		if(mainThread) TerminateThread(mainThread, ULONG_MAX);
+		
+	}
+	
 	FatalAppExit(0, L"Unhandeled exception error, application will exit!");
 	TerminateProcess(GetCurrentProcess(), -1);
-	return 0;
+	return LONG_MAX;
 }
 
 /*
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index e3079019..557c29d6 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -54,7 +54,7 @@ g_lamexp_tools[] =
 {
 	{"3b41f85dde8d4a5a0f4cd5f461099d0db24610ba", CPU_TYPE_ALL, "alac.exe", UINT_MAX},
 	{"fb74ac8b73ad8cba2c3b4e6e61f23401d630dc22", CPU_TYPE_ALL, "elevator.exe", UINT_MAX},
-	{"3c647950bccfcc75d0746c0772e7115684be4dc5", CPU_TYPE_ALL, "faad.exe", 27},
+	{"80e372d8b20be24102c18284286fcdf5fa14bd86", CPU_TYPE_ALL, "faad.exe", 27},
 	{"d33cd86f04bd4067e244d2804466583c7b90a4e2", CPU_TYPE_ALL, "flac.exe", 121},
 	{"9328a50e89b54ec065637496d9681a7e3eebf915", CPU_TYPE_ALL, "gpgv.exe", 1411},
 	{"d837bf6ee4dab557d8b02d46c75a24e58980fffa", CPU_TYPE_ALL, "gpgv.gpg", UINT_MAX},