Fix for converting encoding.

Author: clown

CPP/Common/StringConvert.cpp

@@ -75,8 +75,11 @@ void MultiByteToUnicodeString2(UString &dest, const AString &src, UINT codePage)
     dest.ReleaseBuf_SetLen(i);
     */
     Cube::Encoding::Conversion::Initialize();
-    auto unicode = Cube::Encoding::Conversion::ToUnicode((const char*)src);
-    dest = unicode.c_str();
+    auto code = Cube::Encoding::Conversion::Guess((const char*)src);
+    auto cvt  = code != Cube::Encoding::Unknown ?
+                Cube::Encoding::Conversion::ToUnicode((const char*)src) :
+                Cube::Encoding::Conversion::Widen((const char*)src, codePage);
+    dest = cvt.c_str();
   }
 }
 

CPP/Common/UTFConvert.cpp

@@ -278,9 +278,7 @@ bool ConvertUTF8ToUnicode(const AString &src, UString &dest)
   Cube::Encoding::Conversion::Initialize();
   auto code = Cube::Encoding::Conversion::Guess((const char*)src);
   if (code != Cube::Encoding::Utf8) CUBE_LOG << _T("Encoding:") << code << _T(" (probably not UTF-8)");
-  dest = code == Cube::Encoding::ShiftJis ?
-         Cube::Encoding::Conversion::ToUnicode((const char*)src, Cube::Encoding::ShiftJis).c_str() :
-         Cube::Encoding::Conversion::ToUnicode((const char*)src, Cube::Encoding::Utf8).c_str();
+  dest = Cube::Encoding::Conversion::ToUnicode((const char*)src, code).c_str();
   return true;
 }