From 3810582c8c3ed7bb0c6607dd91c4ee8e8e30d6f8 Mon Sep 17 00:00:00 2001
From: "nitsuja-@hotmail.com"
 <nitsuja-@hotmail.com@0580014a-b4d2-5bf2-de3f-13cfcb458068>
Date: Sun, 24 Jul 2011 20:59:08 +0000
Subject: [PATCH] ask for user confirmation before auto-restart on startup
 crash (this means you have to click through an extra dialog to run
 RotateGear, but could avoid some problems in other games)

---
 src/wintaser/wintaser.cpp | 52 ++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/wintaser/wintaser.cpp b/src/wintaser/wintaser.cpp
index 3aade70..7dbeb91 100644
--- a/src/wintaser/wintaser.cpp
+++ b/src/wintaser/wintaser.cpp
@@ -1146,7 +1146,7 @@ static int LoadMovieFromFile(const char* filename, bool forPreview=false)
 		}
 
 		bool probablyDesync = false;
-		if(version > myVersion+7 || version < myVersion-40) // not very scientific here. change as needed.
+		if(version > myVersion+7 /*|| version < myVersion-40*/) // not very scientific here. change as needed.
 			probablyDesync = true;
 		// in the future: if it's known whether certain versions sync with the current version, set probablyDesync depending on the version numbers.
 		// and maybe add more specific warning messages, if warranted
@@ -1167,7 +1167,7 @@ static int LoadMovieFromFile(const char* filename, bool forPreview=false)
 			probablyDesync?"This could easily cause the movie to desync.":"This could cause desyncs if there were sync changes in-between those versions.",
 			(myVersion>version)?"If this doesn't work, you might want to temporarily use an older version of Hourglass.":"You should probably switch to a newer version of Hourglass.",
 			(myVersion>version)?"Do you want to try playing the movie normally?":"Play the movie anyway?",
-			(myVersion>version)?"(\"No\" enables backward compatibility mode, but might cause problems.)":""
+			(myVersion>version)?"(\"No\" enables backward compatibility mode, but can cause old bugs to reappear.)":""
 		);
 		int result = CustomMessageBox(str, "Movie Version", ((myVersion>version) ? MB_YESNOCANCEL : MB_YESNO) | (probablyDesync?MB_ICONWARNING:MB_ICONQUESTION) | MB_DEFBUTTON1);
 		if(myVersion>version)
@@ -7342,25 +7342,44 @@ static DWORD WINAPI DebuggerThreadFunc(LPVOID lpParam)
 					}
 					else // actual crash:
 					{
+						bool skipDialog = false;
 						if((!postDllMainDone || s_lastFrameCount < 4) && !runDllLast)
 						{
 							// this is so RotateGear can run
-							debugprintf("the game crashed, but...\n");
-							debugprintf("assuming crash is due to some bug in IATModifier::writeIAT. retrying with alternate method.\n");
-							runDllLast = true;
+							int result = IDYES;
+							if(movie.version >= 66)
+							{
+								result = CustomMessageBox("The game failed to start up.\n"
+									"\n"
+									"Sometimes this can be fixed by changing your settings or using a different OS,\n"
+									"but usually this means the game is not supported yet.\n"
+									"\n"
+									"In certain specific games (such as RotateGear),\n"
+									"this is expected to happen because of DLL loading order problems.\n"
+									"Do you want to try restarting the game with a different loading order?\n"
+									"(If this is not one of those specific games, this can cause desyncs.)", "CRASH",
+									MB_YESNO|MB_DEFBUTTON2|MB_ICONERROR);
+								skipDialog = true;
+							}
+							if(result == IDYES)
+							{
+								debugprintf("the game crashed, but...\n");
+								debugprintf("assuming crash is due to some bug in IATModifier::writeIAT. retrying with alternate method.\n");
+								runDllLast = true;
 
-							//CloseHandle(hGameProcess);
-							//hGameProcess = 0;
-							//TerminateProcess(hGameProcess, -1);
+								//CloseHandle(hGameProcess);
+								//hGameProcess = 0;
+								//TerminateProcess(hGameProcess, -1);
 
-							LeaveCriticalSection(&g_processMemCS);
-							//HANDLE hProcess = GetProcessHandle(processInfo,de); 
-							//DebuggerThreadFuncCleanup(processInfo.hThread, hProcess);
+								LeaveCriticalSection(&g_processMemCS);
+								//HANDLE hProcess = GetProcessHandle(processInfo,de); 
+								//DebuggerThreadFuncCleanup(processInfo.hThread, hProcess);
 
-							ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_EXCEPTION_NOT_HANDLED);
-							SafeTerminateProcess(processInfo);
+								ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_EXCEPTION_NOT_HANDLED);
+								SafeTerminateProcess(processInfo);
 
-							goto restartgame;
+								goto restartgame;
+							}
 						}
 
 
@@ -7422,9 +7441,8 @@ static DWORD WINAPI DebuggerThreadFunc(LPVOID lpParam)
 							);
 							debugprintf(msg);
 #ifndef _DEBUG
-
-							CustomMessageBox(msg, "CRASH", MB_OK|MB_ICONERROR);
-
+							if(!skipDialog)
+								CustomMessageBox(msg, "CRASH", MB_OK|MB_ICONERROR);
 #endif
 						}
 						requestedCommandReenter = false; // maybe fixes something?