modify:get info function support for lua plugin

Author: xengine-qyt

XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LibCore/ModulePlugin_LibCore.cpp

@@ -178,12 +178,8 @@ bool CModulePlugin_LibCore::ModulePlugin_LibCore_Destroy()
     unordered_map<XNETHANDLE, PLUGINCORE_FRAMEWORK>::iterator stl_MapIterator = stl_MapFrameWork.begin();
     for (; stl_MapIterator != stl_MapFrameWork.end(); stl_MapIterator++)
     {
-        stl_MapIterator->second.fpCall_PluginCore_UnInit();
-#ifdef _MSC_BUILD
-        FreeLibrary(stl_MapIterator->second.mhFile);
-#else
-        dlclose(stl_MapIterator->second.mhFile);
-#endif
+		stl_MapIterator->second.fpCall_PluginCore_UnInit();
+		XFreeModule(stl_MapIterator->second.mhFile);
     }
     stl_MapFrameWork.clear();
     st_csStl.unlock();
@@ -307,13 +303,7 @@ bool CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR l
         return false;
     }
 	//获得内部模块信息
-    if (!st_FrameWork.fpCall_PluginCore_GetInfo(st_FrameWork.tszModuleName, st_FrameWork.tszModuleVer, st_FrameWork.tszModuleAuthor, st_FrameWork.tszModuleDesc))
-    {
-        XFreeModule(st_FrameWork.mhFile);
-		ModulePlugin_IsErrorOccur = true;
-		ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_INIT;
-		return false;
-    }
+    st_FrameWork.fpCall_PluginCore_GetInfo(st_FrameWork.tszModuleName, st_FrameWork.tszModuleVer, st_FrameWork.tszModuleAuthor, st_FrameWork.tszModuleDesc);
     _tcsxcpy(st_FrameWork.tszModuleFile, lpszPluginFile);
 
     //添加模块属性到STL函数中

XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LibCore/ModulePlugin_LibCore.h

@@ -12,7 +12,7 @@
 *********************************************************************/
 typedef bool(*FPCall_PluginCore_Init)(XPVOID lParam);
 typedef void(*FPCall_PluginCore_UnInit)();
-typedef bool(*FPCall_PluginCore_GetInfo)(XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
+typedef void(*FPCall_PluginCore_GetInfo)(XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
 typedef bool(*FPCall_PluginCore_Call)(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer, int nMsgLen);
 typedef XLONG(*FPCall_PluginCore_GetLastError)();
 
@@ -31,7 +31,7 @@ typedef struct
 
 	bool(*fpCall_PluginCore_Init)(XPVOID lParam);
 	void(*fpCall_PluginCore_UnInit)();
-	bool(*fpCall_PluginCore_GetInfo)(XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
+	void(*fpCall_PluginCore_GetInfo)(XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
 	bool(*fpCall_PluginCore_Call)(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer, int nMsgLen);
 	XLONG(*fpCall_PluginCore_GetLastError)();
 }PLUGINCORE_FRAMEWORK, * LPPLUGINCORE_FRAMEWORK;

XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LuaCore/ModulePlugin_LuaCore.cpp

@@ -273,7 +273,7 @@ bool CModulePlugin_LuaCore::ModulePlugin_LuaCore_Add(XNETHANDLE xhNet, LPCXSTR l
 		ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
 		return false;
 	}
-
+	//得到初始化函数
     if (0 == lua_getglobal(st_LuaCore.pSt_LuaState, "PluginCore_Init"))
     {
 		ModulePlugin_IsErrorOccur = true;
@@ -294,6 +294,31 @@ bool CModulePlugin_LuaCore::ModulePlugin_LuaCore_Add(XNETHANDLE xhNet, LPCXSTR l
 		return false;
     }
     lua_pop(st_LuaCore.pSt_LuaState, -1);
+    //得到信息函数
+	if (0 == lua_getglobal(st_LuaCore.pSt_LuaState, "PluginCore_GetInfo"))
+	{
+		ModulePlugin_IsErrorOccur = true;
+		ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPINIT;
+		return false;
+	}
+	if (LUA_OK != lua_pcall(st_LuaCore.pSt_LuaState, 0, 4, 0))
+	{
+		ModulePlugin_IsErrorOccur = true;
+		ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
+		return false;
+	}
+	if (!lua_toboolean(st_LuaCore.pSt_LuaState, -1))
+	{
+		ModulePlugin_IsErrorOccur = true;
+		ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
+		return false;
+	}
+	// Lua 栈从右到左是逆序压栈的，所以要从 -4 开始取
+	_tcsxcpy(st_LuaCore.tszModuleName, lua_tostring(st_LuaCore.pSt_LuaState, -4));
+	_tcsxcpy(st_LuaCore.tszModuleVer, lua_tostring(st_LuaCore.pSt_LuaState, -3));
+	_tcsxcpy(st_LuaCore.tszModuleAuthor, lua_tostring(st_LuaCore.pSt_LuaState, -2));
+	_tcsxcpy(st_LuaCore.tszModuleDesc, lua_tostring(st_LuaCore.pSt_LuaState, -1));
+	lua_pop(st_LuaCore.pSt_LuaState, 4);
 
     st_csStl.lock();
     stl_MapFrameWork.insert(make_pair(xhNet, st_LuaCore));

XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LuaCore/ModulePlugin_LuaCore.h

@@ -13,6 +13,10 @@
 typedef struct
 {
 	XCHAR tszModuleFile[XPATH_MAX];
+	XCHAR tszModuleName[128];
+	XCHAR tszModuleAuthor[128];
+	XCHAR tszModuleDesc[128];
+	XCHAR tszModuleVer[64];
 #if (1 == _XENGINE_BUILD_SWITCH_LUA)
 	lua_State* pSt_LuaState;
 #endif