Skip to content

Commit 5dcbc50

Browse files
xengine-qytxengine-qyt
committed
update:match x-engine v 9.20
1 parent 263ea47 commit 5dcbc50

File tree

28 files changed

+174
-178
lines changed

28 files changed

+174
-178
lines changed

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ bool CAPIHelp_Api::APIHelp_Api_ProxyAuth(XCHAR* ptszUser, XCHAR* ptszPass, XCHAR
5555
APIHelp_IsErrorOccur = false;
5656

5757
int nAuthType = 0;
58-
int nAuthLen = MAX_PATH;
58+
int nAuthLen = XPATH_MAX;
5959

60-
XCHAR tszAuthStr[MAX_PATH];
60+
XCHAR tszAuthStr[XPATH_MAX];
6161
XCHAR tszSDBuffer[1024];
6262

63-
memset(tszAuthStr, '\0', MAX_PATH);
63+
memset(tszAuthStr, '\0', XPATH_MAX);
6464
memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
6565
//是否有验证信息
6666
if (!HttpProtocol_ServerHelp_GetAuthInfo(&pptszListHdr, nHdrCount, tszAuthStr, &nAuthLen, &nAuthType))
@@ -207,8 +207,8 @@ bool CAPIHelp_Api::APIHelp_Api_VerHash(LPCXSTR lpszFileHash, XCHAR** pptszListHd
207207
APIHelp_IsErrorOccur = false;
208208

209209
LPCXSTR lpszKeyStr = _X("FileHash");
210-
XCHAR tszValueStr[MAX_PATH];
211-
memset(tszValueStr, '\0', MAX_PATH);
210+
XCHAR tszValueStr[XPATH_MAX];
211+
memset(tszValueStr, '\0', XPATH_MAX);
212212

213213
if (!HttpProtocol_ServerHelp_GetField(&pptszListHdr, nHdrCount, lpszKeyStr, tszValueStr))
214214
{
@@ -321,20 +321,20 @@ bool CAPIHelp_Api::APIHelp_Api_UrlParse(XCHAR*** ppptszList, int nListCount, XCH
321321

322322
for (int i = 0; i < nListCount; i++)
323323
{
324-
XCHAR tszKey[MAX_PATH];
325-
XCHAR tszValue[MAX_PATH];
324+
XCHAR tszKey[XPATH_MAX];
325+
XCHAR tszValue[XPATH_MAX];
326326

327-
memset(tszKey, '\0', MAX_PATH);
328-
memset(tszValue, '\0', MAX_PATH);
327+
memset(tszKey, '\0', XPATH_MAX);
328+
memset(tszValue, '\0', XPATH_MAX);
329329

330330
BaseLib_String_GetKeyValue((*ppptszList)[i], _X("="), tszKey, tszValue);
331331

332332
if (0 == _tcsxnicmp(lpszHDRFile, tszKey, _tcsxlen(lpszHDRFile)))
333333
{
334334
//编码格式是utf8,需要转为ansi
335335
#ifdef _MSC_BUILD
336-
XCHAR tszFileName[MAX_PATH];
337-
memset(tszFileName, '\0', MAX_PATH);
336+
XCHAR tszFileName[XPATH_MAX];
337+
memset(tszFileName, '\0', XPATH_MAX);
338338

339339
Cryption_Codec_UrlDeCodec(tszValue, _tcsxlen(tszValue), tszFileName);
340340

@@ -383,15 +383,15 @@ bool CAPIHelp_Api::APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCH
383383
//Content-Type: multipart/form-data; boundary=AaB03x
384384
for (int i = 0; i < nListCount; i++)
385385
{
386-
XCHAR tszKeyStr[MAX_PATH] = {};
387-
XCHAR tszVluStr[MAX_PATH] = {};
386+
XCHAR tszKeyStr[XPATH_MAX] = {};
387+
XCHAR tszVluStr[XPATH_MAX] = {};
388388

389389
BaseLib_String_GetKeyValue((*ppptszList)[i], _X(": "), tszKeyStr, tszVluStr);
390390

391391
if (0 == _tcsxnicmp(lpszHDRContent, tszKeyStr, _tcsxlen(lpszHDRContent)))
392392
{
393-
XCHAR tszKeySub[MAX_PATH] = {};
394-
XCHAR tszVluSub[MAX_PATH] = {};
393+
XCHAR tszKeySub[XPATH_MAX] = {};
394+
XCHAR tszVluSub[XPATH_MAX] = {};
395395
//multipart/form-data; boundary=AaB03x
396396
if (BaseLib_String_GetKeyValue(tszVluStr, _X(";"), tszKeySub, tszVluSub))
397397
{
@@ -465,7 +465,7 @@ bool CAPIHelp_Api::APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)
465465
{
466466
APIHelp_IsErrorOccur = false;
467467

468-
XCHAR tszUrlStr[MAX_PATH] = {};
468+
XCHAR tszUrlStr[XPATH_MAX] = {};
469469
_tcsxcpy(tszUrlStr, lpszUrl);
470470
// 查找第一个 '/' 的位置
471471
XCHAR *ptszFirstStr = _tcsxchr(tszUrlStr, '/');

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Cryption/APIHelp_Cryption.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,23 +203,23 @@ bool CAPIHelp_Cryption::APIHelp_Cryption_Digest(XCHAR* ptszResponseStr, LPCXSTR
203203
{
204204
APIHelp_IsErrorOccur = false;
205205

206-
XCHAR tszResponseStr[2048];
206+
XCHAR tszResponseStr[4096];
207207
XBYTE tszResponseMD5[2048];
208-
XBYTE tszUserMD5[MAX_PATH];
209-
XBYTE tszUrlMD5[MAX_PATH];
210-
XCHAR tszUserStr[MAX_PATH];
211-
XCHAR tszUrlStr[MAX_PATH];
212-
XCHAR tszUserHex[MAX_PATH];
213-
XCHAR tszUrlHex[MAX_PATH];
208+
XBYTE tszUserMD5[XPATH_MAX];
209+
XBYTE tszUrlMD5[XPATH_MAX];
210+
XCHAR tszUserStr[XPATH_MAX];
211+
XCHAR tszUrlStr[XPATH_MAX];
212+
XCHAR tszUserHex[XPATH_MAX];
213+
XCHAR tszUrlHex[XPATH_MAX];
214214

215215
memset(tszResponseStr, '\0', sizeof(tszResponseStr));
216216
memset(tszResponseMD5, '\0', sizeof(tszResponseMD5));
217-
memset(tszUserMD5, '\0', MAX_PATH);
218-
memset(tszUrlMD5, '\0', MAX_PATH);
219-
memset(tszUserStr, '\0', MAX_PATH);
220-
memset(tszUrlStr, '\0', MAX_PATH);
221-
memset(tszUserHex, '\0', MAX_PATH);
222-
memset(tszUrlHex, '\0', MAX_PATH);
217+
memset(tszUserMD5, '\0', XPATH_MAX);
218+
memset(tszUrlMD5, '\0', XPATH_MAX);
219+
memset(tszUserStr, '\0', XPATH_MAX);
220+
memset(tszUrlStr, '\0', XPATH_MAX);
221+
memset(tszUserHex, '\0', XPATH_MAX);
222+
memset(tszUrlHex, '\0', XPATH_MAX);
223223

224224
//计算HA1 的MD5字符串 MD5(USER:PASS:REAL)
225225
int nRet = _xstprintf(tszUserStr, _X("%s:%s:%s"), lpszUser, lpszRealm, lpszPass);

‎XEngine_Source/StorageModule_BTorrent/BTorrent_Creator/BTorrent_Creator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ typedef struct
1414
{
1515
XCHAR tszComment[4096];
1616
XCHAR tszPEMCert[4096];
17-
XCHAR tszBTPath[MAX_PATH];
18-
XCHAR tszCreate[MAX_PATH];
17+
XCHAR tszBTPath[XPATH_MAX];
18+
XCHAR tszCreate[XPATH_MAX];
1919
int m_nPieceSize;
2020

2121
list<BTORRENT_PARSEMAP>* pStl_ListNode;

‎XEngine_Source/StorageModule_BTorrent/BTorrent_DLoader/BTorrent_DLoader.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ typedef struct
1919
#endif
2020
BTORRENT_DLOADER st_DLStatus; //下载状态
2121

22-
XCHAR tszAddr[MAX_PATH]; //下载地址
23-
XCHAR tszFile[MAX_PATH]; //保存地址
24-
XCHAR tszTemp[MAX_PATH]; //临时文件
22+
XCHAR tszAddr[XPATH_MAX]; //下载地址
23+
XCHAR tszFile[XPATH_MAX]; //保存地址
24+
XCHAR tszTemp[XPATH_MAX]; //临时文件
2525
bool bIsResume; //是否续传
2626
XPVOID lPClass; //指向类的指针
2727
}BTORRENT_DLOADINFO, * LPBTORRENT_DLOADINFO;

‎XEngine_Source/StorageModule_BTorrent/BTorrent_Define.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ typedef enum
3939
//////////////////////////////////////////////////////////////////////////
4040
typedef struct
4141
{
42-
XCHAR tszFileName[MAX_PATH]; //文件名
42+
XCHAR tszFileName[XPATH_MAX]; //文件名
4343
__int64x nDLoadTotal; //总大小
4444
__int64x nDLCount; //已下载大小
4545
__int64x nUPCount; //已上传大小
@@ -51,15 +51,15 @@ typedef struct
5151
}BTORRENT_DLOADER;
5252
typedef struct
5353
{
54-
XCHAR tszValue[MAX_PATH];
54+
XCHAR tszValue[XPATH_MAX];
5555
int nValue;
5656
}BTORRENT_PARSEMAP;
5757
typedef struct
5858
{
59-
XCHAR tszFileHash[MAX_PATH]; //文件HASH
60-
XCHAR tszFilePath[MAX_PATH]; //文件路径
61-
XCHAR tszFileName[MAX_PATH]; //文件名称
62-
XCHAR tszFileLink[MAX_PATH]; //文件连接,如果有的话
59+
XCHAR tszFileHash[XPATH_MAX]; //文件HASH
60+
XCHAR tszFilePath[XPATH_MAX]; //文件路径
61+
XCHAR tszFileName[XPATH_MAX]; //文件名称
62+
XCHAR tszFileLink[XPATH_MAX]; //文件连接,如果有的话
6363
__int64x nFileOffset; //文件偏移
6464
__int64x nFileSize; //文件大小
6565
time_t nFileTime; //文件时间戳

‎XEngine_Source/StorageModule_Config/Config_Define.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ typedef struct tag_XEngine_ServerConfig
4747
}st_XTime;
4848
struct
4949
{
50-
XCHAR tszLogFile[MAX_PATH];
50+
XCHAR tszLogFile[XPATH_MAX];
5151
int nMaxSize;
5252
int nMaxCount;
5353
int nLogLeave;
@@ -73,9 +73,9 @@ typedef struct tag_XEngine_ServerConfig
7373
bool bUPPass;
7474
bool bDLPass;
7575
bool bAuthPass;
76-
XCHAR tszUPPass[MAX_PATH];
77-
XCHAR tszDLPass[MAX_PATH];
78-
XCHAR tszAuthPass[MAX_PATH];
76+
XCHAR tszUPPass[XPATH_MAX];
77+
XCHAR tszDLPass[XPATH_MAX];
78+
XCHAR tszAuthPass[XPATH_MAX];
7979
}st_XProxy;
8080
struct
8181
{
@@ -94,17 +94,17 @@ typedef struct tag_XEngine_ServerConfig
9494
}st_P2xp;
9595
struct
9696
{
97-
XCHAR tszCertChain[MAX_PATH];
98-
XCHAR tszCertServer[MAX_PATH];
99-
XCHAR tszCertKey[MAX_PATH];
97+
XCHAR tszCertChain[XPATH_MAX];
98+
XCHAR tszCertServer[XPATH_MAX];
99+
XCHAR tszCertKey[XPATH_MAX];
100100
bool bDLEnable;
101101
bool bUPEnable;
102102
bool bCHEnable;
103103
bool bWDEnable;
104104
}st_XCert;
105105
struct
106106
{
107-
XCHAR tszAPIUrl[MAX_PATH];
107+
XCHAR tszAPIUrl[XPATH_MAX];
108108
XCHAR tszServiceName[128];
109109
bool bEnable;
110110
}st_XReport;
@@ -122,8 +122,8 @@ typedef struct tag_XEngine_ServerConfig
122122

123123
typedef struct
124124
{
125-
XCHAR tszFilePath[MAX_PATH];
126-
XCHAR tszFileName[MAX_PATH];
125+
XCHAR tszFilePath[XPATH_MAX];
126+
XCHAR tszFileName[XPATH_MAX];
127127
XCHAR tszBuckKey[128];
128128
XCHAR tszBuckSize[64];
129129
int nLevel;

‎XEngine_Source/StorageModule_Database/Database_Define.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
typedef struct
1717
{
1818
XENGINE_PROTOCOL_FILE st_ProtocolFile;
19-
XCHAR tszBuckKey[MAX_PATH]; //路径的关键字
20-
XCHAR tszTableName[MAX_PATH]; //日期表名称,插入:表示自定义插入日期表,获取:表示导出这个文件所属日期表
19+
XCHAR tszBuckKey[XPATH_MAX]; //路径的关键字
20+
XCHAR tszTableName[XPATH_MAX]; //日期表名称,插入:表示自定义插入日期表,获取:表示导出这个文件所属日期表
2121
}XSTORAGECORE_DBFILE, *LPXSTORAGECORE_DBFILE;
2222
typedef struct
2323
{

‎XEngine_Source/StorageModule_Database/Database_Help/Database_Help.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
232232
Database_IsErrorOccur = false;
233233

234234
bool bInit = false;
235-
XCHAR tszSQLQuery[MAX_PATH];
236-
memset(tszSQLQuery, '\0', MAX_PATH);
235+
XCHAR tszSQLQuery[XPATH_MAX];
236+
memset(tszSQLQuery, '\0', XPATH_MAX);
237237
//文件所属BUCKET
238238
if (NULL != lpszBuckKey)
239239
{
@@ -247,7 +247,7 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
247247
{
248248
_tcsxcat(ptszSQLBuffer, _X(" WHERE "));
249249
}
250-
memset(tszSQLQuery, '\0', MAX_PATH);
250+
memset(tszSQLQuery, '\0', XPATH_MAX);
251251
_xstprintf(tszSQLQuery, _X("BuckKey = '%s'"), lpszBuckKey);
252252
_tcsxcat(ptszSQLBuffer, tszSQLQuery);
253253
bInit = true;
@@ -266,7 +266,7 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
266266
{
267267
_tcsxcat(ptszSQLBuffer, _X("WHERE "));
268268
}
269-
memset(tszSQLQuery, '\0', MAX_PATH);
269+
memset(tszSQLQuery, '\0', XPATH_MAX);
270270
_xstprintf(tszSQLQuery, _X("FilePath = '%s'"), lpszFilePath);
271271
_tcsxcat(ptszSQLBuffer, tszSQLQuery);
272272
bInit = true;
@@ -285,7 +285,7 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
285285
{
286286
_tcsxcat(ptszSQLBuffer, _X("WHERE "));
287287
}
288-
memset(tszSQLQuery, '\0', MAX_PATH);
288+
memset(tszSQLQuery, '\0', XPATH_MAX);
289289
_xstprintf(tszSQLQuery, _X("FileName = '%s'"), lpszFileName);
290290
_tcsxcat(ptszSQLBuffer, tszSQLQuery);
291291
bInit = true;
@@ -304,7 +304,7 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
304304
{
305305
_tcsxcat(ptszSQLBuffer, _X("WHERE "));
306306
}
307-
memset(tszSQLQuery, '\0', MAX_PATH);
307+
memset(tszSQLQuery, '\0', XPATH_MAX);
308308
_xstprintf(tszSQLQuery, _X("FileHash = '%s'"), lpszFileHash);
309309
_tcsxcat(ptszSQLBuffer, tszSQLQuery);
310310
bInit = true;
@@ -323,7 +323,7 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
323323
{
324324
_tcsxcat(ptszSQLBuffer, _X("WHERE "));
325325
}
326-
memset(tszSQLQuery, '\0', MAX_PATH);
326+
memset(tszSQLQuery, '\0', XPATH_MAX);
327327
_xstprintf(tszSQLQuery, _X("FileUser = '%s'"), lpszFileUser);
328328
_tcsxcat(ptszSQLBuffer, tszSQLQuery);
329329
bInit = true;
@@ -342,7 +342,7 @@ bool CDatabase_Help::Database_Help_Packet(XCHAR* ptszSQLBuffer, LPCXSTR lpszBuck
342342
{
343343
_tcsxcat(ptszSQLBuffer, _X("WHERE "));
344344
}
345-
memset(tszSQLQuery, '\0', MAX_PATH);
345+
memset(tszSQLQuery, '\0', XPATH_MAX);
346346
_xstprintf(tszSQLQuery, _X("BETWEEN '%s' AND '%s'"), lpszTimeStart, lpszTimeEnd);
347347
_tcsxcat(ptszSQLBuffer, tszSQLQuery);
348348
bInit = true;

‎XEngine_Source/StorageModule_Database/Database_Memory/Database_Memory.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,10 @@ bool CDatabase_Memory::Database_Memory_Flush()
288288
int nHashLen = 0;
289289
struct _xtstat st_FileStatus;
290290

291-
XBYTE tszHashStr[MAX_PATH];
291+
XBYTE tszHashStr[XPATH_MAX];
292292
XSTORAGECORE_DBFILE st_DBFile;
293293

294-
memset(tszHashStr, '\0', MAX_PATH);
294+
memset(tszHashStr, '\0', XPATH_MAX);
295295
memset(&st_DBFile, '\0', sizeof(XSTORAGECORE_DBFILE));
296296

297297
_xtstat(pptszListFile[i], &st_FileStatus);

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_Bucket(XCHAR* ptszMsgBuffer
612612
Json::Value st_JsonArray;
613613

614614
auto stl_ListIterator = pStl_ListBucket->begin();
615-
for (int i = 0; stl_ListIterator != pStl_ListBucket->end(); stl_ListIterator++)
615+
for (; stl_ListIterator != pStl_ListBucket->end(); stl_ListIterator++)
616616
{
617617
Json::Value st_JsonObject;
618618
Json::Value st_JsonSub;
@@ -700,7 +700,7 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropfind(XCHAR* ptszMsgBu
700700

701701
for (int i = 0; i < nFileCount; i++)
702702
{
703-
XCHAR tszFileName[MAX_PATH] = {};
703+
XCHAR tszFileName[XPATH_MAX] = {};
704704
SYSTEMAPI_FILE_ATTR st_FileAttr = {};
705705
BaseLib_String_GetFileAndPath((*ppptszListFile)[i], NULL, tszFileName);
706706
SystemApi_File_GetFileAttr((*ppptszListFile)[i], &st_FileAttr);
@@ -714,7 +714,7 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropfind(XCHAR* ptszMsgBu
714714
//文件
715715
XCHAR tszSourceStr[128] = {};
716716
XCHAR tszDestStr[128] = {};
717-
XCHAR tszFileAlis[MAX_PATH] = {};
717+
XCHAR tszFileAlis[XPATH_MAX] = {};
718718
_tcsxcpy(tszFileAlis, (*ppptszListFile)[i] + 1);
719719

720720
APIHelp_Api_UrlStr(tszSourceStr, (*ppptszListFile)[i]);

0 commit comments

Comments
 (0)