0,
NULL
);
- if ( msgLen > 0 )
- error = (char*) cstr;
-
- LocalFree(cstr);
+ if ( msgLen > 0 ) {
+# if defined( UNICODE )
+ error = Kernel_Utils::encode_s((wchar_t*)cstr);
+# else
+ error = (char*)cstr;
+# endif
+ LocalFree(cstr);
+ }
- return msgLen;
+ return (bool)msgLen;
#endif
}
bool isURL( LibraryFile & libraryFile )
{
- enum { SCHEME = 2, AUTHORITY = 4, PATH = 5 }; // sub-strings
- std::regex urlRegex ( R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)",
- std::regex::extended );
- std::smatch matchResult;
-
- libraryFile._isURL = false;
- if ( std::regex_match( libraryFile._name, matchResult, urlRegex ))
- libraryFile._isURL = ( !matchResult.str( SCHEME ).empty() &&
- !matchResult.str( AUTHORITY ).empty() &&
- !matchResult.str( PATH ).empty() );
-
+ {// round1
+ enum { SCHEME = 2, AUTHORITY = 4, PATH = 5 }; // sub-strings
+ std::regex urlRegex ( R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)",
+ std::regex::extended );
+ std::smatch matchResult;
+
+ libraryFile._isURL = false;
+ if ( std::regex_match( libraryFile._name, matchResult, urlRegex ))
+ libraryFile._isURL = ( !matchResult.str( SCHEME ).empty() &&
+ !matchResult.str( AUTHORITY ).empty() &&
+ !matchResult.str( PATH ).empty() );
+ }
+ if(libraryFile._isURL)
+ return true;
+ {// round2
+ enum { HOST = 2, PORT = 3, PATH = 4 }; // sub-strings
+ std::regex urlRegex ( R"(^(([^:\/?#]+):)?([^/]+)?(/[^#]*))",
+ std::regex::extended );
+ std::smatch matchResult;
+
+ libraryFile._isURL = false;
+ if ( std::regex_match( libraryFile._name, matchResult, urlRegex ))
+ libraryFile._isURL = ( !matchResult.str( HOST ).empty() &&
+ !matchResult.str( PORT ).empty() &&
+ !matchResult.str( PATH ).empty() );
+ }
return libraryFile._isURL;
}
#ifdef WIN32
- std::string outFile = tmpDir + "libMeshGemsKeyGenerator.dll";
+ std::string outFile = tmpDir + "MeshGemsKeyGenerator.dll";
// use wget (== Invoke-WebRequest) PowerShell command available since Windows 7
std::string psCmd = "wget -Uri " + url + " -OutFile " + outFile;
- std::string cmd = "start powershell.exe " + psCmd;
+ std::string cmd = "powershell.exe " + psCmd;
#else
if ( ok )
libraryFile._name = outFile;
+ else
+ error = "Can't download file " + url;
return ok;
}
if ( !loadLibrary( error, libraryFile ))
return false;
+ bool ok = false;
typedef bool (*SignFun)(void* );
- SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignCAD" );
+ SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignCAD" );
if ( !signFun )
{
if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'SignCAD' in '") << getenv( theEnvVar ) << "'";
}
+ else
+ {
+ SMESH_TRY;
- bool ok;
-
- SMESH_TRY;
-
- ok = signFun( meshgems_cad );
-
- SMESH_CATCH( SMESH::returnError );
+ ok = signFun( meshgems_cad );
- if ( !error.empty() )
- ok = false;
- else if ( !ok )
- error = "SignCAD() failed (located in '" + libraryFile._name + "')";
+ SMESH_CATCH( SMESH::returnError );
+ if ( !error.empty() )
+ ok = false;
+ else if ( !ok )
+ error = "SignCAD() failed (located in '" + libraryFile._name + "')";
+ }
return ok;
}
if ( !loadLibrary( error, libraryFile ))
return false;
+ bool ok = false;
typedef bool (*SignFun)(void* );
SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignMesh" );
if ( !signFun )
if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'SignMesh' in '") << getenv( theEnvVar ) << "'";
}
- bool ok;
-
- SMESH_TRY;
-
- ok = signFun( meshgems_mesh );
+ else
+ {
+ SMESH_TRY;
- SMESH_CATCH( SMESH::returnError );
+ ok = signFun( meshgems_mesh );
- if ( !error.empty() )
- ok = false;
- else if ( !ok )
- error = "SignMesh() failed (located in '" + libraryFile._name + "')";
+ SMESH_CATCH( SMESH::returnError );
+ if ( !error.empty() )
+ ok = false;
+ else if ( !ok )
+ error = "SignMesh() failed (located in '" + libraryFile._name + "')";
+ }
return ok;
}
if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'GetKey' in '") << getenv( theEnvVar ) << "'";
}
- key = keyFun( gmfFile, nbVertex, nbEdge, nbFace, nbVol );
-
+ else
+ {
+ key = keyFun( gmfFile, nbVertex, nbEdge, nbFace, nbVol );
+ }
if ( key.empty() )
error = "GetKey() failed (located in '" + libraryFile._name + "')";