Skip to content

Commit 0f6dcdf

Browse files
xengine-qytxengine-qyt
committed
update:depend library
update:match xengine v9.20
1 parent 2e82850 commit 0f6dcdf

File tree

40 files changed

+160
-160
lines changed

40 files changed

+160
-160
lines changed

‎XEngine_Source/XEngine_DBDepend/XEngine_IPMacData‎

‎XEngine_Source/XEngine_DBDepend/XEngine_PhoneData‎

‎XEngine_Source/XEngine_Depend‎

Submodule XEngine_Depend updated 52 files

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ typedef struct
3535
}st_XTime; //次数*时间=超时
3636
struct
3737
{
38-
XCHAR tszAPIFile[MAX_PATH]; //日志文件地址
39-
XCHAR tszServiceFile[MAX_PATH];
38+
XCHAR tszAPIFile[XPATH_MAX]; //日志文件地址
39+
XCHAR tszServiceFile[XPATH_MAX];
4040
int nMaxSize; //最大日志大小
4141
int nMaxCount; //最大日志个数
4242
int nLogLeave; //日志等级
@@ -53,46 +53,46 @@ typedef struct
5353
}st_XSql;
5454
struct
5555
{
56-
XCHAR tszWeatherUrl[MAX_PATH]; //天气接口
57-
XCHAR tszBankUrl[MAX_PATH]; //银行卡验证地址
58-
XCHAR tszOilUrl[MAX_PATH]; //油价接口
56+
XCHAR tszWeatherUrl[XPATH_MAX]; //天气接口
57+
XCHAR tszBankUrl[XPATH_MAX]; //银行卡验证地址
58+
XCHAR tszOilUrl[XPATH_MAX]; //油价接口
5959
//翻译接口
6060
struct
6161
{
62-
XCHAR tszAPPUrl[MAX_PATH];
63-
XCHAR tszAPPID[MAX_PATH];
64-
XCHAR tszAPPKey[MAX_PATH];
62+
XCHAR tszAPPUrl[XPATH_MAX];
63+
XCHAR tszAPPID[XPATH_MAX];
64+
XCHAR tszAPPKey[XPATH_MAX];
6565
}st_TranslationInfo;
6666
}st_XApi;
6767
struct
6868
{
6969
bool bEnable; //是否启用
70-
XCHAR tszPlugin[MAX_PATH]; //配置文件地址
70+
XCHAR tszPlugin[XPATH_MAX]; //配置文件地址
7171
}st_XPlugin;
7272
struct
7373
{
7474
//二维码模型库
7575
struct
7676
{
77-
XCHAR tszModelDetect[MAX_PATH];
78-
XCHAR tszModelSr[MAX_PATH];
79-
XCHAR tszProtoDetect[MAX_PATH];
80-
XCHAR tszProtoSr[MAX_PATH];
77+
XCHAR tszModelDetect[XPATH_MAX];
78+
XCHAR tszModelSr[XPATH_MAX];
79+
XCHAR tszProtoDetect[XPATH_MAX];
80+
XCHAR tszProtoSr[XPATH_MAX];
8181
}st_ConfigQRCodec;
82-
XCHAR tszConfigDeamon[MAX_PATH]; //守护进程配置文件
83-
XCHAR tszConfigHTTPMime[MAX_PATH]; //HTTPMINE配置文件
84-
XCHAR tszConfigHTTPCode[MAX_PATH]; //HTTP状态配置文件
82+
XCHAR tszConfigDeamon[XPATH_MAX]; //守护进程配置文件
83+
XCHAR tszConfigHTTPMime[XPATH_MAX]; //HTTPMINE配置文件
84+
XCHAR tszConfigHTTPCode[XPATH_MAX]; //HTTP状态配置文件
8585
}st_XConfig;
8686
struct
8787
{
88-
XCHAR tszHostUrl[MAX_PATH]; //主机地址
88+
XCHAR tszHostUrl[XPATH_MAX]; //主机地址
8989
int nHTTPCode; //转发模式,301 永久,302 临时
9090
}st_XShortLink;
9191
struct
9292
{
9393
bool bEnable; //是否启用
94-
XCHAR tszImagePath[MAX_PATH]; //图片文字识别配置
95-
XCHAR tszImageLanguage[MAX_PATH]; //语言支持
94+
XCHAR tszImagePath[XPATH_MAX]; //图片文字识别配置
95+
XCHAR tszImageLanguage[XPATH_MAX]; //语言支持
9696
}st_XImageText;
9797
struct
9898
{
@@ -101,8 +101,8 @@ typedef struct
101101
}st_XReload;
102102
struct
103103
{
104-
XCHAR tszUserName[MAX_PATH];
105-
XCHAR tszUserPass[MAX_PATH];
104+
XCHAR tszUserName[XPATH_MAX];
105+
XCHAR tszUserPass[XPATH_MAX];
106106
struct
107107
{
108108
bool bBackService;
@@ -112,15 +112,15 @@ typedef struct
112112
struct
113113
{
114114
bool bEnable;
115-
XCHAR tszDBPhone[MAX_PATH];
116-
XCHAR tszDBMac[MAX_PATH];
117-
XCHAR tszDBIPAddr[MAX_PATH];
118-
XCHAR tszDBISPAddr[MAX_PATH];
115+
XCHAR tszDBPhone[XPATH_MAX];
116+
XCHAR tszDBMac[XPATH_MAX];
117+
XCHAR tszDBIPAddr[XPATH_MAX];
118+
XCHAR tszDBISPAddr[XPATH_MAX];
119119
}st_XAPIModule;
120120
struct
121121
{
122122
bool bEnable;
123-
XCHAR tszAPIUrl[MAX_PATH];
123+
XCHAR tszAPIUrl[XPATH_MAX];
124124
XCHAR tszServiceName[128];
125125
}st_XReport;
126126
struct
@@ -132,8 +132,8 @@ typedef struct
132132
typedef struct
133133
{
134134
bool bEnable;
135-
XCHAR tszPluginMethod[MAX_PATH];
136-
XCHAR tszPluginFile[MAX_PATH];
135+
XCHAR tszPluginMethod[XPATH_MAX];
136+
XCHAR tszPluginFile[XPATH_MAX];
137137
}XENGINE_PLUGININFO;
138138
typedef struct
139139
{
@@ -144,9 +144,9 @@ typedef struct
144144
typedef struct
145145
{
146146
bool bEnable;
147-
XCHAR tszOPMethod[MAX_PATH];
148-
XCHAR tszOPNote[MAX_PATH];
149-
XCHAR tszOPExample[MAX_PATH];
147+
XCHAR tszOPMethod[XPATH_MAX];
148+
XCHAR tszOPNote[XPATH_MAX];
149+
XCHAR tszOPExample[XPATH_MAX];
150150
}XENGINE_OPTIONINFO;
151151
typedef struct
152152
{
@@ -157,8 +157,8 @@ typedef struct
157157
typedef struct
158158
{
159159
bool bEnable; //是否启用
160-
XCHAR tszAPPName[MAX_PATH]; //应用程序名称
161-
XCHAR tszAPPPath[MAX_PATH]; //应用程序路径
160+
XCHAR tszAPPName[XPATH_MAX]; //应用程序名称
161+
XCHAR tszAPPPath[XPATH_MAX]; //应用程序路径
162162
int nReTime; //是否自动重启
163163
int nReNumber;
164164
//自定义

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_XLog/ModuleDatabase_XLog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ bool CModuleDatabase_XLog::ModuleDatabase_XLog_Show(XCHAR*** ppptszList, int* pI
350350
return false;
351351
}
352352
*pInt_ListCount = (int)nllLine;
353-
BaseLib_Memory_Malloc((XPPPMEM)ppptszList, (int)nllLine, MAX_PATH);
353+
BaseLib_Memory_Malloc((XPPPMEM)ppptszList, (int)nllLine, XPATH_MAX);
354354
for (__int64u i = 0; i < nllLine; i++)
355355
{
356356
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Define.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ typedef enum
328328
//////////////////////////////////////////////////////////////////////////
329329
// 导出回调函数
330330
//////////////////////////////////////////////////////////////////////////
331-
typedef void(CALLBACK* CALLBACK_APISERVICE_MODULE_HELP_P2PCLIENT)(XENGINE_P2XPPEER_PROTOCOL* pSt_P2PProtocol, XPVOID lParam);
331+
typedef void(XCALLBACK* CALLBACK_APISERVICE_MODULE_HELP_P2PCLIENT)(XENGINE_P2XPPEER_PROTOCOL* pSt_P2PProtocol, XPVOID lParam);
332332
//套接字测试回调:测试句柄，测试的服务器地址，测试的端口，当前测试次数，失败次数,成功次数,状态:0成功报告,1失败报告,2结束报告,自定义参数
333-
typedef void(CALLBACK* CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST)(XNETHANDLE xhToken, LPCXSTR lpszAddr, int nPort, __int64x nNumber, __int64x nFailed, __int64x nSuccess, int nStatus, XPVOID lParam);
333+
typedef void(XCALLBACK* CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST)(XNETHANDLE xhToken, LPCXSTR lpszAddr, int nPort, __int64x nNumber, __int64x nFailed, __int64x nSuccess, int nStatus, XPVOID lParam);
334334
//////////////////////////////////////////////////////////////////////////
335335
// 导出数据结构
336336
//////////////////////////////////////////////////////////////////////////

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Image/ModuleHelp_ImageGet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ bool CModuleHelp_ImageGet::ModuleHelp_ImageGet_TextGet(LPCXSTR lpszMsgBuffer, in
213213
}
214214

215215
*pInt_ListCount = stl_ListStr.size();
216-
BaseLib_Memory_Malloc((XPPPMEM)ppptszListStr, *pInt_ListCount, MAX_PATH);
216+
BaseLib_Memory_Malloc((XPPPMEM)ppptszListStr, *pInt_ListCount, XPATH_MAX);
217217

218218
auto stl_ListIterator = stl_ListStr.begin();
219219
for (int i = 0; stl_ListIterator != stl_ListStr.end(); i++, stl_ListIterator++)

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_P2PClient/ModuleHelp_P2PClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ bool CModuleHelp_P2PClient::ModuleHelp_P2PClient_Heart(XENGINE_P2XPPEER_PROTOCOL
506506
//////////////////////////////////////////////////////////////////////////
507507
// 保护函数
508508
//////////////////////////////////////////////////////////////////////////
509-
XHTHREAD CALLBACK CModuleHelp_P2PClient::ModuleHelp_P2PClient_Thread(XPVOID lParam)
509+
XHTHREAD XCALLBACK CModuleHelp_P2PClient::ModuleHelp_P2PClient_Thread(XPVOID lParam)
510510
{
511511
CModuleHelp_P2PClient* pClass_This = (CModuleHelp_P2PClient*)lParam;
512512
list<XENGINE_P2XP_PEERINFO> stl_ListRemove;

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_P2PClient/ModuleHelp_P2PClient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CModuleHelp_P2PClient
2626
bool ModuleHelp_P2PClient_DelAll();
2727
bool ModuleHelp_P2PClient_Heart(XENGINE_P2XPPEER_PROTOCOL* pSt_P2PProtocol);
2828
protected:
29-
static XHTHREAD CALLBACK ModuleHelp_P2PClient_Thread(XPVOID lParam);
29+
static XHTHREAD XCALLBACK ModuleHelp_P2PClient_Thread(XPVOID lParam);
3030
private:
3131
bool m_bIsRun;
3232
int m_nTimeout;

‎XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LibCore/ModulePlugin_LibCore.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ typedef struct
2222
#else
2323
void* mhFile;
2424
#endif
25-
XCHAR tszModuleFile[MAX_PATH];
25+
XCHAR tszModuleFile[XPATH_MAX];
2626

2727
bool(*fpCall_PluginCore_Init)(XPVOID lParam);
2828
void(*fpCall_PluginCore_UnInit)();

0 commit comments

Comments
 (0)