Upgrade to VS2012; changed to MTASA Pastebin; clarified wording; 1.3.3 nightly support; fixed file checker misleading output

Author: Towncivilian

MTADiag.sln

@@ -1,7 +1,7 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MTADiag", "MTADiag\MTADiag.vcproj", "{C55F3E8F-3FC0-45F5-B595-48D3F1207E6C}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MTADiag", "MTADiag\MTADiag.vcxproj", "{C55F3E8F-3FC0-45F5-B595-48D3F1207E6C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

MTADiag/Common.h

@@ -23,4 +23,4 @@
 #include <shlobj.h>
 #include "Log.h"
 
-#define VERSION "2.7.4"
+#define VERSION "2.7.9"

MTADiag/Curl.cpp

@@ -39,14 +39,79 @@ bool Curl::DownloadFile ( std::string fileURL, std::string filePath )
 		fclose ( fp ); // close the file
 
 		if ( !res ) // if we were successful
-		return true;
+			return true;
 		else // failure
-		return false;
+			return false;
 	}
 	else // failure to initialize CURL
 		return false;
 }
 
+std::string Curl::CreateMTAPasteBin ( std::string filePath, std::string pasteName )
+{
+	CURL *curl; // initialize curl
+	curl = curl_easy_init(); // initialize curl_easy
+
+	std::string logText; // stores entire log file
+	std::string post; // stores POST string
+	std::stringstream ss; // create a stringstream
+	std::ifstream file;
+
+	// read entire MTADiag log into string
+	file.open ( filePath.c_str(), std::ios::in );
+		if ( file )
+		{
+			ss << file.rdbuf();
+			logText = ss.str();
+		}
+	file.close();
+
+	// clear the stringstream
+	ss.str ("");
+	ss.clear();
+
+	ss	<< "code2="
+		<< curl_easy_escape ( curl, logText.c_str(), logText.length() ) // urlencode log file contents
+	    << "&"
+		<< "format=text&"
+		<< "postkey=&"
+		<< "paste=Submit&"
+		<< "expiry=m&"
+		<< "give_pid=yes&"
+		<< "poster="
+		<< curl_easy_escape ( curl, pasteName.c_str(), pasteName.length() ) // urlencode MTADiag log filename
+		<< "&";
+	post = ss.str();
+
+	// clear the stringstream
+	ss.str ("");
+	ss.clear();
+
+	if ( curl ) // if curl was initialized
+	{
+		curl_easy_setopt ( curl, CURLOPT_URL, "http://pastebin.mtasa.com/index.php" ); // set the URL
+		curl_easy_setopt ( curl, CURLOPT_POSTFIELDS, post.c_str() ); // set our log file as the POST field
+		curl_easy_setopt ( curl, CURLOPT_NOPROGRESS, FALSE ); // we want progress
+		curl_easy_setopt ( curl, CURLOPT_PROGRESSFUNCTION, progress_callback ); // set the progress callback function
+		curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, write_data ); // set the write function
+		CURLcode res = curl_easy_perform ( curl ); // perform; store result into res
+		curl_easy_cleanup ( curl ); // clean up
+
+		if ( !res ) // if we were successful
+		{
+			return response;
+		}
+		else // failure
+		{
+			return "Failed to upload to Pastebin.";
+		}
+	}
+	else
+	{
+		return "Failed to initialize CURL.";
+	}
+}
+
 std::string Curl::CreatePasteBin ( std::string filePath, std::string pasteName )
 {
 	CURL *curl; // initialize curl
@@ -77,7 +142,7 @@ std::string Curl::CreatePasteBin ( std::string filePath, std::string pasteName )
 		<< curl_easy_escape ( curl, pasteName.c_str(), pasteName.length() ) // urlencode MTADiag log filename
 		<< "&"
 		<< "api_paste_expire_date=1M&" // paste will expire in one month
-		<< "api_dev_key=provide_your_own&" // Pastebin API dev key
+		<< "api_dev_key=&" // Pastebin API dev key
 		<< "api_paste_code="
 		<< curl_easy_escape ( curl, logText.c_str(), logText.length() ); // urlencode log file contents
 	post = ss.str();
@@ -98,7 +163,6 @@ std::string Curl::CreatePasteBin ( std::string filePath, std::string pasteName )
 
 		if ( !res ) // if we were successful
 		{
-
 			return response;
 		}
 		else // failure

MTADiag/Curl.h

@@ -19,7 +19,7 @@
 namespace Curl {
 
 	bool                  DownloadFile            ( std::string fileURL, std::string filePath );
+	std::string           CreateMTAPasteBin       ( std::string filePath, std::string pasteName );
 	std::string           CreatePasteBin          ( std::string filePath, std::string pasteName );
-
 	static std::string    response;               // HTTP POST response
 }

MTADiag/Diag.cpp

@@ -18,6 +18,7 @@
 
 //#define SKIPUPDATE
 //#define SKIPDXDIAG
+//#define SKIPFILECHECK
 //#define DEBUGOUTPUT // output contents of files vector
 
 std::vector<std::string>      Diag::files;
@@ -53,7 +54,7 @@ void Diag::Begin ( void )
 	// only check 32-bit OSes due to compatibility mode settings *NOT* being written to Wow6432Node on 64-bit OSes
 	// and I can't seem to query non-Wow6432Node keys - maybe I'm doing something wrong?
 	if ( !bIsWOW64 ) { CompatRemoved2 = DeleteCompatibilityEntries ( CompatModeRegKey, HKEY_LOCAL_MACHINE ); }
-
+#ifndef SKIPFILECHECK
 	// check for any missing GTA files
 	std::cout << "Checking for missing GTA files, please wait..." << std::endl;
 
@@ -66,8 +67,7 @@ void Diag::Begin ( void )
 				std::cout << "Missing GTA file: " << fileList[i].szFilename << std::endl; // output any messed up file
 				bQuit = true; // we need to quit since the user's GTA install is probably screwed up
 			}
-			printf ( "Checking %i out of %i...\r", i, ( sizeof ( fileList ) / sizeof ( fileList[0] ) ) );
-			fflush ( stdout );
+			std::cout << "\rChecking " << ( i + 1 ) << " out of " << ( sizeof ( fileList ) / sizeof ( fileList[0] ) ) << "...";
     }
 	std::cout << std::endl;
 	if ( bQuit )
@@ -77,7 +77,7 @@ void Diag::Begin ( void )
 		system ( "pause" );
 		exit ( EXIT_FAILURE ); // exit
 	};
-
+#endif
 	// check if MTA version matches the latest auto-update nightly
 	if ( Curl::DownloadFile ( MTAVerURL, files[1].c_str() ) ) // download the version appropriation HTML
 	{
@@ -122,7 +122,7 @@ void Diag::Begin ( void )
 	if ( CompatRemoved1 == true || CompatRemoved2 == true )
 		Log::WriteStringToLog ( "Compat. mode deleted:  Yes");
 	Log::WriteStringToLog ( "" );
-
+#ifndef SKIPFILECHECK
 	// check for any modified or nonstandard GTA files
 	std::cout << "Checking for modified or nonstandard GTA files, please wait..." << std::endl;
 
@@ -140,10 +140,10 @@ void Diag::Begin ( void )
 				Log::WriteStringToLog ( "Value should be: ", szMd5 );
 				Log::WriteStringToLog ( "" );
 			}
-			printf ( "Checking %i out of %i...\r", i, ( sizeof ( fileList ) / sizeof ( fileList[0] ) ) );
-			fflush ( stdout );
+			std::cout << "\rChecking " << ( i + 1 ) << " out of " << ( sizeof ( fileList ) / sizeof ( fileList[0] ) ) << "...";
     }
-
+	std::cout << std::endl;
+#endif
 	// collect more information and output to log file
 	std::cout << "Gathering information. Please wait..." << std::endl;
 	ProgressBar ( 0 );
@@ -199,11 +199,12 @@ void Diag::Begin ( void )
 	// upload to PasteBin
 	std::cout << "Log file generated. Uploading to Pastebin..." << std::endl;
 
-	PasteBinResult = Curl::CreatePasteBin ( files[0], logFileName ); // store the HTTP POST result into PasteBinResult
+	PasteBinResult = Curl::CreateMTAPasteBin ( files[0], logFileName ); // store the HTTP POST result into PasteBinResult
 
 	// upload successful; copy URL to clipboard
-	if ( strstr ( PasteBinResult.c_str(), "http://pastebin.com/" ) )
+	if ( HasDigits ( PasteBinResult ) && !( strstr ( PasteBinResult.c_str(), "DOCTYPE" ) ) )
 	{
+		PasteBinResult.insert ( 0, "http://pastebin.mtasa.com/" );
 		if ( CopyToClipboard ( PasteBinResult ) ) // was copying to clipboard successful?
 		{
 			std::cout << "Pastebin link (" << PasteBinResult << ") copied to your clipboard." << std::endl << "Please include the Pastebin link in your forum post." << std::endl;
@@ -216,10 +217,10 @@ void Diag::Begin ( void )
 	}
 	else // upload failure, open the log in WordPad so the user can copy & paste it themselves
 	{
-		std::cout << std::endl << std::endl << "Failed to upload log file to Pastebin." << std::endl;
+		std::cout << std::endl << std::endl << "Failed to upload log file to MTA Pastebin." << std::endl;
 		std::cout << "Error code: \"" << PasteBinResult << "\"" << std::endl;
-		std::cout << "Please paste the contents of the opened Wordpad window at www.pastebin.com." << std::endl;
-		std::cout << "Include the Pastebin link in your forum post." << std::endl << std::endl;	
+		std::cout << "Please paste the contents of the opened Wordpad window at www.pastebin.mtasa.com." << std::endl;
+		std::cout << "Include the MTA Pastebin link in your forum post." << std::endl << std::endl;	
 		ShellExecute ( NULL, "open", "wordpad.exe", files[0].c_str(), NULL, SW_SHOW );
 	}
 }
@@ -317,7 +318,7 @@ bool Diag::PollMTAVersions ( void )
 
 void Diag::UserPickVersion ( void )
 {
-	std::cout << "You have multiple versions of MTA installed." << std::endl << "Please pick which version to diagnose:" << std::endl;
+	std::cout << "You have multiple versions of MTA installed." << std::endl << "Please pick which version to diagnose by entering the number within the brackets:" << std::endl;
 
 	// iterate through currently installed MTA versions and output them
 	for (int i = 1; i < CUR_MTA_VERSIONS; i++)

MTADiag/Diag.h

@@ -41,7 +41,7 @@
 // Nightly download URLs
 #define MTA11NightlyURL "https://nightly.mtasa.com/?mtasa-1.1.1-rc-latest"
 #define MTA12NightlyURL "https://nightly.mtasa.com/?mtasa-1.2-rc-latest"
-#define MTA13NightlyURL "https://nightly.mtasa.com/?mtasa-1.3.1-rc-latest"
+#define MTA13NightlyURL "https://nightly.mtasa.com/?mtasa-1.3.3-rc-latest"
 #define MTA14NightlyURL "https://nightly.mtasa.com/?mtasa-1.4-unstable-latest"
 #define MTA15NightlyURL "https://nightly.mtasa.com/?mtasa-1.5-unstable-latest"
 
@@ -234,11 +234,11 @@ namespace Diag {
          {"da741c471b42859c99b3468bde1dc621", "\\data\\Decision\\chris\\ryder3.ped"},
          {"36e16f72d8be78bb8628478d5642860d", "\\data\\Decision\\david\\dam_sec.ped"},
          {"bf932fd285c05f708171b2e7cf0abe35", "\\data\\Decision\\david\\hei2_sc.ped"},
-         {"4d5f2754d6236d7e8c765def78b0fd68", "\\data\\Icons\\app.ico"},
-         {"ca533637e0a1aac05c9b14a98069c224", "\\data\\Icons\\bin.ico"},
-         {"ffcc3a0d32517475bc83f08331169ada", "\\data\\Icons\\saicon.ICN"},
-         {"ffcc3a0d32517475bc83f08331169ada", "\\data\\Icons\\saicon2.ICN"},
-         {"ffcc3a0d32517475bc83f08331169ada", "\\data\\Icons\\saicon3.ICN"},
+         //{"4d5f2754d6236d7e8c765def78b0fd68", "\\data\\Icons\\app.ico"},
+         //{"ca533637e0a1aac05c9b14a98069c224", "\\data\\Icons\\bin.ico"},
+         //{"ffcc3a0d32517475bc83f08331169ada", "\\data\\Icons\\saicon.ICN"},
+         //{"ffcc3a0d32517475bc83f08331169ada", "\\data\\Icons\\saicon2.ICN"},
+         //{"ffcc3a0d32517475bc83f08331169ada", "\\data\\Icons\\saicon3.ICN"},
          {"b65284518b3bab328530eb0f2b969d86", "\\data\\Paths\\NODES0.DAT"},
          {"167712a4ec91fd811670b120ba13ec33", "\\data\\Paths\\NODES1.DAT"},
          {"da13b3a0422f2866cb3cab02a93296fe", "\\data\\Paths\\NODES10.DAT"},
@@ -511,9 +511,9 @@ namespace Diag {
          //{"497d6d1447c62e57c55db49444876fac", "\\movies\\GTAtitles.mpg"},
          //{"fe0ddfa024d1296597890f27d24ae335", "\\movies\\Logo.mpg"},
          {"6791e6e0ffa6317af8a0dff648c9633d", "\\text\\american.gxt"},
-         {"3d069d3322809ccae92f315f53b5ad52", "\\text\\french.gxt"},
-         {"7801fc85df72041ba497bade4b258da5", "\\text\\german.gxt"},
-         {"fe4b7386f7149826ec682c5816f91ae4", "\\text\\italian.gxt"},
-         {"71e0281b4ff0ec6f192a2bda4d00effd", "\\text\\spanish.gxt"},
+         //{"3d069d3322809ccae92f315f53b5ad52", "\\text\\french.gxt"},
+         //{"7801fc85df72041ba497bade4b258da5", "\\text\\german.gxt"},
+         //{"fe4b7386f7149826ec682c5816f91ae4", "\\text\\italian.gxt"},
+         //{"71e0281b4ff0ec6f192a2bda4d00effd", "\\text\\spanish.gxt"},
     };
 }

MTADiag/MTADiag.vcproj

@@ -119,7 +119,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -135,7 +135,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcurl.lib"
 				LinkIncremental="1"
-				UACExecutionLevel="2"
+				UACExecutionLevel="0"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -189,6 +189,10 @@
 				RelativePath=".\main.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\md5.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\util.cpp"
 				>
@@ -215,6 +219,10 @@
 				RelativePath=".\Log.h"
 				>
 			</File>
+			<File
+				RelativePath=".\md5.h"
+				>
+			</File>
 			<File
 				RelativePath=".\util.h"
 				>

MTADiag/util.cpp

@@ -305,6 +305,14 @@ bool FindInFile ( std::string filename, std::string value )
 	return false; // we didn't find it, return false
 }
 
+bool HasDigits ( std::string s )
+{
+	if ( std::string::npos != s.find_first_of ( "0123456789" ) )
+		return true;
+	else
+		return false;
+}
+
 void ProgressBar ( int percent )
 {
 	std::string bar;

MTADiag/util.h

@@ -30,5 +30,6 @@ bool                IsWin8OrNewer                      ( void );
 std::string         GetFileMD5                         ( std::string filename );
 bool                CompareFileMD5                     ( std::string MD5sum, std::string filename );
 bool                FindInFile                         ( std::string filename, std::string value );
+bool                HasDigits                          ( std::string s );
 void                ProgressBar                        ( int percent );
 std::string         GetEnv                             ( std::string variable );