[UNICODE]

* Update unicode tool to wine 1.3.29. By Samuel Serapion.
See issue #6537 for more details.

svn path=/trunk/; revision=54143

reactos/media/doc/README.WINE

@@ -21,7 +21,7 @@ When porting a new DLL from Wine to ReactOS, please do the following steps
 
 The following build tools are shared with Wine.
 
-reactos/tools/unicode             # Synced to Wine-1_2rc6
+reactos/tools/unicode             # Synced to Wine-1.3.29
 reactos/tools/widl                # Synced to Wine-1.3.26
 reactos/tools/winebuild           # Synced to Wine-1_1_13
 reactos/tools/wmc                 # Synced to Wine-20081105 (~Wine-1.1.7)

reactos/tools/unicode/Makefile.in

@@ -1,90 +0,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-LIBRARY   = wine_unicode
-SOVERSION = 1
-VERSCRIPT = $(SRCDIR)/wine_unicode.map
-EXTRADEFS = -D__WINESRC__ -DNO_LIBWINE_PORT -DWINE_UNICODE_API=""
-
-CODEPAGES = \
-	037 \
-	424 \
-	437 \
-	500 \
-	737 \
-	775 \
-	850 \
-	852 \
-	855 \
-	856 \
-	857 \
-	860 \
-	861 \
-	862 \
-	863 \
-	864 \
-	865 \
-	866 \
-	869 \
-	874 \
-	875 \
-	878 \
-	932 \
-	936 \
-	949 \
-	950 \
-	1006 \
-	1026 \
-	1250 \
-	1251 \
-	1252 \
-	1253 \
-	1254 \
-	1255 \
-	1256 \
-	1257 \
-	1258 \
-	1361 \
-	10000 \
-	10006 \
-	10007 \
-	10029 \
-	10079 \
-	10081 \
-	20127 \
-	20866 \
-	20932 \
-	21866 \
-	28591 \
-	28592 \
-	28593 \
-	28594 \
-	28595 \
-	28596 \
-	28597 \
-	28598 \
-	28599 \
-	28600 \
-	28603 \
-	28604 \
-	28605 \
-	28606
-
-C_SRCS = \
-	casemap.c \
-	collation.c \
-	compose.c \
-	cptable.c \
-	fold.c \
-	mbtowc.c \
-	sortkey.c \
-	string.c \
-	utf8.c \
-	wctomb.c \
-	wctype.c \
-	$(CODEPAGES:%=c_%.c)
-
-@MAKE_LIB_RULES@
-
-### Dependencies:

reactos/tools/unicode/c_037.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95,
     0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f,
-    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x88, 0x92, 0x93,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x94, 0x95, 0x97, 0xa2, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x4a, 0x3f, 0x3f, 0xb1, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_10000.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_10006.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x92, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_10007.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_10029.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_1006.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_10079.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_10081.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_1026.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95,
     0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f,
-    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x88, 0x92, 0x93,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x94, 0x95, 0x97, 0xa2, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0xb0, 0x3f, 0x3f, 0xb1, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_1361.c

@@ -4057,8 +4057,8 @@ static const unsigned short uni2cp_low[39424] =
     0x0038, 0x0039, 0x002b, 0x002d, 0x003d, 0x0028, 0x0029, 0xdd9c,
     0x0030, 0xdd9d, 0xdd9e, 0xdd9f, 0xdda0, 0x0035, 0x0036, 0x0037,
     0x0038, 0x0039, 0x002b, 0x002d, 0x003d, 0x0028, 0x0029, 0x003f,
-    0x0061, 0x0065, 0x006f, 0x0078, 0x003f, 0x003f, 0x003f, 0x003f,
+    0x0061, 0x0065, 0x006f, 0x0078, 0x003f, 0x0068, 0x006b, 0x006c,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
+    0x006d, 0x006e, 0x0070, 0x0073, 0x0074, 0x003f, 0x003f, 0x003f,
     0x003f, 0x0063, 0x003f, 0x003f, 0x004c, 0x003f, 0x003f, 0x003f,
     0x003f, 0x005c, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,

reactos/tools/unicode/c_20127.c

@@ -291,8 +291,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_20866.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_20932.c

@@ -2968,8 +2968,8 @@ static const unsigned short uni2cp_low[27904] =
     0x0038, 0x0039, 0x002b, 0xa1dd, 0x003d, 0x0028, 0x0029, 0x006e,
     0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
     0x0038, 0x0039, 0x002b, 0xa1dd, 0x003d, 0x0028, 0x0029, 0x003f,
-    0x0061, 0x0065, 0x006f, 0x0078, 0x003f, 0x003f, 0x003f, 0x003f,
+    0x0061, 0x0065, 0x006f, 0x0078, 0x003f, 0x0068, 0x006b, 0x006c,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
+    0x006d, 0x006e, 0x0070, 0x0073, 0x0074, 0x003f, 0x003f, 0x003f,
     0x003f, 0xa1f1, 0x003f, 0x003f, 0xa1f2, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,

reactos/tools/unicode/c_21866.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28591.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28592.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28593.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28594.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28595.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28596.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28597.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0xa4, 0x3f, 0x3f, 0xa5,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28598.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28599.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28600.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28603.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28604.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28605.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0xa4, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_28606.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0xa4, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_424.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95,
     0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f,
-    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x88, 0x92, 0x93,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x94, 0x95, 0x97, 0xa2, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x4a, 0x3f, 0x3f, 0xb1, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_437.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x9b, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x9e,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_500.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95,
     0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f,
-    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x88, 0x92, 0x93,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x94, 0x95, 0x97, 0xa2, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0xb0, 0x3f, 0x3f, 0xb1, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_737.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_775.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x96, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_850.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xbd, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_852.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_855.c

@@ -358,8 +358,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_856.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xbd, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_857.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xbd, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_860.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x9b, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x9e,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_861.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x9e,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_862.c

@@ -358,8 +358,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x9b, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x9e,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_863.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x9b, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_864.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0xc0, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_865.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0xfc,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x9e,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_866.c

@@ -358,8 +358,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_869.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[4864] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x9c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_875.c

@@ -292,8 +292,8 @@ static const unsigned char uni2cp_low[4864] =
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95,
     0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
     0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f,
-    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x81, 0x85, 0x96, 0xa7, 0x3f, 0x88, 0x92, 0x93,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x94, 0x95, 0x97, 0xa2, 0xa3, 0x3f, 0x3f, 0x3f,
     0x3f, 0x83, 0x3f, 0x3f, 0xb0, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/c_878.c

@@ -325,8 +325,8 @@ static const unsigned char uni2cp_low[5120] =
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f,
-    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x61, 0x65, 0x6f, 0x78, 0x3f, 0x68, 0x6b, 0x6c,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x3f, 0x3f, 0x3f,
     0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,

reactos/tools/unicode/casemap.c

@@ -219,7 +219,7 @@ const WCHAR wine_casemap_lower[3802] =
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
-    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030,
     0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030,
@@ -420,7 +420,7 @@ const WCHAR wine_casemap_lower[3802] =
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
-    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -455,10 +455,10 @@ const WCHAR wine_casemap_lower[3802] =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001,
     0x0000, 0x0001, 0x0000, 0x75fc, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0001, 0x0000, 0x5ad8, 0x0000, 0x0000, 0x0001, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -635,7 +635,7 @@ const WCHAR wine_casemap_upper[3994] =
     0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff,
     0x2a1f, 0x2a1c, 0x2a1e, 0xff2e, 0xff32, 0x0000, 0xff33, 0xff33,
     0x0000, 0xff36, 0x0000, 0xff35, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xff33, 0x0000, 0x0000, 0xff31, 0x0000, 0x0000, 0x0000, 0x0000,
+    0xff33, 0x0000, 0x0000, 0xff31, 0x0000, 0xa528, 0x0000, 0x0000,
     0xff2f, 0xff2d, 0x0000, 0x29f7, 0x0000, 0x0000, 0x0000, 0xff2d,
     0x0000, 0x29fd, 0xff2b, 0x0000, 0x0000, 0xff2a, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x29e7, 0x0000, 0x0000,
@@ -718,7 +718,7 @@ const WCHAR wine_casemap_upper[3994] =
     0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff,
     0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff,
     0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff,
-    0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000,
+    0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -949,7 +949,7 @@ const WCHAR wine_casemap_upper[3994] =
     0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
     0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
     0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
-    0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
+    0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
     0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -983,10 +983,10 @@ const WCHAR wine_casemap_upper[3994] =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff,
     0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
     0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000,
+    0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,

reactos/tools/unicode/mbtowc.c

@@ -39,15 +39,25 @@ static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
     return res;
 }
 
+/* check the code whether it is in Unicode Private Use Area (PUA). */
+/* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */
+static inline int is_private_use_area_char(WCHAR code)
+{
+    return (code >= 0xe000 && code <= 0xf8ff);
+}
+
 /* check src string for invalid chars; return non-zero if invalid char found */
 static inline int check_invalid_chars_sbcs( const struct sbcs_table *table, int flags,
                                             const unsigned char *src, unsigned int srclen )
 {
     const WCHAR * const cp2uni = (flags & MB_USEGLYPHCHARS) ? table->cp2uni_glyphs : table->cp2uni;
+    const WCHAR def_unicode_char = table->info.def_unicode_char;
+    const unsigned char def_char = table->uni2cp_low[table->uni2cp_high[def_unicode_char >> 8]
+                                                     + (def_unicode_char & 0xff)];
     while (srclen)
     {
-        if (cp2uni[*src] == table->info.def_unicode_char && *src != table->info.def_char)
+        if ((cp2uni[*src] == def_unicode_char && *src != def_char) ||
-            break;
+            is_private_use_area_char(cp2uni[*src])) break;
         src++;
         srclen--;
     }
@@ -151,20 +161,22 @@ static inline int check_invalid_chars_dbcs( const struct dbcs_table *table,
 {
     const WCHAR * const cp2uni = table->cp2uni;
     const unsigned char * const cp2uni_lb = table->cp2uni_leadbytes;
-
+    const WCHAR def_unicode_char = table->info.def_unicode_char;
+    const unsigned short def_char = table->uni2cp_low[table->uni2cp_high[def_unicode_char >> 8]
+                                                      + (def_unicode_char & 0xff)];
     while (srclen)
     {
         unsigned char off = cp2uni_lb[*src];
         if (off)  /* multi-byte char */
         {
             if (srclen == 1) break;  /* partial char, error */
-            if (cp2uni[(off << 8) + src[1]] == table->info.def_unicode_char &&
+            if (cp2uni[(off << 8) + src[1]] == def_unicode_char &&
-                ((src[0] << 8) | src[1]) != table->info.def_char) break;
+                ((src[0] << 8) | src[1]) != def_char) break;
             src++;
             srclen--;
         }
-        else if (cp2uni[*src] == table->info.def_unicode_char &&
+        else if ((cp2uni[*src] == def_unicode_char && *src != def_char) ||
-                 *src != table->info.def_char) break;
+                 is_private_use_area_char(cp2uni[*src])) break;
         src++;
         srclen--;
     }

reactos/tools/unicode/string.c

@@ -300,7 +300,7 @@ noconv:
 
 
 /* format a WCHAR string according to a printf format; helper for vsnprintfW */
-static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str )
+static int format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len )
 {
     size_t count = 0;
     int i, left_align = 0, width = 0, max = 0;
@@ -316,13 +316,14 @@ static int format_string( WCHAR *buffer, size_t len, const char *format, const W
 
     while (isdigit(*format)) width = width * 10 + *format++ - '0';
 
+    if (str_len == -1) str_len = strlenW( str );
     if (*format == '.')
     {
         format++;
         while (isdigit(*format)) max = max * 10 + *format++ - '0';
-        for (i = 0; i < max; i++) if (!str[i]) max = i;
+        if (max > str_len) max = str_len;
     }
-    else max = strlenW(str);
+    else max = str_len;
 
     if (*format == 'h' || *format == 'l') format++;
 
@@ -425,7 +426,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist)
 
                 *fmta++ = 's';
                 *fmta = 0;
-                count = format_string( str, len - written, fmtbufa, wstr ? wstr : none );
+                count = format_string( str, len - written, fmtbufa, wstr ? wstr : none, -1 );
                 if (count == -1) return -1;
                 str += count;
                 written += count;
@@ -435,14 +436,13 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist)
 
             case 'c':
             {
-                WCHAR wstr[2];
+                WCHAR wstr;
                 int count;
 
-                wstr[0] = va_arg(valist, int);
+                wstr = va_arg(valist, int);
-                wstr[1] = 0;
                 *fmta++ = 's';
                 *fmta = 0;
-                count = format_string( str, len - written, fmtbufa, wstr );
+                count = format_string( str, len - written, fmtbufa, &wstr, 1 );
                 if (count == -1) return -1;
                 str += count;
                 written += count;
@@ -464,7 +464,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist)
                     *fmta = '\0';
                     if (*iter == 'a' || *iter == 'A' ||
                         *iter == 'e' || *iter == 'E' ||
-                        *iter == 'f' || *iter == 'F' ||
+                        *iter == 'f' || *iter == 'F' || 
                         *iter == 'g' || *iter == 'G')
                         sprintf(bufaiter, fmtbufa, va_arg(valist, double));
                     else