Windows 8 support, automatic removal of useless compatibility mode flags, other minor tweaks

Author: Towncivilian

MTADiag/Common.h

@@ -12,8 +12,8 @@
 * 
 *****************************************************************************/ 
 
-#ifndef COMMON_H
-#define COMMON_H
+#pragma once
+
 #include <iostream>
 #include <windows.h>
 #include <string>
@@ -22,6 +22,4 @@
 #include <vector>
 #include "Log.h"
 
-#define VERSION "2.3.5"
-
-#endif
+#define VERSION "2.4"

MTADiag/Diag.cpp

@@ -47,21 +47,29 @@ void Diag::Begin ( void )
 	if ( CheckForFile( files[4].c_str() ) ) { std::cout << "DirectX is up-to-date." << std::endl << std::endl; }
 	else { UpdateDirectX(); DXUpdated = 1; }
 
+	// remove any compatibility mode settings on gta_sa.exe and/or Multi Theft Auto.exe
+	CompatRemoved1 = DeleteCompatibilityEntries ( CompatModeRegKey, HKEY_CURRENT_USER );
+	CompatRemoved2 = DeleteCompatibilityEntries ( CompatModeRegKey, HKEY_LOCAL_MACHINE );
+
 	// update MTA to latest nightly/unstable build, depending on the version
 	UpdateMTA();
 
 	// write a bunch of information to the log file since we just collected it
-	Log::WriteStringToLog ( "MTA path:            ", MTAPath );
-	Log::WriteStringToLog ( "Old MTA version:     ", OriginalMTAVersion );
-	Log::WriteStringToLog ( "New MTA version:         ", MTAVersion );
-	Log::WriteStringToLog ( "GTA path:            ", GTAPath );
+	Log::WriteStringToLog ( "MTA path:             ", MTAPath );
+	Log::WriteStringToLog ( "Old MTA version:      ", OriginalMTAVersion );
+	Log::WriteStringToLog ( "New MTA version:      ", MTAVersion );
+	Log::WriteStringToLog ( "GTA path:             ", GTAPath );
+
 	std::string D3D9Present = ( CheckForFile ( GTAPath + "\\D3D9.dll" ) ) ? "Yes" : "No";
-	Log::WriteStringToLog ( "D3D9.dll present:    ", D3D9Present );
+	Log::WriteStringToLog ( "D3D9.dll present:     ", D3D9Present );
 
 	std::string DirectXState = ( CheckForFile ( files[4] ) ) ? "Yes" : "No";
-	Log::WriteStringToLog ( "DirectX up-to-date:  ", DirectXState );
-	if ( DXUpdated == 1 )
-		Log::WriteStringToLog ( "DirectX was updated:  Yes");
+	Log::WriteStringToLog ( "DirectX up-to-date:   ", DirectXState );
+	if ( DXUpdated == 0 )
+		Log::WriteStringToLog ( "DirectX was updated:   Yes");
+
+	if ( CompatRemoved1 == true || CompatRemoved2 == true )
+		Log::WriteStringToLog ( "Compat. mode deleted:  Yes");
 	Log::WriteStringToLog ( "" );
 
 	// collect more information and output to log file
@@ -72,8 +80,6 @@ void Diag::Begin ( void )
 	DoSystemCommandWithOutput ( "dxdiag /t " );
 #endif
 	DoSystemCommandWithOutput ( "tasklist >" );
-	DoSystemCommandWithOutput ( "ipconfig /all >" );
-	DoSystemCommandWithOutput ( "wevtutil qe Application /q:\"Event [System [(Level=2)] ] [EventData [(Data='Multi Theft Auto.exe')] ]\" /c:1 /f:text /rd:true >" );
 
 	// write some of MTA's logs to our log
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\core.log", "core.log" );
@@ -82,14 +88,9 @@ void Diag::Begin ( void )
 	Log::WriteFileToLog ( MTAPath + "\\MTA\\timings.log", "timings.log" );
 	if ( IsVistaOrNewer() ) { Log::WriteFileToLog ( programData + "\\MTA San Andreas All\\" + MTAShortVersion + "\\report.log", "report.log" ); }
 
-	// get some video controller information
-	QueryWMIC ( "Path", "Win32_VideoController", "Get" );
-
-	// export compatibility mode registry keys and export to log only if a match for MTA or GTA is found
-	ExportRegKeyToFile ( CompatModeRegKey1 );
-	TrimCompatabilityExport();
-	ExportRegKeyToFile ( CompatModeRegKey2 );
-	TrimCompatabilityExport();
+	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
+	QueryWMIC ( "Path", "Win32_VideoController", "Get" ); // get some video controller information
 
 	// get directory listing of some folders
 	GetDir ( ( MTAPath + "\\MTA" ) );
@@ -102,7 +103,7 @@ 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 POST result into PasteBinResult
+	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" ) )
@@ -116,15 +117,15 @@ void Diag::Begin ( void )
 	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", PasteBinResult.c_str(), NULL, NULL, SW_SHOW );
+		ShellExecute ( NULL, "open", "rundll32.exe", ( "url.dll,FileProtocolHandler " + PasteBinResult ).c_str(), NULL, SW_SHOW );
 	}
 }
 
 void Diag::Cleanup ( void )
 {
 	// clean up after ourselves
 	// start at 1 since 0 is the generated log's path; we still need that
-	for (int i = 1; i < ( signed ) files.size() - 1; i++) // don't delete D3DX9_43.dll
+	for ( unsigned int i = 1; i < files.size() - 1; i++) // don't delete D3DX9_43.dll
 		remove ( files[i].c_str() );
 }
 
@@ -154,7 +155,7 @@ void Diag::GeneratePaths ( void )
 
 	// output contents of files vector
 #ifdef DEBUGOUTPUT
-	for ( int i = 0; i < ( signed ) files.size(); i++ )
+	for ( unsigned int i = 0; i < files.size(); i++ )
 		std::cout << i << " " << files[i] << std::endl;
 #endif
 }
@@ -418,44 +419,4 @@ void Diag::GetDir ( std::string directory )
 	system ( dirPath.c_str() ); // do it
 
 	Log::WriteFileToLog ( files[1].c_str(), ( directory + " directory listing" ) ); // write the result to the log file with a description
-}
-
-void Diag::ExportRegKeyToFile ( std::string subkey )
-{
-	std::string ExportReg;
-	std::stringstream ss; // create a stringstream
-
-	ss << "regedit /e /a " << files[1] << " \"" << subkey << "\""; // regedit EXPORT ASCII <filename> <subkey>
-	ExportReg = ss.str();
-
-	// clear the stringstream
-	ss.str ("");
-	ss.clear();
-
-	system ( ExportReg.c_str() ); // do it
-}
-
-void Diag::TrimCompatabilityExport ( void )
-{
-	std::ifstream file;
-	std::string line;
-
-	file.open ( files[1].c_str(), std::ios::in ); // open the file with the exported registry key
-
-	if ( file ) // if file exists
-	{
-		while ( !file.eof() ) // while we haven't hit the end of the file
-		{
-			getline ( file, line ); // read one line
-
-			if ( strstr ( line.c_str(), "gta_sa.exe" ) || strstr ( line.c_str(), "Multi Theft Auto.exe" ) ) // if we get a filename match, output it to the log file
-			{
-				Log::WriteStringToLog ( "Compatibility registry entry match:", line );
-				Log::WriteStringToLog ( "" );
-			}
-		}
-	}
-	Log::WriteStringToLog ( "" );
-
-	file.close(); // close the file for writing
 }

MTADiag/Diag.h

@@ -12,8 +12,7 @@
 * 
 *****************************************************************************/ 
 
-#ifndef DIAG_H
-#define DIAG_H
+#pragma once
 
 #include "Common.h"
 
@@ -46,9 +45,8 @@
 #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 keys
-#define CompatModeRegKey1 "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"
-#define CompatModeRegKey2 "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"
+// Compatability mode registry key
+#define CompatModeRegKey "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"
 
 namespace Diag {
 
@@ -73,8 +71,6 @@ namespace Diag {
 	// information gathering functions
 	void                    DoSystemCommandWithOutput   ( std::string command );
 	void                    GetDir                      ( std::string directory );
-	void                    ExportRegKeyToFile          ( std::string subkey );
-	void                    TrimCompatabilityExport     ( void );
 	void                    QueryWMIC                   ( std::string, std::string = "", std::string = "", std::string = "" );
 
 	// used for storing environment variables, current system time, files, and some paths
@@ -99,7 +95,7 @@ namespace Diag {
 
 	static std::string      PasteBinResult;                         // HTTP response
 
+	static bool             CompatRemoved1;                         // were any compatibility mode registry settings removed?
+	static bool             CompatRemoved2;                         // were any compatibility mode registry settings removed?
 	static bool             DXUpdated;                              // was DirectX updated by MTADiag?
-}
-
-#endif
+}

MTADiag/Log.cpp

@@ -31,7 +31,7 @@ bool Log::WriteFileToLog ( std::string filePath, std::string itemName )
 
 	if ( !file ) // if we can't create the file
 	{
-		WriteStringToLog ( "Can't create", filePath );
+		WriteStringToLog ( "Can't access ", filePath );
 		WriteStringToLog ( "" );
 		return false; // failure!
 	}

MTADiag/util.cpp

@@ -21,9 +21,9 @@ std::string ReadRegKey ( std::string value, std::string subkey )
 	DWORD dwType = 1; // REG_SZ
 	DWORD dwBufSize = sizeof ( buf ); // buffer size
 
-	if ( RegOpenKey ( HKEY_LOCAL_MACHINE, subkey.c_str(), &hKey ) == ERROR_SUCCESS ) // registry key read was successful
+	if ( RegOpenKeyEx ( HKEY_LOCAL_MACHINE, subkey.c_str(), NULL, KEY_READ, &hKey ) == ERROR_SUCCESS ) // if registry key read was successfully
 	{
-		if ( RegQueryValueEx ( hKey, value.c_str(), NULL, &dwType, ( BYTE* ) buf, &dwBufSize ) == ERROR_SUCCESS ) // registry value read was successful
+		if ( RegQueryValueEx ( hKey, value.c_str(), NULL, &dwType, ( BYTE* ) buf, &dwBufSize ) == ERROR_SUCCESS ) // if registry value read was successfully
 		{
 			std::string value ( buf ); // store the value
 			RegCloseKey ( hKey ); // close the registry key
@@ -41,6 +41,77 @@ std::string ReadRegKey ( std::string value, std::string subkey )
 	}
 }
 
+bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
+{
+	HKEY hKey = 0; // handle to registry key
+	char buf[255] = {0}; // buffer for reading registry value
+	char buf2[255] = {0}; // buffer for reading value data
+	DWORD dwType = 1; // REG_SZ
+	DWORD dwBufSize = sizeof ( buf ); // registry value buffer size
+	DWORD dwBuf2Size = sizeof ( buf2 ); // value data buffer size
+
+	DWORD index = 0; // index for RegEnumKeyEx
+	long result = 0; // result of RegEnumKeyEx
+
+	bool changed = false;
+
+	if ( RegOpenKeyEx ( hKeyType, subkey.c_str(), NULL, KEY_ALL_ACCESS, &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
+		{
+			result = RegEnumValue ( hKey, index, buf, &dwBufSize, 0, NULL, NULL, NULL ); // attempt to enumerate values and store result
+			dwBufSize = sizeof ( buf ); // set the buffer size to the read value's size
+
+			if ( result == ERROR_SUCCESS ) // if we read something
+			{
+				index++; // increment index
+				if ( strstr ( buf, "gta_sa.exe" ) || strstr ( buf, "Multi Theft Auto.exe" ) ) // check for filename matches
+				{
+					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
+						}
+
+						if ( strstr ( buf2, "RUNASADMIN" ) ) // does it contain "RUNASADMIN" along with something else?
+						{
+							if ( IsWin8OrNewer() ) // is the user running Windows 8 or newer?
+							{
+								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;
+								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;
+								continue;
+							}
+						}
+
+						else // the user only has other compatibility mode settings enabled
+						{
+							RegDeleteValue ( hKey, buf ); // delete the registry value
+							changed = true;
+							continue;
+						}
+					}
+				}
+			}
+		}
+		return changed;
+		RegCloseKey ( hKey ); // close the registry key
+	}
+	else
+	{
+		return false; // unable to read registry key
+	}
+}
+
 bool CheckForFile ( std::string FilePath )
 {
 	std::ifstream ifile ( FilePath.c_str() );
@@ -80,4 +151,21 @@ bool IsVistaOrNewer ( void )
 		return true;
 	else
 		return false;
+}
+
+// slightly modified version of http://msdn.microsoft.com/en-us/library/ms724451%28VS.85%29.aspx
+bool IsWin8OrNewer ( void )
+{
+	OSVERSIONINFO osvi;
+	bool bIsWin8OrNewer;
+
+	ZeroMemory ( &osvi, sizeof ( OSVERSIONINFO ) );
+	osvi.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO );
+
+	GetVersionEx ( &osvi );
+
+	if ( bIsWin8OrNewer = ( osvi.dwMajorVersion >= 6 && osvi.dwMinorVersion >= 2 )  )
+		return true;
+	else
+		return false;
 }

MTADiag/util.h

@@ -12,14 +12,13 @@
 * 
 *****************************************************************************/ 
 
-#ifndef UTIL_H
-#define UTIL_H
-#include "Common.h"
-#include <windows.h>
+#pragma once
 
-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 );
+#include "Common.h"
 
-#endif
+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                IsVistaOrNewer                     ( void );
+bool                IsWin8OrNewer                      ( void );