diff --git a/KeyGenerator.rc b/KeyGenerator.rc index bcd2208..61482fe 100644 Binary files a/KeyGenerator.rc and b/KeyGenerator.rc differ diff --git a/KeyGenerator.vcxproj b/KeyGenerator.vcxproj index c64bce0..ba60e5b 100644 --- a/KeyGenerator.vcxproj +++ b/KeyGenerator.vcxproj @@ -66,7 +66,7 @@ Windows true - c:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies) + c:\EgtDev\Extern\OxySec\Lib\x32\xnodus32.obj;%(AdditionalDependencies) false @@ -99,7 +99,7 @@ false true true - c:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies) + c:\EgtDev\Extern\OxySec\Lib\x32\xnodus32.obj;%(AdditionalDependencies) false diff --git a/KeyGeneratorDlg.cpp b/KeyGeneratorDlg.cpp index 37c80a5..f125808 100644 --- a/KeyGeneratorDlg.cpp +++ b/KeyGeneratorDlg.cpp @@ -268,16 +268,24 @@ CKeyGeneratorDlg::LoadFile( const char* szFile) int nProd = GetPrivateProfileInt( sSec.c_str(), "Product", 0, szFile) ; int nSel = - 1 ; switch ( nProd) { - case 207 : nSel = 0 ; break ; // librerie base - case 823 : nSel = 1 ; break ; // generatore di licenze - case 1231 : nSel = 2 ; break ; // vecchie librerie base - case 3279 : nSel = 3 ; break ; // EgtCAM5 - case 5327 : nSel = 4 ; break ; // SarmaxWall - case 9423 : nSel = 5 ; break ; // OmagCUT + case 207 : nSel = 0 ; break ; // librerie base + case 823 : nSel = 1 ; break ; // generatore di licenze + case 1231 : nSel = 2 ; break ; // vecchie librerie base + case 3279 : nSel = 3 ; break ; // EgtCAM5 + case 5327 : nSel = 4 ; break ; // SarmaxWall + case 9423 : nSel = 5 ; break ; // OmagCUT } // altri valori : 463, 975, 1487, 2511, 3535, 4559, 5583 (max 9999 e deve contenere i bit di 207) ((CComboBox*)GetDlgItem( IDC_PROD))->SetCurSel( nSel) ; int nVer = GetPrivateProfileInt( sSec.c_str(), "Ver", 0, szFile) ; - ((CComboBox*)GetDlgItem( IDC_VER))->SetCurSel( nVer - 15) ; + nSel = - 1 ; + switch ( nVer) { + case 15 : nSel = 0 ; break ; + case 16 : nSel = 1 ; break ; + case 18 : nSel = 2 ; break ; + case 19 : nSel = 3 ; break ; + case 21 : nSel = 4 ; break ; + } + ((CComboBox*)GetDlgItem( IDC_VER))->SetCurSel( nSel) ; int nLev = GetPrivateProfileInt( sSec.c_str(), "Lev", 0, szFile) ; ((CComboBox*)GetDlgItem( IDC_LEV))->SetCurSel( nLev - 1) ; int nExpTime = GetPrivateProfileInt( sSec.c_str(), "ExpDays", 0, szFile) ;