From 7335a703cffcc10e583a64d1bfd3642d9c7c43fc Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 9 Oct 2023 12:59:50 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGnGetKeyData.h | 1 + EXeExecutor.h | 8 ++++---- SELkLockId.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/EGnGetKeyData.h b/EGnGetKeyData.h index 6b050bd..dd0c352 100644 --- a/EGnGetKeyData.h +++ b/EGnGetKeyData.h @@ -33,3 +33,4 @@ EGN_EXPORT bool SetEGnKeyOptions( int nRet, int nKeyOpt1, int nKeyOpt2, int nKey EGN_EXPORT int GetEGnKeyOptions( int nProd, int nVer, int nLev, unsigned int& nKeyOpt1, unsigned int& nKeyOpt2, int& nKeyOptExpDays) ; // Interpretazione della stringa di LockId EGN_EXPORT bool GetLockIdStringInfo( const std::string& sLockId, int& nKeyType, bool& bNetKey, int& nUserId) ; +EGN_EXPORT bool GetLockIdStringNetData( const std::string& sLockId, std::string& sAddrPort) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 7973916..457a49d 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -56,7 +56,7 @@ EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeSetLockType( int nType) ; EXE_EXPORT bool ExeSetLockId( const std::string& sLockId) ; -EXE_EXPORT bool ExeSetNetHwKey( bool bNetHwKey, int nUserId = 0) ; +EXE_EXPORT bool ExeSetNetHwKey( bool bNetHwKey, int nUserId = 0, const std::string& sAddrPort = "") ; EXE_EXPORT bool ExeGetKeyLevel( int nProd, int nVer, int nLev, int& nKLev) ; EXE_EXPORT bool ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& nOpt2) ; EXE_EXPORT bool ExeGetKeyLeftDays( int& nLeftDays) ; @@ -608,9 +608,9 @@ EXE_EXPORT bool ExeSurfTmIntersect( int nId1, int nId2, bool bTwoColors = false) EXE_EXPORT bool ExeSurfTmResetTwoColors( int nId) ; EXE_EXPORT int ExeSurfTmSplit( int nId, int nSplitterId, int* pnCount) ; EXE_EXPORT bool ExeSurfTmCut( int nId, int nCutterId, bool bInVsOut, bool bSaveOnEq) ; -EXE_EXPORT bool ExeSubtractProjectedFacesOnStmFace( int nSurfId, int nFaceInd, int nDestGrpId, - INTVECTOR vSurfsId, INTVECTOR vSurfFacesInd, bool bOCFlag, - int& nNewId, bool& bExistProjection, int& nNewFaceNbr) ; +EXE_EXPORT bool ExeSurfTmSubtractProjectedFacesOnFace( int nSurfId, int nFaceInd, int nDestGrpId, + INTVECTOR vSurfsId, INTVECTOR vSurfFacesInd, bool bOCFlag, + bool& bExistProjection, int& nNewId, int& nNewFaceNbr) ; // GeomDb Volume Modify EXE_EXPORT int ExeExplodeVolume( int nId, int* pnCount) ; diff --git a/SELkLockId.h b/SELkLockId.h index 4758594..f7a6b09 100644 --- a/SELkLockId.h +++ b/SELkLockId.h @@ -19,8 +19,8 @@ //------------------------------------------------------------------------------- // Imposto il tipo di protezione ammessa (ANY, HW, SW) bool SetLockType( int nType) ; -// Imposto chiave di rete e identificativo utente (0-9) -bool SetNetHwKey( bool bNetHwKey, int nUserId) ; +// Imposto chiave di rete, identificativo utente (0-9) e indirizzo +bool SetNetHwKey( bool bNetHwKey, int nUserId, const std::string& sAddrPort) ; // Libero chiave di rete (da eseguire al termine del programma) bool CloseNetHwKey( void) ; // Recupero l'identificativo in chiaro della protezione