Merge remote-tracking branch 'origin/develop' into feature/range-loops

Author: qaisjp

amx-deps/src/CFunctions.cpp

@@ -66,7 +66,7 @@ AMX *suspendedAMX = NULL;
 
 // amxLoadPlugin(pluginName)
 int CFunctions::amxLoadPlugin(lua_State *luaVM) {
-	static const char *requiredExports[] = { "Load", "Unload", "Supports", 0 };
+	static const char *requiredExports[] = { "Load", "Supports", 0 };
 
 	const char *pluginName = luaL_checkstring(luaVM, 1);
 	if(!pluginName || loadedPlugins.find(pluginName) != loadedPlugins.end() || !isSafePath(pluginName)) {
@@ -83,7 +83,7 @@ int CFunctions::amxLoadPlugin(lua_State *luaVM) {
 	#endif
 
 	HMODULE hPlugin = loadLib(pluginPath.c_str());
-	
+
 	if(!hPlugin) {
 		lua_pushboolean(luaVM, 0);
 		return 1;
@@ -150,14 +150,26 @@ int CFunctions::amxLoad(lua_State *luaVM) {
 		return 1;
 	}
 
-	char buff[256];
-	snprintf(buff, sizeof(buff), "%s/mods/deathmatch/resources/[gamemodes]/[amx]/%s/%s", fs::current_path().string().c_str(), resName, amxName);
-	fs::path amxPath = buff;
-	amxPath = fs::canonical(amxPath);
+	lua_State* theirLuaVM = pModuleManager->GetResourceFromName(resName);
+	if (theirLuaVM == nullptr) {
+		using namespace std::string_literals;
+		std::string errMsg = "resource "s + resName + " does not exist!";
+		lua_pushboolean(luaVM, false);
+		lua_pushstring(luaVM, errMsg.c_str());
+		return 2;
+	}
+
+	char amxPath[256];
+	if (!pModuleManager->GetResourceFilePath(theirLuaVM, amxName, amxPath, 256))
+	{
+		lua_pushboolean(luaVM, false);
+		lua_pushstring(luaVM, "file not found");
+		return 2;
+	}
 
 	// Load .amx
 	AMX *amx = new AMX;
-	int err = aux_LoadProgram(amx, buff, NULL);
+	int  err = aux_LoadProgram(amx, amxPath, NULL);
 	if(err != AMX_ERR_NONE) {
 		delete amx;
 		lua_pushboolean(luaVM, 0);
@@ -196,9 +208,9 @@ int CFunctions::amxLoad(lua_State *luaVM) {
 
 	// Save info about the amx
 	AMXPROPS props;
-	props.filePath = amxPath.string();
+	props.filePath = amxPath;
 	props.resourceName = resName;
-	props.resourceVM = pModuleManager->GetResourceFromName(resName);
+	props.resourceVM = theirLuaVM;
 
 	lua_register(props.resourceVM, "pawn", CFunctions::pawn);
 	loadedAMXs[amx] = props;
@@ -391,9 +403,12 @@ int CFunctions::amxUnload(lua_State *luaVM) {
 // amxUnloadAllPlugins()
 int CFunctions::amxUnloadAllPlugins(lua_State *luaVM) {
 	for (const auto& plugin : loadedPlugins) {
-		plugin.second->Unload();
-		freeLib(plugin.second->pPluginPointer);
-		delete plugin.second;
+		Unload_t* Unload = it.second->Unload;
+		if (Unload) {
+			Unload();
+		}
+		freeLib(it.second->pPluginPointer);
+		delete it.second;
 	}
 	loadedPlugins.clear();
 	vecPfnProcessTick.clear();
@@ -407,15 +422,15 @@ int CFunctions::amxRegisterLuaPrototypes(lua_State *luaVM) {
 	luaL_checktype(luaVM, 1, LUA_TTABLE);
 	int mainTop = lua_gettop(mainVM);
 
-	string resName;
-	pModuleManager->GetResourceName(luaVM, resName);
+	char resName[255];
+	pModuleManager->GetResourceName(luaVM, resName, 255);
 	lua_getfield(mainVM, LUA_REGISTRYINDEX, "amx");
-	lua_getfield(mainVM, -1, resName.c_str());
+	lua_getfield(mainVM, -1, resName);
 	if(lua_isnil(mainVM, -1)) {
 		lua_pop(mainVM, 1);
 		lua_newtable(mainVM);
 		lua_pushvalue(mainVM, -1);
-		lua_setfield(mainVM, -3, resName.c_str());
+		lua_setfield(mainVM, -3, resName);
 	}
 
 	lua_newtable(mainVM);
@@ -488,18 +503,18 @@ int CFunctions::pawn(lua_State *luaVM) {
 
 	int mainTop = lua_gettop(mainVM);
 
-	string resName;
-	pModuleManager->GetResourceName(luaVM, resName);
+	char resName[255];
+	pModuleManager->GetResourceName(luaVM, resName, 255);
 	lua_getfield(mainVM, LUA_REGISTRYINDEX, "amx");
-	lua_getfield(mainVM, -1, resName.c_str());
+	lua_getfield(mainVM, -1, resName);
 	if(lua_isnil(mainVM, -1)) {
 		lua_settop(mainVM, mainTop);
-		return luaL_error(luaVM, "pawn: resource %s is not an amx resource", resName.c_str());
+		return luaL_error(luaVM, "pawn: resource %s is not an amx resource", resName);
 	}
 	lua_getfield(mainVM, -1, "pawnprototypes");
 	if(lua_isnil(mainVM, -1)) {
 		lua_settop(mainVM, mainTop);
-		return luaL_error(luaVM, "pawn: resource %s does not have any registered Pawn functions - see amxRegisterPawnPrototypes", resName.c_str());
+		return luaL_error(luaVM, "pawn: resource %s does not have any registered Pawn functions - see amxRegisterPawnPrototypes", resName);
 	}
 	lua_getfield(mainVM, -1, fnName);
 	if(lua_isnil(mainVM, -1)) {

amx-deps/src/Makefile

@@ -10,7 +10,7 @@ CPP = gcc
 # Compiler flags
 # NOTE: add -g for debug, remove for release!
 ASMFLAGS = -O1 -f elf -I./amx/
-CPPFLAGS = -MD -O2 -Wall -I./ -I/usr/local/include/boost-1_35 -I./amx -I./include -I./linux -DAMX_DONT_RELOCATE -DFLOATPOINT -DASM32
+CPPFLAGS = -MD -O2 -Wall -I./ -I/usr/local/include/boost-1_35 -I./amx -I./include -I./linux -DAMX_DONT_RELOCATE -DFLOATPOINT
 LDFLAGS = -fPIC -s -shared -Wl,-soname,$(PROG).1,-R./
 LIBS = -lpthread -lstdc++ -llua5.1 -lsqlite3 -lboost_filesystem-gcc41-mt-s -lboost_system-gcc41-mt-s
 

amx-deps/src/amx/amxexec.obj

@@ -1,53 +1,65 @@
 /*****************************************************************************
-*
-*  PROJECT:     Multi Theft Auto v1.0
-*  LICENSE:     See LICENSE in the top level directory
-*  FILE:        publicsdk/include/ILuaModuleManager.h
-*  PURPOSE:     Lua dynamic module interface
-*
-*  Multi Theft Auto is available from http://www.multitheftauto.com/
-*
-*****************************************************************************/
+ *
+ *  PROJECT:     Multi Theft Auto v1.0
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        publicsdk/include/ILuaModuleManager.h
+ *  PURPOSE:     Lua dynamic module interface
+ *
+ *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *
+ *****************************************************************************/
 
 // INTERFACE for Lua dynamic modules
 
-#ifndef __ILUAMODULEMANAGER_H
-#define __ILUAMODULEMANAGER_H
+#pragma once
 
 #define MAX_INFO_LENGTH 128
 
 extern "C"
 {
-    #include "lua.h"
-    #include "lualib.h"
-    #include "lauxlib.h"
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
 }
+#include <string>
+
+#ifndef __CChecksum_H
+class CChecksum
+{
+public:
+    unsigned long ulCRC;
+    unsigned char mD5[16];
+};
+#endif
 
 /* Interface for modules until DP2.3 */
 class ILuaModuleManager
 {
 public:
-	virtual void                ErrorPrintf             ( const char* szFormat, ... ) = 0;
-	virtual void                DebugPrintf             ( lua_State * luaVM, const char* szFormat, ... ) = 0;
-	virtual void                Printf                  ( const char* szFormat, ... ) = 0;
-
-	virtual bool                RegisterFunction        ( lua_State * luaVM, const char *szFunctionName, lua_CFunction Func ) = 0;
-    virtual bool                GetResourceName         ( lua_State * luaVM, std::string &strName ) = 0;
-	virtual unsigned long       GetResourceMetaCRC      ( lua_State * luaVM ) = 0;
-	virtual unsigned long       GetResourceFileCRC      ( lua_State * luaVM, const char* szFile ) = 0;
+    virtual void ErrorPrintf(const char* szFormat, ...) = 0;
+    virtual void DebugPrintf(lua_State* luaVM, const char* szFormat, ...) = 0;
+    virtual void Printf(const char* szFormat, ...) = 0;
+
+    virtual bool RegisterFunction(lua_State* luaVM, const char* szFunctionName, lua_CFunction Func) = 0;
+    virtual bool GetResourceName(
+        lua_State* luaVM, std::string& strName) = 0;            // This function might not work if module and MTA were compiled with different compiler versions
+    virtual CChecksum GetResourceMetaChecksum(lua_State* luaVM) = 0;
+    virtual CChecksum GetResourceFileChecksum(lua_State* luaVM, const char* szFile) = 0;
 };
 
 /* Interface for modules until 1.0 */
 class ILuaModuleManager10 : public ILuaModuleManager
 {
 public:
-    virtual unsigned long       GetVersion              ( ) = 0;
-    virtual const char*         GetVersionString        ( ) = 0;
-    virtual const char*         GetVersionName          ( ) = 0;
-    virtual unsigned long       GetNetcodeVersion       ( ) = 0;
-    virtual const char*         GetOperatingSystemName  ( ) = 0;
+    virtual unsigned long GetVersion() = 0;
+    virtual const char*   GetVersionString() = 0;
+    virtual const char*   GetVersionName() = 0;
+    virtual unsigned long GetNetcodeVersion() = 0;
+    virtual const char*   GetOperatingSystemName() = 0;
 
-    virtual lua_State*          GetResourceFromName     ( const char* szResourceName ) = 0;
-};
+    virtual lua_State* GetResourceFromName(const char* szResourceName) = 0;
 
-#endif
+    // GetResourceName above doesn't work if module and MTA were compiled with different compiler versions
+    virtual bool GetResourceName(lua_State* luaVM, char* szName, size_t length) = 0;
+    virtual bool GetResourceFilePath(lua_State* luaVM, const char* fileName, char* path, size_t length) = 0;
+};

amx-deps/src/include/ILuaModuleManager.h

@@ -150,8 +150,9 @@ MTAEXPORT void RegisterFunctions ( lua_State * luaVM )
 		pModuleManager->RegisterFunction(luaVM, "amxVersion", CFunctions::amxVersion);
 		pModuleManager->RegisterFunction(luaVM, "amxVersionString", CFunctions::amxVersionString);
 
-		string resName;
-		if(!pModuleManager->GetResourceName(luaVM, resName) || resName.compare("amx"))
+		char resNameBuf[4];
+		bool ok = pModuleManager->GetResourceName(luaVM, resNameBuf, 4);
+		if (!ok || std::string(resNameBuf) != "amx")
 			return;
 
 		mainVM = luaVM;

amx-deps/src/lib/lua5.1d.exp

@@ -63,7 +63,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;__WIN32__;AMX_DONT_RELOCATE;FLOATPOINT;ASM32;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;__WIN32__;FLOATPOINT;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -79,7 +79,6 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>amx\amxexec.obj %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>./lib/lua5.1.lib;./lib/sqlite3.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile />
@@ -101,7 +100,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;__WIN32__;AMX_DONT_RELOCATE;FLOATPOINT;ASM32;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;__WIN32__;FLOATPOINT;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -116,7 +115,6 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>amx\amxexec.obj %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>./lib/lua5.1.lib;./lib/sqlite3.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile />
       <GenerateDebugInformation>true</GenerateDebugInformation>