Added file size report for Nonstandard GTA files.

Increased timeout for tasklist command.

Author: ccw808

MTADiag/Common.h

@@ -23,6 +23,7 @@
 #include <fstream>
 #include <vector>
 #include <shlobj.h>
+#include <time.h>
 #include "Log.h"
 
-#define VERSION "2.7.17"
+#define VERSION "2.7.18"

MTADiag/Diag.cpp

@@ -139,12 +139,15 @@ void Diag::Begin ( void )
             if ( GetAsyncKeyState( VK_F1 ) )
                 break;
 #endif
-			if ( !( CompareFileMD5 ( szMd5, ( GTAPath + szFilename ) ) ) )
+            std::string strCalcedMd5 = GetFileMD5( GTAPath + szFilename );
+            long long fileSize = GetFileSize( GTAPath + szFilename );
+			if ( strCalcedMd5 != szMd5 )
 			{
-				std::cout << "Nonstandard GTA file: " << fileList[i].szFilename << std::endl;
+				std::cout << "Nonstandard GTA file: " << szFilename << std::endl;
 
 				Log::WriteStringToLog ( "Nonstandard GTA file: ", szFilename );
-				Log::WriteStringToLog ( GetFileMD5 ( GTAPath + szFilename ) );
+	            std::stringstream ss; ss << "MD5sum for " << szFilename << ": " << strCalcedMd5 << "   Size: " << fileSize;
+	            Log::WriteStringToLog ( ss.str() );
 				Log::WriteStringToLog ( "Value should be: ", szMd5 );
 				Log::WriteStringToLog ( "" );
 			}
@@ -161,7 +164,7 @@ void Diag::Begin ( void )
 	DoSystemCommandWithOutput ( std::string( "dxdiag /t " ) + files[FILE_TEMP], OUTPUT_NONE );
 	ProgressBar ( 10 );
 #endif
-	DoSystemCommandWithOutput ( "tasklist" );
+	DoSystemCommandWithOutput ( "tasklist", OUTPUT_ANSI, 120000 );
 	ProgressBar ( 20 );
 
 	// write some of MTA's logs to our log
@@ -196,12 +199,6 @@ void Diag::Begin ( void )
 	ProgressBar ( 40 );
 
 	DoSystemCommandWithOutput ( "ipconfig /all" ); // get network configuration
-	ProgressBar ( 45 );
-	if ( IsVistaOrNewer() )
-    {
-         // might help resolve Visual C++ runtime issues
-        DoSystemCommandWithOutput ( "wevtutil qe Application /q:\"Event [System [(Level=2)] ] [EventData [(Data='Multi Theft Auto.exe')] ]\" /c:1 /f:text /rd:true" );
-    }
 	ProgressBar ( 50 );
 	QueryWMIC ( "Path", "Win32_VideoController", "Get" ); // get some video controller information
 	ProgressBar ( 55 );
@@ -215,20 +212,29 @@ void Diag::Begin ( void )
 
 	// get relevant MD5sum(	s)
     Log::WriteDividerToLog ();
-	Log::WriteStringToLog ( GetFileMD5 ( GTAPath + "\\gta_sa.exe" ) );
-	Log::WriteStringToLog ( "Value should be: 170b3a9108687b26da2d8901c6948a18 (HOODLUM 1.0)" );
+	Log::WriteStringToLog ( "MD5sum for gta_sa.exe: " + GetFileMD5 ( GTAPath + "\\gta_sa.exe" ) );
+	//Log::WriteStringToLog ( "Value should be: 170b3a9108687b26da2d8901c6948a18 (HOODLUM 1.0)" );
 	Log::WriteStringToLog ( "" );
 
 	ProgressBar ( 80 );
 
 	// font diagnostics
     Log::WriteDividerToLog ();
 	Log::WriteStringToLog ( "Verdana (TrueType) registry value:", ReadRegKey ( "Verdana (TrueType)", "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts\\" ) );
-	Log::WriteStringToLog ( GetFileMD5 ( systemRoot + "\\Fonts\\verdana.ttf" ) );
+	Log::WriteStringToLog ( "MD5sum for verdana.ttf: " + GetFileMD5 ( systemRoot + "\\Fonts\\verdana.ttf" ) );
 	Log::WriteStringToLog ( "Value should be: ba34b303291e36596759eb46ad9c51f2 (Win 8) / 6eee3713d2330d93183846f2d34f0976 (Win 7)" );
 	Log::WriteStringToLog ( "" );
 	GetDir ( systemRoot + "\\Fonts\\verd*" );
 
+	ProgressBar ( 90 );
+
+    // Do this last in case of problems
+	if ( IsVistaOrNewer() )
+    {
+         // might help resolve Visual C++ runtime issues
+        DoSystemCommandWithOutput ( "wevtutil qe Application /q:\"Event [System [(Level=2)] ] [EventData [(Data='Multi Theft Auto.exe')] ]\" /c:1 /f:text /rd:true" );
+    }
+
 	ProgressBar ( 100 ); std::cout << std::endl << std::endl;
 
 	// close the log file for writing
@@ -586,6 +592,7 @@ void Diag::GetDir ( std::string directory )
 void Diag::DoSystemCommandWithOutput ( std::string command, int outputType, DWORD maxTimeMs )
 {
 	Log::WriteDividerToLog();
+    time_t startTime = time( NULL );
 
     SECURITY_ATTRIBUTES sa;
     sa.nLength = sizeof(sa);
@@ -656,7 +663,7 @@ void Diag::DoSystemCommandWithOutput ( std::string command, int outputType, DWOR
         {
             DWORD dwExitCode = 0xFFFFFFFF;
             GetExitCodeProcess( pi.hProcess, &dwExitCode );
-	        ss << command << " (returned " << dwExitCode << ")";
+	        ss << command << " (returned " << dwExitCode << ") [Took " << time( NULL ) - startTime << " seconds]";
         }
         CloseHandle( pi.hProcess );
         CloseHandle( pi.hThread );

MTADiag/util.cpp

@@ -213,12 +213,12 @@ std::string GetFileMD5 ( std::string filename )
 
 	std::string md5sum; // string to store md5sum
 
-	unsigned char buffer[4096]; // file buffer
+	unsigned char buffer[65536]; // file buffer
 
 	// read all bytes throughout the file
 	while ( !feof ( fp ) )
 	{
-		unsigned int read = fread ( buffer, 1, 4096, fp );
+		unsigned int read = fread ( buffer, 1, sizeof( buffer ), fp );
 
 		// update the MD5 with what we just read
 		md5.update ( buffer, read );
@@ -228,61 +228,27 @@ std::string GetFileMD5 ( std::string filename )
 
 	fclose ( fp ); // close the file
 
-	std::stringstream ss; // create a stringstream
-
-	ss << "MD5sum for " << filename << ": " << md5;
-	md5sum = ss.str();
-
-	// clear the stringstream
-	ss.str ("");
-	ss.clear();
-
-	return md5sum;
+	return md5.hexdigest();
 }
 
 bool CompareFileMD5 ( std::string MD5sum, std::string filename )
 {
-	FILE *fp; // file pointer
+    return MD5sum == GetFileMD5 ( filename );
+}
 
+long long GetFileSize ( const std::string& filename )
+{
+	FILE *fp;
 	fopen_s ( &fp, filename.c_str(), "rb" ); // try to open the file
-
 	if ( fp == NULL ) // we can't open it
 	{
-		return false;
+		return 0;
 	}
 
-	MD5 md5; // initialize MD5
-
-	std::string md5sum; // string to store md5sum
-
-	unsigned char buffer[4096]; // file buffer
-
-	// read all bytes throughout the file
-	while ( !feof ( fp ) )
-	{
-		unsigned int read = fread ( buffer, 1, 4096, fp );
-
-		// update the MD5 with what we just read
-		md5.update ( buffer, read );
-	}
-
-	md5.finalize(); // create a digest from the MD5 result
-
-	fclose ( fp ); // close the file
-
-	std::stringstream ss; // create a stringstream
-
-	ss << md5;
-	md5sum = ss.str(); // put the md5sum into a string
-
-	// clear the stringstream
-	ss.str ("");
-	ss.clear();
-
-	if ( md5sum == MD5sum ) // compare the file's actual MD5sum to the passed MD5sum
-		return true; // return true if they're the same
-	else
-		return false; // return false if they're different
+    fseek( fp, 0, SEEK_END );
+    long long fileSize = _ftelli64 ( fp );
+	fclose ( fp );
+	return fileSize;
 }
 
 bool FindInFile ( std::string filename, std::string value )

MTADiag/util.h

@@ -28,6 +28,7 @@ bool                CopyToClipboard                    ( std::string contents );
 bool                IsVistaOrNewer                     ( void );
 bool                IsWin8OrNewer                      ( void );
 std::string         GetFileMD5                         ( std::string filename );
+long long           GetFileSize                        ( const std::string& filename );
 bool                CompareFileMD5                     ( std::string MD5sum, std::string filename );
 bool                FindInFile                         ( std::string filename, std::string value );
 bool                HasDigits                          ( std::string s );