diff --git a/ConstGen.vb b/ConstGen.vb index 6b4b837..6457a72 100644 --- a/ConstGen.vb +++ b/ConstGen.vb @@ -13,11 +13,16 @@ Module ConstGen -' File con indicazione radice dei dati di configurazione +' File con direttorio radice dei dati Public Const DAT_FILE_NAME As String = "DataRoot.Ini" Public Const S_DATA As String = "Data" Public Const K_DATAROOT As String = "DataRoot" +' File con dati di licenza +Public Const LIC_FILE_NAME As String = "TestEIn.lic" +Public Const S_LICENCE As String = "Licence" +Public Const K_KEY As String = "Key" + ' File di log generale ( # per numero di istanza) Public Const GENLOG_FILE_NAME As String = "EInGenLog#.txt" diff --git a/ConstIni.vb b/ConstIni.vb index 0a89e65..d042c07 100644 --- a/ConstIni.vb +++ b/ConstIni.vb @@ -20,7 +20,6 @@ Public Const K_DEBUG As String = "Debug" Public Const K_MAXINST As String = "MaxInstances" Public Const K_INSTANCES As String = "Instances" Public Const K_COMMANDLOG As String = "CommandLog" -Public Const K_KEY As String = "Key" Public Const K_MESSAGES As String = "Messages" Public Const K_WINPLACE As String = "WinPlace" Public Const K_LASTNGEDIR As String = "LastNgeDir" diff --git a/Form1.vb b/Form1.vb index bf2f1b2..757a92e 100644 --- a/Form1.vb +++ b/Form1.vb @@ -67,10 +67,10 @@ Public Class Form1 ' Verifico indice di istanza ManageIstance() ' Inizializzazione generale di EgtInterface - Dim sIniFile As String = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) + Dim sLogFile As String = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) Dim sLogMsg As String = "User " & SystemInformation.UserName & "\" & SystemInformation.ComputerName & " (" & GetInstance() & ")" & vbLf & My.Application.Info.Description.ToString() & " ver. " & My.Application.Info.Version.ToString() - EgtInit(0, sIniFile, sLogMsg) + EgtInit(0, sLogFile, sLogMsg) ' Leggo file messaggi Dim sMsgFile As String = String.Empty GetPrivateProfileString(S_GENERAL, K_MESSAGES, "", sMsgFile, m_sIniFile) @@ -78,9 +78,10 @@ Public Class Form1 If Not EgtLoadMessages(sMsgFilePath) Then EgtOutLog("Error in EgtLoadMessages") End If - ' Imposto chiave di protezione + ' Leggo e imposto chiave di protezione + Dim sLicFile As String = m_sConfigDir & "\" & LIC_FILE_NAME Dim sKey As String = String.Empty - GetPrivateProfileString(S_GENERAL, K_KEY, "", sKey, m_sIniFile) + GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile) EgtSetKey(sKey) ' imposto dir font Nfe e font default Dim sNfeDir As String = String.Empty diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 2993738..9033f2b 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + +