Skip to content

Commit a00254c

Browse files
xengine-qytxengine-qyt
committed
delete:build switch for verification module
1 parent 17ee0da commit a00254c

File tree

4 files changed

+59
-84
lines changed

4 files changed

+59
-84
lines changed

‎XEngine_Module/XEngine_Verification/Verification_Define.h‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@
1212
*********************************************************************/
1313
typedef enum
1414
{
15-
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW = 0, //无法识别的充值卡
16-
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_SECOND = 1, //秒钟,本地使用在read和write的时候更新
17-
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY = 2, //天数,本地使用天数卡,不使用不减天数.
18-
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_TIME = 3, //次数卡
19-
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM = 4 //自定义过期日期
20-
}ENUM_AUTHORIZE_MODULE_SERIAL_TYPE, * LPENUM_AUTHORIZE_MODULE_SERIAL_TYPE;
15+
ENUM_VERIFICATION_MODULE_SERIAL_TYPE_UNKNOW = 0, //无法识别的充值卡
16+
ENUM_VERIFICATION_MODULE_SERIAL_TYPE_SECOND = 1, //秒钟,本地使用在read和write的时候更新
17+
ENUM_VERIFICATION_MODULE_SERIAL_TYPE_DAY = 2, //天数,本地使用天数卡,不使用不减天数.
18+
ENUM_VERIFICATION_MODULE_SERIAL_TYPE_TIME = 3, //次数卡
19+
ENUM_VERIFICATION_MODULE_SERIAL_TYPE_CUSTOM = 4 //自定义过期日期
20+
}ENUM_VERIFICATION_MODULE_SERIAL_TYPE, * LPENUM_VERIFICATION_MODULE_SERIAL_TYPE;
2121
typedef enum
2222
{
23-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_UNKNOW = 0, //未注册,Authorize_CDKey_GetLeftTimer将返回失败
24-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_TEMP = 1, //临时,Authorize_CDKey_GetLeftTimer一次后过期,需要Write
25-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_TRY = 2, //试用
26-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_OFFICIAL = 3, //正式版
27-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_UNLIMIT = 4, //无限制版,永不过期.CDKEY不做任何验证
28-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_EXPIRED = 5 //已过期的版本,Authorize_CDKey_GetLeftTimer将返回失败
29-
}ENUM_AUTHORIZE_MODULE_CDKEY_TYPE, * LPENUM_AUTHORIZE_MODULE_CDKEY_TYPE;
23+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE_UNKNOW = 0, //未注册,Authorize_CDKey_GetLeftTimer将返回失败
24+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE_TEMP = 1, //临时,Authorize_CDKey_GetLeftTimer一次后过期,需要Write
25+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE_TRY = 2, //试用
26+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE_OFFICIAL = 3, //正式版
27+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE_UNLIMIT = 4, //无限制版,永不过期.CDKEY不做任何验证
28+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE_EXPIRED = 5 //已过期的版本,Authorize_CDKey_GetLeftTimer将返回失败
29+
}ENUM_VERIFICATION_MODULE_CDKEY_TYPE, * LPENUM_VERIFICATION_MODULE_CDKEY_TYPE;
3030
typedef enum
3131
{
32-
ENUM_AUTHORIZE_MODULE_HW_TYPE_UNKNOW = 0, //未指定
33-
ENUM_AUTHORIZE_MODULE_HW_TYPE_CPU = 1, //CPU序列号
34-
ENUM_AUTHORIZE_MODULE_HW_TYPE_DISK = 2, //硬盘序列号
35-
ENUM_AUTHORIZE_MODULE_HW_TYPE_BOARD = 3, //主板序列号
36-
ENUM_AUTHORIZE_MODULE_HW_TYPE_MAC = 4, //网卡MAC地址
37-
ENUM_AUTHORIZE_MODULE_HW_TYPE_BIOS = 5 //BIOS序列号
38-
}ENUM_AUTHORIZE_MODULE_HW_TYPE, * LPENUM_AUTHORIZE_MODULE_HW_TYPE;
32+
ENUM_VERIFICATION_MODULE_HW_TYPE_UNKNOW = 0, //未指定
33+
ENUM_VERIFICATION_MODULE_HW_TYPE_CPU = 1, //CPU序列号
34+
ENUM_VERIFICATION_MODULE_HW_TYPE_DISK = 2, //硬盘序列号
35+
ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD = 3, //主板序列号
36+
ENUM_VERIFICATION_MODULE_HW_TYPE_MAC = 4, //网卡MAC地址
37+
ENUM_VERIFICATION_MODULE_HW_TYPE_BIOS = 5 //BIOS序列号
38+
}ENUM_VERIFICATION_MODULE_HW_TYPE, * LPENUM_VERIFICATION_MODULE_HW_TYPE;
3939
typedef enum
4040
{
41-
ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_UNKNOW = 0, //未知
42-
ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_LOCAL = 0x01, //本地
43-
ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_NETWORK = 0x02, //网络
44-
}ENUM_AUTHORIZE_MODULE_VERMODE_TYPE, * LPENUM_AUTHORIZE_MODULE_VERMODE_TYPE;
41+
ENUM_VERIFICATION_MODULE_VERMODE_TYPE_UNKNOW = 0, //未知
42+
ENUM_VERIFICATION_MODULE_VERMODE_TYPE_LOCAL = 0x01, //本地
43+
ENUM_VERIFICATION_MODULE_VERMODE_TYPE_NETWORK = 0x02, //网络
44+
}ENUM_VERIFICATION_MODULE_VERMODE_TYPE, * LPENUM_VERIFICATION_MODULE_VERMODE_TYPE;
4545
//////////////////////////////////////////////////////////////////////////
4646
// 导出定义
4747
//////////////////////////////////////////////////////////////////////////
@@ -68,10 +68,6 @@ typedef enum
6868
//////////////////////////////////////////////////////////////////////////
6969
// 导出结构体
7070
//////////////////////////////////////////////////////////////////////////
71-
//扩展登录协议
72-
struct XENGINE_PROTOCOL_USERAUTHEX : public XENGINE_PROTOCOL_USERAUTH {
73-
XCHAR tszHWCode[64];
74-
};
7571
typedef struct
7672
{
7773
XCHAR tszClientID[128]; // 客户端ID
@@ -111,10 +107,10 @@ typedef struct
111107
XCHAR tszStartTime[64]; //当前启动时间,由系统读取CDKEY的时候自动更新,天数和分钟有效
112108
XCHAR tszExpiryTime[64]; //过期的时间,需要调用Authorize_CDKey_GetLeftTimer并且Write才生效
113109
__int64x nHasTime; //当前还拥有时间，根据nLeftType决定此值的意义,调用Authorize_CDKey_GetLeftTimer会更新
114-
ENUM_AUTHORIZE_MODULE_SERIAL_TYPE enSerialType; //过期类型，参考:ENUM_AUTHORIZE_MODULE_SERIAL_TYPE
115-
ENUM_AUTHORIZE_MODULE_CDKEY_TYPE enRegType; //注册类型，参考:ENUM_AUTHORIZE_MODULE_CDKEY_TYPE
116-
ENUM_AUTHORIZE_MODULE_HW_TYPE enHWType; //硬件类型，参考:ENUM_AUTHORIZE_MODULE_HW_TYPE
117-
ENUM_AUTHORIZE_MODULE_VERMODE_TYPE enVModeType; //验证方式，参考:ENUM_AUTHORIZE_MODULE_VERMODE_TYPE
110+
ENUM_VERIFICATION_MODULE_SERIAL_TYPE enSerialType; //过期类型，参考:ENUM_VERIFICATION_MODULE_SERIAL_TYPE
111+
ENUM_VERIFICATION_MODULE_CDKEY_TYPE enRegType; //注册类型，参考:ENUM_VERIFICATION_MODULE_CDKEY_TYPE
112+
ENUM_VERIFICATION_MODULE_HW_TYPE enHWType; //硬件类型，参考:ENUM_VERIFICATION_MODULE_HW_TYPE
113+
ENUM_VERIFICATION_MODULE_VERMODE_TYPE enVModeType; //验证方式，参考:ENUM_VERIFICATION_MODULE_VERMODE_TYPE
118114
}st_AuthRegInfo;
119115
//临时序列号
120116
struct

‎XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthKey.cpp‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_FileRead(VERIFICATION_XAUTHKE
8484
}
8585
}
8686

87-
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_DAY == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
87+
if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_DAY == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
8888
{
8989
XENGINE_LIBTIME st_SysTime = {};
9090
XENGINE_LIBTIME st_EndTime = {};
@@ -136,7 +136,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_FileWrite(VERIFICATION_XAUTHK
136136
XCHAR tszENCodecBuffer[4096] = {};
137137

138138
//更新使用时间
139-
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
139+
if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
140140
{
141141
XCHAR tszTimeEnd[64] = {};
142142
__int64x nUsedTime = 0;
@@ -207,22 +207,22 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
207207
XENGINE_LIBTIME st_EndTimer = {};
208208
XENGINE_LIBTIME st_SysTimer = {};
209209
//处理注册类型
210-
if (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_UNLIMIT == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
210+
if (ENUM_VERIFICATION_MODULE_CDKEY_TYPE_UNLIMIT == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
211211
{
212212
return true;
213213
}
214-
else if (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
214+
else if (ENUM_VERIFICATION_MODULE_CDKEY_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
215215
{
216216
Verification_IsErrorOccur = true;
217217
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_UNKNOW;
218218
return false;
219219
}
220-
else if (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_TEMP == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
220+
else if (ENUM_VERIFICATION_MODULE_CDKEY_TYPE_TEMP == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
221221
{
222-
pSt_XAuthInfo->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_EXPIRED;
222+
pSt_XAuthInfo->st_AuthRegInfo.enRegType = ENUM_VERIFICATION_MODULE_CDKEY_TYPE_EXPIRED;
223223
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszExpiryTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), st_SysTimer.wYear, st_SysTimer.wMonth, st_SysTimer.wDay, st_SysTimer.wHour, st_SysTimer.wMinute, st_SysTimer.wSecond);
224224
}
225-
else if (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_EXPIRED == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
225+
else if (ENUM_VERIFICATION_MODULE_CDKEY_TYPE_EXPIRED == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
226226
{
227227
Verification_IsErrorOccur = true;
228228
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_EXPIRED;
@@ -232,7 +232,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
232232
{
233233
//其他类型的注册机制
234234
BaseLib_Time_GetSysTime(&st_SysTimer);
235-
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
235+
if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_SECOND == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
236236
{
237237
XCHAR tszTimeEnd[64] = {};
238238
__int64x nUsedTime = 0;
@@ -244,11 +244,11 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
244244
pSt_XAuthInfo->st_AuthRegInfo.nHasTime = nUsedTime;
245245
}
246246
}
247-
else if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_TIME == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
247+
else if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_TIME == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
248248
{
249249
pSt_XAuthInfo->st_AuthRegInfo.nHasTime--;
250250
}
251-
else if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
251+
else if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_CUSTOM == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
252252
{
253253
_stxscanf(pSt_XAuthInfo->st_AuthRegInfo.tszLeftTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), &st_EndTimer.wYear, &st_EndTimer.wMonth, &st_EndTimer.wDay, &st_EndTimer.wHour, &st_EndTimer.wMinute, &st_EndTimer.wSecond);
254254
BaseLib_TimeSpan_GetForStu(&st_SysTimer, &st_EndTimer, &pSt_XAuthInfo->st_AuthRegInfo.nHasTime, ENUM_XENGINE_BASELIB_TIME_TYPE_SECOND);
@@ -263,21 +263,21 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
263263
{
264264
Verification_IsErrorOccur = true;
265265
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_EXPIRED;
266-
pSt_XAuthInfo->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_EXPIRED;
266+
pSt_XAuthInfo->st_AuthRegInfo.enRegType = ENUM_VERIFICATION_MODULE_CDKEY_TYPE_EXPIRED;
267267
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszExpiryTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), st_SysTimer.wYear, st_SysTimer.wMonth, st_SysTimer.wDay, st_SysTimer.wHour, st_SysTimer.wMinute, st_SysTimer.wSecond);
268268
return false;
269269
}
270270
}
271271

272272
SYSTEMAPI_SERIAL_INFOMATION st_SDKSerial = {};
273273
SystemApi_HardWare_GetSerial(&st_SDKSerial);
274-
if (ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_LOCAL != pSt_XAuthInfo->st_AuthRegInfo.enVModeType)
274+
if (ENUM_VERIFICATION_MODULE_VERMODE_TYPE_LOCAL != pSt_XAuthInfo->st_AuthRegInfo.enVModeType)
275275
{
276276
Verification_IsErrorOccur = true;
277277
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_MODETYPE;
278278
return false;
279279
}
280-
if (ENUM_AUTHORIZE_MODULE_HW_TYPE_BIOS != pSt_XAuthInfo->st_AuthRegInfo.enHWType)
280+
if (ENUM_VERIFICATION_MODULE_HW_TYPE_BIOS != pSt_XAuthInfo->st_AuthRegInfo.enHWType)
281281
{
282282
Verification_IsErrorOccur = true;
283283
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_HWTYPE;
@@ -338,27 +338,27 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyInit(VERIFICATION_XAUTHKEY
338338
SystemApi_HardWare_GetSerial(&st_SDKSerial);
339339

340340
BaseLib_Time_TimeToStr(pSt_XAuthInfo->st_AuthRegInfo.tszCreateTime);
341-
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
341+
if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enSerialType)
342342
{
343-
pSt_XAuthInfo->st_AuthRegInfo.enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_TIME;
343+
pSt_XAuthInfo->st_AuthRegInfo.enSerialType = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_TIME;
344344
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszLeftTime, _X("5"));
345345
pSt_XAuthInfo->st_AuthRegInfo.nHasTime = 5;
346346
}
347-
if (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
347+
if (ENUM_VERIFICATION_MODULE_CDKEY_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enRegType)
348348
{
349-
pSt_XAuthInfo->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_TRY;
349+
pSt_XAuthInfo->st_AuthRegInfo.enRegType = ENUM_VERIFICATION_MODULE_CDKEY_TYPE_TRY;
350350
}
351-
if (ENUM_AUTHORIZE_MODULE_HW_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
351+
if (ENUM_VERIFICATION_MODULE_HW_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
352352
{
353-
pSt_XAuthInfo->st_AuthRegInfo.enHWType = ENUM_AUTHORIZE_MODULE_HW_TYPE_BOARD;
353+
pSt_XAuthInfo->st_AuthRegInfo.enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD;
354354
if (_tcsxlen(pSt_XAuthInfo->st_AuthRegInfo.tszHardware) <= 0)
355355
{
356356
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszBoardSerial);
357357
}
358358
}
359-
if (ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enVModeType)
359+
if (ENUM_VERIFICATION_MODULE_VERMODE_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enVModeType)
360360
{
361-
pSt_XAuthInfo->st_AuthRegInfo.enVModeType = ENUM_AUTHORIZE_MODULE_VERMODE_TYPE_LOCAL;
361+
pSt_XAuthInfo->st_AuthRegInfo.enVModeType = ENUM_VERIFICATION_MODULE_VERMODE_TYPE_LOCAL;
362362
}
363363
//临时序列号
364364
if (0 == pSt_XAuthInfo->st_AuthSerial.st_TimeLimit.nTimeCount)
@@ -472,16 +472,16 @@ bool CVerification_XAuthKey::Verification_XAuthKey_UserRegister(VERIFICATION_XAU
472472
{
473473
//次数验证
474474
bSerial = true;
475-
pSt_AuthLocal->st_AuthRegInfo.enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_TIME;
476-
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_OFFICIAL;
475+
pSt_AuthLocal->st_AuthRegInfo.enSerialType = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_TIME;
476+
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_VERIFICATION_MODULE_CDKEY_TYPE_OFFICIAL;
477477
Verification_XAuthKey_BuildKeyTime(pSt_AuthLocal, pSt_AuthLocal->st_AuthSerial.st_TimeLimit.nTimeCount);
478478
}
479479
else if (0 == _tcsxncmp(pSt_AuthLocal->st_AuthSerial.st_DataLimit.tszDataSerial, lpszSerialStr, _tcsxlen(pSt_AuthLocal->st_AuthSerial.st_DataLimit.tszDataSerial)))
480480
{
481481
//日期序列
482482
bSerial = true;
483-
pSt_AuthLocal->st_AuthRegInfo.enSerialType = ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM;
484-
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_OFFICIAL;
483+
pSt_AuthLocal->st_AuthRegInfo.enSerialType = ENUM_VERIFICATION_MODULE_SERIAL_TYPE_CUSTOM;
484+
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_VERIFICATION_MODULE_CDKEY_TYPE_OFFICIAL;
485485
XENGINE_LIBTIME st_LibTime = {};
486486
BaseLib_Time_GetSysTime(&st_LibTime);
487487
if (pSt_AuthLocal->st_AuthSerial.st_DataLimit.bTimeAdd)
@@ -517,7 +517,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_UserRegister(VERIFICATION_XAU
517517
{
518518
//无限制
519519
bSerial = true;
520-
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_AUTHORIZE_MODULE_CDKEY_TYPE_UNLIMIT;
520+
pSt_AuthLocal->st_AuthRegInfo.enRegType = ENUM_VERIFICATION_MODULE_CDKEY_TYPE_UNLIMIT;
521521
}
522522

523523
if (!bSerial)
@@ -895,10 +895,10 @@ bool CVerification_XAuthKey::Verification_XAuthKey_ReadKey(LPCXSTR lpszFileKey,
895895
pSt_AuthLocal->st_AuthAppInfo.nExecTime = SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AppInfo"), _X("nExecTime"));
896896
pSt_AuthLocal->st_AuthAppInfo.bInit = SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AppInfo"), _X("bInit"));
897897
//添加注册信息
898-
pSt_AuthLocal->st_AuthRegInfo.enHWType = (ENUM_AUTHORIZE_MODULE_HW_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enHWType"));
899-
pSt_AuthLocal->st_AuthRegInfo.enRegType = (ENUM_AUTHORIZE_MODULE_CDKEY_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enRegType"));
900-
pSt_AuthLocal->st_AuthRegInfo.enSerialType = (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enSerialType"));
901-
pSt_AuthLocal->st_AuthRegInfo.enVModeType = (ENUM_AUTHORIZE_MODULE_VERMODE_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enVModeType"));
898+
pSt_AuthLocal->st_AuthRegInfo.enHWType = (ENUM_VERIFICATION_MODULE_HW_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enHWType"));
899+
pSt_AuthLocal->st_AuthRegInfo.enRegType = (ENUM_VERIFICATION_MODULE_CDKEY_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enRegType"));
900+
pSt_AuthLocal->st_AuthRegInfo.enSerialType = (ENUM_VERIFICATION_MODULE_SERIAL_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enSerialType"));
901+
pSt_AuthLocal->st_AuthRegInfo.enVModeType = (ENUM_VERIFICATION_MODULE_VERMODE_TYPE)SystemConfig_File_ReadIntFromFile(lpszFileKey, _X("AuthReg"), _X("enVModeType"));
902902
pSt_AuthLocal->st_AuthRegInfo.nHasTime = SystemConfig_File_ReadInt64FromFile(lpszFileKey, _X("AuthReg"), _X("nHasTime"));
903903
if (SystemConfig_File_ReadProfileFromFile(lpszFileKey, _X("AuthReg"), _X("tszHardware"), pSt_AuthLocal->st_AuthRegInfo.tszHardware) <= 0)
904904
{
@@ -1389,7 +1389,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_BuildKeyTime(VERIFICATION_XAU
13891389
Verification_IsErrorOccur = false;
13901390

13911391
//判断注册时间方式
1392-
if (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_CUSTOM == pSt_AuthLocal->st_AuthRegInfo.enSerialType)
1392+
if (ENUM_VERIFICATION_MODULE_SERIAL_TYPE_CUSTOM == pSt_AuthLocal->st_AuthRegInfo.enSerialType)
13931393
{
13941394
//按照到期时间计算
13951395
_xstprintf(pSt_AuthLocal->st_AuthRegInfo.tszLeftTime, _X("%04d-%02d-%02d %02d:%02d:%02d"), pSt_DayTimer->wYear, pSt_DayTimer->wMonth, pSt_DayTimer->wDay, pSt_DayTimer->wHour, pSt_DayTimer->wMinute, pSt_DayTimer->wSecond);

0 commit comments

Comments
 (0)