Now copies Pastebin URL to clipboard; fixed compatibility mode setting deletion; added font diagnostics

Author: Towncivilian

MTADiag/Common.h

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

MTADiag/Diag.cpp

@@ -48,8 +48,12 @@ void Diag::Begin ( void )
 	else { UpdateDirectX(); DXUpdated = 1; }
 
 	// remove any compatibility mode settings on gta_sa.exe and/or Multi Theft Auto.exe
+
+	// check HKCU first
 	CompatRemoved1 = DeleteCompatibilityEntries ( CompatModeRegKey, HKEY_CURRENT_USER );
-	CompatRemoved2 = DeleteCompatibilityEntries ( CompatModeRegKey, HKEY_LOCAL_MACHINE );
+	// check HKLM for compat. mode settings set for all users
+	// only check 32-bit OSes due to compat. mode settings *NOT* being written to Wow6432Node on 64-bit OSes, and I can't seem to query non-Wow6432Node keys
+	if ( !bIsWOW64 ) { CompatRemoved2 = DeleteCompatibilityEntries ( CompatModeRegKey, HKEY_LOCAL_MACHINE ); }
 
 	// update MTA to latest nightly/unstable build, depending on the version
 	UpdateMTA();
@@ -86,7 +90,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" ); }
+	if ( bIsVistaOrNewer ) { Log::WriteFileToLog ( programData + "\\MTA San Andreas All\\" + MTAShortVersion + "\\report.log", "report.log" ); }
 
 	DoSystemCommandWithOutput ( "ipconfig /all >" ); // get network configuration
 	DoSystemCommandWithOutput ( "wevtutil qe Application /q:\"Event [System [(Level=2)] ] [EventData [(Data='Multi Theft Auto.exe')] ]\" /c:1 /f:text /rd:true >" ); // might help resolve Visual C++ runtime issues
@@ -97,6 +101,11 @@ void Diag::Begin ( void )
 	GetDir ( GTAPath );
 	GetDir ( ( GTAPath + "\\models" ) );
 
+	// font diagnostics
+	Log::WriteStringToLog ( "Verdana (TrueType) registry value:", ReadRegKey ( "Verdana (TrueType)", "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts\\" ) );
+	Log::WriteStringToLog ( "" );
+	GetDir ( systemRoot + "\\fonts\\verd*" );
+
 	// close the log file for writing
 	Log::Close();
 
@@ -105,20 +114,27 @@ void Diag::Begin ( void )
 
 	PasteBinResult = Curl::CreatePasteBin ( files[0], logFileName ); // store the HTTP POST result into PasteBinResult
 
-	// deal with a couple of errors in case there are any
-	if ( strstr ( PasteBinResult.c_str(), "Bad API request" ) || strstr ( PasteBinResult.c_str(), "Post limit" ) )
+	// upload successful; copy URL to clipboard
+	if ( strstr ( PasteBinResult.c_str(), "http://pastebin.com/" ) )
+	{
+		if ( CopyToClipboard ( PasteBinResult ) ) // was copying to clipboard successful?
+		{
+			std::cout << "Pastebin link copied to your clipboard." << std::endl << "Please include the Pastebin link in your forum post." << std::endl;
+		}
+		else // just in case that didn't work
+		{
+			std::cout << "Log file uploaded to Pastebin. Please include the Pastebin link in your forum post:" << std::endl;
+			std::cout << PasteBinResult << std::endl;
+		}
+	}
+	else // upload failure
 	{
 		std::cout << std::endl << std::endl << "Failed to upload log file to 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 << "Include the Pastebin link in your forum post." << std::endl << std::endl;	
 		ShellExecute ( NULL, "open", "wordpad.exe", files[0].c_str(), NULL, SW_SHOW );
 	}
-	else // upload successful; open the pasted log file in a browser window
-	{
-		std::cout << "Log file uploaded to Pastebin. Please include the Pastebin link in your forum post." << std::endl;
-		ShellExecute ( NULL, "open", "rundll32.exe", ( "url.dll,FileProtocolHandler " + PasteBinResult ).c_str(), NULL, SW_SHOW );
-	}
 }
 
 void Diag::Cleanup ( void )
@@ -132,9 +148,11 @@ void Diag::Cleanup ( void )
 void Diag::GeneratePaths ( void )
 {
 	// obtain Temp and WINDOWS environment variables, and store system time
+	bIsVistaOrNewer = IsVistaOrNewer();      // is the user running Vista or newer?
 	tempDir = getenv ( "Temp" );            // get the Temp directory
 	systemRoot = getenv ( "SystemRoot" );	// get the WINDOWS directory
-	if ( IsVistaOrNewer() ) { programData = getenv ( "ProgramData" ); } // get the ProgramData directory 
+	if ( bIsVistaOrNewer ) { programData = getenv ( "ProgramData" ); } // get the ProgramData directory 
+	IsWow64Process ( GetCurrentProcess(), &bIsWOW64 ); // is MTADiag running under WOW64?
 	GetLocalTime ( &sysTime );              // get the current system time
 
 	// generate necessary file paths

MTADiag/Diag.h

@@ -41,13 +41,10 @@
 // Nightly download URLs
 #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"
+#define MTA13NightlyURL "http://nightly.mtasa.com/?mtasa-1.3.1-rc-latest"
 #define MTA14NightlyURL "http://nightly.mtasa.com/?mtasa-1.4-unstable-latest"
 #define MTA15NightlyURL "http://nightly.mtasa.com/?mtasa-1.5-unstable-latest"
 
-// Compatability mode registry key
-#define CompatModeRegKey "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"
-
 namespace Diag {
 
 	void                    Begin                       ( void );
@@ -79,6 +76,8 @@ namespace Diag {
 	static std::string      systemRoot;
 	static std::string      programData;
 	static SYSTEMTIME       sysTime;
+	static bool             bIsVistaOrNewer;
+	static BOOL             bIsWOW64;
 
 	extern std::vector<std::string> files;
 

MTADiag/util.cpp

@@ -55,7 +55,7 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 
 	bool changed = false;
 
-	if ( RegOpenKeyEx ( hKeyType, subkey.c_str(), NULL, KEY_ALL_ACCESS, &hKey ) == ERROR_SUCCESS ) // if registry key read was successfully
+	if ( RegOpenKeyEx ( hKeyType, subkey.c_str(), NULL, KEY_READ | KEY_WRITE, &hKey ) == ERROR_SUCCESS ) // if registry key read was successfully
 	{
 		while ( result != ERROR_NO_MORE_ITEMS ) // loop until we run out of registry values to read
 		{
@@ -69,10 +69,9 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 				{
 					if ( RegQueryValueEx ( hKey, buf, NULL, &dwType, ( BYTE* ) buf2, &dwBuf2Size ) == ERROR_SUCCESS ) // read the value's data
 					{
-
 						if ( strcmp ( buf2, "~ RUNASADMIN" ) == 0 || strcmp ( buf2, "RUNASADMIN" ) == 0 ) // is the value's data already just "RUNASADMIN"?
 						{
-							continue; // break since we don't need to do anything
+							continue; // continue since we don't need to do anything
 						}
 
 						if ( strstr ( buf2, "RUNASADMIN" ) ) // does it contain "RUNASADMIN" along with something else?
@@ -82,13 +81,15 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 								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
 								RegSetValueEx ( hKey, buf, 0, dwType, ( BYTE* ) XPData, sizeof (XPData) ); // set the value data to RUNASADMIN only
 								changed = true;
+								index--;
 								continue;
 							}
 						}
@@ -97,6 +98,7 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 						{
 							RegDeleteValue ( hKey, buf ); // delete the registry value
 							changed = true;
+							index--;
 							continue;
 						}
 					}
@@ -136,6 +138,32 @@ void ConvertUnicodeToASCII ( std::string file1, std::string file2 )
 	system ( convert.c_str() ); // do it
 }
 
+bool CopyToClipboard ( std::string contents )
+{
+	HGLOBAL hGlobal = GlobalAlloc ( GMEM_MOVEABLE, contents.length() + 1 ); // get a handle to store our data in the clipboard
+
+	if ( hGlobal ) // if handle was allocated successfully
+	{
+		char *szData = ( char * ) GlobalLock ( hGlobal ); // allocate a handle for the data
+
+		strcpy_s ( szData, contents.length() + 1, contents.c_str() ); // copy data to clipboard
+
+		GlobalUnlock ( hGlobal ); // free the handle
+
+		OpenClipboard ( NULL ); // open the clipboard
+
+		EmptyClipboard(); // empty any previous contents
+
+		SetClipboardData ( CF_TEXT, hGlobal ); // set the clipboard data to the Pastebin URL
+
+		CloseClipboard(); // close the clipboard
+
+		return true; // success
+	}
+	else
+		return false; // failure
+}
+
 // slightly modified version of http://msdn.microsoft.com/en-us/library/ms724451%28VS.85%29.aspx
 bool IsVistaOrNewer ( void )
 {

MTADiag/util.h

@@ -16,9 +16,13 @@
 
 #include "Common.h"
 
+// Compatability mode registry key
+#define CompatModeRegKey "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"
+
 std::string         ReadRegKey			               ( std::string value, std::string subkey );
 bool                DeleteCompatibilityEntries         ( std::string subkey, HKEY hKeyType );
 bool                CheckForFile                       ( std::string FilePath );
 void                ConvertUnicodeToASCII              ( std::string file1, std::string file2 );
+bool                CopyToClipboard                    ( std::string contents );
 bool                IsVistaOrNewer                     ( void );
 bool                IsWin8OrNewer                      ( void );