From 0461e9b3b606630aab14a80ee53beb90d9ae9353 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 29 Jul 2015 07:05:32 +0000
Subject: [PATCH] EgtGeomKernel 1.6g8 : - aggiornato per modifiche alla
 gestione delle chiavi.

---
 EgtGeomKernel.rc      | Bin 11710 -> 11710 bytes
 EgtGeomKernel.vcxproj |   8 ++++----
 GeomDB.cpp            |  10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index 1c8eec6a4f26b4b4402311501db9073bac0595ca..59bb72599b2d423f04a7517507f0adc3f34921b8 100644
GIT binary patch
delta 94
zcmdlNy)SyhFE&Pt&A-_cnHeo6D{|{@_Trkr0u;H;XNwSVW8B;$>;>dw2zN+>g;Df-
LFmBFL4&ed-Yp@$C

delta 94
zcmdlNy)SyhFE&Q=&A-_cnHkL|D{|{@_Trkr0u;H;XNwSVW8B;$>;>dw2zN+>g;Df-
LFmBFL4&ed-Y7!eF

diff --git a/EgtGeomKernel.vcxproj b/EgtGeomKernel.vcxproj
index c75cf3d..ffa979b 100644
--- a/EgtGeomKernel.vcxproj
+++ b/EgtGeomKernel.vcxproj
@@ -118,7 +118,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -151,7 +151,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\EgtDev\Extern\OxySec\Lib\x64\oxyxlt.obj;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -193,7 +193,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
       <OptimizeReferences>true</OptimizeReferences>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateMapFile>false</GenerateMapFile>
     </Link>
     <Midl>
@@ -234,7 +234,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
       <OptimizeReferences>true</OptimizeReferences>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\EgtDev\Extern\OxySec\Lib\x64\oxyxlt.obj;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
diff --git a/GeomDB.cpp b/GeomDB.cpp
index 8c50a1b..666859d 100644
--- a/GeomDB.cpp
+++ b/GeomDB.cpp
@@ -20,7 +20,7 @@
 #include "NgeReader.h"
 #include "NgeWriter.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
-#include "/EgtDev/Include/SELkMachineId.h"
+#include "/EgtDev/Include/SELkLockId.h"
 #include "/EgtDev/Include/SELkKeyProc.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
@@ -382,13 +382,13 @@ GeomDB::SaveHeader( NgeWriter& ngeOut) const
    if ( ! ngeOut.WriteInt( NGE_VER_LAST, ";", true))
       return false ;
 
-  // MachineId del sistema come commento
-   string sMachineId ;
-   if ( ! GetMachineId( sMachineId)) {
+  // LockId del sistema come commento
+   string sLockId ;
+   if ( ! GetLockId( sLockId)) {
       LOG_ERROR( GetEGkLogger(), "Error on Key (1)")
       return false ;
    }
-   if ( ! ngeOut.WriteRemark( "LWR=" + sMachineId))
+   if ( ! ngeOut.WriteRemark( "LWR=" + sLockId))
       return false ;
 
   // materiale di default come colore