Code cleanup + changes regarding compatibility with latest pull request

spmn · Jul 24, 2016 · 59b17e7 · 59b17e7
1 parent 21a1007
commit 59b17e7
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 307 deletions.
diff --git a/hook/hook.cpp b/hook/hook.cpp
diff --git a/hook/hook.vcxproj.filters b/hook/hook.vcxproj.filters
diff --git a/injector/injector.cpp b/injector/injector.cpp
diff --git a/injector/injector.vcxproj b/injector/injector.vcxproj
diff --git a/injector/resources/resource.rc b/injector/resources/resource.rc
diff --git a/injector/resources/samp.ico b/injector/resources/samp.ico
diff --git a/sa-mp_masterlist_fix.sln b/sa-mp_masterlist_fix.sln
@@ -1,20 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "injector", "injector\injector.vcxproj", "{0F91D87C-7ED2-4D04-A419-6199253A477B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hook", "hook\hook.vcxproj", "{AC1F8B56-A267-43D0-8036-0F3CBCBB374F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sa-mp_masterlist_fix", "sa-mp_masterlist_fix\sa-mp_masterlist_fix.vcxproj", "{AC1F8B56-A267-43D0-8036-0F3CBCBB374F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0F91D87C-7ED2-4D04-A419-6199253A477B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F91D87C-7ED2-4D04-A419-6199253A477B}.Debug|Win32.Build.0 = Debug|Win32
-		{0F91D87C-7ED2-4D04-A419-6199253A477B}.Release|Win32.ActiveCfg = Release|Win32
-		{0F91D87C-7ED2-4D04-A419-6199253A477B}.Release|Win32.Build.0 = Release|Win32
 		{AC1F8B56-A267-43D0-8036-0F3CBCBB374F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AC1F8B56-A267-43D0-8036-0F3CBCBB374F}.Debug|Win32.Build.0 = Debug|Win32
 		{AC1F8B56-A267-43D0-8036-0F3CBCBB374F}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/hook/fix.cpp → sa-mp_masterlist_fix/fix.cpp b/hook/fix.cpp → sa-mp_masterlist_fix/fix.cpp
diff --git a/hook/main.cpp → sa-mp_masterlist_fix/main.cpp b/hook/main.cpp → sa-mp_masterlist_fix/main.cpp
@@ -3,6 +3,7 @@
 #pragma comment(lib, "ws2_32.lib")
 #include <Shlobj.h>
 #include <iostream>
+#include <tchar.h>
 
 void InitializeFix();
 void GetRidOfMe();
@@ -32,15 +33,15 @@ WRAPPER_GENFUNC(VerQueryValueW)
 
 bool InitializeWrapper()
 {
-	char szDLLPath[MAX_PATH];
+	TCHAR szDLLPath[MAX_PATH];
 
 	if (SUCCEEDED(SHGetFolderPath(NULL,
 		CSIDL_SYSTEM,
 		NULL,
 		0,
 		szDLLPath)))
 	{
-		strcat_s(szDLLPath, MAX_PATH, "\\version.dll");
+		_tcscat_s(szDLLPath, MAX_PATH, TEXT("\\version.dll"));
 
 		HMODULE hModVersion = LoadLibrary(szDLLPath);
 #define WRAPPER_FUNC(name) orig_##name = GetProcAddress(hModVersion, ###name);
@@ -64,7 +65,7 @@ bool InitializeWrapper()
 	}
 	else
 	{
-		MessageBox(NULL, "Failed to get your origin dll.\nPlease report this issue on github,\nand remove version.dll from your GTA:SA Folder until the problem is solved.", "Whoopsie", MB_OK);
+		MessageBox(NULL, TEXT("Failed to get your origin dll.\nPlease report this issue on GitHub,\nand remove version.dll from your GTA:SA folder until the problem is solved."), TEXT("Whoopsie"), MB_OK);
 	}
 
 	return false;

diff --git a/hook/mod.def → sa-mp_masterlist_fix/mod.def b/hook/mod.def → sa-mp_masterlist_fix/mod.def
@@ -15,4 +15,4 @@ EXPORTS
 	VerLanguageNameA           = _VerLanguageNameA @12       
 	VerLanguageNameW           = _VerLanguageNameW @13      
 	VerQueryValueA             = _VerQueryValueA @14      
-	VerQueryValueW             = _VerQueryValueW @15   
+	VerQueryValueW             = _VerQueryValueW @15