Skip to content

Commit 05f0983

Browse files
committed
modify:parameter adjust and msg buffer deliver
1 parent 0d41eeb commit 05f0983

8 files changed

Lines changed: 108 additions & 72 deletions

File tree

XEngine_Module/XEngine_PluginExtension/PluginExtension_Define.h

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -76,37 +76,37 @@ extern "C" bool PluginExtension_LibCore_Push(XNETHANDLE * pxhNet, LPCXSTR lpszPl
7676
类型:整数型
7777
可空:N
7878
意思:输入列表个数
79-
参数.四:pInt_HTTPCode
80-
In/Out:Out
81-
类型:整数型指针
82-
可空:N
83-
意思:输出返回的HTTPCODE值
84-
参数.五:ptszMsgBuffer
79+
参数.四:ptszMsgBuffer
8580
In/Out:Out
8681
类型:字符指针
8782
可空:N
8883
意思:输出负载的内容
89-
参数.:pInt_MsgLen
84+
参数.:pInt_MsgLen
9085
In/Out:Out
9186
类型:整数型指针
9287
可空:N
9388
意思:输出内容大小
94-
参数.:lpszMsgBufer
89+
参数.:lpszMsgBufer
9590
In/Out:Out
9691
类型:常量字符指针
9792
可空:Y
9893
意思:输入负载内容
99-
参数.:nMsgLen
94+
参数.:nMsgLen
10095
In/Out:Out
10196
类型:整数型指针
10297
可空:Y
10398
意思:输入负载大小
99+
参数.八:pInt_HTTPCode
100+
In/Out:Out
101+
类型:整数型指针
102+
可空:Y
103+
意思:输出返回的HTTPCODE值
104104
返回值
105105
类型:逻辑型
106106
意思:是否成功
107107
备注:
108108
*********************************************************************/
109-
extern "C" bool PluginExtension_LibCore_Exec(XNETHANDLE xhModule, XCHAR * **pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0);
109+
extern "C" bool PluginExtension_LibCore_Exec(XNETHANDLE xhModule, XCHAR * **pppHDRList, int nListCount, XCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0, int* pInt_HTTPCode = NULL);
110110
/********************************************************************
111111
函数名称:PluginExtension_LibCore_Get
112112
函数功能:获取插件基础信息函数
@@ -204,37 +204,37 @@ extern "C" bool PluginExtension_LuaCore_Push(XNETHANDLE* pxhModule, LPCXSTR lpsz
204204
类型:整数型
205205
可空:N
206206
意思:输入列表个数
207-
参数.四:pInt_HTTPCode
208-
In/Out:Out
209-
类型:整数型指针
210-
可空:N
211-
意思:输出返回的HTTPCODE值
212-
参数.五:ptszMsgBuffer
207+
参数.四:ptszMsgBuffer
213208
In/Out:Out
214209
类型:字符指针
215210
可空:N
216211
意思:输出负载的内容
217-
参数.:pInt_MsgLen
212+
参数.:pInt_MsgLen
218213
In/Out:Out
219214
类型:整数型指针
220215
可空:N
221216
意思:输出内容大小
222-
参数.:lpszMsgBufer
217+
参数.:lpszMsgBufer
223218
In/Out:Out
224219
类型:常量字符指针
225220
可空:Y
226221
意思:输入负载内容
227-
参数.:nMsgLen
222+
参数.:nMsgLen
228223
In/Out:Out
229224
类型:整数型指针
230225
可空:Y
231226
意思:输入负载大小
227+
参数.八:pInt_HTTPCode
228+
In/Out:Out
229+
类型:整数型指针
230+
可空:Y
231+
意思:输出返回的HTTPCODE值
232232
返回值
233233
类型:逻辑型
234234
意思:是否成功
235235
备注:
236236
*********************************************************************/
237-
extern "C" bool PluginExtension_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0);
237+
extern "C" bool PluginExtension_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0, int* pInt_HTTPCode = NULL);
238238
/********************************************************************
239239
函数名称:PluginExtension_LuaCore_Get
240240
函数功能:获取插件基础信息函数
@@ -419,27 +419,42 @@ extern "C" bool PluginExtension_Loader_GetForModule(LPCXSTR lpszModuleName, XCHA
419419
类型:整数型
420420
可空:N
421421
意思:输入列表个数
422-
参数.四:pInt_HTTPCode
423-
In/Out:Out
424-
类型:整数型指针
425-
可空:N
426-
意思:输出返回的HTTPCODE值
427-
参数.五:ptszMsgBuffer
422+
参数.四:ptszMsgBuffer
428423
In/Out:Out
429424
类型:字符指针
430425
可空:N
431426
意思:输出负载的内容
432-
参数.:pInt_MsgLen
427+
参数.:pInt_MsgLen
433428
In/Out:Out
434429
类型:整数型指针
435430
可空:N
436431
意思:输出内容大小
432+
参数.六:pInt_HTTPCode
433+
In/Out:Out
434+
类型:整数型指针
435+
可空:N
436+
意思:输出返回的HTTPCODE值
437+
参数.七:lpszMsgBufer
438+
In/Out:In
439+
类型:常量字符指针
440+
可空:Y
441+
意思:输入要传递的内容
442+
参数.八:nMsgLen
443+
In/Out:In
444+
类型:整数型
445+
可空:Y
446+
意思:输入传递内容大小
447+
参数.九:pInt_HTTPCode
448+
In/Out:Out
449+
类型:整数型指针
450+
可空:N
451+
意思:输出返回的HTTPCODE值
437452
返回值
438453
类型:逻辑型
439454
意思:是否成功
440455
备注:
441456
*********************************************************************/
442-
extern "C" bool PluginExtension_Loader_Exec(LPCXSTR lpszMethodName, XCHAR * **pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR * ptszMsgBuffer, int* pInt_MsgLen);
457+
extern "C" bool PluginExtension_Loader_Exec(LPCXSTR lpszMethodName, XCHAR * **pppHDRList, int nListCount, XCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0, int* pInt_HTTPCode = NULL);
443458
/********************************************************************
444459
函数名称:PluginExtension_Loader_Destory
445460
函数功能:销毁加载器

XEngine_Module/XEngine_PluginExtension/PluginExtension_LibCore/PluginExtension_LibCore.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,37 +100,37 @@ bool CPluginExtension_LibCore::PluginExtension_LibCore_Push(XNETHANDLE* pxhModul
100100
类型:整数型
101101
可空:N
102102
意思:输入列表个数
103-
参数.四:pInt_HTTPCode
104-
In/Out:Out
105-
类型:整数型指针
106-
可空:N
107-
意思:输出返回的HTTPCODE值
108-
参数.五:ptszMsgBuffer
103+
参数.四:ptszMsgBuffer
109104
In/Out:Out
110105
类型:字符指针
111106
可空:N
112107
意思:输出负载的内容
113-
参数.:pInt_MsgLen
108+
参数.:pInt_MsgLen
114109
In/Out:Out
115110
类型:整数型指针
116111
可空:N
117112
意思:输出内容大小
118-
参数.:lpszMsgBufer
113+
参数.:lpszMsgBufer
119114
In/Out:Out
120115
类型:常量字符指针
121116
可空:Y
122117
意思:输入负载内容
123-
参数.:nMsgLen
118+
参数.:nMsgLen
124119
In/Out:Out
125120
类型:整数型指针
126121
可空:Y
127122
意思:输入负载大小
123+
参数.八:pInt_HTTPCode
124+
In/Out:Out
125+
类型:整数型指针
126+
可空:Y
127+
意思:输出返回的HTTPCODE值
128128
返回值
129129
类型:逻辑型
130130
意思:是否成功
131131
备注:
132132
*********************************************************************/
133-
bool CPluginExtension_LibCore::PluginExtension_LibCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */)
133+
bool CPluginExtension_LibCore::PluginExtension_LibCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */, int* pInt_HTTPCode /* = NULL */)
134134
{
135135
PluginExtension_IsErrorOccur = false;
136136

@@ -144,7 +144,7 @@ bool CPluginExtension_LibCore::PluginExtension_LibCore_Exec(XNETHANDLE xhModule,
144144
st_csStl.unlock_shared();
145145
return false;
146146
}
147-
if (!stl_MapIterator->second.fpCall_PluginCore_Call(pppHDRList, nListCount, pInt_HTTPCode, ptszMsgBuffer, pInt_MsgLen, lpszMsgBufer, nMsgLen))
147+
if (!stl_MapIterator->second.fpCall_PluginCore_Call(pppHDRList, nListCount, ptszMsgBuffer, pInt_MsgLen, lpszMsgBufer, nMsgLen, pInt_HTTPCode))
148148
{
149149
PluginExtension_IsErrorOccur = true;
150150
PluginExtension_dwErrorCode = stl_MapIterator->second.fpCall_PluginCore_GetLastError();

XEngine_Module/XEngine_PluginExtension/PluginExtension_LibCore/PluginExtension_LibCore.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
typedef bool(*FPCall_PluginCore_Init)(XENGINE_PLUGINPARAM* pSt_PluginParameter);
1414
typedef void(*FPCall_PluginCore_UnInit)();
1515
typedef void(*FPCall_PluginCore_GetInfo)(XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
16-
typedef bool(*FPCall_PluginCore_Call)(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer, int nMsgLen);
16+
typedef bool(*FPCall_PluginCore_Call)(XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer, int nMsgLen, int* pInt_HTTPCode);
1717
typedef XLONG(*FPCall_PluginCore_GetLastError)();
1818

1919
typedef struct
@@ -32,7 +32,7 @@ typedef struct
3232
bool(*fpCall_PluginCore_Init)(XENGINE_PLUGINPARAM* pSt_PluginParameter);
3333
void(*fpCall_PluginCore_UnInit)();
3434
void(*fpCall_PluginCore_GetInfo)(XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
35-
bool(*fpCall_PluginCore_Call)(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer, int nMsgLen);
35+
bool(*fpCall_PluginCore_Call)(XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer, int nMsgLen, int* pInt_HTTPCode);
3636
XLONG(*fpCall_PluginCore_GetLastError)();
3737
}PLUGINCORE_LIBFRAMEWORK;
3838

@@ -44,7 +44,7 @@ class CPluginExtension_LibCore
4444
public:
4545
bool PluginExtension_LibCore_Init();
4646
bool PluginExtension_LibCore_Push(XNETHANDLE* pxhModule, LPCXSTR lpszPluginFile, XENGINE_PLUGINPARAM* pSt_PluginParameter = NULL);
47-
bool PluginExtension_LibCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0);
47+
bool PluginExtension_LibCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0, int* pInt_HTTPCode = NULL);
4848
bool PluginExtension_LibCore_Get(XNETHANDLE xhModule, XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
4949
bool PluginExtension_LibCore_Destroy();
5050
protected:

XEngine_Module/XEngine_PluginExtension/PluginExtension_Loader/PluginExtension_Loader.cpp

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -302,27 +302,42 @@ bool CPluginExtension_Loader::PluginExtension_Loader_GetForModule(LPCXSTR lpszMo
302302
类型:整数型
303303
可空:N
304304
意思:输入列表个数
305-
参数.四:pInt_HTTPCode
306-
In/Out:Out
307-
类型:整数型指针
308-
可空:N
309-
意思:输出返回的HTTPCODE值
310-
参数.五:ptszMsgBuffer
305+
参数.四:ptszMsgBuffer
311306
In/Out:Out
312307
类型:字符指针
313308
可空:N
314309
意思:输出负载的内容
315-
参数.:pInt_MsgLen
310+
参数.:pInt_MsgLen
316311
In/Out:Out
317312
类型:整数型指针
318313
可空:N
319314
意思:输出内容大小
315+
参数.六:pInt_HTTPCode
316+
In/Out:Out
317+
类型:整数型指针
318+
可空:N
319+
意思:输出返回的HTTPCODE值
320+
参数.七:lpszMsgBufer
321+
In/Out:In
322+
类型:常量字符指针
323+
可空:Y
324+
意思:输入要传递的内容
325+
参数.八:nMsgLen
326+
In/Out:In
327+
类型:整数型
328+
可空:Y
329+
意思:输入传递内容大小
330+
参数.九:pInt_HTTPCode
331+
In/Out:Out
332+
类型:整数型指针
333+
可空:N
334+
意思:输出返回的HTTPCODE值
320335
返回值
321336
类型:逻辑型
322337
意思:是否成功
323338
备注:
324339
*********************************************************************/
325-
bool CPluginExtension_Loader::PluginExtension_Loader_Exec(LPCXSTR lpszMethodName, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen)
340+
bool CPluginExtension_Loader::PluginExtension_Loader_Exec(LPCXSTR lpszMethodName, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */, int* pInt_HTTPCode /* = NULL */)
326341
{
327342
PluginExtension_IsErrorOccur = false;
328343

@@ -344,15 +359,15 @@ bool CPluginExtension_Loader::PluginExtension_Loader_Exec(LPCXSTR lpszMethodName
344359

345360
if (0 == stl_MapIterator->second.nType)
346361
{
347-
if (!PluginExtension_LibCore_Exec(stl_MapIterator->second.xhToken, pppHDRList, nListCount, pInt_HTTPCode, ptszMsgBuffer, pInt_MsgLen))
362+
if (!PluginExtension_LibCore_Exec(stl_MapIterator->second.xhToken, pppHDRList, nListCount, ptszMsgBuffer, pInt_MsgLen, lpszMsgBufer, nMsgLen, pInt_HTTPCode))
348363
{
349364
st_Locker.unlock_shared();
350365
return false;
351366
}
352367
}
353368
else
354369
{
355-
if (!PluginExtension_LuaCore_Exec(stl_MapIterator->second.xhToken, pppHDRList, nListCount, pInt_HTTPCode, ptszMsgBuffer, pInt_MsgLen))
370+
if (!PluginExtension_LuaCore_Exec(stl_MapIterator->second.xhToken, pppHDRList, nListCount, ptszMsgBuffer, pInt_MsgLen, lpszMsgBufer, nMsgLen, pInt_HTTPCode))
356371
{
357372
st_Locker.unlock_shared();
358373
return false;

XEngine_Module/XEngine_PluginExtension/PluginExtension_Loader/PluginExtension_Loader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CPluginExtension_Loader
3333
bool PluginExtension_Loader_Find(LPCXSTR lpszMethodName, int* pInt_Type);
3434
bool PluginExtension_Loader_Get(LPCXSTR lpszMethodName, XCHAR* ptszPluginName = NULL, XCHAR* ptszPluginVersion = NULL, XCHAR* ptszPluginAuthor = NULL, XCHAR* ptszPluginDesc = NULL);
3535
bool PluginExtension_Loader_GetForModule(LPCXSTR lpszModuleName, XCHAR* ptszPluginName = NULL, XCHAR* ptszPluginVersion = NULL, XCHAR* ptszPluginAuthor = NULL, XCHAR* ptszPluginDesc = NULL);
36-
bool PluginExtension_Loader_Exec(LPCXSTR lpszMethodName, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen);
36+
bool PluginExtension_Loader_Exec(LPCXSTR lpszMethodName, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0, int* pInt_HTTPCode = NULL);
3737
bool PluginExtension_Loader_Destory();
3838
protected:
3939
private:

XEngine_Module/XEngine_PluginExtension/PluginExtension_LuaCore/PluginExtension_LuaCore.cpp

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,37 +90,37 @@ bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Push(XNETHANDLE* pxhModul
9090
类型:整数型
9191
可空:N
9292
意思:输入列表个数
93-
参数.四:pInt_HTTPCode
94-
In/Out:Out
95-
类型:整数型指针
96-
可空:N
97-
意思:输出返回的HTTPCODE值
98-
参数.五:ptszMsgBuffer
93+
参数.四:ptszMsgBuffer
9994
In/Out:Out
10095
类型:字符指针
10196
可空:N
10297
意思:输出负载的内容
103-
参数.:pInt_MsgLen
98+
参数.:pInt_MsgLen
10499
In/Out:Out
105100
类型:整数型指针
106101
可空:N
107102
意思:输出内容大小
108-
参数.:lpszMsgBufer
103+
参数.:lpszMsgBufer
109104
In/Out:Out
110105
类型:常量字符指针
111106
可空:Y
112107
意思:输入负载内容
113-
参数.:nMsgLen
108+
参数.:nMsgLen
114109
In/Out:Out
115110
类型:整数型指针
116111
可空:Y
117112
意思:输入负载大小
113+
参数.八:pInt_HTTPCode
114+
In/Out:Out
115+
类型:整数型指针
116+
可空:Y
117+
意思:输出返回的HTTPCODE值
118118
返回值
119119
类型:逻辑型
120120
意思:是否成功
121121
备注:
122122
*********************************************************************/
123-
bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */)
123+
bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */, int* pInt_HTTPCode /* = NULL */)
124124
{
125125
PluginExtension_IsErrorOccur = false;
126126

@@ -165,11 +165,17 @@ bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Exec(XNETHANDLE xhModule,
165165
return false;
166166
}
167167
lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PInt_HTTPCode");
168-
*pInt_HTTPCode = (int)lua_tonumber(stl_MapIterator->second.pSt_LuaState, -1);
168+
if (!lua_isnil(stl_MapIterator->second.pSt_LuaState, -1))
169+
{
170+
*pInt_HTTPCode = (int)lua_tointeger(stl_MapIterator->second.pSt_LuaState, -1);
171+
}
169172
lua_pop(stl_MapIterator->second.pSt_LuaState, -1);
170173

171174
lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PInt_MsgLen");
172-
*pInt_MsgLen = (int)lua_tonumber(stl_MapIterator->second.pSt_LuaState, -1);
175+
if (!lua_isnil(stl_MapIterator->second.pSt_LuaState, -1))
176+
{
177+
*pInt_MsgLen = (int)lua_tointeger(stl_MapIterator->second.pSt_LuaState, -1);
178+
}
173179
lua_pop(stl_MapIterator->second.pSt_LuaState, -1);
174180

175181
if (*pInt_MsgLen > 0)

XEngine_Module/XEngine_PluginExtension/PluginExtension_LuaCore/PluginExtension_LuaCore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class CPluginExtension_LuaCore
3030
public:
3131
bool PluginExtension_LuaCore_Init();
3232
bool PluginExtension_LuaCore_Push(XNETHANDLE* pxhModule, LPCXSTR lpszPluginFile, XENGINE_PLUGINPARAM* pSt_PluginParameter = NULL);
33-
bool PluginExtension_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0);
33+
bool PluginExtension_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer = NULL, int nMsgLen = 0, int* pInt_HTTPCode = NULL);
3434
bool PluginExtension_LuaCore_Get(XNETHANDLE xhModule, XCHAR* ptszPluginName, XCHAR* ptszPluginVersion, XCHAR* ptszPluginAuthor, XCHAR* ptszPluginDesc);
3535
bool PluginExtension_LuaCore_Destroy();
3636
protected:

0 commit comments

Comments
 (0)