From cb734655ad52c31cbf2f6b0c85a6bddb305e5eff Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 15 Jan 2018 09:59:33 +0000
Subject: [PATCH] KeyGenerator 1.9a1 : - aggiunte versioni 19 e 21.

---
 KeyGenerator.rc      | Bin 28358 -> 28444 bytes
 KeyGenerator.vcxproj |   4 ++--
 KeyGeneratorDlg.cpp  |  22 +++++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/KeyGenerator.rc b/KeyGenerator.rc
index bcd22083450940a39458bc875a3e48ccb2a26fd9..61482fe3c8fac64cc5d9fff8e832138f7cd525d8 100644
GIT binary patch
delta 143
zcmX?hmvPQL#tkf{td<Nq42F|AO?4S9H=CRCGc#K<Bu-9rxXx&?S<$kZ5y(}VywOZ_
z@)@TWo99@kFrsNV$TazjeHKE~WJSyElRr2ff$7_P#%U49<RjiXlizu1F<MSm^w$Ql
USPdDB8H^??`UY;6@>!z<0DKcJ8UO$Q

delta 129
zcmbPpkMY=D#tkf{tQHJ94Ca$LO?4S9Hk+IBGc#K-q)$$CxXx(4S<$kZ5y(}VywOZ_
z@)@TWo99@kFrsNV$TazjeHKE~WJSyElRr2ff$7_P#%U1;qxs}~@6gG4-a3;P_-Sn}
I@L8h-01bpHZU6uP

diff --git a/KeyGenerator.vcxproj b/KeyGenerator.vcxproj
index c64bce0..ba60e5b 100644
--- a/KeyGenerator.vcxproj
+++ b/KeyGenerator.vcxproj
@@ -66,7 +66,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>c:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>c:\EgtDev\Extern\OxySec\Lib\x32\xnodus32.obj;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -99,7 +99,7 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>c:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>c:\EgtDev\Extern\OxySec\Lib\x32\xnodus32.obj;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
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) ;