Add premake build files and fix WinAPI usage

Author: jushar

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*.{h,hpp,cpp}]
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+
+[*.lua]
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4

.gitignore

@@ -0,0 +1,6 @@
+.vs/
+.vscode/
+
+bin/
+build/
+tools/vswhere.exe

premake5.lua

@@ -0,0 +1,38 @@
+workspace "MTADiag"
+	configurations { "Debug", "Release" }
+	location "build"
+	targetdir "bin"
+	startproject "MTADiag"
+
+	toolset "v141_xp" -- Enable XP support
+	flags { "StaticRuntime" }
+
+	filter "configurations:Debug"
+		targetsuffix "_d"
+
+	filter "configurations:Release"
+		optimize "Full"
+
+	filter {}
+		-- Dependencies
+		include "vendor/curl"
+
+		project "MTADiag"
+			language "C++"
+			cppdialect "C++14"
+			kind "ConsoleApp"
+
+			defines { "BUILDING_LIBCURL" }
+			includedirs { "include", "vendor/curl/include" }
+			links { "curl" }
+
+			files {
+				"premake5.lua",
+
+				"include/**.h",
+				"include/**.hpp",
+
+				"src/**.cpp",
+
+				"res/**.rc"
+			}

res/resource.rc

@@ -12,4 +12,4 @@
 
 // remains consistent on all systems.
 
-IDI_APPLICATION     ICON          "res\\MTADiag.ico"
+IDI_APPLICATION     ICON          "MTADiag.ico"

src/Curl.cpp

@@ -14,9 +14,8 @@
 
 #include "Curl.h"
 #include "util.h"
-#include "curl/curl.h"
-#include "curl/easy.h"
-#include "curl/types.h"
+#include <curl/curl.h>
+#include <curl/easy.h>
 
 void progress_callback ( void* percent, double TotalToDL, double CurrentDL, double TotalToUL, double CurrentUL ); // percentage progress callback
 size_t write_data ( void *ptr, size_t size, size_t nmemb, void *stream ); // writes HTTP response to a string
@@ -189,4 +188,4 @@ size_t write_data ( void* ptr, size_t size, size_t nmemb, void* )
 	std::string temp ( static_cast <const char*> ( ptr ), size* nmemb );
     Curl::response.append ( temp );
     return size* nmemb;
-}
+}

src/Diag.cpp

@@ -294,7 +294,7 @@ void Diag::Begin ( void )
 		std::cout << "Error code: \"" << PasteBinResult << "\"" << std::endl;
 		std::cout << "Please paste the contents of the opened Wordpad window at https://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", QuoteFilename( files[FILE_LOG] ).c_str(), NULL, SW_SHOW );
+		ShellExecuteA ( NULL, "open", "wordpad.exe", QuoteFilename( files[FILE_LOG] ).c_str(), NULL, SW_SHOW );
 	}
 }
 
@@ -333,7 +333,7 @@ void Diag::GeneratePaths ( void )
     // 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 );
+        SHCreateDirectoryExA( NULL, altTempDir.c_str(), NULL );
         // Check can write there
 	    std::string altTempDirTest = altTempDir + "\\test.txt";
 	    std::ofstream file;
@@ -547,7 +547,7 @@ void Diag::UpdateMTA ( void )
 	{
 		std::cout << "Unable to automatically download MTA patch. Launching download link..." << std::endl;
 		system ( "pause" ); // wait for user acknowledgement
-		ShellExecute ( NULL, "open", url.c_str(), NULL, NULL, SW_HIDE );
+		ShellExecuteA ( NULL, "open", url.c_str(), NULL, NULL, SW_HIDE );
 		std::cout << std::endl << "Install the patch. ";
 	}
 #endif
@@ -589,7 +589,7 @@ void Diag::UpdateDirectX ( void )
 	{
 		std::cout << "Unable to automatically download DirectX updater. Launching download link..." << std::endl;
 		system ( "pause" ); // wait for user acknowledgement
-		ShellExecute ( NULL, "open", DXWebSetupURL.c_str(), NULL, NULL, SW_HIDE );
+		ShellExecuteA ( NULL, "open", DXWebSetupURL.c_str(), NULL, NULL, SW_HIDE );
 		std::cout << "Continue when DirectX has finished updating." << std::endl;
 		system ( "pause" ); // wait for user acknowledgement
 	}
@@ -639,7 +639,7 @@ DWORD Diag::DoSystemCommandWithOutput ( std::string command, int outputType, DWO
     if ( outputType != OUTPUT_NONE )
     {
         // File for output to be redirected to
-        h = CreateFile( files[FILE_TEMP].c_str(),
+        h = CreateFileA( files[FILE_TEMP].c_str(),
             FILE_APPEND_DATA,
             FILE_SHARE_WRITE | FILE_SHARE_READ,
             &sa,
@@ -653,7 +653,7 @@ DWORD Diag::DoSystemCommandWithOutput ( std::string command, int outputType, DWO
     }
 
     PROCESS_INFORMATION pi; 
-    STARTUPINFO si;
+    STARTUPINFOA si;
     BOOL ret = FALSE; 
     DWORD flags = CREATE_NO_WINDOW;
 
@@ -665,7 +665,7 @@ DWORD Diag::DoSystemCommandWithOutput ( std::string command, int outputType, DWO
     si.hStdError = h;
     si.hStdOutput = h;
 
-    ret = CreateProcess( NULL, (LPSTR)command.c_str(), NULL, NULL, TRUE, flags, NULL, NULL, &si, &pi );
+    ret = CreateProcessA( NULL, (LPSTR)command.c_str(), NULL, NULL, TRUE, flags, NULL, NULL, &si, &pi );
 
     DWORD status = ERROR_INVALID_FUNCTION;
 	std::stringstream ss;

src/main.cpp

@@ -18,7 +18,7 @@ extern std::vector<std::string>      Diag::files;
 
 int main()
 {
-	SetConsoleTitle ( "MTADiag v" VERSION ); // set the console title
+	SetConsoleTitleA ( "MTADiag v" VERSION ); // set the console title
 	std::cout << "MTADiag v" << VERSION << " by Towncivilian" << std::endl << std::endl; // tell the user what this program is
 
 	Diag::Begin(); // begin diagnostics
@@ -28,4 +28,4 @@ int main()
 	system ( "pause" ); // wait for user exit
 
 	remove ( Diag::files[FILE_LOG].c_str() ); // remove the generated MTADiag log
-};
+};

src/util.cpp

@@ -58,19 +58,19 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 
 	bool changed = false;
 
-	if ( RegOpenKeyEx ( hKeyType, subkey.c_str(), NULL, KEY_READ | KEY_WRITE, &hKey ) == ERROR_SUCCESS ) // if registry key read was successfully
+	if ( RegOpenKeyExA ( 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
 		{
-			result = RegEnumValue ( hKey, index, buf, &dwBufSize, 0, NULL, NULL, NULL ); // attempt to enumerate values and store result
+			result = RegEnumValueA ( 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 ( RegQueryValueExA ( 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"?
 						{
@@ -82,15 +82,15 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 							if ( IsWin8OrNewer() ) // is the user running Windows 8 or newer?
 							{
 								const 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
+								RegSetValueExA ( hKey, buf, 0, dwType, ( BYTE* ) Win8Data, sizeof (Win8Data) ); // set the value data to RUNASADMIN only
 								changed = true;
 								index--;
 								continue;
 							}
 							else // 7 or older
 							{
 								const 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
+								RegSetValueExA ( hKey, buf, 0, dwType, ( BYTE* ) XPData, sizeof (XPData) ); // set the value data to RUNASADMIN only
 								changed = true;
 								index--;
 								continue;
@@ -99,7 +99,7 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 
 						else // the user only has other compatibility mode settings enabled
 						{
-							RegDeleteValue ( hKey, buf ); // delete the registry value
+							RegDeleteValueA ( hKey, buf ); // delete the registry value
 							changed = true;
 							index--;
 							continue;

tools/premake5.exe

@@ -0,0 +1,31 @@
+@echo off
+set VSWHERE=tools\vswhere.exe
+
+rem Download vswhere (command line utility to find MSBuild path)
+if not exist %VSWHERE% (
+	echo vswhere utility doesn't exist. Downloading...
+	powershell -Command "Invoke-WebRequest https://mirror.mtasa.com/bdata/vswhere.exe -OutFile %VSWHERE%"
+)
+
+rem Create solution (ignoring pause)
+call win-create-projects.bat < nul
+echo.
+
+rem Find MSBuild installation path
+for /f "usebackq tokens=1* delims=: " %%i in (`%VSWHERE% -latest -requires Microsoft.Component.MSBuild`) do (
+	if /i "%%i"=="installationPath" set INSTALLDIR=%%j
+)
+
+rem Output an error if not exists
+set MSBUILDPATH="%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe"
+if not exist %MSBUILDPATH% (
+	echo Could not find MSBuild. Make sure you have Visual Studio 2017 installed
+	goto end
+)
+echo Found MSBuild at: %MSBUILDPATH%
+
+rem Start compiling
+%MSBUILDPATH% build/MTADiag.sln /property:Configuration=Release /m
+
+:end
+pause