diff -r bb1748e0dd9b -r c6e8afe0ba85 secureswitools/swisistools/source/interpretsislib/sisfile.cpp --- a/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Tue Jun 29 16:50:12 2010 +0300 +++ b/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Thu Jul 08 20:28:00 2010 +0300 @@ -204,10 +204,10 @@ if (failed) { - std::string x; - throw InvalidSis(Ucs2ToUtf8(this->GetPackageName(),x), - error, SIS_NOT_SUPPORTED); + std::string x = wstring2string(this->GetPackageName()); + throw InvalidSis(x, error, SIS_NOT_SUPPORTED); } + } bool SisFile::ProcessInstallOptionsWarning(const CSISInstallBlock& aInstallBlock, std::string& aError) @@ -219,7 +219,7 @@ { const CSISFileDescription& fD = aInstallBlock.FileDescription(i); const CSISFileDescription::TSISFileOperation operation = fD.Operation(); - std::wstring target(fD.Target().GetString()); + std::wstring target(fD.Target().GetString().c_str()); // switch( operation ) { @@ -263,6 +263,7 @@ success = true; break; case CSISFileDescription::EOpNull: + case CSISFileDescription::EOpNone: success = true; break; default: @@ -276,6 +277,7 @@ break; } } + return success; }