ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-12 17:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Debug under Windows + some minor corrections.

Browse Source
This commit is contained in:
rnv 2021-08-19 15:24:41 +03:00
parent db3a0bbde4
commit 096a139769
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx
View File

@ -152,12 +152,16 @@ namespace
0, 0,
NULL NULL
); );
if ( msgLen > 0 ) if ( msgLen > 0 ) {
error = (char*) cstr; #if defined( WIN32 ) && defined( UNICODE )
error = Kernel_Utils::encode((wchar_t*)cstr);
#else
error = (char*)cstr;
#endif
LocalFree(cstr);
}
LocalFree(cstr); return (bool)msgLen;
return msgLen;
#endif #endif
} }
@ -244,11 +248,11 @@ namespace
#ifdef WIN32 #ifdef WIN32
std::string outFile = tmpDir + "libMeshGemsKeyGenerator.dll"; std::string outFile = tmpDir + "MeshGemsKeyGenerator.dll";
// use wget (== Invoke-WebRequest) PowerShell command available since Windows 7 // use wget (== Invoke-WebRequest) PowerShell command available since Windows 7
std::string psCmd = "wget -Uri " + url + " -OutFile " + outFile; std::string psCmd = "wget -Uri " + url + " -OutFile " + outFile;
std::string cmd = "start powershell.exe " + psCmd; std::string cmd = "powershell.exe " + psCmd;
#else #else
@ -273,8 +277,10 @@ namespace
SMESH_File resultFile( outFile, /*open=*/false ); SMESH_File resultFile( outFile, /*open=*/false );
bool ok = ( resultFile.exists() && resultFile.size() > 0 ); bool ok = ( resultFile.exists() && resultFile.size() > 0 );
if ( ok ) if (ok)
libraryFile._name = outFile; libraryFile._name = outFile;
else
error = "Can't download file " + url;
return ok; return ok;
} }
@ -357,6 +363,7 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
if ( !loadLibrary( error, libraryFile )) if ( !loadLibrary( error, libraryFile ))
return false; return false;
bool ok = false;
typedef bool (*SignFun)(void* ); typedef bool (*SignFun)(void* );
SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignCAD" ); SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignCAD" );
if ( !signFun ) if ( !signFun )
@ -364,20 +371,20 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
if ( ! getLastError( error )) if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'SignCAD' in '") << getenv( theEnvVar ) << "'"; error = SMESH_Comment( "Can't find symbol 'SignCAD' in '") << getenv( theEnvVar ) << "'";
} }
else
{
bool ok; SMESH_TRY;
SMESH_TRY; ok = signFun( meshgems_cad );
ok = signFun( meshgems_cad ); SMESH_CATCH( SMESH::returnError );
SMESH_CATCH( SMESH::returnError );
if ( !error.empty() )
ok = false;
else if ( !ok )
error = "SignCAD() failed (located in '" + libraryFile._name + "')";
if ( !error.empty() )
ok = false;
else if ( !ok )
error = "SignCAD() failed (located in '" + libraryFile._name + "')";
}
return ok; return ok;
} }