Added %ProgramData%\MTA San Andreas All\<version>\report.log to log; MTADiag now prompts for Administrator privileges on Vista and newer if UAC is enabled

Author: Towncivilian

MTADiag/Common.h

@@ -22,6 +22,6 @@
 #include <vector>
 #include "Log.h"
 
-#define VERSION "2.3.3"
+#define VERSION "2.3.4"
 
 #endif

MTADiag/Diag.cpp

@@ -78,6 +78,7 @@ void Diag::Begin ( void )
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\logfile.txt", "logfile.txt" );
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\CEGUI.log", "CEGUI.log" );
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\timings.log", "timings.log" );
+	if ( IsVistaOrNewer() ) { Log::WriteFileToLog ( programData + "\\MTA San Andreas All\\" + MTAShortVersion + "\\report.log", "report.log" ); }
 
 	QueryWMIC ( "Path", "Win32_VideoController", "Get" );
 
@@ -125,6 +126,7 @@ void Diag::GeneratePaths ( void )
 	// obtain Temp and WINDOWS environment variables, and store system time
 	tempDir = getenv ( "Temp" );            // get the Temp directory
 	systemRoot = getenv ( "SystemRoot" );	// get the WINDOWS directory
+	if ( IsVistaOrNewer() ) { programData = getenv ( "ProgramData" ); } // get the ProgramData directory 
 	GetLocalTime ( &sysTime );              // get the current system time
 
 	// generate necessary file paths
@@ -137,11 +139,11 @@ void Diag::GeneratePaths ( void )
 	ss.str ("");
 	ss.clear();
 
-	files.push_back ( tempDir + "\\" + logFileName + ".txt" ); // files [0] ...
-	files.push_back ( tempDir + "\\tempoutput.txt" );
-	files.push_back ( tempDir + "\\MTANightly.exe" );
-	files.push_back ( tempDir + "\\WMICUni.txt" );
-	files.push_back ( systemRoot + "\\system32\\D3DX9_43.dll" );
+	files.push_back ( tempDir + "\\" + logFileName + ".txt" ); // files [0] ... / log file path
+	files.push_back ( tempDir + "\\tempoutput.txt" ); // general temporary output file for almost everything
+	files.push_back ( tempDir + "\\MTANightly.exe" ); // filepath for nightly
+	files.push_back ( tempDir + "\\WMICUni.txt" ); // WMIC command outputs as ASCII; convert to unicode for proper insertion & formatting in the log
+	files.push_back ( systemRoot + "\\system32\\D3DX9_43.dll" ); // we check for this file to see if DirectX is up to date
 
 #ifdef DEBUGOUTPUT
 	for ( int i = 0; i < ( signed ) files.size(); i++ )
@@ -158,7 +160,7 @@ bool Diag::PollMTAVersions ( void )
 	MTAVersionsInstalled[5] = ReadRegKey ( MTAPathValue, MTA15PathSubKey ); // store MTA 1.5 path, if present
 
 	// if a version isn't installed, "Failed to get key." is returned by readRegKey; clear that array element
-	for ( int i = 1; i < CUR_MTA_VERSIONS; i++ )
+	for ( int i = 1; i <= CUR_MTA_VERSIONS; i++ )
 	{
 		if ( !strcmp ( MTAVersionsInstalled[i].c_str(), "Failed to read key." ) )
 			MTAVersionsInstalled[i].assign( "" );
@@ -167,7 +169,7 @@ bool Diag::PollMTAVersions ( void )
 	// check how many versions of MTA:SA are installed; if there's only one, we'll narrow it down and set MTAVerChoice to that version
 	int versionCounter = 0;
 
-	for (int i = 1; i < CUR_MTA_VERSIONS; i++)
+	for (int i = 1; i <= CUR_MTA_VERSIONS; i++)
 	{
 		if ( !MTAVersionsInstalled[i].empty() )
 		{
@@ -183,14 +185,14 @@ bool Diag::PollMTAVersions ( void )
 	// or is not running this program as Administrator when they should be
 	else if ( versionCounter == 0 )
 	{
-		std::cout << "Can't read MTA path." << std::endl << "You are either not running this program as an Administrator," << std::endl;
-		std::cout << "or you may be running a version of MTA older than 1.1." << std::endl;
+		std::cout << "Can't read MTA path." << std::endl;
+		std::cout << "You may be running a version of MTA older than 1.1." << std::endl;
 		std::cout << "Update at www.mtasa.com, then run MTADiag again if necessary." << std::endl;
 		system ( "pause" );
 		exit ( EXIT_FAILURE );
 	}
 	else
-		return false; // return false signifying that there are multiple versions of MTA:SA installed
+		return false; // return false, signifying that there are multiple versions of MTA:SA installed
 }
 
 void Diag::UserPickVersion ( void )
@@ -249,22 +251,27 @@ std::string Diag::GetMTAVersion ( void )
 	{
 	case 1:
 		MTAVersion = ReadRegKey ( MTAVerValue, MTA11VerSubKey );
+		MTAShortVersion = "1.1";
 		return MTAVersion;
 		break;
 	case 2:
 		MTAVersion = ReadRegKey ( MTAVerValue, MTA12VerSubKey );
+		MTAShortVersion = "1.2";
 		return MTAVersion;
 		break;
 	case 3:
 		MTAVersion = ReadRegKey ( MTAVerValue, MTA13VerSubKey );
+		MTAShortVersion = "1.3";
 		return MTAVersion;
 		break;
 	case 4:
 		MTAVersion = ReadRegKey ( MTAVerValue, MTA14VerSubKey );
+		MTAShortVersion = "1.4";
 		return MTAVersion;
 		break;
 	case 5:
 		MTAVersion = ReadRegKey ( MTAVerValue, MTA15VerSubKey );
+		MTAShortVersion = "1.5";
 		return MTAVersion;
 		break;
 	}

MTADiag/Diag.h

@@ -17,7 +17,7 @@
 
 #include "Common.h"
 
-#define CUR_MTA_VERSIONS 6 // beginning at 1; encompasses 1.1, 1.2, 1.3, 1.4, 1.5
+#define CUR_MTA_VERSIONS 5 // beginning at 1; encompasses 1.1, 1.2, 1.3, 1.4, 1.5
 
 #define MTAPathValue	"Last Install Location"
 #define MTA11PathSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.1"
@@ -36,6 +36,13 @@
 #define MTA14VerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.4\\Settings\\general"
 #define MTA15VerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.5\\Settings\\general"
 
+#define MTAShortVerValue    "Last Run Path Version"
+#define MTA11ShortVerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.1"
+#define MTA12ShortVerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.2"
+#define MTA13ShortVerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.3"
+#define MTA14ShortVerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.4"
+#define MTA15ShortVerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.5"
+
 #define MTA11NightlyURL "http://nightly.mtasa.com/?mtasa-1.1.1-rc-latest"
 #define MTA12NightlyURL "http://nightly.mtasa.com/?mtasa-1.2-rc-latest"
 #define MTA13NightlyURL "http://nightly.mtasa.com/?mtasa-1.3-rc-latest"
@@ -75,6 +82,7 @@ namespace Diag {
 	static std::string      logFileName;
 	static std::string      tempDir;
 	static std::string      systemRoot;
+	static std::string      programData;
 	static SYSTEMTIME       sysTime;
 
 	extern std::vector<std::string> files;
@@ -84,6 +92,7 @@ namespace Diag {
 
 	// store current MTA version when GetMTAVersion() is called, and store the original version to dump in the log file
 	static std::string      MTAVersion;
+	static std::string      MTAShortVersion;
 	static std::string      OriginalMTAVersion;
 
 	static std::string      MTAVersionsInstalled[CUR_MTA_VERSIONS]; // array to store paths of all MTA versions currently installed

MTADiag/MTADiag.vcproj

@@ -135,6 +135,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcurl.lib"
 				LinkIncremental="1"
+				UACExecutionLevel="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

MTADiag/util.cpp

@@ -63,4 +63,21 @@ void ConvertUnicodeToASCII ( std::string file1, std::string file2 )
 	ss.clear();
 
 	system ( convert.c_str() );
+}
+
+// slightly modified version of http://msdn.microsoft.com/en-us/library/ms724451%28VS.85%29.aspx
+bool IsVistaOrNewer ( void )
+{
+	OSVERSIONINFO osvi;
+	bool bIsVistaOrNewer;
+
+	ZeroMemory ( &osvi, sizeof ( OSVERSIONINFO ) );
+	osvi.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO );
+
+	GetVersionEx ( &osvi );
+
+	if ( bIsVistaOrNewer = ( osvi.dwMajorVersion >= 6 ) )
+		return true;
+	else
+		return false;
 }

MTADiag/util.h

@@ -15,9 +15,11 @@
 #ifndef UTIL_H
 #define UTIL_H
 #include "Common.h"
+#include <windows.h>
 
 std::string         ReadRegKey			  ( std::string value, std::string subkey );
 bool                CheckForFile          ( std::string FilePath );
 void                ConvertUnicodeToASCII ( std::string file1, std::string file2 );
+bool                IsVistaOrNewer        ( void );
 
 #endif