Skip to content

Commit bba611f

Browse files
committed
delete:bios serial key support
improved:init key info
1 parent 7599c6c commit bba611f

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed

XEngine_Module/XEngine_Verification/Verification_Define.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ typedef enum
3333
ENUM_VERIFICATION_MODULE_HW_TYPE_CPU = 1, //CPU序列号
3434
ENUM_VERIFICATION_MODULE_HW_TYPE_DISK = 2, //硬盘序列号
3535
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序列号
36+
ENUM_VERIFICATION_MODULE_HW_TYPE_SYSTEM = 4, //系统序列号,重装系统后改变
37+
ENUM_VERIFICATION_MODULE_HW_TYPE_MAC = 5 //网卡MAC地址
3838
}ENUM_VERIFICATION_MODULE_HW_TYPE, * LPENUM_VERIFICATION_MODULE_HW_TYPE;
3939
typedef enum
4040
{

XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthKey.cpp

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyParse(VERIFICATION_XAUTHKE
370370
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_MODETYPE;
371371
return false;
372372
}
373-
if (ENUM_VERIFICATION_MODULE_HW_TYPE_BIOS != pSt_XAuthInfo->st_AuthRegInfo.enHWType)
373+
if (ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD != pSt_XAuthInfo->st_AuthRegInfo.enHWType)
374374
{
375375
Verification_IsErrorOccur = true;
376376
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_HWTYPE;
@@ -444,9 +444,43 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyInit(VERIFICATION_XAUTHKEY
444444
if (ENUM_VERIFICATION_MODULE_HW_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
445445
{
446446
pSt_XAuthInfo->st_AuthRegInfo.enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD;
447-
if (_tcsxlen(pSt_XAuthInfo->st_AuthRegInfo.tszHardware) <= 0)
447+
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszBoardSerial);
448+
}
449+
else
450+
{
451+
if (ENUM_VERIFICATION_MODULE_HW_TYPE_CPU == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
452+
{
453+
if (_tcsxlen(pSt_XAuthInfo->st_AuthRegInfo.tszHardware) == 0)
454+
{
455+
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszCPUSerial);
456+
}
457+
}
458+
else if (ENUM_VERIFICATION_MODULE_HW_TYPE_DISK == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
459+
{
460+
if (_tcsxlen(pSt_XAuthInfo->st_AuthRegInfo.tszHardware) == 0)
461+
{
462+
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszDiskSerial);
463+
}
464+
}
465+
else if (ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
448466
{
449-
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszBoardSerial);
467+
if (_tcsxlen(pSt_XAuthInfo->st_AuthRegInfo.tszHardware) == 0)
468+
{
469+
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszBoardSerial);
470+
}
471+
}
472+
else if (ENUM_VERIFICATION_MODULE_HW_TYPE_SYSTEM == pSt_XAuthInfo->st_AuthRegInfo.enHWType)
473+
{
474+
if (_tcsxlen(pSt_XAuthInfo->st_AuthRegInfo.tszHardware) == 0)
475+
{
476+
_xstprintf(pSt_XAuthInfo->st_AuthRegInfo.tszHardware, _X("%s"), st_SDKSerial.tszSystemSerial);
477+
}
478+
}
479+
else
480+
{
481+
Verification_IsErrorOccur = true;
482+
Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_NOTSUPPORT;
483+
return false;
450484
}
451485
}
452486
if (ENUM_VERIFICATION_MODULE_VERMODE_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo.enVModeType)

0 commit comments

Comments
 (0)