Skip to content

Commit 38cdeef

Browse files
xengine-qytxengine-qyt
committed
update:XEngine V9.x supported
1 parent 9db2a00 commit 38cdeef

File tree

39 files changed

+176
-155
lines changed

39 files changed

+176
-155
lines changed

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_IDCard/ModuleDatabase_IDCard.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ bool CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryByAddr(XENGINE_IDREGION*
139139
#ifdef _MSC_BUILD
140140
XCHAR tszUTFBuffer[1024] = {};
141141
int nULen = _tcsxlen(tszSQLStatement);
142-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFBuffer, &nULen);
142+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFBuffer, &nULen);
143143
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFBuffer, &nLine, &nRow))
144144
#else
145145
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
@@ -167,7 +167,7 @@ bool CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryByAddr(XENGINE_IDREGION*
167167
#ifdef _MSC_BUILD
168168
XCHAR tszUTFBuffer[1024] = {};
169169
int nULen = _tcsxlen(tszSQLStatement);
170-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFBuffer, &nULen);
170+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFBuffer, &nULen);
171171
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFBuffer, &nLine, &nRow))
172172
#else
173173
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
@@ -196,7 +196,7 @@ bool CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryByAddr(XENGINE_IDREGION*
196196
#ifdef _MSC_BUILD
197197
XCHAR tszUTFBuffer[1024] = {};
198198
int nULen = _tcsxlen(tszSQLStatement);
199-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFBuffer, &nULen);
199+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFBuffer, &nULen);
200200
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFBuffer, &nLine, &nRow))
201201
#else
202202
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Machine/ModuleDatabase_Machine.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_Insert(XENGINE_MACHINEINFO*
9999
#ifdef _MSC_BUILD
100100
XCHAR tszUTFStr[4096] = {};
101101
int nSLen = _tcsxlen(tszSQLStatement);
102-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
102+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
103103
if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFStr))
104104
#else
105105
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -315,7 +315,7 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_List(XENGINE_MACHINEINFO***
315315
return false;
316316
}
317317
*pInt_ListCount = (int)nllLine;
318-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_MachineInfo, *pInt_ListCount, sizeof(XENGINE_MACHINEINFO));
318+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_MachineInfo, *pInt_ListCount, sizeof(XENGINE_MACHINEINFO));
319319
for (__int64u i = 0; i < nllLine; i++)
320320
{
321321
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_OilInfo/ModuleDatabase_OilInfo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ bool CModuleDatabase_OilInfo::ModuleDatabase_OilInfo_Query(XENGINE_OILINFO* pSt_
104104
#ifdef _MSC_BUILD
105105
XCHAR tszUTFStr[1024] = {};
106106
int nSLen = _tcsxlen(tszSQLStatement);
107-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
107+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
108108
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFStr, &nllLine, &nllRow))
109109
#else
110110
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nllLine, &nllRow))
@@ -195,7 +195,7 @@ bool CModuleDatabase_OilInfo::ModuleDatabase_OilInfo_UPDate(XENGINE_OILINFO* pSt
195195
#ifdef _MSC_BUILD
196196
XCHAR tszUTFStr[1024] = {};
197197
int nSLen = _tcsxlen(tszSQLStatement);
198-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
198+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
199199
if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFStr))
200200
#else
201201
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_ShortLink/ModuleDatabase_ShortLink.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ bool CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_List(XENGINE_SHORTLINK*
267267
return false;
268268
}
269269
*pInt_ListCount = (int)nllLine;
270-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_SLinkInfo, *pInt_ListCount, sizeof(XENGINE_SHORTLINK));
270+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_SLinkInfo, *pInt_ListCount, sizeof(XENGINE_SHORTLINK));
271271

272272
for (__int64u i = 0; i < nllLine; i++)
273273
{

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_WordFilter/ModuleDatabase_WordFilter.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ bool CModuleDatabase_WordFilter::ModuleDatabase_WordFilter_Query(XENGINE_WORDFIL
103103
#ifdef _MSC_BUILD
104104
XCHAR tszUTFStr[1024] = {};
105105
int nSLen = _tcsxlen(tszSQLStatement);
106-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
106+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
107107
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFStr, &nLine, &nRow))
108108
#else
109109
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
@@ -158,7 +158,7 @@ bool CModuleDatabase_WordFilter::ModuleDatabase_WordFilter_Insert(XENGINE_WORDFI
158158
#ifdef _MSC_BUILD
159159
int nRet = _tcsxlen(tszSQLStatement);
160160
XCHAR tszUTFStr[1024] = {};
161-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nRet);
161+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nRet);
162162
if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFStr))
163163
#else
164164
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -200,7 +200,7 @@ bool CModuleDatabase_WordFilter::ModuleDatabase_WordFilter_Delete(XENGINE_WORDFI
200200
#ifdef _MSC_BUILD
201201
XCHAR tszUTFStr[1024] = {};
202202
int nSLen = _tcsxlen(tszSQLStatement);
203-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
203+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
204204
if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFStr))
205205
#else
206206
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -256,7 +256,7 @@ bool CModuleDatabase_WordFilter::ModuleDatabase_WordFilter_List(XENGINE_WORDFILT
256256
return false;
257257
}
258258
*pInt_ListCount = (int)nLine;
259-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_WordFilter, *pInt_ListCount, sizeof(XENGINE_WORDFILTER));
259+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_WordFilter, *pInt_ListCount, sizeof(XENGINE_WORDFILTER));
260260

261261
for (__int64u i = 0; i < nLine; i++)
262262
{

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_XLog/ModuleDatabase_XLog.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ bool CModuleDatabase_XLog::ModuleDatabase_XLog_Create(LPCXSTR lpszTableName)
109109
#ifdef _MSC_BUILD
110110
int nUTFLen = 0;
111111
XCHAR tszUTFQuery[4096] = {};
112-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFQuery, &nUTFLen);
112+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFQuery, &nUTFLen);
113113
if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFQuery))
114114
#else
115115
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -152,7 +152,7 @@ bool CModuleDatabase_XLog::ModuleDatabase_XLog_Insert(XENGINE_XLOGINFO* pSt_XLog
152152
#ifdef _MSC_BUILD
153153
XCHAR tszUTFStr[10240] = {};
154154
int nSLen = _tcsxlen(tszSQLStatement);
155-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
155+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
156156
if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFStr))
157157
#else
158158
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -220,7 +220,7 @@ bool CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_X
220220
#ifdef _MSC_BUILD
221221
XCHAR tszUTFStr[1024] = {};
222222
int nSLen = _tcsxlen(tszSQLStatement);
223-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
223+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
224224
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFStr, &nllLine, &nllRow))
225225
#else
226226
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nllLine, &nllRow))
@@ -237,7 +237,7 @@ bool CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_X
237237
return false;
238238
}
239239
*pInt_ListCount = (int)nllLine;
240-
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_XLogInfo, (int)nllLine, sizeof(XENGINE_XLOGINFO));
240+
BaseLib_Memory_Malloc((XPPPMEM)pppSt_XLogInfo, (int)nllLine, sizeof(XENGINE_XLOGINFO));
241241
for (__int64u i = 0; i < nllLine; i++)
242242
{
243243
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
@@ -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_OperatorMemory_Malloc((XPPPMEM)ppptszList, (int)nllLine, MAX_PATH);
353+
BaseLib_Memory_Malloc((XPPPMEM)ppptszList, (int)nllLine, MAX_PATH);
354354
for (__int64u i = 0; i < nllLine; i++)
355355
{
356356
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_ZIPCode/ModuleDatabase_ZIPCode.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ bool CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryName(XENGINE_ZIPINFO*
192192
#ifdef _MSC_BUILD
193193
XCHAR tszUTFStr[1024] = {};
194194
int nSLen = _tcsxlen(tszSQLStatement);
195-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
195+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
196196
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszUTFStr, &nLine, &nRow))
197197
#else
198198
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
@@ -326,7 +326,7 @@ bool CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryParentByName(LPCXSTR l
326326
#ifdef _MSC_BUILD
327327
XCHAR tszUTFStr[1024] = {};
328328
int nSLen = _tcsxlen(tszSQLStatement);
329-
BaseLib_OperatorCharset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
329+
BaseLib_Charset_AnsiToUTF(tszSQLStatement, tszUTFStr, &nSLen);
330330
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
331331
#else
332332
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))

‎XEngine_Source/XEngine_ModuleDatabase/XEngine_ModuleDatabase.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
85-
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
85+
<IncludePath>$(XEngine_Include);..\XEngine_ModuleDatabase;$(IncludePath)</IncludePath>
8686
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8787
</PropertyGroup>
8888
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Define.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ extern "C" bool ModuleHelp_P2PClient_Add(XENGINE_P2XP_PEERINFO * pSt_PeerInfo);
477477
返回值
478478
类型：逻辑型
479479
意思：是否成功
480-
备注：参数二需要调用基础库的BaseLib_OperatorMemory_Free函数进行内存释放
480+
备注：参数二需要调用基础库的BaseLib_Memory_Free函数进行内存释放
481481
*********************************************************************/
482482
extern "C" bool ModuleHelp_P2PClient_GetLan(XENGINE_P2XPPEER_PROTOCOL * pSt_P2PProtocol, XENGINE_P2XPPEER_PROTOCOL * **pppSt_P2XPClient, int* pInt_ListCount);
483483
/********************************************************************
@@ -501,7 +501,7 @@ extern "C" bool ModuleHelp_P2PClient_GetLan(XENGINE_P2XPPEER_PROTOCOL * pSt_P2PP
501501
返回值
502502
类型：逻辑型
503503
意思：是否成功
504-
备注：参数二需要调用基础库的BaseLib_OperatorMemory_Free函数进行内存释放
504+
备注：参数二需要调用基础库的BaseLib_Memory_Free函数进行内存释放
505505
*********************************************************************/
506506
extern "C" bool ModuleHelp_P2PClient_GetLList(LPCXSTR lpszPubAddr, XCHAR * **pppszP2XPClient, int* pInt_ListCount);
507507
/********************************************************************

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Locker/ModuleHelp_Locker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ bool CModuleHelp_Locker::ModuleHelp_Locker_Create(XNETHANDLE* pxhToken)
5353
}
5454
pSt_LockInfo->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_NOTUSED;
5555

56-
BaseLib_OperatorHandle_Create(pxhToken);
56+
BaseLib_Handle_Create(pxhToken);
5757

5858
st_Locker.lock();
5959
stl_MapLocker.insert(make_pair(*pxhToken, pSt_LockInfo));

0 commit comments

Comments
 (0)