EgtGeneral 1.9h1 :

- ricompilazione per cambio versione e controllo versione chiave 19.
This commit is contained in:
Dario Sassi
2018-08-08 10:58:39 +00:00
parent 16576fba64
commit fd2661dae8
3 changed files with 11 additions and 20 deletions
+9 -18
View File
@@ -24,34 +24,29 @@ using namespace std ;
bool
GetModuleVersion( HINSTANCE hModule, string& sVer)
{
bool bOk ;
wchar_t szFileName[_MAX_PATH] ;
DWORD dwNULL ;
DWORD dwSize ;
UINT dwUsefulSize ;
LPVOID lpData ;
LPVOID lpUsefulData ;
VS_FIXEDFILEINFO* pvsInfo ;
// imposto versione a non trovata
sVer = "0.0_0" ;
// trovo nome del file dato l'hInstance
wchar_t szFileName[_MAX_PATH] ;
::GetModuleFileNameW( hModule, szFileName, _MAX_PATH) ;
// mi faccio dare il buffer delle informazioni dal file
dwSize = ::GetFileVersionInfoSizeW( szFileName, &dwNULL) ;
DWORD dwNULL ;
DWORD dwSize = ::GetFileVersionInfoSizeW( szFileName, &dwNULL) ;
if ( dwSize == 0)
return false ;
lpData = malloc( size_t( dwSize));
LPVOID lpData = malloc( size_t( dwSize));
if ( lpData == nullptr)
return false ;
GetFileVersionInfoW( szFileName, dwNULL, dwSize, lpData) ;
// Chiedo le info standard
bool bOk = false ;
LPVOID lpUsefulData ;
UINT dwUsefulSize ;
if ( ::VerQueryValueW( lpData, L"\\", &lpUsefulData, &dwUsefulSize)) {
pvsInfo = (VS_FIXEDFILEINFO*) lpUsefulData ;
VS_FIXEDFILEINFO* pvsInfo = (VS_FIXEDFILEINFO*) lpUsefulData ;
int nMajVer = pvsInfo->dwFileVersionMS >> 16 ;
int nMinVer = pvsInfo->dwFileVersionMS % 0x10000 ;
char cChar = (char) ( (pvsInfo->dwFileVersionLS >> 16) + 96) ;
@@ -59,8 +54,6 @@ GetModuleVersion( HINSTANCE hModule, string& sVer)
sVer = ToString( nMajVer) + "." + ToString( nMinVer) + cChar + ToString( nSub) ;
bOk = true ;
}
else
bOk = false ;
// disalloco il buffer
free( lpData) ;
@@ -72,10 +65,8 @@ GetModuleVersion( HINSTANCE hModule, string& sVer)
bool
GetModuleDirectory( HINSTANCE hModule, string& sDir)
{
wchar_t szFileNameW[_MAX_PATH] ;
// trovo path del file dato l'hInstance
wchar_t szFileNameW[_MAX_PATH] ;
if ( ::GetModuleFileNameW( hModule, szFileNameW, _MAX_PATH) == 0)
return false ;