Minor tweaks

Author: Towncivilian

MTADiag/Common.h

@@ -22,4 +22,4 @@
 #include <vector>
 #include "Log.h"
 
-#define VERSION "2.6"
+#define VERSION "2.6.4"

MTADiag/Diag.cpp

@@ -67,9 +67,8 @@ void Diag::Begin ( void )
 	if ( bQuit )
 	{
 		std::cout << "Your Grand Theft Auto installation is missing one or more files." << std::endl << "Please reinstall GTA and see if MTA works then." << std::endl;
-		Cleanup(); // clean up any temporary files that might have been created
-		Log::Close(); // close the log file for writing
-		remove ( files[0].c_str() ); // remove the MTADiag log
+		Cleanup ( true ); // clean up any temporary files that might have been created
+		system ( "pause" );
 		exit ( EXIT_FAILURE ); // exit
 	};
 
@@ -107,7 +106,7 @@ void Diag::Begin ( void )
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\core.log", "core.log" );
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\logfile.txt", "logfile.txt" );
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\CEGUI.log", "CEGUI.log" );
-	Log::WriteFileToLog ( MTAPath + "\\MTA\\timings.log", "timings.log" );
+	Log::WriteFileToLog ( MTAPath + "\\timings.log", "timings.log" );
 	if ( IsVistaOrNewer() ) { Log::WriteFileToLog ( programData + "\\MTA San Andreas All\\" + MTAShortVersion + "\\report.log", "report.log" ); }
 
 	DoSystemCommandWithOutput ( "ipconfig /all >" ); // get network configuration
@@ -163,12 +162,18 @@ void Diag::Begin ( void )
 	}
 }
 
-void Diag::Cleanup ( void )
+void Diag::Cleanup ( bool deleteLog )
 {
 	// clean up after ourselves
 	// start at 1 since 0 is the generated log's path; we still need that
 	for ( unsigned int i = 1; i < files.size() - 1; i++) // don't delete D3DX9_43.dll
 		remove ( files[i].c_str() );
+
+	if ( deleteLog )
+	{
+		Log::Close(); // close the log file for writing
+		remove ( files[0].c_str() ); // remove the MTADiag log
+	}
 }
 
 void Diag::GeneratePaths ( void )
@@ -338,11 +343,13 @@ void Diag::GeneratePaths ( void )
 	GTAFiles.push_back ( "\\data\\Decision\\Imran\\std1_is.ped" );
 	GTAFiles.push_back ( "\\data\\Decision\\Imran\\std2_is.ped" );
 
+	/*
 	GTAFiles.push_back ( "\\data\\Icons\\app.ico" );
 	GTAFiles.push_back ( "\\data\\Icons\\bin.ico" );
 	GTAFiles.push_back ( "\\data\\Icons\\saicon.ICN" );
 	GTAFiles.push_back ( "\\data\\Icons\\saicon2.ICN" );
 	GTAFiles.push_back ( "\\data\\Icons\\saicon3.ICN" );
+	*/
 
 	GTAFiles.push_back ( "\\data\\maps\\Audiozon.ipl" );
 	GTAFiles.push_back ( "\\data\\maps\\cull.ipl" );
@@ -636,16 +643,7 @@ void Diag::GeneratePaths ( void )
 	GTAFiles.push_back ( "\\models\\txd\\splash2.txd" );
 	GTAFiles.push_back ( "\\models\\txd\\splash3.txd" );
 
-	GTAFiles.push_back ( "\\movies\\GTAtitles.mpg" );
-	GTAFiles.push_back ( "\\movies\\Logo.mpg" );
-
-	GTAFiles.push_back ( "\\ReadMe\\Readme.txt" );
-
 	GTAFiles.push_back ( "\\text\\american.gxt" );
-	GTAFiles.push_back ( "\\text\\french.gxt" );
-	GTAFiles.push_back ( "\\text\\german.gxt" );
-	GTAFiles.push_back ( "\\text\\italian.gxt" );
-	GTAFiles.push_back ( "\\text\\spanish.gxt" );
 
 	// output contents of files vector
 #ifdef DEBUGOUTPUT

MTADiag/Diag.h

@@ -48,7 +48,7 @@
 namespace Diag {
 
 	void                    Begin                       ( void );
-	void                    Cleanup                     ( void );
+	void                    Cleanup                     ( bool deleteLog = false );
 
 	// gather all currently installed MTA:SA versions and ask the user to pick between them if necessary
 	void                    GeneratePaths               ( void );

MTADiag/util.cpp

@@ -78,15 +78,15 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 						{
 							if ( IsWin8OrNewer() ) // is the user running Windows 8 or newer?
 							{
-								char Win8Data[13] = "~ RUNASADMIN"; // set the data buffer to the proper string
+								const char Win8Data[13] = "~ RUNASADMIN"; // set the data buffer to the proper string
 								RegSetValueEx ( hKey, buf, 0, dwType, ( BYTE* ) Win8Data, sizeof (Win8Data) ); // set the value data to RUNASADMIN only
 								changed = true;
 								index--;
 								continue;
 							}
 							else // 7 or older
 							{
-								char XPData[11] = "RUNASADMIN"; // set the data buffer to the proper string
+								const char XPData[11] = "RUNASADMIN"; // set the data buffer to the proper string
 								RegSetValueEx ( hKey, buf, 0, dwType, ( BYTE* ) XPData, sizeof (XPData) ); // set the value data to RUNASADMIN only
 								changed = true;
 								index--;
@@ -181,23 +181,6 @@ bool IsVistaOrNewer ( void )
 		return false;
 }
 
-// slightly modified version of http://msdn.microsoft.com/en-us/library/ms724451%28VS.85%29.aspx
-bool IsWin7 ( void )
-{
-	OSVERSIONINFO osvi;
-	bool bIsWin7OrNewer;
-
-	ZeroMemory ( &osvi, sizeof ( OSVERSIONINFO ) );
-	osvi.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO );
-
-	GetVersionEx ( &osvi );
-
-	if ( ( bIsWin7OrNewer = ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 ) ) != 0 )
-		return true;
-	else
-		return false;
-}
-
 // slightly modified version of http://msdn.microsoft.com/en-us/library/ms724451%28VS.85%29.aspx
 bool IsWin8OrNewer ( void )
 {

MTADiag/util.h

@@ -16,6 +16,7 @@
 
 #include "Common.h"
 #include "md5.h"
+
 // Compatability mode registry key
 #define CompatModeRegKey "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"
 
@@ -25,6 +26,5 @@ bool                CheckForFile                       ( std::string FilePath );
 void                ConvertUnicodeToASCII              ( std::string file1, std::string file2 );
 bool                CopyToClipboard                    ( std::string contents );
 bool                IsVistaOrNewer                     ( void );
-bool                IsWin7                             ( void );
 bool                IsWin8OrNewer                      ( void );
 std::string         GetFileMD5                         ( std::string filename );