Skip to content

Commit ee641df

Browse files
xengine-qytxengine-qyt
committed
update:xengine v8.10
modify:charset to unicode
1 parent e14e584 commit ee641df

File tree

81 files changed

+1535
-1573
lines changed

Some content is hidden

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

81 files changed

+1535
-1573
lines changed

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp‎

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

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@
3030
<ConfigurationType>DynamicLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
3232
<PlatformToolset>v143</PlatformToolset>
33-
<CharacterSet>MultiByte</CharacterSet>
33+
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>MultiByte</CharacterSet>
40+
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v143</PlatformToolset>
46-
<CharacterSet>MultiByte</CharacterSet>
46+
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<CharacterSet>MultiByte</CharacterSet>
53+
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5656
<ImportGroup Label="ExtensionSettings">

‎XEngine_Source/XEngine_ModuleConfigure/dllmain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
1414
case DLL_PROCESS_DETACH:
1515
break;
1616
}
17-
return XTRUE;
17+
return TRUE;
1818
}
1919

‎XEngine_Source/XEngine_ModuleConfigure/pch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Purpose: 导出函数实现
1212
// History:
1313
*********************************************************************/
14-
XBOOL Config_IsErrorOccur = XFALSE;
14+
XBOOL Config_IsErrorOccur = FALSE;
1515
XLONG Config_dwErrorCode = 0;
1616
//////////////////////////////////////////////////////////////////////
1717
CModuleConfigure_Json m_ConfigJson;

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Bank/ModuleDatabase_Bank.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ CModuleDatabase_Bank::~CModuleDatabase_Bank()
3636
*********************************************************************/
3737
XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
3838
{
39-
DBModule_IsErrorOccur = XFALSE;
39+
DBModule_IsErrorOccur = FALSE;
4040

4141
if (NULL == pSt_DBConnector)
4242
{
43-
DBModule_IsErrorOccur = XTRUE;
43+
DBModule_IsErrorOccur = TRUE;
4444
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
45-
return XFALSE;
45+
return FALSE;
4646
}
4747
//连接数据库
48-
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APIInfo"));
48+
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APIInfo"));
4949
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
5050
{
51-
DBModule_IsErrorOccur = XTRUE;
51+
DBModule_IsErrorOccur = TRUE;
5252
DBModule_dwErrorCode = DataBase_GetLastError();
53-
return XFALSE;
53+
return FALSE;
5454
}
55-
return XTRUE;
55+
return TRUE;
5656
}
5757
/********************************************************************
5858
函数名称：ModuleDatabase_Bank_Destory
@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Init(DATABASE_MYSQL_CONNECTINFO*
6464
*********************************************************************/
6565
XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Destory()
6666
{
67-
DBModule_IsErrorOccur = XFALSE;
67+
DBModule_IsErrorOccur = FALSE;
6868

6969
DataBase_MySQL_Close(xhDBSQL);
70-
return XTRUE;
70+
return TRUE;
7171
}
7272
/********************************************************************
7373
函数名称：ModuleDatabase_Bank_Query
@@ -84,13 +84,13 @@ XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Destory()
8484
*********************************************************************/
8585
XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Query(XENGINE_BANKINFO* pSt_BankInfo)
8686
{
87-
DBModule_IsErrorOccur = XFALSE;
87+
DBModule_IsErrorOccur = FALSE;
8888

8989
if (NULL == pSt_BankInfo)
9090
{
91-
DBModule_IsErrorOccur = XTRUE;
91+
DBModule_IsErrorOccur = TRUE;
9292
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
93-
return XFALSE;
93+
return FALSE;
9494
}
9595
//查询
9696
__int64u nLine = 0;
@@ -99,22 +99,22 @@ XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Query(XENGINE_BANKINFO* pSt_Bank
9999
XCHAR tszSQLStatement[1024];
100100

101101
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
102-
_stprintf(tszSQLStatement, _T("SELECT * FROM `BankList` WHERE tszBankAbridge = '%s'"), pSt_BankInfo->tszBankAbridge);
102+
_xstprintf(tszSQLStatement, _X("SELECT * FROM `BankList` WHERE tszBankAbridge = '%s'"), pSt_BankInfo->tszBankAbridge);
103103
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
104104
{
105-
DBModule_IsErrorOccur = XTRUE;
105+
DBModule_IsErrorOccur = TRUE;
106106
DBModule_dwErrorCode = DataBase_GetLastError();
107-
return XFALSE;
107+
return FALSE;
108108
}
109109
if (nLine <= 0)
110110
{
111-
DBModule_IsErrorOccur = XTRUE;
111+
DBModule_IsErrorOccur = TRUE;
112112
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
113-
return XFALSE;
113+
return FALSE;
114114
}
115115
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
116-
_tcscpy(pSt_BankInfo->tszBankName, pptszResult[2]);
116+
_tcsxcpy(pSt_BankInfo->tszBankName, pptszResult[2]);
117117

118118
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
119-
return XTRUE;
119+
return TRUE;
120120
}

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_IDCard/ModuleDatabase_IDCard.cpp‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ CModuleDatabase_IDCard::~CModuleDatabase_IDCard()
3636
*********************************************************************/
3737
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
3838
{
39-
DBModule_IsErrorOccur = XFALSE;
39+
DBModule_IsErrorOccur = FALSE;
4040

4141
if (NULL == pSt_DBConnector)
4242
{
43-
DBModule_IsErrorOccur = XTRUE;
43+
DBModule_IsErrorOccur = TRUE;
4444
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
45-
return XFALSE;
45+
return FALSE;
4646
}
4747
//连接数据库
48-
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APIInfo"));
48+
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APIInfo"));
4949
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
5050
{
51-
DBModule_IsErrorOccur = XTRUE;
51+
DBModule_IsErrorOccur = TRUE;
5252
DBModule_dwErrorCode = DataBase_GetLastError();
53-
return XFALSE;
53+
return FALSE;
5454
}
55-
return XTRUE;
55+
return TRUE;
5656
}
5757
/********************************************************************
5858
函数名称：ModuleDatabase_IDCard_Destory
@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Init(DATABASE_MYSQL_CONNECTI
6464
*********************************************************************/
6565
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Destory()
6666
{
67-
DBModule_IsErrorOccur = XFALSE;
67+
DBModule_IsErrorOccur = FALSE;
6868

6969
DataBase_MySQL_Close(xhDBSQL);
70-
return XTRUE;
70+
return TRUE;
7171
}
7272
/********************************************************************
7373
函数名称：ModuleDatabase_IDCard_QueryRegion
@@ -89,12 +89,12 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Destory()
8989
*********************************************************************/
9090
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryRegion(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
9191
{
92-
DBModule_IsErrorOccur = XFALSE;
92+
DBModule_IsErrorOccur = FALSE;
9393

9494
ModuleDatabase_IDCard_QueryProvincer(pSt_IDRegion, pSt_IDInfo);
9595
ModuleDatabase_IDCard_QueryCity(pSt_IDRegion, pSt_IDInfo);
9696
ModuleDatabase_IDCard_QueryCounty(pSt_IDRegion, pSt_IDInfo);
97-
return XTRUE;
97+
return TRUE;
9898
}
9999
/********************************************************************
100100
函数名称：ModuleDatabase_IDCard_QueryProvincer
@@ -116,13 +116,13 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryRegion(XENGINE_IDREGION
116116
*********************************************************************/
117117
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryProvincer(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
118118
{
119-
DBModule_IsErrorOccur = XFALSE;
119+
DBModule_IsErrorOccur = FALSE;
120120

121121
if ((NULL == pSt_IDRegion) || (NULL == pSt_IDInfo))
122122
{
123-
DBModule_IsErrorOccur = XTRUE;
123+
DBModule_IsErrorOccur = TRUE;
124124
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
125-
return XFALSE;
125+
return FALSE;
126126
}
127127
//查询
128128
__int64u nLine = 0;
@@ -131,24 +131,24 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryProvincer(XENGINE_IDREG
131131
XCHAR tszSQLStatement[1024];
132132

133133
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
134-
_stprintf(tszSQLStatement, _T("SELECT * FROM `RegionID` WHERE code = '%02d0000'"), pSt_IDInfo->nIDProvince);
134+
_xstprintf(tszSQLStatement, _X("SELECT * FROM `RegionID` WHERE code = '%02d0000'"), pSt_IDInfo->nIDProvince);
135135
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
136136
{
137-
DBModule_IsErrorOccur = XTRUE;
137+
DBModule_IsErrorOccur = TRUE;
138138
DBModule_dwErrorCode = DataBase_GetLastError();
139-
return XFALSE;
139+
return FALSE;
140140
}
141141
if (nLine <= 0)
142142
{
143-
DBModule_IsErrorOccur = XTRUE;
143+
DBModule_IsErrorOccur = TRUE;
144144
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
145-
return XFALSE;
145+
return FALSE;
146146
}
147147
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
148-
_tcscpy(pSt_IDRegion->tszProvincer, pptszResult[1]);
148+
_tcsxcpy(pSt_IDRegion->tszProvincer, pptszResult[1]);
149149

150150
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
151-
return XTRUE;
151+
return TRUE;
152152
}
153153
/********************************************************************
154154
函数名称：ModuleDatabase_IDCard_QueryCity
@@ -170,13 +170,13 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryProvincer(XENGINE_IDREG
170170
*********************************************************************/
171171
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCity(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
172172
{
173-
DBModule_IsErrorOccur = XFALSE;
173+
DBModule_IsErrorOccur = FALSE;
174174

175175
if ((NULL == pSt_IDRegion) || (NULL == pSt_IDInfo))
176176
{
177-
DBModule_IsErrorOccur = XTRUE;
177+
DBModule_IsErrorOccur = TRUE;
178178
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
179-
return XFALSE;
179+
return FALSE;
180180
}
181181
//查询
182182
__int64u nLine = 0;
@@ -185,24 +185,24 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCity(XENGINE_IDREGION*
185185
XCHAR tszSQLStatement[1024];
186186

187187
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
188-
_stprintf(tszSQLStatement, _T("SELECT * FROM `RegionID` WHERE code = '%02d%02d00'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity);
188+
_xstprintf(tszSQLStatement, _X("SELECT * FROM `RegionID` WHERE code = '%02d%02d00'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity);
189189
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
190190
{
191-
DBModule_IsErrorOccur = XTRUE;
191+
DBModule_IsErrorOccur = TRUE;
192192
DBModule_dwErrorCode = DataBase_GetLastError();
193-
return XFALSE;
193+
return FALSE;
194194
}
195195
if (nLine <= 0)
196196
{
197-
DBModule_IsErrorOccur = XTRUE;
197+
DBModule_IsErrorOccur = TRUE;
198198
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
199-
return XFALSE;
199+
return FALSE;
200200
}
201201
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
202-
_tcscpy(pSt_IDRegion->tszCity, pptszResult[1]);
202+
_tcsxcpy(pSt_IDRegion->tszCity, pptszResult[1]);
203203

204204
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
205-
return XTRUE;
205+
return TRUE;
206206
}
207207
/********************************************************************
208208
函数名称：ModuleDatabase_IDCard_QueryCounty
@@ -224,13 +224,13 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCity(XENGINE_IDREGION*
224224
*********************************************************************/
225225
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCounty(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
226226
{
227-
DBModule_IsErrorOccur = XFALSE;
227+
DBModule_IsErrorOccur = FALSE;
228228

229229
if ((NULL == pSt_IDRegion) || (NULL == pSt_IDInfo))
230230
{
231-
DBModule_IsErrorOccur = XTRUE;
231+
DBModule_IsErrorOccur = TRUE;
232232
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
233-
return XFALSE;
233+
return FALSE;
234234
}
235235
//查询
236236
__int64u nLine = 0;
@@ -239,22 +239,22 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCounty(XENGINE_IDREGION
239239
XCHAR tszSQLStatement[1024];
240240

241241
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
242-
_stprintf(tszSQLStatement, _T("SELECT * FROM `RegionID` WHERE code = '%02d%02d%02d'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity, pSt_IDInfo->nIDCounty);
242+
_xstprintf(tszSQLStatement, _X("SELECT * FROM `RegionID` WHERE code = '%02d%02d%02d'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity, pSt_IDInfo->nIDCounty);
243243
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
244244
{
245-
DBModule_IsErrorOccur = XTRUE;
245+
DBModule_IsErrorOccur = TRUE;
246246
DBModule_dwErrorCode = DataBase_GetLastError();
247-
return XFALSE;
247+
return FALSE;
248248
}
249249
if (nLine <= 0)
250250
{
251-
DBModule_IsErrorOccur = XTRUE;
251+
DBModule_IsErrorOccur = TRUE;
252252
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
253-
return XFALSE;
253+
return FALSE;
254254
}
255255
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
256-
_tcscpy(pSt_IDRegion->tszCounty, pptszResult[1]);
256+
_tcsxcpy(pSt_IDRegion->tszCounty, pptszResult[1]);
257257

258258
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
259-
return XTRUE;
259+
return TRUE;
260260
}

0 commit comments

Comments
 (0)