@@ -245,9 +245,9 @@ int CLicense::LoadIni()
245245 m_ExpireDate = iniGetInt (APP_NAME_LICENSE, KEY_NAME_EXPIRE_DATE, -1 );
246246 m_Trial = iniGetInt (APP_NAME_LICENSE, KEY_NAME_TRIAL, 5 );
247247
248- iniGetString (APP_NAME_USER, KEY_NAME_ACCOUNT, m_Account, sizeof (m_Account), " A " );
249- iniGetString (APP_NAME_USER, KEY_NAME_USERNAME, m_UserName, sizeof (m_UserName), " B " );
250- iniGetString (APP_NAME_LICENSE, KEY_NAME_MAC, m_MAC, sizeof (m_MAC), " C " );
248+ iniGetString (APP_NAME_USER, KEY_NAME_ACCOUNT, m_Account, sizeof (m_Account), " " );
249+ iniGetString (APP_NAME_USER, KEY_NAME_USERNAME, m_UserName, sizeof (m_UserName), " " );
250+ iniGetString (APP_NAME_LICENSE, KEY_NAME_MAC, m_MAC, sizeof (m_MAC), " " );
251251
252252 iniFileFree ();
253253
@@ -308,7 +308,7 @@ void CLicense::CreateDefault()
308308 m_nCurrentTrial = 0 ;
309309
310310 strncpy (m_Account, " .*" , sizeof (m_Account));
311- strncpy (m_UserName, " .* " , sizeof (m_UserName));
311+ strncpy (m_UserName, " " , sizeof (m_UserName));
312312 strncpy (m_MAC, " .*" , sizeof (m_MAC));
313313}
314314
@@ -359,6 +359,10 @@ int CLicense::GetErrorCodeForMachineID()
359359
360360 do
361361 {
362+ if (strlen (m_MAC) <= 0 )
363+ {
364+ break ;
365+ }
362366 // 检查机器码
363367 regex pattern (m_MAC);
364368 if (!regex_search (m_RealMAC, pattern))
@@ -408,6 +412,10 @@ int CLicense::GetErrorCodeByAccount(const char* account)
408412
409413 do
410414 {
415+ if (strlen (m_Account) <= 0 )
416+ {
417+ break ;
418+ }
411419 regex pattern (m_Account);
412420 if (!regex_search (account, pattern))
413421 {
@@ -429,13 +437,6 @@ int CLicense::GetErrorCodeByNameThenAccount(const char* name, const char* accoun
429437 do
430438 {
431439 // 汉字使用正则太复杂,还是改用查找
432- // regex pattern(m_UserName);
433- // if (!regex_search(name, pattern))
434- // {
435- // m_ErrorCode = -9;
436- // sprintf(m_ErrorInfo, ERROR_CODE_9, name);
437- // break;
438- // }
439440 if (strlen (m_UserName) <= 0 )
440441 {
441442 break ;
0 commit comments