--- a/secureswitools/swisistools/source/interpretsislib/expressionevaluator.cpp	Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/expressionevaluator.cpp	Wed Oct 13 14:40:19 2010 +0300
@@ -108,9 +108,9 @@
 	    {
 		iExpressionDepth=0;
 		std::string error = "SIS File expression too complex\n";
-		std::string x = wstring2string(iExpEnv.GetPackageName());
+		std::string x;
         //
-		throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+		throw InvalidSis(Ucs2ToUtf8(iExpEnv.GetPackageName(),x), error, SIS_NOT_SUPPORTED);
 	    }
 
 	switch (aExpression.Operator())
@@ -248,9 +248,9 @@
 		{
 		iExpressionDepth=0;
 		std::string error = "SIS File contains user options\n";
-		std::string x = wstring2string(iExpEnv.GetPackageName());
+		std::string x;
         //
-		throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+		throw InvalidSis(Ucs2ToUtf8(iExpEnv.GetPackageName(),x), error, SIS_NOT_SUPPORTED);
 		}
 
 	case CSISExpression::EPrimTypeNumber:
@@ -261,9 +261,9 @@
 		{
 		iExpressionDepth=0;
 		std::string error = "SIS File contains unknown expression\n";
-		std::string x = wstring2string(iExpEnv.GetPackageName());
+		std::string x;
         //
-		throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+		throw InvalidSis(Ucs2ToUtf8(iExpEnv.GetPackageName(),x), error, SIS_NOT_SUPPORTED);
 		}
     	}
 
@@ -316,7 +316,8 @@
         }
 
     // Require for invalid file exception (also helps with debugging)
-	    std::string narrowFileName = wstring2string( fileName );
+    std::string narrowFileName;
+    narrowFileName = Ucs2ToUtf8( fileName, narrowFileName );
 
     // Now continue with file, assuming we've fixed up the path or then
     // have enough characters to process
@@ -344,7 +345,8 @@
             ConvertToLocalPath( fileName, iCDrive );
 
             // For debugging
-			narrowFileName = wstring2string( fileName );
+            narrowFileName = Ucs2ToUtf8( fileName, narrowFileName );
+
             fileExists = FileExists( fileName );
             break;
             }
@@ -361,7 +363,7 @@
 		std::ostringstream stream;
 		stream << "\tIF EXISTS(\'" << narrowFileName << "\') => " << fileExists;
 		std::string msg = stream.str();
-		std::wstring finalMessage = string2wstring( msg );
+		std::wstring finalMessage = Utf8ToUcs2( msg );
 		LINFO( finalMessage );
 		}
     //
@@ -426,7 +428,7 @@
 					std::ostringstream stream;
 					stream << "Input language " << result << " is not supported by SIS file. Using first language " <<firstLanguage;
 					std::string msg = stream.str();
-					std::wstring finalMessage = string2wstring( msg );
+					std::wstring finalMessage = Utf8ToUcs2( msg );
 					LWARN( finalMessage );	
 					}
 				result = firstLanguage;
@@ -437,7 +439,7 @@
 			std::ostringstream stream;
 			stream << "\tIF " << attributeName << " ... where [" << attributeName << " = " << result << "]";
 			std::string msg = stream.str();
-			std::wstring finalMessage = string2wstring( msg );
+			std::wstring finalMessage = Utf8ToUcs2( msg );
 			LINFO( finalMessage );
 			}
         }
@@ -451,7 +453,8 @@
     	}
     else
         {
-        std::string packageName = wstring2string( GetPackageName() );
+        std::string packageName;
+        packageName = Ucs2ToUtf8( GetPackageName(), packageName );
         //
 		std::string error = "SIS File contains HAL attributes\n";
 		throw InvalidSis( packageName, error, SIS_NOT_SUPPORTED );