Fix detection of Blade Symphony on Windows x64 (#67)

peace-maker · web-flow · commit b267567e5078 · 2020-06-25T00:04:36.000Z
* Fix detection of Blade Symphony on Windows x64

Port finding the module base address on x64 builds from SourceMod.
Fix a bunch of truncation warnings on x64 while at it too.

* Fix mm_TrimComments stripping last char before comment

```c
char test[] = "hi this is a a test!// comment";
mm_TrimComments(test);
puts(test); // prints "hi this is a test" without the !
```

* Fix unsigned comparison warnings

* Fix truncation warnings in SourceHook::String

* Fix unsigned comparison warnings

clang does have some nice analysis.
diff --git a/core/ISmmAPI.h b/core/ISmmAPI.h
@@ -206,7 +206,7 @@ namespace SourceMM
 		 * @return				The newly incremented iface version number.
 		 * @deprecated			Use InterfaceSearch() or VInterfaceMatch instead.
 		 */
-		virtual int FormatIface(char iface[], unsigned int maxlength) =0;
+		virtual int FormatIface(char iface[], size_t maxlength) =0;
 
 		/**
 		 * @brief Searches for an interface, eliminating the need to loop 
diff --git a/core/metamod.cpp b/core/metamod.cpp
@@ -792,13 +792,13 @@ void MetamodSource::GetShVersions(int &shvers, int &shimpl)
 	shimpl = SH_IMPL_VERSION;
 }
 
-int MetamodSource::FormatIface(char iface[], unsigned int maxlength)
+int MetamodSource::FormatIface(char iface[], size_t maxlength)
 {
-	int length = (int)strlen(iface);
-	int i;
+	size_t length = strlen(iface);
+	size_t i;
 	int num = 0;
 
-	for (i = length - 1; i >= 0; i--)
+	for (i = length - 1; i + 1 > 0; i--)
 	{
 		if (!isdigit(iface[i]))
 		{
@@ -810,7 +810,7 @@ int MetamodSource::FormatIface(char iface[], unsigned int maxlength)
 		}
 	}
 
-	if ( (num && ((int)maxlength <= length)) || (!num && ((int)maxlength <= length + 3)) )
+	if ( (num && (maxlength <= length)) || (!num && (maxlength <= length + 3)) )
 	{
 		return -1;
 	}
diff --git a/core/metamod.h b/core/metamod.h
@@ -72,7 +72,7 @@ class MetamodSource : public ISmmAPI
 	void GetShVersions(int &shvers, int &shimpl);
 	void AddListener(ISmmPlugin *plugin, IMetamodListener *pListener);
 	void *MetaFactory(const char *iface, int *ret, PluginId *id);
-	int FormatIface(char iface[], unsigned int maxlength);
+	int FormatIface(char iface[], size_t maxlength);
 	void *InterfaceSearch(CreateInterfaceFn fn, const char *iface, int max, int *ret);
 	const char *GetBaseDir();
 	size_t PathFormat(char *buffer, size_t len, const char *fmt, ...);
diff --git a/core/metamod_console.cpp b/core/metamod_console.cpp
@@ -184,7 +184,7 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
 			const char *plname;
 			PluginIter i;
 			char buffer[256];
-			int len;
+			size_t len;
 			int plnum = g_PluginMngr.GetPluginCount();
 
 			if (!plnum)
@@ -688,7 +688,7 @@ bool Command_ClientMeta(edict_t *client, IMetamodSourceCommandInfo *info)
 				const char *plname;
 				PluginIter i;
 				char buffer[256];
-				int len = 0;
+				size_t len = 0;
 				int plnum = 0;
 
 				for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++, len=0)
diff --git a/core/metamod_oslink.cpp b/core/metamod_oslink.cpp
@@ -81,7 +81,7 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
 	if (mem.AllocationBase == NULL)
 		return false;
 	HMODULE dll = (HMODULE)mem.AllocationBase;
-	GetModuleFileName(dll, (LPTSTR)buffer, maxlength);
+	GetModuleFileName(dll, (LPTSTR)buffer, static_cast<DWORD>(maxlength));
 #elif defined __linux__ || defined __APPLE__
 	Dl_info info;
 	if (!dladdr(pAddr, &info))
diff --git a/core/metamod_util.cpp b/core/metamod_util.cpp
@@ -38,10 +38,10 @@
 
 const char *UTIL_GetExtension(const char *file)
 {
-	int len = strlen(file);
-	int i = 0;
+	size_t len = strlen(file);
+	size_t i = 0;
 
-	for (i = len - 1; i >= 0; i--)
+	for (i = len - 1; i + 1 > 0; i--)
 	{
 		if (file[i] == '/' || file[i] == '\\')
 		{
diff --git a/core/sourcehook/sh_string.h b/core/sourcehook/sh_string.h
@@ -134,14 +134,14 @@ class String
 			return 0;
 	}
 
-	int find(const char c, int index = 0) const
+	size_t find(const char c, size_t index = 0) const
 	{
-		int len = static_cast<int>(size());
+		size_t len = size();
 		if (len < 1)
 			return npos;
-		if (index >= len || index < 0)
+		if (index >= len)
 			return npos;
-		int i = 0;
+		size_t i = 0;
 		for (i=index; i<len; i++)
 		{
 			if (v[i] == c)
@@ -153,20 +153,20 @@ class String
 		return npos;
 	}
 
-	int find_last_of(const char c, int index = npos) const
+	size_t find_last_of(const char c, size_t index = npos) const
 	{
-		int len = static_cast<int>(size());
+		size_t len = size();
 		if (len < 1)
 			return npos;
-		if (index >= len || index < npos)
+		if (index >= len)
 			return npos;
-		int i;
+		size_t i;
 		if (index == npos)
 			i = len - 1;
 		else
 			i = index;
 
-		for (; i>=0; i--)
+		for (; i+1>0; i--)
 		{
 			if (v[i] == c)
 			{
@@ -194,8 +194,8 @@ class String
 		if (!v)
 			return;
 
-		unsigned int i = 0;
-		unsigned int j = 0;
+		size_t i = 0;
+		size_t j = 0;
 		size_t len = strlen(v);
 
 		if (len == 1)
@@ -213,7 +213,7 @@ class String
 		{
 			for (i=0; i<len; i++)
 			{
-				if (!is_space(v[i]) || (is_space(v[i]) && ((unsigned char)i==len-1)))
+				if (!is_space(v[i]) || (is_space(v[i]) && (i==len-1)))
 				{
 					erase(0, i);
 					break;
@@ -252,11 +252,11 @@ class String
 		}
 	}
 
-	void erase(unsigned int start, int num = npos)
+	void erase(size_t start, size_t num = npos)
 	{
 		if (!v)
 			return;
-		unsigned int i = 0;
+		size_t i = 0;
 		size_t len = size();
 		//check for bounds
 		if (num == npos || start+num > len-start)
@@ -287,7 +287,7 @@ class String
 		v[len] = 0;
 	}
 
-	String substr(unsigned int index, int num = npos) const
+	String substr(size_t index, size_t num = npos) const
 	{
 		if (!v)
 		{
@@ -309,8 +309,8 @@ class String
 			num = len - index;
 		}
 
-		unsigned int i = 0;
-		unsigned int nslen = num + 2;
+		size_t i = 0;
+		size_t nslen = num + 2;
 
 		ns.Grow(nslen);
 
@@ -324,7 +324,7 @@ class String
 	{
 		if (!v)
 			return;
-		unsigned int i = 0;
+		size_t i = 0;
 		size_t len = strlen(v);
 		for (i=0; i<len; i++)
 		{
@@ -346,27 +346,27 @@ class String
 
 	}
 
-	char operator [] (unsigned int index) const
+	char operator [] (size_t index) const
 	{
-		if (index > size() || !v)
+		if (index >= size() || !v)
 		{
 			return -1;
 		} else {
 			return v[index];
 		}
 	}
 
-	int at(int a) const
+	int at(size_t a) const
 	{
-		if (a < 0 || a >= (int)size() || !v)
+		if (a >= size() || !v)
 			return -1;
 
 		return v[a];
 	}
 
-	bool at(int at, char c)
+	bool at(size_t at, char c)
 	{
-		if (at < 0 || at >= (int)size() || !v)
+		if (at >= size() || !v)
 			return false;
 
 		v[at] = c;
@@ -375,7 +375,7 @@ class String
 	}
 
 private:
-	void Grow(unsigned int d, bool copy=true)
+	void Grow(size_t d, bool copy=true)
 	{
 		if (d <= a_size)
 			return;
@@ -385,15 +385,15 @@ class String
 		if (v)
 			delete [] v;
 		else
-			strcpy(n, "");			
+			strcpy(n, "");
 		v = n;
 		a_size = d + 1;
 	}
 
 	char *v;
-	unsigned int a_size;
+	size_t a_size;
 public:
-	static const int npos = -1;
+	static const size_t npos = static_cast<size_t>(-1);
 };
 
 };	//NAMESPACE
diff --git a/core/sourcehook/test/testvphooks.cpp b/core/sourcehook/test/testvphooks.cpp
@@ -2,6 +2,7 @@
 #include "sourcehook.h"
 #include "sourcehook_test.h"
 #include "testevents.h"
+#include <ctime>
 
 // TEST VP HOOKS
 // Test vfnptr-wide hooks
diff --git a/loader/utility.cpp b/loader/utility.cpp

Original file line number	Diff line number	Diff line change
`@@ -792,13 +792,13 @@ void MetamodSource::GetShVersions(int &shvers, int &shimpl)`
`792`	`792`	`shimpl = SH_IMPL_VERSION;`
`793`	`793`	`}`
`794`	`794`
`795`		`-int MetamodSource::FormatIface(char iface[], unsigned int maxlength)`
	`795`	`+int MetamodSource::FormatIface(char iface[], size_t maxlength)`
`796`	`796`	`{`
`797`		`- int length = (int)strlen(iface);`
`798`		`- int i;`
	`797`	`+ size_t length = strlen(iface);`
	`798`	`+ size_t i;`
`799`	`799`	`int num = 0;`
`800`	`800`
`801`		`- for (i = length - 1; i >= 0; i--)`
	`801`	`+ for (i = length - 1; i + 1 > 0; i--)`
`802`	`802`	`{`
`803`	`803`	`if (!isdigit(iface[i]))`
`804`	`804`	`{`
`@@ -810,7 +810,7 @@ int MetamodSource::FormatIface(char iface[], unsigned int maxlength)`
`810`	`810`	`}`
`811`	`811`	`}`
`812`	`812`
`813`		`- if ( (num && ((int)maxlength <= length)) \|\| (!num && ((int)maxlength <= length + 3)) )`
	`813`	`+ if ( (num && (maxlength <= length)) \|\| (!num && (maxlength <= length + 3)) )`
`814`	`814`	`{`
`815`	`815`	`return -1;`
`816`	`816`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@`
`38`	`38`
`39`	`39`	`const char UTIL_GetExtension(const char file)`
`40`	`40`	`{`
`41`		`- int len = strlen(file);`
`42`		`- int i = 0;`
	`41`	`+ size_t len = strlen(file);`
	`42`	`+ size_t i = 0;`
`43`	`43`
`44`		`- for (i = len - 1; i >= 0; i--)`
	`44`	`+ for (i = len - 1; i + 1 > 0; i--)`
`45`	`45`	`{`
`46`	`46`	`if (file[i] == '/' \|\| file[i] == '\\')`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -134,14 +134,14 @@ class String`
`134`	`134`	`return 0;`
`135`	`135`	`}`
`136`	`136`
`137`		`- int find(const char c, int index = 0) const`
	`137`	`+ size_t find(const char c, size_t index = 0) const`
`138`	`138`	`{`
`139`		`- int len = static_cast<int>(size());`
	`139`	`+ size_t len = size();`
`140`	`140`	`if (len < 1)`
`141`	`141`	`return npos;`
`142`		`- if (index >= len \|\| index < 0)`
	`142`	`+ if (index >= len)`
`143`	`143`	`return npos;`
`144`		`- int i = 0;`
	`144`	`+ size_t i = 0;`
`145`	`145`	`for (i=index; i<len; i++)`
`146`	`146`	`{`
`147`	`147`	`if (v[i] == c)`
`@@ -153,20 +153,20 @@ class String`
`153`	`153`	`return npos;`
`154`	`154`	`}`
`155`	`155`
`156`		`- int find_last_of(const char c, int index = npos) const`
	`156`	`+ size_t find_last_of(const char c, size_t index = npos) const`
`157`	`157`	`{`
`158`		`- int len = static_cast<int>(size());`
	`158`	`+ size_t len = size();`
`159`	`159`	`if (len < 1)`
`160`	`160`	`return npos;`
`161`		`- if (index >= len \|\| index < npos)`
	`161`	`+ if (index >= len)`
`162`	`162`	`return npos;`
`163`		`- int i;`
	`163`	`+ size_t i;`
`164`	`164`	`if (index == npos)`
`165`	`165`	`i = len - 1;`
`166`	`166`	`else`
`167`	`167`	`i = index;`
`168`	`168`
`169`		`- for (; i>=0; i--)`
	`169`	`+ for (; i+1>0; i--)`
`170`	`170`	`{`
`171`	`171`	`if (v[i] == c)`
`172`	`172`	`{`
`@@ -194,8 +194,8 @@ class String`
`194`	`194`	`if (!v)`
`195`	`195`	`return;`
`196`	`196`
`197`		`- unsigned int i = 0;`
`198`		`- unsigned int j = 0;`
	`197`	`+ size_t i = 0;`
	`198`	`+ size_t j = 0;`
`199`	`199`	`size_t len = strlen(v);`
`200`	`200`
`201`	`201`	`if (len == 1)`
`@@ -213,7 +213,7 @@ class String`
`213`	`213`	`{`
`214`	`214`	`for (i=0; i<len; i++)`
`215`	`215`	`{`
`216`		`- if (!is_space(v[i]) \|\| (is_space(v[i]) && ((unsigned char)i==len-1)))`
	`216`	`+ if (!is_space(v[i]) \|\| (is_space(v[i]) && (i==len-1)))`
`217`	`217`	`{`
`218`	`218`	`erase(0, i);`
`219`	`219`	`break;`
`@@ -252,11 +252,11 @@ class String`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`- void erase(unsigned int start, int num = npos)`
	`255`	`+ void erase(size_t start, size_t num = npos)`
`256`	`256`	`{`
`257`	`257`	`if (!v)`
`258`	`258`	`return;`
`259`		`- unsigned int i = 0;`
	`259`	`+ size_t i = 0;`
`260`	`260`	`size_t len = size();`
`261`	`261`	`//check for bounds`
`262`	`262`	`if (num == npos \|\| start+num > len-start)`
`@@ -287,7 +287,7 @@ class String`
`287`	`287`	`v[len] = 0;`
`288`	`288`	`}`
`289`	`289`
`290`		`- String substr(unsigned int index, int num = npos) const`
	`290`	`+ String substr(size_t index, size_t num = npos) const`
`291`	`291`	`{`
`292`	`292`	`if (!v)`
`293`	`293`	`{`
`@@ -309,8 +309,8 @@ class String`
`309`	`309`	`num = len - index;`
`310`	`310`	`}`
`311`	`311`
`312`		`- unsigned int i = 0;`
`313`		`- unsigned int nslen = num + 2;`
	`312`	`+ size_t i = 0;`
	`313`	`+ size_t nslen = num + 2;`
`314`	`314`
`315`	`315`	`ns.Grow(nslen);`
`316`	`316`
`@@ -324,7 +324,7 @@ class String`
`324`	`324`	`{`
`325`	`325`	`if (!v)`
`326`	`326`	`return;`
`327`		`- unsigned int i = 0;`
	`327`	`+ size_t i = 0;`
`328`	`328`	`size_t len = strlen(v);`
`329`	`329`	`for (i=0; i<len; i++)`
`330`	`330`	`{`
`@@ -346,27 +346,27 @@ class String`
`346`	`346`
`347`	`347`	`}`
`348`	`348`
`349`		`- char operator [] (unsigned int index) const`
	`349`	`+ char operator [] (size_t index) const`
`350`	`350`	`{`
`351`		`- if (index > size() \|\| !v)`
	`351`	`+ if (index >= size() \|\| !v)`
`352`	`352`	`{`
`353`	`353`	`return -1;`
`354`	`354`	`} else {`
`355`	`355`	`return v[index];`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`
`359`		`- int at(int a) const`
	`359`	`+ int at(size_t a) const`
`360`	`360`	`{`
`361`		`- if (a < 0 \|\| a >= (int)size() \|\| !v)`
	`361`	`+ if (a >= size() \|\| !v)`
`362`	`362`	`return -1;`
`363`	`363`
`364`	`364`	`return v[a];`
`365`	`365`	`}`
`366`	`366`
`367`		`- bool at(int at, char c)`
	`367`	`+ bool at(size_t at, char c)`
`368`	`368`	`{`
`369`		`- if (at < 0 \|\| at >= (int)size() \|\| !v)`
	`369`	`+ if (at >= size() \|\| !v)`
`370`	`370`	`return false;`
`371`	`371`
`372`	`372`	`v[at] = c;`
`@@ -375,7 +375,7 @@ class String`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`private:`
`378`		`- void Grow(unsigned int d, bool copy=true)`
	`378`	`+ void Grow(size_t d, bool copy=true)`
`379`	`379`	`{`
`380`	`380`	`if (d <= a_size)`
`381`	`381`	`return;`
`@@ -385,15 +385,15 @@ class String`
`385`	`385`	`if (v)`
`386`	`386`	`delete [] v;`
`387`	`387`	`else`
`388`		`- strcpy(n, "");`
	`388`	`+ strcpy(n, "");`
`389`	`389`	`v = n;`
`390`	`390`	`a_size = d + 1;`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`char *v;`
`394`		`- unsigned int a_size;`
	`394`	`+ size_t a_size;`
`395`	`395`	`public:`
`396`		`- static const int npos = -1;`
	`396`	`+ static const size_t npos = static_cast<size_t>(-1);`
`397`	`397`	`};`
`398`	`398`
`399`	`399`	`}; //NAMESPACE`