Skip to content

Commit 8718fda

Browse files
xengine-qytxengine-qyt
committed
update:match xengine v9.20
1 parent aec1b43 commit 8718fda

File tree

35 files changed

+158
-158
lines changed

35 files changed

+158
-158
lines changed

‎XEngine_Apps/Authorize_APPClient/Authorize_APPClient.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ int AuthClient_Register()
131131
#ifdef _PASS_ENCRYPT
132132
XCHAR tszPassCodec[128] = {};
133133
int nPLen = _tcsxlen(lpszPass);
134-
XBYTE byMD5Buffer[MAX_PATH] = {};
134+
XBYTE byMD5Buffer[XPATH_MAX] = {};
135135
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
136136
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPassCodec);
137137
st_JsonUserInfo["tszUserPass"] = tszPassCodec;
@@ -275,7 +275,7 @@ int AuthClient_Login()
275275

276276
#ifdef _PASS_ENCRYPT
277277
int nPLen = _tcsxlen(st_AuthUser.tszUserPass);
278-
XBYTE byMD5Buffer[MAX_PATH] = {};
278+
XBYTE byMD5Buffer[XPATH_MAX] = {};
279279
Cryption_Api_Digest(st_AuthUser.tszUserPass, byMD5Buffer, &nPLen);
280280
memset(st_AuthUser.tszUserPass, '\0', sizeof(st_AuthUser.tszUserPass));
281281
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, st_AuthUser.tszUserPass);
@@ -322,7 +322,7 @@ int AuthClient_Login()
322322
}
323323
int AuthClient_Notice()
324324
{
325-
XCHAR tszURLStr[MAX_PATH] = {};
325+
XCHAR tszURLStr[XPATH_MAX] = {};
326326
_xstprintf(tszURLStr, _X("http://127.0.0.1:5302/api?function=notice&token=%lld"), xhToken);
327327

328328
int nMsgLen = 0;
@@ -379,7 +379,7 @@ int AuthClient_GetPass()
379379
#ifdef _PASS_ENCRYPT
380380
XCHAR tszPASSCodec[128] = {};
381381
int nPLen = _tcsxlen(lpszPass);
382-
XBYTE byMD5Buffer[MAX_PATH] = {};
382+
XBYTE byMD5Buffer[XPATH_MAX] = {};
383383
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
384384
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPASSCodec);
385385
st_JsonObject["tszUserPass"] = tszPASSCodec;
@@ -423,15 +423,15 @@ int AuthClient_GetTime()
423423
{
424424
Json::Value st_JsonRoot;
425425
Json::Value st_JsonObject;
426-
XCHAR tszURLStr[MAX_PATH] = {};
426+
XCHAR tszURLStr[XPATH_MAX] = {};
427427
_xstprintf(tszURLStr, _X("http://127.0.0.1:5302/api?function=time&token=%lld"),xhToken);
428428

429429
st_JsonObject["tszUserName"] = lpszUser;
430430

431431
#ifdef _PASS_ENCRYPT
432432
XCHAR tszPASSCodec[128] = {};
433433
int nPLen = _tcsxlen(lpszPass);
434-
XBYTE byMD5Buffer[MAX_PATH] = {};
434+
XBYTE byMD5Buffer[XPATH_MAX] = {};
435435
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
436436
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPASSCodec);
437437
st_JsonObject["tszUserPass"] = tszPASSCodec;
@@ -475,7 +475,7 @@ int AuthClient_Delete()
475475
#ifdef _PASS_ENCRYPT
476476
XCHAR tszPASSCodec[128] = {};
477477
int nPLen = _tcsxlen(lpszPass);
478-
XBYTE byMD5Buffer[MAX_PATH] = {};
478+
XBYTE byMD5Buffer[XPATH_MAX] = {};
479479
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
480480
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPASSCodec);
481481
st_JsonObject["tszUserPass"] = tszPASSCodec;

‎XEngine_Apps/Authorize_APPLocal/Authorize_APPLocal.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
//WINDOWS支持VS2022 x86 debug 编译调试
3636
//g++ -std=c++17 -Wall -g Authorize_APPLocal.cpp -o Authorize_APPLocal.exe -I ../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Release -lXEngine_BaseLib -lXEngine_Cryption -lXEngine_SystemApi -lAuthorizeModule_CDKey -ljsoncpp -Wl,-rpath=../../XEngine_Release
3737

38-
XCHAR tszSerialStr[MAX_PATH] = {};
38+
XCHAR tszSerialStr[XPATH_MAX] = {};
3939
//1.创建CDKEY.或者由管理员创建.
4040
bool Authorize_APPLocal_Create(LPCXSTR lpszKeyFile, LPCXSTR lpszPasswd)
4141
{

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_CDKey/Authorize_CDKey.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,12 +1067,12 @@ bool CAuthorize_CDKey::Authorize_CDKey_WriteTime(LPCXSTR lpszFileKey, int nCount
10671067
Authorize_dwErrorCode = ERROR_AUTHORIZE_MODULE_CDKEY_OPENFILE;
10681068
return false;
10691069
}
1070-
XCHAR tszMsgBuffer[MAX_PATH];
1071-
memset(tszMsgBuffer, '\0', MAX_PATH);
1070+
XCHAR tszMsgBuffer[XPATH_MAX];
1071+
memset(tszMsgBuffer, '\0', XPATH_MAX);
10721072
//查找是否有时间列表字段
10731073
while (1)
10741074
{
1075-
if (NULL == fgets(tszMsgBuffer, MAX_PATH, pSt_File))
1075+
if (NULL == fgets(tszMsgBuffer, XPATH_MAX, pSt_File))
10761076
{
10771077
break;
10781078
}
@@ -1211,12 +1211,12 @@ bool CAuthorize_CDKey::Authorize_CDKey_ReadTime(LPCXSTR lpszFileKey, XCHAR*** pp
12111211
Authorize_dwErrorCode = ERROR_AUTHORIZE_MODULE_CDKEY_OPENFILE;
12121212
return false;
12131213
}
1214-
XCHAR tszMsgBuffer[MAX_PATH];
1214+
XCHAR tszMsgBuffer[XPATH_MAX];
12151215
//查找是否有时间列表字段
12161216
while (1)
12171217
{
12181218
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
1219-
if (NULL == fgets(tszMsgBuffer, MAX_PATH, pSt_File))
1219+
if (NULL == fgets(tszMsgBuffer, XPATH_MAX, pSt_File))
12201220
{
12211221
break;
12221222
}

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_Serial/Authorize_Serial.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ bool CAuthorize_Serial::Authorize_Serial_Creator(XCHAR*** ppptszSerialNumber, LP
7979
Authorize_dwErrorCode = ERROR_AUTHORIZE_MODULE_CDKEY_PARAMENT;
8080
return false;
8181
}
82-
BaseLib_Memory_Malloc((XPPPMEM)ppptszSerialNumber, nCardNumber, MAX_PATH);
82+
BaseLib_Memory_Malloc((XPPPMEM)ppptszSerialNumber, nCardNumber, XPATH_MAX);
8383
srand((unsigned int)time(NULL)); //取随机因子
8484

8585
for (int i = 0; i < nCardNumber; i++)
8686
{
87-
XCHAR tszSerialNumber[MAX_PATH];
88-
memset(tszSerialNumber, '\0', MAX_PATH);
87+
XCHAR tszSerialNumber[XPATH_MAX];
88+
memset(tszSerialNumber, '\0', XPATH_MAX);
8989
//检查生成类型
9090
switch (enSerialType)
9191
{
@@ -225,13 +225,13 @@ bool CAuthorize_Serial::Authorize_Serial_Create(XCHAR*** ppptszSerialNumber, LPC
225225
Authorize_dwErrorCode = ERROR_AUTHORIZE_MODULE_CDKEY_PARAMENT;
226226
return false;
227227
}
228-
BaseLib_Memory_Malloc((XPPPMEM)ppptszSerialNumber, nCardNumber, MAX_PATH);
228+
BaseLib_Memory_Malloc((XPPPMEM)ppptszSerialNumber, nCardNumber, XPATH_MAX);
229229
srand((unsigned int)time(NULL)); //取随机因子
230230

231231
for (int i = 0; i < nCardNumber; i++)
232232
{
233-
XCHAR tszSerialNumber[MAX_PATH];
234-
memset(tszSerialNumber, '\0', MAX_PATH);;
233+
XCHAR tszSerialNumber[XPATH_MAX];
234+
memset(tszSerialNumber, '\0', XPATH_MAX);;
235235

236236
_xstprintf(tszSerialNumber, _X("%s"), lpszUserHeader);
237237
if (!Authorize_Serial_Fill(tszSerialNumber, nFieldNumber))

‎XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ bool CAuthClient_Connector::AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR
183183
if (dwCryption > 0)
184184
{
185185
int nPLen = _tcsxlen(lpszPass);
186-
XBYTE byMD5Buffer[MAX_PATH] = {};
186+
XBYTE byMD5Buffer[XPATH_MAX] = {};
187187
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen, false, dwCryption);
188188
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, st_AuthUser.tszUserPass);
189189
}
@@ -293,7 +293,7 @@ bool CAuthClient_Connector::AuthClient_Connector_Heart(bool bEnable /* = true */
293293
//////////////////////////////////////////////////////////////////////////
294294
// 保护函数
295295
//////////////////////////////////////////////////////////////////////////
296-
XHTHREAD CALLBACK CAuthClient_Connector::AuthClient_Connector_Thread(XPVOID lParam)
296+
XHTHREAD XCALLBACK CAuthClient_Connector::AuthClient_Connector_Thread(XPVOID lParam)
297297
{
298298
CAuthClient_Connector* pClass_This = (CAuthClient_Connector*)lParam;
299299

‎XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CAuthClient_Connector
2929
bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
3030
bool AuthClient_Connector_Heart(bool bEnable = true);
3131
protected:
32-
static XHTHREAD CALLBACK AuthClient_Connector_Thread(XPVOID lParam);
32+
static XHTHREAD XCALLBACK AuthClient_Connector_Thread(XPVOID lParam);
3333
private:
3434
bool m_bRun = false;
3535
bool m_bLogin = false;

‎XEngine_Source/AuthorizeModule_Client/AuthClient_HTTPVer/AuthClient_HTTPVer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_TryRequest(LPCXSTR lpszURLAddr, LPC
5050
}
5151
#if (1 == _XAUTH_BUILD_SWITCH_CLIENT_HTTP)
5252
int nHTTPCode = 0;
53-
XCHAR tszJsonStr[MAX_PATH] = {};
53+
XCHAR tszJsonStr[XPATH_MAX] = {};
5454
Json::Value st_JsonRoot;
5555
Json::Value st_JsonObject;
5656
JSONCPP_STRING st_JsonError;

‎XEngine_Source/AuthorizeModule_Configure/Config_Define.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ typedef struct
4242
{
4343
struct
4444
{
45-
XCHAR tszKeyFile[MAX_PATH]; //本地CDKEY文件地址
46-
XCHAR tszKeyPass[MAX_PATH]; //本地CDKEY密码
45+
XCHAR tszKeyFile[XPATH_MAX]; //本地CDKEY文件地址
46+
XCHAR tszKeyPass[XPATH_MAX]; //本地CDKEY密码
4747
}st_XCDKey;
4848
struct
4949
{
@@ -66,9 +66,9 @@ typedef struct
6666
int nMultiMode; //多端登录模式,0按照平台(PC,WEB,PAD,PHONE 4种),1按照类型(每种都可以),2无限制
6767
struct
6868
{
69-
XCHAR tszPassLogin[MAX_PATH]; //三方认证登录验证
70-
XCHAR tszPassLogout[MAX_PATH]; //三方认证登出通知
71-
XCHAR tszPassTimeout[MAX_PATH]; //三方认证超时通知
69+
XCHAR tszPassLogin[XPATH_MAX]; //三方认证登录验证
70+
XCHAR tszPassLogout[XPATH_MAX]; //三方认证登出通知
71+
XCHAR tszPassTimeout[XPATH_MAX]; //三方认证超时通知
7272
}st_PassUrl;
7373
//多端登录支持的计时方式
7474
struct
@@ -97,12 +97,12 @@ typedef struct
9797
}st_MYSQL;
9898
struct
9999
{
100-
XCHAR tszSQLite[MAX_PATH]; //数据库文件位置
100+
XCHAR tszSQLite[XPATH_MAX]; //数据库文件位置
101101
}st_SQLite;
102102
}st_XSql;
103103
struct
104104
{
105-
XCHAR tszLogFile[MAX_PATH]; //日志文件
105+
XCHAR tszLogFile[XPATH_MAX]; //日志文件
106106
int nMaxSize; //最大大小
107107
int nMaxCount; //备份个数
108108
int nLogLeave; //日志级别
@@ -111,7 +111,7 @@ typedef struct
111111
struct
112112
{
113113
bool bEnable;
114-
XCHAR tszAPIUrl[MAX_PATH];
114+
XCHAR tszAPIUrl[XPATH_MAX];
115115
XCHAR tszServiceName[128];
116116
}st_XReport;
117117
struct

‎XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,8 @@ bool CDBModule_MySQL::DBModule_MySQL_SerialInsert(LPCXSTR lpszSerialNumber)
694694
}
695695
else if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM == enAuthSerialType)
696696
{
697-
XCHAR tszLeftTime[MAX_PATH];
698-
memset(tszLeftTime, '\0', MAX_PATH);
697+
XCHAR tszLeftTime[XPATH_MAX];
698+
memset(tszLeftTime, '\0', XPATH_MAX);
699699
_xstprintf(tszLeftTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), st_AuthTimer.wYear, st_AuthTimer.wMonth, st_AuthTimer.wDay, st_AuthTimer.wHour, st_AuthTimer.wMinute, st_AuthTimer.wSecond);
700700
_xstprintf(tszSQLStatement, _X("INSERT INTO `Authorize_Serial` values(NULL,'NOT','%s','%s','%d',0,NOW())"), lpszSerialNumber, tszLeftTime, enAuthSerialType);
701701
}

‎XEngine_Source/AuthorizeModule_Database/DBModule_SQLite/DBModule_SQLite.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,8 @@ bool CDBModule_SQLite::DBModule_SQLite_SerialInsert(LPCXSTR lpszSerialNumber)
645645
}
646646
else if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM == enAuthSerialType)
647647
{
648-
XCHAR tszLeftTime[MAX_PATH];
649-
memset(tszLeftTime, '\0', MAX_PATH);
648+
XCHAR tszLeftTime[XPATH_MAX];
649+
memset(tszLeftTime, '\0', XPATH_MAX);
650650
_xstprintf(tszLeftTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), st_AuthTimer.wYear, st_AuthTimer.wMonth, st_AuthTimer.wDay, st_AuthTimer.wHour, st_AuthTimer.wMinute, st_AuthTimer.wSecond);
651651
_xstprintf(tszSQLStatement, _X("INSERT INTO Authorize_Serial values(NULL,'NOT','%s','%s','%d',0,datetime('now', 'localtime'))"), lpszSerialNumber, tszLeftTime, enAuthSerialType);
652652
}

0 commit comments

Comments
 (0)