resolve #7 by refactoring all luaL_error statements into fmt strings

Author: gynt

CodeFunctions.cpp

@@ -177,7 +177,7 @@ int luaExposeCode(lua_State* L) {
 	}
 
 	if (argumentCount > RPS_ARGUMENT_LIMIT) {
-		return luaL_error(L, (std::string("too many arguments specified, max is ") + std::to_string(RPS_ARGUMENT_LIMIT) + ": " + std::to_string(argumentCount)).c_str());
+		return luaL_error(L, "too many arguments specified, max is %d but %d were specified", RPS_ARGUMENT_LIMIT, argumentCount);
 	}
 
 	int adjustedArgCount = argumentCount - (int)(callingConvention == CallingConvention::THISCALL);
@@ -219,13 +219,13 @@ int luaHookCode(lua_State* L) {
 	}
 
 	if (argumentCount > RPS_ARGUMENT_LIMIT) {
-		return luaL_error(L, ("too many arguments specified, max is " + std::to_string(RPS_ARGUMENT_LIMIT) + ": " + std::to_string(argumentCount)).c_str());
+		return luaL_error(L, "too many arguments specified, max is %d but %d were specified" , RPS_ARGUMENT_LIMIT, argumentCount);
 	}
 
 	std::pair<std::map<DWORD, std::shared_ptr<LuaHook>>::const_iterator, bool> hi = hookMapping.insert(std::pair<DWORD, std::shared_ptr<LuaHook>>(address, std::make_shared<LuaHook>(address, hookSize, callingConvention, argumentCount, "", "")));
 
 	if (!hi.second) {
-		return luaL_error(L, "a hook already exists for function at: " + address);
+		return luaL_error(L, "a hook already exists for function at: 0x%X", address);
 	}
 
 	// Store a reference to the hook function that is to be called later.
@@ -316,11 +316,12 @@ int luaCallMachineCode(lua_State* L) {
 	int argumentCount = lua_tointeger(L, lua_upvalueindex(2));
 	int callingConvention = lua_tointeger(L, lua_upvalueindex(3));
 
+	int actualArgCount = lua_gettop(L);
+
 	if (callingConvention == CallingConvention::THISCALL) {
 		int totalArgCount = argumentCount + 1;  // ecx is passed as the first parameter
-		if (lua_gettop(L) != totalArgCount) {
-			//std::cout << "[RPS]: calling function " << std::hex << functionLocation << " with too few arguments;" << std::endl;
-			return luaL_error(L, ("[RPS]: calling function " + std::to_string(functionLocation) + " with too few arguments;").c_str());
+		if (actualArgCount != totalArgCount) {
+			return luaL_error(L, "[RPS]: error when invoking function 0x%X: expected %d arguments, but received %d", functionLocation, totalArgCount, actualArgCount);
 		}
 
 		for (int i = 0; i < argumentCount; i++) {
@@ -331,20 +332,19 @@ int luaCallMachineCode(lua_State* L) {
 		}
 
 		if (lua_type(L, 1) != LUA_TNUMBER) {
-			return luaL_error(L, ("[RPS]: calling function " + std::to_string(functionLocation) + " ecx value is not an integer (or pointer);").c_str());
+			return luaL_error(L, "[RPS]: calling function 0x%X ecx value is not an integer (or pointer)", functionLocation);
 		}
 
 		currentECXValue = lua_tointeger(L, 1); // this parameter
 	}
 	else {
 		if (lua_gettop(L) != argumentCount) { // + 0
-			//std::cout << "[RPS]: calling function " << std::hex << functionLocation << " with too few arguments;" << std::endl;
-			return luaL_error(L, ("[RPS]: calling function " + std::to_string(functionLocation) + " with too few arguments;").c_str());
+			return luaL_error(L, "[RPS]: error when invoking function 0x%X: expected %d arguments, but received %d", functionLocation, argumentCount, actualArgCount);
 		}
 
 		for (int i = 0; i < argumentCount; i++) {
 			if (lua_type(L, i + 1) != LUA_TNUMBER) {
-				return luaL_error(L, ("[RPS]: calling function " + std::to_string(functionLocation) + " argument #" + std::to_string(i+1) + " is not an integer (or pointer);").c_str());
+				return luaL_error(L, "[RPS]: calling function 0x%X argument #%d is not an integer (or pointer)", functionLocation, i + 1);
 			}
 			fakeStack[i] = lua_tointeger(L, i + 1); // i + 1 to offset the 0-base
 		}
@@ -713,7 +713,7 @@ int luaDetourCode(lua_State* L) {
 
 	std::pair<std::map<DWORD, std::shared_ptr<LuaDetour>>::const_iterator, bool> hi = detourTargetMap.insert(std::pair<DWORD, std::shared_ptr<LuaDetour>>(address, std::make_shared<LuaDetour>(address, ret)));
 	if (!hi.second) {
-		return luaL_error(L, ("detour already exists at this address: " + std::to_string(address)).c_str());
+		return luaL_error(L, "detour already exists at this address: 0x%X", address);
 	}
 
 	detourTargetMap[address]->luaFunctionRef = luaFunctionRef;

MemoryFunctions.cpp

@@ -118,7 +118,7 @@ int luaWriteString(lua_State* L) {
 
 #ifdef _DEBUG
 	if (!canWrite(address, size)) {
-		return luaL_error(L, ("cannot write " + std::to_string(1) + " string to location: " + std::to_string(address)).c_str());
+		return luaL_error(L, "cannot write %d string to location: 0x%X", 1, address);
 	}
 #endif
 
@@ -140,7 +140,7 @@ int luaWriteByte(lua_State* L) {
 
 #ifdef _DEBUG
 	if (!canWrite(address, 1)) {
-		return luaL_error(L, ("cannot write " + std::to_string(1) + " bytes to location: " + std::to_string(address)).c_str());
+		return luaL_error(L, "cannot write 1 bytes to location: 0x%X", address);
 	}
 #endif
 
@@ -161,7 +161,7 @@ int luaWriteSmallInteger(lua_State* L) {
 
 #ifdef _DEBUG
 	if (!canWrite(address, 2)) {
-		return luaL_error(L, ("cannot write " + std::to_string(2) + " bytes to location: " + std::to_string(address)).c_str());
+		return luaL_error(L, "cannot write 2 bytes to location: 0x%X", address);
 	}
 #endif
 
@@ -182,7 +182,7 @@ int luaWriteInteger(lua_State* L) {
 
 #ifdef _DEBUG
 	if (!canWrite(address, 4)) {
-		return luaL_error(L, ("cannot write " + std::to_string(4) + " bytes to location: " + std::to_string(address)).c_str());
+		return luaL_error(L, "cannot write 4 bytes to location: 0x%X", address);
 	}
 #endif
 
@@ -206,7 +206,7 @@ int luaWriteBytes(lua_State* L) {
 #ifdef _DEBUG
 	int length = lua_rawlen(L, 2);
 	if (!canWrite(address, length)) {
-		return luaL_error(L, ("cannot write " + std::to_string(length) + " bytes to location: " + std::to_string(address)).c_str());
+		return luaL_error(L, "cannot write %d bytes to location: 0x%X", length, address);
 	}
 #endif
 
@@ -254,7 +254,7 @@ int luaMemCpy(lua_State* L) {
 
 #ifdef _DEBUG
 	if (!canWrite(dst, size)) {
-		return luaL_error(L, ("cannot write " + std::to_string(size) + " bytes to location: " + std::to_string(dst)).c_str());
+		return luaL_error(L, "cannot write %d bytes to location: 0x%X", size, dst);
 	}
 #endif
 
@@ -288,7 +288,7 @@ int luaMemSet(lua_State* L) {
 
 #ifdef _DEBUG
 	if (!canWrite(dst, size)) {
-		return luaL_error(L, ("cannot write " + std::to_string(size) + " bytes to location: " + std::to_string(dst)).c_str());
+		return luaL_error(L, "cannot write %d bytes to location: 0x%X", size, dst);
 	}
 #endif