PIString and PIChar fixes 2

libs/main/core/pichar.cpp

@@ -91,7 +91,7 @@ ushort charFromCodepage(const char * c, int size, const char * codepage, int * t
 	ret = mbtowc(&wc, c, size);
 	//printf("mbtowc = %d\n", ret);
 	if (ret < 1) return 0;
-	return ushort(int(wc));
+	return ushort(wc);
 #  endif
 #endif
 	return ushort(c[0]);

libs/main/core/pistring_std.h

@@ -68,7 +68,7 @@ inline PIString StdWString2PIString(const std::wstring & v) {
 	PIString s;
 	uint l = v.size();
 	for (uint i = 0; i < l; ++i) {
-		s.push_back(v[i]);
+		s.push_back(PIChar(v[i]));
 	}
 	return s;
 }