Skip to content

Commit 2ed96d7

Browse files
committed
modify:PluginCore_UnInit bool to void for plugin
1 parent a12a9fb commit 2ed96d7

File tree

23 files changed

+48
-62
lines changed

23 files changed

+48
-62
lines changed

XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);../XEngine_ThirdPart/opencc/include;$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

XEngine_Source/XEngine_ModuleHelp/pch.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,4 @@ extern DWORD ModuleHelp_dwErrorCode;
4646

4747
#ifdef _MSC_BUILD
4848
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
49-
#ifdef _WIN64
50-
#pragma comment(lib,"../XEngine_ThirdPart/opencc/libx64/opencc")
51-
#else
52-
#pragma comment(lib,"../XEngine_ThirdPart/opencc/libx86/opencc")
53-
#endif
5449
#endif

XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LibCore/ModulePlugin_LibCore.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// History:
1212
*********************************************************************/
1313
typedef BOOL(*FPCall_PluginCore_Init)(LPVOID lParam);
14-
typedef BOOL(*FPCall_PluginCore_UnInit)();
14+
typedef void(*FPCall_PluginCore_UnInit)();
1515
typedef BOOL(*FPCall_PluginCore_Call)(TCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszMsgBufer, int nMsgLen);
1616
typedef DWORD(*FPCall_PluginCore_GetLastError)();
1717

@@ -21,7 +21,7 @@ typedef struct
2121
TCHAR tszModuleFile[MAX_PATH];
2222

2323
BOOL(*fpCall_PluginCore_Init)(LPVOID lParam);
24-
BOOL(*fpCall_PluginCore_UnInit)();
24+
void(*fpCall_PluginCore_UnInit)();
2525
BOOL(*fpCall_PluginCore_Call)(TCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszMsgBufer, int nMsgLen);
2626
DWORD(*fpCall_PluginCore_GetLastError)();
2727
}PLUGINCORE_FRAMEWORK, * LPPLUGINCORE_FRAMEWORK;

XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/BMIndex_Define.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ extern "C" BOOL PluginCore_Init(LPVOID lParam = NULL);
3535
函数名称:PluginCore_UnInit
3636
函数功能:卸载插件
3737
返回值
38-
类型:逻辑型
39-
意思:是否成功
38+
类型:
39+
意思:
4040
备注:
4141
*********************************************************************/
42-
extern "C" BOOL PluginCore_UnInit();
42+
extern "C" void PluginCore_UnInit();
4343
/********************************************************************
4444
函数名称:PluginCore_Call
4545
函数功能:调用插件

XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Plugin_BMIndex/Plugin_BMIndex.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ BOOL CPlugin_BMIndex::PluginCore_Init(LPVOID lParam)
4343
函数名称:PluginCore_UnInit
4444
函数功能:卸载插件
4545
返回值
46-
类型:逻辑型
47-
意思:是否成功
46+
类型:
47+
意思:
4848
备注:
4949
*********************************************************************/
50-
BOOL CPlugin_BMIndex::PluginCore_UnInit()
50+
void CPlugin_BMIndex::PluginCore_UnInit()
5151
{
5252
BMIndex_IsErrorOccur = FALSE;
53-
54-
return TRUE;
5553
}
5654
/********************************************************************
5755
函数名称:PluginCore_Call

XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Plugin_BMIndex/Plugin_BMIndex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CPlugin_BMIndex
1818
~CPlugin_BMIndex();
1919
public:
2020
BOOL PluginCore_Init(LPVOID lParam);
21-
BOOL PluginCore_UnInit();
21+
void PluginCore_UnInit();
2222
BOOL PluginCore_Call(TCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszMsgBuffer, int nMsgLen);
2323
protected:
2424
BOOL Plugin_Timezone_BMIndex(LPCTSTR lpszHigh, LPCTSTR lpszWeight, TCHAR* ptszMsgBufer, int* pInt_Len);

XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/pch.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ extern "C" BOOL PluginCore_Init(LPVOID lParam)
2929
{
3030
return m_PluginBMIndex.PluginCore_Init(lParam);
3131
}
32-
extern "C" BOOL PluginCore_UnInit()
32+
extern "C" void PluginCore_UnInit()
3333
{
34-
return m_PluginBMIndex.PluginCore_UnInit();
34+
m_PluginBMIndex.PluginCore_UnInit();
3535
}
3636
extern "C" BOOL PluginCore_Call(TCHAR * **pppHDRList, int nListCount, int* pInt_HTTPCode, TCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszMsgBuffer, int nMsgLen)
3737
{

XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/PluginMeter_Define.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ extern "C" BOOL PluginCore_Init(LPVOID lParam = NULL);
8888
函数名称:PluginCore_UnInit
8989
函数功能:卸载插件
9090
返回值
91-
类型:逻辑型
92-
意思:是否成功
91+
类型:
92+
意思:
9393
备注:
9494
*********************************************************************/
95-
extern "C" BOOL PluginCore_UnInit();
95+
extern "C" void PluginCore_UnInit();
9696
/********************************************************************
9797
函数名称:PluginCore_Call
9898
函数功能:调用插件

XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Plugin_Meter/Plugin_Meter.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ BOOL CPlugin_Meter::PluginCore_Init(LPVOID lParam)
4343
函数名称:PluginCore_UnInit
4444
函数功能:卸载插件
4545
返回值
46-
类型:逻辑型
47-
意思:是否成功
46+
类型:
47+
意思:
4848
备注:
4949
*********************************************************************/
50-
BOOL CPlugin_Meter::PluginCore_UnInit()
50+
void CPlugin_Meter::PluginCore_UnInit()
5151
{
5252
Meter_IsErrorOccur = FALSE;
53-
54-
return TRUE;
5553
}
5654
/********************************************************************
5755
函数名称:PluginCore_Call

XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Plugin_Meter/Plugin_Meter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CPlugin_Meter
1818
~CPlugin_Meter();
1919
public:
2020
BOOL PluginCore_Init(LPVOID lParam);
21-
BOOL PluginCore_UnInit();
21+
void PluginCore_UnInit();
2222
BOOL PluginCore_Call(TCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszMsgBuffer, int nMsgLen);
2323
protected:
2424
BOOL Plugin_Meter_LengthConvert(int nSource, __int64x nValue, Json::Value *pSt_JsonObject);

0 commit comments

Comments
 (0)