Merge branch 'master' into another

.travis.yml

@@ -7,20 +7,25 @@ dist: trusty
 osx_image: xcode8
 addons:
   ssh_known_hosts:
-  - github.com
+    - github.com
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
-    - libfreetype6-dev
-    - libevent-dev
-    - libsqlite3-dev
-    - libirrlicht-dev
-    - libgl1-mesa-dev
-    - libglu-dev
-    - p7zip-full
+      - gcc-6
+      - g++-6
+      - libfreetype6-dev
+      - libevent-dev
+      - libsqlite3-dev
+      - libirrlicht-dev
+      - libgl1-mesa-dev
+      - libglu-dev
+      - p7zip-full
 env:
 - USE_IRRKLANG=1
 before_install:
 - git submodule update --init --recursive
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc; sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     brew update > /dev/null;
     brew install freetype libevent sqlite p7zip dylibbundler > /dev/null;

gframe/bufferio.h

@@ -60,7 +60,7 @@ public:
 		*pstr = 0;
 		return l;
 	}
-	// UCS-2 to UTF-8
+	// UTF-16/UTF-32 to UTF-8
 	static int EncodeUTF8(const wchar_t * wsrc, char * str) {
 		char* pstr = str;
 		while(*wsrc != 0) {
@@ -71,18 +71,35 @@ public:
 				str[0] = ((*wsrc >> 6) & 0x1f) | 0xc0;
 				str[1] = ((*wsrc) & 0x3f) | 0x80;
 				str += 2;
-			} else {
+			} else if(*wsrc < 0x10000 && (*wsrc < 0xd800 || *wsrc > 0xdfff)) {
 				str[0] = ((*wsrc >> 12) & 0xf) | 0xe0;
 				str[1] = ((*wsrc >> 6) & 0x3f) | 0x80;
 				str[2] = ((*wsrc) & 0x3f) | 0x80;
 				str += 3;
+			} else {
+#ifdef _WIN32
+				unsigned unicode = 0;
+				unicode |= (*wsrc++ & 0x3ff) << 10;
+				unicode |= *wsrc & 0x3ff;
+				unicode += 0x10000;
+				str[0] = ((unicode >> 18) & 0x7) | 0xf0;
+				str[1] = ((unicode >> 12) & 0x3f) | 0x80;
+				str[2] = ((unicode >> 6) & 0x3f) | 0x80;
+				str[3] = ((unicode) & 0x3f) | 0x80;
+#else
+				str[0] = ((*wsrc >> 18) & 0x7) | 0xf0;
+				str[1] = ((*wsrc >> 12) & 0x3f) | 0x80;
+				str[2] = ((*wsrc >> 6) & 0x3f) | 0x80;
+				str[3] = ((*wsrc) & 0x3f) | 0x80;
+#endif // _WIN32
+				str += 4;
 			}
 			wsrc++;
 		}
 		*str = 0;
 		return str - pstr;
 	}
-	// UTF-8 to UCS-2
+	// UTF-8 to UTF-16/UTF-32
 	static int DecodeUTF8(const char * src, wchar_t * wstr) {
 		const char* p = src;
 		wchar_t* wp = wstr;
@@ -97,7 +114,14 @@ public:
 				*wp = (((unsigned)p[0] & 0xf) << 12) | (((unsigned)p[1] & 0x3f) << 6) | ((unsigned)p[2] & 0x3f);
 				p += 3;
 			} else if((*p & 0xf8) == 0xf0) {
+#ifdef _WIN32
+				unsigned unicode = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
+				unicode -= 0x10000;
+				*wp++ = (unicode >> 10) | 0xd800;
+				*wp = (unicode & 0x3ff) | 0xdc00;
+#else
 				*wp = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
+#endif // _WIN32
 				p += 4;
 			} else
 				p++;

script @ bc26f53a

-Subproject commit f2531bc8e1a1a5a20d7867c678b3aa6166fbcd67
+Subproject commit bc26f53a53296fc481b18044195f34c97066fd57