Skip to content

Commit 9f6b646

Browse files
xengine-qytxengine-qyt
committed
update:match xengine v9.x
1 parent 63f60a0 commit 9f6b646

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+382
-369
lines changed

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_CDKey/Authorize_CDKey.cpp‎

Lines changed: 129 additions & 129 deletions
Large diffs are not rendered by default.

‎XEngine_Source/AuthorizeModule_CDKey/Authorize_Serial/Authorize_Serial.cpp‎

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

8585
for (int i = 0; i < nCardNumber; i++)
@@ -225,7 +225,7 @@ bool CAuthorize_Serial::Authorize_Serial_Create(XCHAR*** ppptszSerialNumber, LPC
225225
Authorize_dwErrorCode = ERROR_AUTHORIZE_MODULE_CDKEY_PARAMENT;
226226
return false;
227227
}
228-
BaseLib_OperatorMemory_Malloc((XPPPMEM)ppptszSerialNumber, nCardNumber, MAX_PATH);
228+
BaseLib_Memory_Malloc((XPPPMEM)ppptszSerialNumber, nCardNumber, MAX_PATH);
229229
srand((unsigned int)time(NULL)); //取随机因子
230230

231231
for (int i = 0; i < nCardNumber; i++)
@@ -464,7 +464,7 @@ bool CAuthorize_Serial::Authorize_Serial_Random(XCHAR *ptszFillBuffer)
464464
{
465465
Authorize_IsErrorOccur = false;
466466

467-
BaseLib_OperatorHandle_CreateStr(ptszFillBuffer, 5, 0, 1);
467+
BaseLib_Handle_CreateStr(ptszFillBuffer, 5, 0, 1);
468468
return true;
469469
}
470470
/********************************************************************
@@ -484,7 +484,7 @@ bool CAuthorize_Serial::Authorize_Serial_RandomWord(XCHAR *ptszFillBuffer)
484484
{
485485
Authorize_IsErrorOccur = false;
486486

487-
BaseLib_OperatorHandle_CreateStr(ptszFillBuffer, 5, 2, 1);
487+
BaseLib_Handle_CreateStr(ptszFillBuffer, 5, 2, 1);
488488
return true;
489489
}
490490
/********************************************************************
@@ -504,6 +504,6 @@ bool CAuthorize_Serial::Authorize_Serial_RandomNumber(XCHAR *ptszFilleBuffer)
504504
{
505505
Authorize_IsErrorOccur = false;
506506

507-
BaseLib_OperatorHandle_CreateStr(ptszFilleBuffer, 5, 1);
507+
BaseLib_Handle_CreateStr(ptszFilleBuffer, 5, 1);
508508
return true;
509509
}

‎XEngine_Source/AuthorizeModule_CDKey/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LIBFLAG =
77
RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./
10-
LIB = -lXEngine_BaseLib
10+
LIB = -lXEngine_BaseLib -lXEngine_SystemConfig
1111
LIBEX =
1212
LOADSO =
1313
OBJECTS = Authorize_Serial.o Authorize_CDKey.o pch.o

‎XEngine_Source/AuthorizeModule_CDKey/pch.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ using namespace std;
2929
#include <XEngine_Include/XEngine_ProtocolHdr.h>
3030
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
3131
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
32+
#include <XEngine_Include/XEngine_SystemSdk/SystemConfig_Define.h>
33+
#include <XEngine_Include/XEngine_SystemSdk/SystemConfig_Error.h>
3234
#include "../XAuth_Protocol.h"
3335
#include "CDKey_Define.h"
3436
#include "CDKey_Error.h"
@@ -50,4 +52,5 @@ typedef std::string xstring;
5052

5153
#ifdef _MSC_BUILD
5254
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
55+
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemConfig.lib")
5356
#endif

‎XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ bool CAuthClient_Connector::AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR
186186
XCHAR tszCodecBuffer[2048] = {};
187187

188188
st_ProtocolHdr.wCrypto = ENUM_XENGINE_PROTOCOLHDR_CRYPTO_TYPE_XCRYPT;
189-
OPenSsl_XCrypto_Encoder((LPCXSTR)&st_AuthUser, (int*)&st_ProtocolHdr.unPacketSize, (XBYTE*)tszCodecBuffer, tszPassStr);
189+
Cryption_XCrypto_Encoder((LPCXSTR)&st_AuthUser, (int*)&st_ProtocolHdr.unPacketSize, (XBYTE*)tszCodecBuffer, tszPassStr);
190190

191191
memcpy(tszMsgBuffer, &st_ProtocolHdr, sizeof(XENGINE_PROTOCOLHDR));
192192
memcpy(tszMsgBuffer + sizeof(XENGINE_PROTOCOLHDR), tszCodecBuffer, st_ProtocolHdr.unPacketSize);
@@ -269,7 +269,7 @@ XHTHREAD CALLBACK CAuthClient_Connector::AuthClient_Connector_Thread(XPVOID lPar
269269
if (nMsgLen > 0 && _tcsxlen(pClass_This->tszPassStr) > 0)
270270
{
271271
//只有有后续数据的情况才需要解密
272-
OPenSsl_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszMsgBuffer, pClass_This->tszPassStr);
272+
Cryption_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszMsgBuffer, pClass_This->tszPassStr);
273273
}
274274
else
275275
{

‎XEngine_Source/AuthorizeModule_Client/AuthClient_HTTPVer/AuthClient_HTTPVer.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_TryRequest(LPCXSTR lpszURLAddr, LPC
7474
XCHAR tszDECodec[2048] = {};
7575

7676
nMsgLen = st_JsonRoot.toStyledString().length();
77-
OPenSsl_XCrypto_Encoder(st_JsonRoot.toStyledString().c_str(), &nMsgLen, (XBYTE*)tszENCodec, lpszPass);
77+
Cryption_XCrypto_Encoder(st_JsonRoot.toStyledString().c_str(), &nMsgLen, (XBYTE*)tszENCodec, lpszPass);
7878
APIClient_Http_Request(_X("POST"), lpszURLAddr, tszENCodec, &nHTTPCode, &ptszMsgBuffer, &nMsgLen);
7979

80-
OPenSsl_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDECodec, lpszPass);
80+
Cryption_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDECodec, lpszPass);
8181
st_JsonRoot.clear();
8282
st_JsonObject.clear();
8383
//解析回复
@@ -86,7 +86,7 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_TryRequest(LPCXSTR lpszURLAddr, LPC
8686
{
8787
AuthClient_IsErrorOccur = true;
8888
AuthClient_dwErrorCode = ERROR_AUTHORIZE_MODULE_HTTPVER_PARSE;
89-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
89+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
9090
return false;
9191
}
9292
}
@@ -101,7 +101,7 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_TryRequest(LPCXSTR lpszURLAddr, LPC
101101
{
102102
AuthClient_IsErrorOccur = true;
103103
AuthClient_dwErrorCode = ERROR_AUTHORIZE_MODULE_HTTPVER_PARSE;
104-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
104+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
105105
return false;
106106
}
107107
}
@@ -110,10 +110,10 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_TryRequest(LPCXSTR lpszURLAddr, LPC
110110
{
111111
AuthClient_IsErrorOccur = true;
112112
AuthClient_dwErrorCode = ERROR_AUTHORIZE_MODULE_HTTPVER_VERFAILED;
113-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
113+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
114114
return false;
115115
}
116-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
116+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
117117
#endif
118118
return true;
119119
}
@@ -173,14 +173,14 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_GetDCode(LPCXSTR lpszURLAddr, int*
173173
if (NULL != lpszPass)
174174
{
175175
XCHAR tszDECodec[2048] = {};
176-
OPenSsl_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDECodec, lpszPass);
176+
Cryption_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDECodec, lpszPass);
177177

178178
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_ReaderBuilder.newCharReader());
179179
if (!pSt_JsonReader->parse(tszDECodec, tszDECodec + nMsgLen, &st_JsonRoot, &st_JsonError))
180180
{
181181
AuthClient_IsErrorOccur = true;
182182
AuthClient_dwErrorCode = ERROR_AUTHORIZE_MODULE_HTTPVER_PARSE;
183-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
183+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
184184
return false;
185185
}
186186
}
@@ -192,7 +192,7 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_GetDCode(LPCXSTR lpszURLAddr, int*
192192
{
193193
AuthClient_IsErrorOccur = true;
194194
AuthClient_dwErrorCode = ERROR_AUTHORIZE_MODULE_HTTPVER_PARSE;
195-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
195+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
196196
return false;
197197
}
198198
}
@@ -201,7 +201,7 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_GetDCode(LPCXSTR lpszURLAddr, int*
201201
{
202202
AuthClient_IsErrorOccur = true;
203203
AuthClient_dwErrorCode = ERROR_AUTHORIZE_MODULE_HTTPVER_VERFAILED;
204-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
204+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
205205
return false;
206206
}
207207

@@ -211,7 +211,7 @@ bool CAuthClient_HTTPVer::AuthClient_HTTPVer_GetDCode(LPCXSTR lpszURLAddr, int*
211211
{
212212
*pInt_Timeout = st_JsonRoot["nTimeout"].asInt();
213213
}
214-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
214+
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
215215
#endif
216216
return true;
217217
}

‎XEngine_Source/AuthorizeModule_Client/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
1010
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
11-
LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lXClient_Socket -lXClient_APIHelp -lXEngine_SystemApi
11+
LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_Cryption -lXClient_Socket -lXClient_APIHelp -lXEngine_SystemApi
1212
LIBEX =
1313
OBJECTS = AuthClient_Connector.o AuthClient_HTTPVer.o pch.o
1414

‎XEngine_Source/AuthorizeModule_Client/pch.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2727
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2828
#if (1 == _XAUTH_BUILD_SWITCH_CLIENT_TCP)
29-
#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
30-
#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
29+
#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
30+
#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
3131
#include <XEngine_Include/XEngine_Client/XClient_Define.h>
3232
#include <XEngine_Include/XEngine_Client/XClient_Error.h>
3333
#include "../XAuth_Protocol.h"
@@ -58,7 +58,7 @@ extern XLONG AuthClient_dwErrorCode;
5858

5959
#ifdef _MSC_BUILD
6060
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
61-
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
61+
#pragma comment(lib,"XEngine_Core/XEngine_Cryption")
6262
#pragma comment(lib,"XEngine_Client/XClient_Socket")
6363
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
6464
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")

‎XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ bool CDBModule_MySQL::DBModule_MySQL_UserList(AUTHREG_USERTABLE*** pppSt_UserInf
501501
return false;
502502
}
503503
*pInt_ListCount = (int)nRow;
504-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_UserInfo, (int)nRow, sizeof(AUTHREG_USERTABLE));
504+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_UserInfo, (int)nRow, sizeof(AUTHREG_USERTABLE));
505505

506506
for (__int64u i = 0; i < nRow; i++)
507507
{
@@ -772,7 +772,7 @@ bool CDBModule_MySQL::DBModule_MySQL_SerialQueryAll(AUTHREG_SERIALTABLE*** pppSt
772772
SQLPacket_dwErrorCode = ERROR_AUTHORIZE_MODULE_DATABASE_NONE;
773773
return false;
774774
}
775-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_SerialTable, (int)nRow, sizeof(AUTHREG_SERIALTABLE));
775+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_SerialTable, (int)nRow, sizeof(AUTHREG_SERIALTABLE));
776776

777777
*pInt_ListCount = (int)nRow;
778778

@@ -1195,7 +1195,7 @@ bool CDBModule_MySQL::DBModule_MySQL_TryList(AUTHREG_TEMPVER*** pppSt_AuthVer, i
11951195
SQLPacket_dwErrorCode = DataBase_GetLastError();
11961196
return false;
11971197
}
1198-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_AuthVer, (int)nRow, sizeof(AUTHREG_TEMPVER));
1198+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_AuthVer, (int)nRow, sizeof(AUTHREG_TEMPVER));
11991199

12001200
//轮训所有内容
12011201
for (__int64u i = 0; i < nRow; i++)
@@ -1454,8 +1454,8 @@ bool CDBModule_MySQL::DBModule_MySQL_BannedList(AUTHREG_BANNED*** pppSt_BannedUs
14541454
//导出
14551455
*pInt_AddrCount = stl_ListAddr.size();
14561456
*pInt_UserCount = stl_ListUser.size();
1457-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_BannedAddr, stl_ListAddr.size(), sizeof(AUTHREG_BANNED));
1458-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_BannedUser, stl_ListUser.size(), sizeof(AUTHREG_BANNED));
1457+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_BannedAddr, stl_ListAddr.size(), sizeof(AUTHREG_BANNED));
1458+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_BannedUser, stl_ListUser.size(), sizeof(AUTHREG_BANNED));
14591459

14601460
list<AUTHREG_BANNED>::const_iterator stl_ListIterator = stl_ListAddr.begin();
14611461
for (int i = 0; stl_ListIterator != stl_ListAddr.end(); stl_ListIterator++, i++)
@@ -1553,8 +1553,8 @@ bool CDBModule_MySQL::DBModule_MySQL_BannedExist(AUTHREG_BANNED* pSt_Banned)
15531553
__int64x nTimer = 0;
15541554
XCHAR tszTimeEnd[128];
15551555
memset(tszTimeEnd, '\0', sizeof(tszTimeEnd));
1556-
BaseLib_OperatorTime_TimeToStr(tszTimeEnd);
1557-
BaseLib_OperatorTimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszTimeEnd, &nTimer, 3);
1556+
BaseLib_Time_TimeToStr(tszTimeEnd);
1557+
BaseLib_TimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszTimeEnd, &nTimer, 3);
15581558
//如果没有超过禁用时间 直接返回 说明存在黑名单 不在执行判断IP地址
15591559
if (nTimer < 0)
15601560
{
@@ -1630,8 +1630,8 @@ bool CDBModule_MySQL::DBModule_MySQL_BannedExist(AUTHREG_BANNED* pSt_Banned)
16301630
__int64x nTimer = 0;
16311631
XCHAR tszStrTime[128];
16321632
memset(tszStrTime, '\0', sizeof(tszStrTime));
1633-
BaseLib_OperatorTime_TimeToStr(tszStrTime);
1634-
BaseLib_OperatorTimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszStrTime, &nTimer, 3);
1633+
BaseLib_Time_TimeToStr(tszStrTime);
1634+
BaseLib_TimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszStrTime, &nTimer, 3);
16351635
if (nTimer < 0)
16361636
{
16371637
SQLPacket_IsErrorOccur = true;
@@ -1807,7 +1807,7 @@ bool CDBModule_MySQL::DBModule_MySQL_AnnouncementList(AUTHREG_ANNOUNCEMENT*** pp
18071807
{
18081808
return true;
18091809
}
1810-
BaseLib_OperatorMemory_Malloc((XPPPMEM)ppppSt_Announcement, (int)nRow, sizeof(AUTHREG_ANNOUNCEMENT));
1810+
BaseLib_Memory_Malloc((XPPPMEM)ppppSt_Announcement, (int)nRow, sizeof(AUTHREG_ANNOUNCEMENT));
18111811

18121812
//轮训所有内容
18131813
for (__int64u i = 0; i < nRow; i++)

‎XEngine_Source/AuthorizeModule_Database/DBModule_SQLite/DBModule_SQLite.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ bool CDBModule_SQLite::DBModule_SQLite_UserList(AUTHREG_USERTABLE*** pppSt_UserI
455455
return false;
456456
}
457457
*pInt_ListCount = nRow;
458-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_UserInfo, nRow, sizeof(AUTHREG_USERTABLE));
458+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_UserInfo, nRow, sizeof(AUTHREG_USERTABLE));
459459
//ID
460460
int nFliedValue = nColumn;
461461
for (int i = 0; i < nRow; i++)
@@ -716,7 +716,7 @@ bool CDBModule_SQLite::DBModule_SQLite_SerialQueryAll(AUTHREG_SERIALTABLE*** ppp
716716
SQLPacket_dwErrorCode = ERROR_AUTHORIZE_MODULE_DATABASE_NONE;
717717
return false;
718718
}
719-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_SerialTable, nRow, sizeof(AUTHREG_SERIALTABLE));
719+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_SerialTable, nRow, sizeof(AUTHREG_SERIALTABLE));
720720

721721
*pInt_ListCount = nRow;
722722
int nFliedValue = nColumn;
@@ -1105,7 +1105,7 @@ bool CDBModule_SQLite::DBModule_SQLite_TryList(AUTHREG_TEMPVER*** pppSt_AuthVer,
11051105
SQLPacket_dwErrorCode = DataBase_GetLastError();
11061106
return false;
11071107
}
1108-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_AuthVer, nRow, sizeof(AUTHREG_TEMPVER));
1108+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_AuthVer, nRow, sizeof(AUTHREG_TEMPVER));
11091109
int nFliedValue = nColumn;
11101110
//轮训所有内容
11111111
for (int i = 0; i < nRow; i++)
@@ -1347,8 +1347,8 @@ bool CDBModule_SQLite::DBModule_SQLite_BannedList(AUTHREG_BANNED*** pppSt_Banned
13471347
//导出
13481348
*pInt_AddrCount = stl_ListAddr.size();
13491349
*pInt_UserCount = stl_ListUser.size();
1350-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_BannedAddr, stl_ListAddr.size(), sizeof(AUTHREG_BANNED));
1351-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_BannedUser, stl_ListUser.size(), sizeof(AUTHREG_BANNED));
1350+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_BannedAddr, stl_ListAddr.size(), sizeof(AUTHREG_BANNED));
1351+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_BannedUser, stl_ListUser.size(), sizeof(AUTHREG_BANNED));
13521352

13531353
list<AUTHREG_BANNED>::const_iterator stl_ListIterator = stl_ListAddr.begin();
13541354
for (int i = 0; stl_ListIterator != stl_ListAddr.end(); stl_ListIterator++, i++)
@@ -1430,8 +1430,8 @@ bool CDBModule_SQLite::DBModule_SQLite_BannedExist(AUTHREG_BANNED* pSt_Banned)
14301430
XCHAR tszStrTime[128];
14311431
memset(tszStrTime, '\0', sizeof(tszStrTime));
14321432

1433-
BaseLib_OperatorTime_TimeToStr(tszStrTime);
1434-
BaseLib_OperatorTimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszStrTime, &nTimer, 3);
1433+
BaseLib_Time_TimeToStr(tszStrTime);
1434+
BaseLib_TimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszStrTime, &nTimer, 3);
14351435
if (nTimer < 0)
14361436
{
14371437
SQLPacket_IsErrorOccur = true;
@@ -1491,8 +1491,8 @@ bool CDBModule_SQLite::DBModule_SQLite_BannedExist(AUTHREG_BANNED* pSt_Banned)
14911491
XCHAR tszStrTime[128];
14921492
memset(tszStrTime, '\0', sizeof(tszStrTime));
14931493

1494-
BaseLib_OperatorTime_TimeToStr(tszStrTime);
1495-
BaseLib_OperatorTimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszStrTime, &nTimer, 3);
1494+
BaseLib_Time_TimeToStr(tszStrTime);
1495+
BaseLib_TimeSpan_GetForStr(pSt_Banned->tszLeftTime, tszStrTime, &nTimer, 3);
14961496
if (nTimer < 0)
14971497
{
14981498
SQLPacket_IsErrorOccur = true;
@@ -1669,7 +1669,7 @@ bool CDBModule_SQLite::DBModule_SQLite_AnnouncementList(AUTHREG_ANNOUNCEMENT***
16691669
return true;
16701670
}
16711671

1672-
BaseLib_OperatorMemory_Malloc((XPPPMEM)ppppSt_Announcement, nRow, sizeof(AUTHREG_ANNOUNCEMENT));
1672+
BaseLib_Memory_Malloc((XPPPMEM)ppppSt_Announcement, nRow, sizeof(AUTHREG_ANNOUNCEMENT));
16731673

16741674
int nFliedValue = nColumn;
16751675
//轮训所有内容

0 commit comments

Comments
 (0)