Url decode/encode and JSON escaped chars go to/from local charset in ASL_ANSI mode

Author: aslze

include/asl/String.h

@@ -753,6 +753,9 @@ int ASL_API utf8toUtf16(const char* u, wchar_t* p, int);
 int ASL_API utf32toUtf8(const int* p, char* u, int);
 int ASL_API utf8toUtf32(const char* u, int* p, int);
 String ASL_API localToString(const String& a);
+String ASL_API stringToLocal(const String& a);
+String ASL_API localToUtf8(const String& a);
+String ASL_API utf8ToLocal(const String& a);
 }
 
 #ifdef QSTRING_H

src/Http.cpp

@@ -33,7 +33,11 @@ String Url::decode(const String& q0)
 		else
 		q << c;
 	}
+#ifdef ASL_ANSI
+	return utf8ToLocal(q);
+#else
 	return q;
+#endif
 }
 
 inline bool isanyof(char c, const char* chars)
@@ -51,8 +55,14 @@ inline char hexNibble(int x)
 	return h[x];
 }
 
-String Url::encode(const String& q0, bool component)
+String Url::encode(const String& q0_, bool component)
 {
+#ifdef ASL_ANSI
+	String q0 = localToUtf8(q0_);
+#else
+	const String& q0 = q0_;
+#endif
+
 	String q(q0.length(), 0);
 	for (int i = 0; i < q0.length(); i++)
 	{

src/String.cpp

@@ -211,6 +211,31 @@ String localToString(const String& a)
 	return String(ws.ptr());
 }
 
+String stringToLocal(const String& a)
+{
+	Array<char> s(a.length() + 1);
+	utf16toLocal8((const wchar_t*)a, s.ptr(), a.length() + 1);
+	return String(s.ptr());
+}
+
+String localToUtf8(const String& a)
+{
+	Array<wchar_t> ws(a.length() + 1);
+	local8toUtf16(a, ws.ptr(), a.length() + 1);
+	String u(a.length() * 3, 0);
+	int n = utf16toUtf8(ws.ptr(), u.data(), a.length() * 3);
+	return u.fix(n);
+}
+
+String utf8ToLocal(const String& a)
+{
+	Array<char> s(a.length() + 1);
+	Array<wchar_t> ws(a.length() + 1);
+	int         n = utf8toUtf16(*a, ws.ptr(), a.length());
+	utf16toLocal8(ws.ptr(), s.ptr(), a.length() + 1);
+	return String(s.ptr());
+}
+
 int String::Enumerator::operator*()
 {
 #ifdef ASL_ANSI

src/Xdl.cpp

@@ -559,7 +559,11 @@ void XdlParser::parse(const char* s)
 					wchar_t u16[3] = { _wchar, wchar, 0 };
 					char ch[9];
 					utf16toUtf8(u16, ch, 2);
+#ifdef ASL_ANSI
+					_buffer << utf8ToLocal(ch);
+#else
 				_buffer << ch;
+#endif
 					_unicodeCount = 0;
 				}
 				else if (_unicodeCount == 4) // first code
@@ -569,7 +573,11 @@ void XdlParser::parse(const char* s)
 						wchar_t u16[2] = { wchar, 0 };
 						char    ch[8];
 						utf16toUtf8(u16, ch, 1);
+#ifdef ASL_ANSI
+						_buffer << utf8ToLocal(ch);
+#else
 						_buffer << ch;
+#endif
 						_unicodeCount = 0;
 					}
 					else