git-svn-id: svn://db.shs.com.ru/pip@901 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2020-03-05 13:16:53 +00:00
parent d6f7e261b2
commit 5c6d9feb3d
6 changed files with 142 additions and 621 deletions
--- a/src_main/core/pichar.cpp
+++ b/src_main/core/pichar.cpp
@@ -26,9 +26,14 @@
 #  define U_NOEXCEPT
 #  include "unicode/ucnv.h"
 #  include "unicode/ustring.h"
+#else
+#  ifdef WINDOWS
+#    include <stringapiset.h>
+#  endif
+#endif
 char * __syslocname__ = 0;
 char * __sysoemname__ = 0;
-#endif
+char * __utf8name__ = 0;
 #ifdef BLACKBERRY
 #  include <ctype.h>
 #endif
@@ -47,88 +52,64 @@ char * __sysoemname__ = 0;
 */


-PIChar::PIChar(const char * c, int * bytes) {
+ushort charFromCodepage(const char * c, int size, const char * codepage, int * taken = 0) {
+	if (!c || size <= 0) return 0;
+	if (c[0] < 0x80) return c[0];
+	int ret;
 #ifdef PIP_ICU
 	UErrorCode e((UErrorCode)0);
-	UConverter * cc = ucnv_open(__syslocname__, &e);
+	UConverter * cc = ucnv_open(codepage, &e);
 	if (cc) {
 		UChar uc;
 		e = (UErrorCode)0;
-		int ret = ucnv_toUChars(cc, &uc, 1, c, 4, &e);
-		if (bytes) * bytes = ret;
+		ret = ucnv_toUChars(cc, &uc, 1, c, size, &e);
+		if (taken) *taken = ret;
 		ucnv_close(cc);
-		ch = uc;
-		return;
+		return ushort(uc);
 	}
+#else
+#  ifdef WINDOWS
+	wchar_t buffer;
+	ret = MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, size, &buffer, 1);
+	if (ret <= 0) return 0;
+	if (taken) *taken = ret;
+	return buffer;
+	//printf("request %d\n", sz);
+#  endif
 #endif
-	ch = *reinterpret_cast<const int * >(c);
+	wchar_t wc(0);
+	mbtowc(0, 0, 0); // reset mbtowc
+	ret = mbtowc(&wc, c, sizeof(ushort));
+	if (ret < 1 || ret > (int)sizeof(ushort)) return 0;
+	else return wc;
+	return c[0];
+}
+
+
+PIChar::PIChar(const char * c, int * bytes) {
+	ch = charFromCodepage(c, 4, __syslocname__, bytes);
 }


 PIChar PIChar::fromConsole(char c) {
 	PIChar ret;
-#ifdef PIP_ICU
-	UErrorCode e((UErrorCode)0);
-	UConverter * cc = ucnv_open(__sysoemname__, &e);
-	if (cc) {
-		UChar uc;
-		e = (UErrorCode)0;
-		ucnv_toUChars(cc, &uc, 1, &c, 1, &e);
-		ucnv_close(cc);
-		ret.ch = uc;
-		return ret;
-	}
-#endif
-	ret.ch = c;
+	ret.ch = charFromCodepage(&c, 1, __sysoemname__);
 	return ret;
 }


 PIChar PIChar::fromSystem(char c) {
 	PIChar ret;
-#ifdef PIP_ICU
-	UErrorCode e((UErrorCode)0);
-	UConverter * cc = ucnv_open(__syslocname__, &e);
-	if (cc) {
-		UChar uc;
-		e = (UErrorCode)0;
-		ucnv_toUChars(cc, &uc, 1, &c, 1, &e);
-		ucnv_close(cc);
-		ret.ch = uc;
-		return ret;
-	}
-#endif
-	ret.ch = c;
+	ret.ch = charFromCodepage(&c, 1, __syslocname__);
 	return ret;
 }


 PIChar PIChar::fromUTF8(const char * c) {
 	PIChar ret;
-#ifdef PIP_ICU
-	UErrorCode e((UErrorCode)0);
-	UConverter * cc = ucnv_open("UTF-8", &e);
-	if (cc) {
-		UChar uc;
-		e = (UErrorCode)0;
-		ucnv_toUChars(cc, &uc, 1, c, 8, &e);
-		ucnv_close(cc);
-		ret.ch = uc;
-		return ret;
-	}
-#endif
-//#ifdef ANDROID
-	wchar_t wc(0);
-	mbtowc(0, 0, 0); // reset mbtowc
-	//mbstate_t s;
-	//mbrtowc(&wc, c, 4, &s);
-	int sz = 0;
-	sz = mbtowc(&wc, c, sizeof(ushort));
-	if (sz < 1 || sz > (int)sizeof(ushort)) ret.ch = 0;
-	else ret.ch = wc;
-	return ret;
-//#endif
-//	ret.ch = *(ushort*)c;
+	int l = 0;
+	while (c[l] != '\0') ++l;
+	ret.ch = charFromCodepage(c, l, __utf8name__);
 	return ret;
 }

@@ -255,6 +236,11 @@ char PIChar::toConsole1Byte() const {
 		ucnv_close(cc);
 		return uc[0];
 	}
+#endif
+#ifdef WINDOWS
+	char ret[4] = {0,0,0,0};
+	WideCharToMultiByte(CP_OEMCP, 0, (LPCWCH)&ch, 1, ret, 4, NULL, NULL);
+	return ret[0];
 #endif
 	return toAscii();
 }
@@ -272,6 +258,11 @@ char PIChar::toSystem() const {
 		ucnv_close(cc);
 		return uc[0];
 	}
+#endif
+#ifdef WINDOWS
+	char ret[4] = {0,0,0,0};
+	WideCharToMultiByte(CP_ACP, 0, (LPCWCH)&ch, 1, ret, 4, NULL, NULL);
+	return ret[0];
 #endif
 	return toAscii();
 }
@@ -316,7 +307,14 @@ PICout operator <<(PICout s, const PIChar & v) {
 		s << uc;
 	} else
 #endif
+#ifdef WINDOWS
+	//if (PICout::isBufferActive())
+		s << v.toSystem();
+	//else
+	//	s << v.toConsole1Byte();
+#else
 	s << v.toCharPtr();
+#endif
 	s.restoreControl();
 	return s;
 }
--- a/src_main/core/pichar.h
+++ b/src_main/core/pichar.h
@@ -25,10 +25,9 @@

 #include "piincludes.h"

-#ifdef PIP_ICU
 extern char * __syslocname__;
 extern char * __sysoemname__;
-#endif
+extern char * __utf8name__;

 class PIP_EXPORT PIChar
 {
--- a/src_main/core/piinit.cpp
+++ b/src_main/core/piinit.cpp
@@ -92,6 +92,7 @@ PRIVATE_DEFINITION_START(PIInit)
 #ifdef WINDOWS
 	HMODULE ntlib;
 	ULONG prev_res;
+	bool delete_locs;
 #endif
 PRIVATE_DEFINITION_END(PIInit)

@@ -186,13 +187,16 @@ PIInit::PIInit() {
 	actions.sa_handler = android_thread_exit_handler;
 	sigaction(SIGTERM, &actions, 0);
 #endif
-#ifdef PIP_ICU
+	PRIVATE->delete_locs = false;
 	__syslocname__ = __sysoemname__ = 0;
+	__utf8name__ = "UTF-8";
+#ifdef PIP_ICU
 	//__syslocname__ = new char[256];
 	//memset(__syslocname__, 0, 256);
 	UErrorCode e((UErrorCode)0);
 	u_init(&e);
 #  ifdef WINDOWS
+	PRIVATE->delete_locs = true;
 	CPINFOEX cpinfo;
 	int l = 0;
 	/*GetCPInfoEx(CP_ACP, 0, &cpinfo);
@@ -218,6 +222,12 @@ PIInit::PIInit() {
 #  endif
 	//piCout << __syslocname__;
 	//piCout << __sysoemname__;
+#else
+#  ifdef WINDOWS
+	__syslocname__ = (char *)CP_ACP;
+	__sysoemname__ = (char *)CP_OEMCP;
+	__utf8name__ = (char *)CP_UTF8;
+#  endif
 #endif
 #ifdef MAC_OS
 	host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &__pi_mac_clock);
@@ -315,9 +325,11 @@ PIInit::~PIInit() {
 #ifdef MAC_OS
 	mach_port_deallocate(mach_task_self(), __pi_mac_clock);
 #endif
+	if (PRIVATE->delete_locs) {
+		if (__syslocname__) delete __syslocname__;
+		if (__sysoemname__) delete __sysoemname__;
+	}
 #ifdef PIP_ICU
-	if (__syslocname__) delete __syslocname__;
-	if (__sysoemname__) delete __sysoemname__;
 	u_cleanup();
 #endif
 	//if (currentLocale_t != 0) freelocale(currentLocale_t);
--- a/src_main/core/pistring.cpp
+++ b/src_main/core/pistring.cpp
@@ -21,6 +21,10 @@
 #ifdef PIP_ICU
 #  define U_NOEXCEPT
 #  include "unicode/ucnv.h"
+#else
+#  ifdef WINDOWS
+#    include <stringapiset.h>
+#  endif
 #endif
 #include <wchar.h>
 #ifdef ANDROID
@@ -205,6 +209,7 @@ llong PIString::toNumberBase(const PIString & value, int base, bool * ok) {

 void PIString::appendFromChars(const char * c, int s, const char * cp) {
 	if (s <= 0) return;
+	int sz;
 #ifdef PIP_ICU
 	UErrorCode e((UErrorCode)0);
 	UConverter * cc = ucnv_open(cp, &e);
@@ -212,16 +217,27 @@ void PIString::appendFromChars(const char * c, int s, const char * cp) {
 		UChar * ucs = new UChar[s];
 		memset(ucs, 0, s * sizeof(UChar));
 		e = (UErrorCode)0;
-		int rs = ucnv_toUChars(cc, ucs, s, c, s, &e);
-		//printf("appendFromChars %d -> %d\n", s, rs);
-		for (int i = 0; i < rs; ++i)
+		int sz = ucnv_toUChars(cc, ucs, s, c, s, &e);
+		//printf("appendFromChars %d -> %d\n", s, sz);
+		for (int i = 0; i < sz; ++i)
 			push_back(PIChar(ucs[i]));
 		delete[] ucs;
 		ucnv_close(cc);
 		return;
 	}
+#else
+#  ifdef WINDOWS
+	sz = MultiByteToWideChar((uint)(uintptr_t)cp, MB_ERR_INVALID_CHARS, c, s, 0, 0);
+	if (sz <= 0) return;
+	wchar_t * buffer = new wchar_t[sz];
+	MultiByteToWideChar((uint)(uintptr_t)cp, MB_ERR_INVALID_CHARS, c, s, buffer, sz);
+	for (int i = 0; i < sz; ++i)
+		push_back(PIChar((ushort)buffer[i]));
+	delete[] buffer;
+	return;
+	//printf("request %d\n", sz);
+#  endif
 #endif
-	int sz;
 	wchar_t wc;
 	mbtowc(0,0,0); // reset mbtowc
 	//qDebug() << "FromChars ...";
@@ -242,11 +258,7 @@ PIString PIString::fromConsole(const char * s) {
 	int l = 0;
 	while (s[l] != '\0') ++l;
 	PIString ret;
-	if (l > 0) ret.appendFromChars(s, l
-#ifdef PIP_ICU
-										, __sysoemname__
-#endif
-														);
+	if (l > 0) ret.appendFromChars(s, l, __sysoemname__);
 	return ret;

 }
@@ -256,7 +268,7 @@ PIString PIString::fromSystem(const char * s) {
 	int l = 0;
 	while (s[l] != '\0') ++l;
 	PIString ret;
-	if (l > 0) ret.appendFromChars(s, l);
+	if (l > 0) ret.appendFromChars(s, l, __syslocname__);
 	return ret;
 }

@@ -265,11 +277,7 @@ PIString PIString::fromUTF8(const char * s) {
 	int l = 0;
 	while (s[l] != '\0') ++l;
 	PIString ret;
-	if (l > 0) ret.appendFromChars(s, l
-#ifdef PIP_ICU
-								   , "UTF-8"
-#endif
-								   );
+	if (l > 0) ret.appendFromChars(s, l, __utf8name__);
 	return ret;
 }

@@ -277,11 +285,7 @@ PIString PIString::fromUTF8(const char * s) {
 PIString PIString::fromUTF8(const PIByteArray & ba) {
 	PIString ret;
 	if (ba.isEmpty()) return ret;
-	ret.appendFromChars((const char*)ba.data(), ba.size()
-#ifdef PIP_ICU
-						, "UTF-8"
-#endif
-						);
+	ret.appendFromChars((const char*)ba.data(), ba.size(), __utf8name__);
 	return ret;
 }

@@ -304,6 +308,10 @@ PIString PIString::fromCodepage(const char * s, const char * c) {
 	if (l > 0) ret.appendFromChars(s, l
 #ifdef PIP_ICU
 										, c
+#else
+#  ifdef WINDOWS
+										, __utf8name__
+#  endif
 #endif
 											);
 	return ret;
@@ -319,60 +327,53 @@ PIString PIString::readableSize(llong bytes) {

 void PIString::buildData(const char * cp) const {
 	data_.clear();
+	int sz = 0;
 #ifdef PIP_ICU
 	UErrorCode e((UErrorCode)0);
 	UConverter * cc = ucnv_open(cp, &e);
 	if (cc) {
-		int rs = 0;//, ol = UCNV_GET_MAX_BYTES_FOR_STRING(size_s(), ucnv_getMaxCharSize(cc));
 		char uc[8];
 		for (int i = 0; i < size_s(); ++i) {
 			if (at(i).isAscii())
 				data_.push_back(uchar(at(i).unicode16Code()));
 			else {
 				e = (UErrorCode)0;
-				rs = ucnv_fromUChars(cc, uc, 8, (const UChar*)(PIDeque<PIChar>::data(i)), 1, &e);
-				//printf("conv %d\n", rs);
-				for (int j = 0; j < rs; ++j)
+				sz = ucnv_fromUChars(cc, uc, 8, (const UChar*)(PIDeque<PIChar>::data(i)), 1, &e);
+				for (int j = 0; j < sz; ++j)
 					data_.push_back(uc[j]);
 			}
 		}
-		//printf("buildData %d -> %d\n", size_s(), data_.size_s());
 		ucnv_close(cc);
 		data_.push_back('\0');
 		return;
 	}
+#else
+#  ifdef WINDOWS
+	sz = WideCharToMultiByte((uint)(uintptr_t)cp, 0, (LPCWCH)PIDeque<PIChar>::data(), PIDeque<PIChar>::size_s(), 0, 0, NULL, NULL);
+	//printf("WideCharToMultiByte %d %d\n", (uint)(uintptr_t)cp, sz);
+	if (sz <= 0) {
+		//printf("WideCharToMultiByte erro %d\n", GetLastError());
+		data_.push_back(uchar('\0'));
+		return;
+	}
+	data_.resize(sz);
+	WideCharToMultiByte((uint)(uintptr_t)cp, 0, (LPCWCH)PIDeque<PIChar>::data(), PIDeque<PIChar>::size_s(), (LPSTR)data_.data(), data_.size_s(), NULL, NULL);
+	data_.push_back(uchar('\0'));
+	return;
+#  endif
 #endif
 	wchar_t wc;
 	char tc[8];
-//	mbstate_t s;
-//	mbrlen(0,0,&s);
 	wctomb(0, 0);
-	int sz(0);
-	//printf("PIString::data %d\n", size_s());
 	for (int i = 0; i < size_s(); ++i) {
 		if (at(i).isAscii()) {
 			data_.push_back(uchar(at(i).toAscii()));
 			continue;
 		}
 		wc = at(i).toWChar();
-//		sz = piClampi(wcrtomb(tc, wc, &s), 0, 4);
 		sz = wctomb(tc, wc);
 		for (int b = 0; b < sz; ++b)
 			data_.push_back(uchar(tc[b]));
-		//printf("__%d_%d\n", i, wc);
-		/*tc = wc & 0xFF;
-		while (tc) {
-			data_.push_back(uchar(tc));
-			wc >>= 8;
-			tc = wc & 0xFF;
-			//printf("____%d\n", wc);
-		}*/
-		/*if (at(i).isAscii())
-			data_.push_back(uchar(at(i).toAscii()));
-		else {
-			data_.push_back((at(i).toCharPtr()[0])); ++j;
-			data_.push_back((at(i).toCharPtr()[1]));
-		}*/
 	}
 	data_.push_back(uchar('\0'));
 }
@@ -390,21 +391,13 @@ void PIString::trimsubstr(int &st, int &fn) const {


 const char * PIString::dataConsole() const {
-	buildData(
-#ifdef PIP_ICU
-			__sysoemname__
-#endif
-						);
+	buildData(__sysoemname__ );
 	return (const char *)(data_.data());
 }


 const char * PIString::dataUTF8() const {
-	buildData(
-#ifdef PIP_ICU
-			"UTF-8"
-#endif
-					);
+	buildData(__utf8name__);
 	return (const char *)(data_.data());
 }

@@ -425,11 +418,7 @@ uint PIString::hash() const {

 PIByteArray PIString::toUTF8() const {
 	if (isEmpty()) return data_.resized(0);
-	buildData(
-#ifdef PIP_ICU
-			"UTF-8"
-#endif
-					);
+	buildData(__utf8name__);
 	return data_.resized(data_.size_s() - 1);
 }

@@ -439,6 +428,10 @@ PIByteArray PIString::toCharset(const char * c) const {
 	buildData(
 #ifdef PIP_ICU
 			  c
+#else
+#  ifdef WINDOWS
+			  __utf8name__
+#  endif
 #endif
 				);
 	return data_.resized(data_.size_s() - 1);
@@ -450,7 +443,7 @@ PIString & PIString::operator +=(const char * str) {
 	if (!str) return *this;
 	int l = 0;
 	while (str[l] != '\0') ++l;
-	appendFromChars(str, l);
+	appendFromChars(str, l, __syslocname__);
 	return *this;
 }

@@ -1119,17 +1112,11 @@ PICout operator <<(PICout s, const PIString & v) {
 	s.space();
 	s.quote();
 	s.setControl(0, true);
-	if (PICout::isBufferActive())
+	//if (PICout::isBufferActive())
 		s << v.data();
-	else {
-#ifdef WINDOWS
-		PIByteArray d = v.toByteArray();
-		d.push_back(uchar('\0'));
-		s << (const char*)d.data();
-#else
-		s << v.dataConsole();
-#endif
-	}
+	//else {
+	//	s << v.dataConsole();
+	//}
 	s.restoreControl();
 	s.quote();
 	return s;
--- a/src_main/core/pistring.h
+++ b/src_main/core/pistring.h
@@ -439,7 +439,7 @@ public:
 	 * returned by function \a data() - 1, without terminating null-char \n
 	 * Example: \snippet pistring.cpp PIString::lengthAscii
 	 * \sa \a data() */
-	int lengthAscii() const {buildData(); return data_.size_s() - 1;}
+	int lengthAscii() const {buildData(__syslocname__); return data_.size_s() - 1;}
 	
 	/*! \brief Return \c char * representation of this string in system codepage
 	 * \details This function fill buffer by sequence
@@ -448,7 +448,7 @@ public:
 	 * execution of this function.\n
 	 * Example: \snippet pistring.cpp PIString::data
 	 * \sa \a dataConsole(), \a dataUTF8() */
-	const char * data() const {buildData(); return (const char *)(data_.data());}
+	const char * data() const {buildData(__syslocname__); return (const char *)(data_.data());}
 	
 	/*! \brief Return \c char * representation of this string in terminal codepage
 	 * \details This function fill buffer by sequence
@@ -477,7 +477,7 @@ public:
 	uint hash() const;

 	//! \brief Return \a PIByteArray contains \a data() of this string without terminating null-char
-	PIByteArray toByteArray() const {buildData(); return data_.resized(data_.size_s() - 1);}
+	PIByteArray toByteArray() const {buildData(__utf8name__); return data_.resized(data_.size_s() - 1);}

 	//! \brief Return \a PIByteArray contains UTF-8 \a data() of this string without terminating null-char
 	PIByteArray toUTF8() const;
@@ -750,8 +750,8 @@ private:
 	static PIString fromNumberBaseS(const llong value, int base = 10, bool * ok = 0);
 	static PIString fromNumberBaseU(const ullong value, int base = 10, bool * ok = 0);
 	static llong toNumberBase(const PIString & value, int base = -1, bool * ok = 0);
-	void appendFromChars(const char * c, int s, const char * cp = 0);
-	void buildData(const char * cp = 0) const;
+	void appendFromChars(const char * c, int s, const char * cp = __syslocname__);
+	void buildData(const char * cp = __syslocname__) const;
 	void trimsubstr(int &st, int &fn) const;
 	mutable PIByteArray data_;
 };