haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FILENAME_RESOLVER: fix missing conversion from UTF8 to wide chars. 

Fixes #3742
https://gitlab.com/kicad/code/kicad/issues/3742
This commit is contained in:
jean-pierre charras 2020-01-07 13:35:37 +01:00
parent 1f3a2dcd1d
commit e2492f773d
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/filename_resolver.cpp
View File

@ -185,9 +185,9 @@ bool FILENAME_RESOLVER::createPathList()
if( GetKicadPaths( epaths ) ) if( GetKicadPaths( epaths ) )
{ {
for( const auto& i : epaths ) for( const wxString& curr_path : epaths )
{ {
wxString pathVal = ExpandEnvVarSubstitutions( i ); wxString pathVal = ExpandEnvVarSubstitutions( curr_path );
if( pathVal.empty() ) if( pathVal.empty() )
{ {
@ -200,8 +200,8 @@ bool FILENAME_RESOLVER::createPathList()
lpath.m_pathexp = fndummy.GetFullPath(); lpath.m_pathexp = fndummy.GetFullPath();
} }
lpath.m_alias = i; lpath.m_alias = curr_path;
lpath.m_pathvar = i; lpath.m_pathvar = curr_path;
if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() ) if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
lpath.m_pathexp.erase( --lpath.m_pathexp.end() ); lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
@ -219,9 +219,8 @@ bool FILENAME_RESOLVER::createPathList()
#ifdef DEBUG #ifdef DEBUG
wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" ); wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" );
std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();
while( sPL != ePL ) while( sPL != m_Paths.end() )
{ {
wxLogTrace( MASK_3D_RESOLVER, " + %s : '%s'\n", (*sPL).m_alias.GetData(), wxLogTrace( MASK_3D_RESOLVER, " + %s : '%s'\n", (*sPL).m_alias.GetData(),
(*sPL).m_pathexp.GetData() ); (*sPL).m_pathexp.GetData() );
@ -636,9 +635,9 @@ bool FILENAME_RESOLVER::writePathList()
// skip all ${ENV_VAR} alias names // skip all ${ENV_VAR} alias names
std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();
while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) ) while( sPL != m_Paths.end() &&
( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
++sPL; ++sPL;
wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG ); wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG );
@ -662,7 +661,7 @@ bool FILENAME_RESOLVER::writePathList()
cfgFile << "#V" << CFGFILE_VERSION << "\n"; cfgFile << "#V" << CFGFILE_VERSION << "\n";
std::string tstr; std::string tstr;
while( sPL != ePL ) while( sPL != m_Paths.end() )
{ {
tstr = sPL->m_alias.ToUTF8(); tstr = sPL->m_alias.ToUTF8();
cfgFile << "\"" << tstr.size() << ":" << tstr << "\","; cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
@ -762,10 +761,9 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
wxCriticalSectionLocker lock( lock_resolver ); wxCriticalSectionLocker lock( lock_resolver );
std::list< SEARCH_PATH >::const_iterator sL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sL = m_Paths.begin();
std::list< SEARCH_PATH >::const_iterator eL = m_Paths.end();
size_t idx; size_t idx;
while( sL != eL ) while( sL != m_Paths.end() )
{ {
// undefined paths do not participate in the // undefined paths do not participate in the
// file name shortening procedure // file name shortening procedure
@ -949,7 +947,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( nchars > 0 ) if( nchars > 0 )
{ {
aResult = aString.substr( i2, nchars ); aResult = wxString::FromUTF8( aString.substr( i2, nchars ).c_str() );
i2 += nchars; i2 += nchars;
} }

2
utils/kicad2step/pcb/3d_resolver.cpp
View File

@ -1065,7 +1065,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
if( nchars > 0 ) if( nchars > 0 )
{ {
aResult = aString.substr( i2, nchars ); aResult = wxString::FromUTF8( aString.substr( i2, nchars ).c_str() );
i2 += nchars; i2 += nchars;
} }