Egalware/EgtGeneral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtGeneral 1.6f1 :

Browse Source 
- aggiunto EgtUUID e relativa gestione
- aggiunte CopyFileEgt e RenameFile
- aggiunt Writer per scrivere file di testo anche compressi.
This commit is contained in:
Dario Sassi
2015-06-06 17:47:25 +00:00
parent 825f256f66
commit e31f4e26c8
8 changed files with 168 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtGeneral.rc
BIN
View File
Binary file not shown.
EgtGeneral.vcxproj
+9 -6
View File
@@ -105,7 +105,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>version.lib;shlwapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
@@ -126,7 +126,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>version.lib;shlwapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
@@ -155,7 +155,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>version.lib;shlwapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
@@ -183,7 +183,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>version.lib;shlwapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
@@ -201,8 +201,9 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<ClInclude Include="..\Include\EgnGetModuleVer.h" />
<ClInclude Include="..\Include\EGnLuaAux.h" />
<ClInclude Include="..\Include\EGnLuaMgr.h" />
<ClInclude Include="..\Include\EGnScan.h" />
<ClInclude Include="..\Include\EGnScanner.h" />
<ClInclude Include="..\Include\EGnStringUtils.h" />
<ClInclude Include="..\Include\EGnWriter.h" />
<ClInclude Include="..\Include\EgtStringBase.h" />
<ClInclude Include="..\Include\EgtStringConverter.h" />
<ClInclude Include="..\Include\EgtTrace.h" />
@@ -229,6 +230,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</PrecompiledHeader>
</ClCompile>
<ClCompile Include="EgtUUID.cpp" />
<ClCompile Include="FileCompare.cpp" />
<ClCompile Include="FileUtils.cpp" />
<ClCompile Include="GetCpuInfo.cpp" />
@@ -240,7 +242,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="LuaManager.cpp" />
<ClCompile Include="Scan.cpp" />
<ClCompile Include="Scanner.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -248,6 +250,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="Writer.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EgtGeneral.rc" />
EgtGeneral.vcxproj.filters
+15 -6
View File
@@ -21,9 +21,6 @@
<ClInclude Include="..\Include\EGnStringUtils.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="..\Include\EGnScan.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>File di intestazione</Filter>
</ClInclude>
@@ -66,6 +63,12 @@
<ClInclude Include="..\Include\EgtStringConverter.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="..\Include\EGnScanner.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="..\Include\EGnWriter.h">
<Filter>File di intestazione</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@@ -74,9 +77,6 @@
<ClCompile Include="EGnDllMain.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Scan.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="StringUtils.cpp">
<Filter>File di origine</Filter>
</ClCompile>
@@ -104,6 +104,15 @@
<ClCompile Include="LuaManager.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="EgtUUID.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Writer.cpp">
<Filter>File di origine</Filter>
</ClCompile>
<ClCompile Include="Scanner.cpp">
<Filter>File di origine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EgtGeneral.rc">
EgtUUID.cpp
+58
View File
@@ -0,0 +1,58 @@
//----------------------------------------------------------------------------
// EgalTech 2015-2015
//----------------------------------------------------------------------------
// File : EgtUUID.cpp Data : 01.06.15 Versione : 1.6f1
// Contenuto : Funzioni per EgtUUID.
//
//
//
// Modifiche : 01.06.15 DS Creazione modulo.
//
//
//----------------------------------------------------------------------------
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "/EgtDev/Include/EGnEgtUUID.h"
#include <Rpc.h>
#include <Rpcdce.h>
using namespace std ;
//----------------------------------------------------------------------------
bool
CreateEgtUUID( EgtUUID& uuId)
{
if ( UuidCreate( (UUID*)( &uuId)) != RPC_S_OK)
return false ;
return true ;
}
//----------------------------------------------------------------------------
string
ToString( const EgtUUID& uuId)
{
static const int order[16] = {3,2,1,0, 5,4, 7,6, 8,9, 10,11,12,13,14,15} ;
static const int dash[16] = {0,0,0,1, 0,1, 0,1, 0,1, 0, 0, 0, 0, 0, 0} ;
static const char x[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'} ;
const unsigned char* b = (const unsigned char*) &uuId ;
char szBuff[40] ;
char* p = szBuff ;
for ( int i = 0 ; i < 16 ; ++i) {
*p++ = x[b[order[i]]>>4] ;
*p++ = x[b[order[i]]&0x0f] ;
if ( dash[i] != 0)
*p++ = '-' ;
}
*p = '\0' ;
return szBuff ;
}
//----------------------------------------------------------------------------
bool
FromString( const string& sVal, EgtUUID& uuId)
{
if ( UuidFromStringA( (unsigned char*) sVal.c_str(), (UUID*)( &uuId)) != RPC_S_OK)
return false ;
return true ;
}
FileCompare.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "stdafx.h"
#include "/EgtDEv/Include/EgnFileCompare.h"
#include "/EgtDEv/Include/EgtStringConverter.h"
#include "/EgtDEv/Include/EGnScan.h"
#include "/EgtDEv/Include/EGnScanner.h"
#include <fstream>
#include <iomanip>
FileUtils.cpp
+14
View File
@@ -40,6 +40,20 @@ ExistsFile( const string& sFile)
return true ;
}
//-----------------------------------------------------------------------------
bool
CopyFileEgt( const string& sFile, const string& sNewFile)
{
return ( ::CopyFileW( stringtoW( sFile), stringtoW( sNewFile), false) != 0) ;
}
//-----------------------------------------------------------------------------
bool
RenameFile( const string& sFile, const string& sNewFile)
{
return ( ::MoveFileW( stringtoW( sFile), stringtoW( sNewFile)) != 0) ;
}
//-----------------------------------------------------------------------------
bool
EraseFile( const string& sFile)
Scan.cpp → Scanner.cpp
+3 -3
View File
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2014
//----------------------------------------------------------------------------
// File : Scan.cpp Data : 17.06.14 Versione : 1.5f3
// File : Scanner.cpp Data : 17.06.14 Versione : 1.5f3
// Contenuto : Implementazione della classe Scanner.
// Scansione di file di testo con codifica UTF-8 (anche con BOM)
// e quindi anche ASCII.
@@ -16,7 +16,7 @@
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "/EgtDEv/Include/EGnScan.h"
#include "/EgtDEv/Include/EGnScanner.h"
#include "/EgtDEv/Include/EGnStringUtils.h"
#include "/EgtDEv/Include/EgtStringConverter.h"
#include "/EgtDev/Extern/Zlib/Include/zlib.h"
@@ -25,7 +25,7 @@ using namespace std ;
//----------------------------------------------------------------------------
bool
Scanner::Init( const std::string& sFile, const char* szRemInit, bool bSkipEmptyLine)
Scanner::Init( const string& sFile, const char* szRemInit, bool bSkipEmptyLine)
{
// apertura del file di ingresso
m_InFile = gzopen_w( stringtoW( sFile), "rb") ;
Writer.cpp
+68
View File
@@ -0,0 +1,68 @@
//----------------------------------------------------------------------------
// EgalTech 2015-2015
//----------------------------------------------------------------------------
// File : Writer.cpp Data : 02.06.15 Versione : 1.6f1
// Contenuto : Implementazione della classe Writer.
// Scrittura di file di testo con codifica UTF-8.
//
//
// Modifiche : 02.06.15 DS Creazione modulo.
//
//
//
//----------------------------------------------------------------------------
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "/EgtDev/Include/EGnWriter.h"
#include "/EgtDev/Include/EgtStringConverter.h"
#include "/EgtDev/Extern/Zlib/Include/zlib.h"
using namespace std ;
//----------------------------------------------------------------------------
bool
Writer::Init( const string& sFileOut, bool bCompressed)
{
// apertura del file di uscita
m_OutFile = gzopen_w( stringtoW( sFileOut), ( bCompressed ? "wb" : "wbT")) ;
if ( m_OutFile == nullptr)
return false ;
const int DIM_BUFFER = 65536 ;
if ( gzbuffer( m_OutFile, DIM_BUFFER) != Z_OK)
return false ;
const int COMPR_LEVEL = 3 ; // 0 = no compression ... 9 = max compression
if ( gzsetparams( m_OutFile, COMPR_LEVEL, Z_DEFAULT_STRATEGY) != Z_OK)
return false ;
return true ;
}
//----------------------------------------------------------------------------
bool
Writer::Close( void)
{
if ( m_OutFile != nullptr) {
bool bOk = ( gzclose( m_OutFile) == Z_OK) ;
m_OutFile = nullptr ;
return bOk ;
}
return true ;
}
//----------------------------------------------------------------------------
bool
Writer::OutText( const string& sText, bool bEndL)
{
// verifico apertura file
if ( m_OutFile == nullptr)
return false ;
// scrivo stringa
if ( gzputs( m_OutFile, sText.c_str()) == Z_ERRNO)
return false ;
// se richiesto, scrivo fine linea
if ( bEndL) {
if ( gzputs( m_OutFile, "\r\n") == Z_ERRNO)
return false ;
}
return true ;
}