Add alternate temp dir.

Disabled MTA update because status page is not updated correctly.

Author: ccw808

MTADiag/Common.h

@@ -25,4 +25,4 @@
 #include <shlobj.h>
 #include "Log.h"
 
-#define VERSION "2.7.15"
+#define VERSION "2.7.16"

MTADiag/Diag.cpp

@@ -20,6 +20,7 @@
 //#define SKIPDXDIAG
 //#define SKIPFILECHECK
 //#define DEBUGOUTPUT // output contents of files vector
+#define SKIP_MTA_UPDATE // Disabled until status page is fixed
 
 std::vector<std::string>      Diag::files;
 
@@ -32,6 +33,7 @@ void Diag::Begin ( void )
 
 	Log::WriteStringToLog ( "MTADiag version", VERSION, false );
 	Log::WriteStringToLog ( " by Towncivilian" );
+	std::cout << "MTADiag version " VERSION << std::endl;
 
 	// poll all currently installed MTA versions; if there is more than one installed, ask the user to pick one
 	if ( !PollMTAVersions() ) // PollMTAVersions will return true if there is only one version of MTA installed
@@ -78,6 +80,7 @@ void Diag::Begin ( void )
 		exit ( EXIT_FAILURE ); // exit
 	};
 #endif
+#ifndef SKIP_MTA_UPDATE
 	// check if MTA version matches the latest auto-update nightly
 	if ( Curl::DownloadFile ( MTAVerURL, files[FILE_TEMP].c_str() ) ) // download the version appropriation HTML
 	{
@@ -92,6 +95,7 @@ void Diag::Begin ( void )
 			UpdateMTA(); // update MTA to latest nightly / unstable build, depending on MTA's major version
 		}
 	}
+#endif
 
 	// write some information to the log file
 	Log::WriteStringToLog ( "MTA path:             ", MTAPath );
@@ -284,6 +288,22 @@ void Diag::GeneratePaths ( void )
 	bQuit = false;                                      // initialize quit bool, used in GTA files checking
 	MTAUpdated = false;                                 // initialize MTAUpdated bool
 
+    // Try to use 'MTA San Andreas All\MTADiag' as a temp dir first, so non admin can peek at it
+    {
+	    std::string altTempDir = programData + "\\MTA San Andreas All\\MTADiag";
+        SHCreateDirectoryEx( NULL, altTempDir.c_str(), NULL );
+        // Check can write there
+	    std::string altTempDirTest = altTempDir + "\\test.txt";
+	    std::ofstream file;
+	    file.open ( altTempDirTest.c_str(), std::ios::out );
+	    if ( file )
+        {
+            tempDir = altTempDir;
+            file.close();
+            remove( altTempDirTest.c_str() );
+        }
+    }
+
 	// generate MTADiag log file path
 	std::stringstream ss;
 
@@ -479,7 +499,7 @@ void Diag::UpdateMTA ( void )
 	{
 		std::cout << std::endl << "Launching the installer..." << std::endl;
 		std::cout << "Run MTA once the installer has finished to see if it works now." << std::endl;
-		system ( files[FILE_NIGHTLY_INSTALLER].c_str()  );
+		system ( QuoteFilename( files[FILE_NIGHTLY_INSTALLER] ).c_str()  );
 	}
 	else // if the download failed, open a browser window to start the download of the nightly
 	{
@@ -521,7 +541,7 @@ void Diag::UpdateDirectX ( void )
 	if ( Curl::DownloadFile ( DXWebSetupURL.c_str(), DXWebSetupPath.c_str() ) ) // success! open the file
 	{
 		std::cout << std::endl << "Follow the instructions to update DirectX." << std::endl << std::endl;
-		system ( DXWebSetupPath.c_str() );
+		system ( QuoteFilename( DXWebSetupPath ).c_str() );
 	}
 	else // failure; open a browser window to start the download of DXWebSetup
 	{
@@ -613,7 +633,14 @@ void Diag::DoSystemCommandWithOutput ( std::string command, int outputType, DWOR
     else
     {
         // Apply time limit for command to complete
-        DWORD status = WaitForSingleObject ( pi.hProcess, maxTimeMs );
+        DWORD status = 1;
+        for( unsigned int i = 0 ; i < maxTimeMs ; i += 100 )
+        {
+            status = WaitForSingleObject ( pi.hProcess, 100 );
+            if ( status != WAIT_TIMEOUT )
+                break;
+            ProgressBarInc();
+        }
         if ( status == WAIT_TIMEOUT )
         {
             TerminateProcess ( pi.hProcess, 1 );

MTADiag/Log.cpp

@@ -31,8 +31,13 @@ bool Log::WriteFileToLog ( std::string filePath, std::string itemName )
 
 	if ( !file ) // if we can't create the file
 	{
-		WriteStringToLog ( "Can't access ", filePath );
-		WriteStringToLog ( "" );
+	    logfile << itemName
+			    << ":"
+			    << std::endl
+			    << "Can't access "
+			    << filePath
+			    << std::endl << std::endl
+			    << std::flush;
 		return false; // failure!
 	}
 
@@ -73,6 +78,8 @@ void Log::WriteStringToLog ( std::string string, std::string string2, bool endli
 
 	if ( endline ) // add an endline if specified
 		logfile << std::endl;
+
+	logfile << std::flush;
 }
 
 void Log::WriteDividerToLog ( void )

MTADiag/util.cpp

@@ -128,7 +128,7 @@ void ConvertUnicodeToASCII ( std::string file1, std::string file2 )
 	std::stringstream ss; // create a stringstream
 	std::string convert;
 
-	ss << "TYPE " << file1 << " > " << file2; // TYPE <file1> > <file2>
+	ss << "TYPE " << QuoteFilename( file1 ) << " > " << QuoteFilename( file2 ); // TYPE <file1> > <file2>
 	convert = ss.str ();
 
 	// clear the stringstream
@@ -313,10 +313,23 @@ bool HasDigits ( std::string s )
 		return false;
 }
 
+int lastPercent = 0;
+int fraction = 0;
 void ProgressBar ( int percent )
 {
 	std::string bar;
 
+    if ( percent >= 0 )
+    {
+        lastPercent = percent;
+        fraction = 0;
+    }
+    else
+    {
+        percent = lastPercent;
+        fraction++;
+    }
+
 	for ( int i = 0; i < 50; i++ )
 	{
 		if ( i < ( percent / 2 ) )
@@ -332,7 +345,21 @@ void ProgressBar ( int percent )
 			bar.replace ( i, 1, " " );
 		}
 	}
-	std::cout << "\r" "[" << bar << "] "; std::cout.width ( 3 ); std::cout << percent << "%     " << std::flush;
+	std::cout << "\r" "[" << bar << "] "; std::cout.width ( 3 ); std::cout << percent << "%     ";
+    if ( percent < 100 )
+	    std::cout << "" << fraction << "     "  << std::flush;
+    else
+	    std::cout << "     "  << std::flush;
+}
+
+void ProgressBarInc ( void )
+{
+    ProgressBar( -1 );
+}
+
+std::string QuoteFilename( const std::string& filename )
+{
+    return "\"" + filename + "\"";
 }
 
 // slightly modified version of https://msdn.microsoft.com/en-us/library/ms175774(v=vs.80).aspx

MTADiag/util.h

@@ -32,4 +32,6 @@ bool                CompareFileMD5                     ( std::string MD5sum, std
 bool                FindInFile                         ( std::string filename, std::string value );
 bool                HasDigits                          ( std::string s );
 void                ProgressBar                        ( int percent );
+void                ProgressBarInc                     ( void );
+std::string         QuoteFilename                      ( const std::string& filename );
 std::string         GetEnv                             ( std::string variable );