libwine: Add support for defining round-trip mappings using the Unicode private range.

libs/wine/c_10003.c

@@ -21,23 +21,23 @@ static const WCHAR cp2uni[23296] =
     0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
     0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
-    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0xf8e5,
     0x00a0, 0x20a9, 0x2013, 0x00a9, 0xff3f, 0x0085, 0x0086, 0x0087,
     0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
     0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
     0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
-    0x003f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0xf8e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003f, 0x003f,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf8e7, 0xf8e8,
     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, 0x003f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0xf8e9, 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, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003f, 0x2026,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf8ea, 0x2026,
     /* lead byte a1 */
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
@@ -3064,7 +3064,7 @@ static const unsigned short uni2cp_low[39826] =
     0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
     0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
-    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x0085, 0x0086, 0x0087,
     0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
     0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
@@ -7998,7 +7998,7 @@ static const unsigned short uni2cp_low[39826] =
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
+    0x007f, 0x00a0, 0x00ae, 0x00af, 0x00c9, 0x00fe, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
     0x003f, 0x003f, 0x003f,

libs/wine/c_10081.c

@@ -36,11 +36,11 @@ static const WCHAR cp2uni[256] =
     0x00ff, 0x0178, 0x011e, 0x011f, 0x0130, 0x0131, 0x015e, 0x015f,
     0x2021, 0x00b7, 0x201a, 0x201e, 0x2030, 0x00c2, 0x00ca, 0x00c1,
     0x00cb, 0x00c8, 0x00cd, 0x00ce, 0x00cf, 0x00cc, 0x00d3, 0x00d4,
-    0x003f, 0x00d2, 0x00da, 0x00db, 0x00d9, 0x003f, 0x02c6, 0x02dc,
+    0xf89f, 0x00d2, 0x00da, 0x00db, 0x00d9, 0xf8a0, 0x02c6, 0x02dc,
     0x00af, 0x02d8, 0x02d9, 0x02da, 0x00b8, 0x02dd, 0x02db, 0x02c7
 };
 
-static const unsigned char uni2cp_low[4889] =
+static const unsigned char uni2cp_low[5104] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -523,12 +523,7 @@ static const unsigned char uni2cp_low[4889] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x48, 0xcf, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf806 .. 0xf8ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -548,6 +543,11 @@ static const unsigned char uni2cp_low[4889] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0xf0, 0xf5, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -556,6 +556,34 @@ static const unsigned char uni2cp_low[4889] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb29 .. 0xfbff */
+    0x2b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0xf8, 0xf8, 0xf8, 0xf8, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0xd1,
@@ -648,38 +676,38 @@ static const unsigned char uni2cp_low[4889] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x03d7, 0x04d7, 0x05d1,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x03d7, 0x04d7, 0x05d1,
-    0x06d1, 0x07cf, 0x08cd, 0x09ca, 0x0a6a, 0x0b6a, 0x1119, 0x1119,
+    0x06d1, 0x07cf, 0x08cd, 0x09ca, 0x0a6a, 0x0b6a, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x0c5a, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x0c5a, 0x11f0, 0x11f0, 0x11f0,
-    0x0d5a, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x0d5a, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x0d7a,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x0d7a,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119, 0x1119,
+    0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0,
-    0x1119, 0x1119, 0x1119, 0x0e74, 0x1119, 0x1119, 0x0f2b, 0x102a
+    0x0e74, 0x11f0, 0x11f0, 0x0f4b, 0x11f0, 0x11f0, 0x1002, 0x1101
 };
 
 const struct sbcs_table cptable_10081 =

libs/wine/c_28593.c

@@ -26,21 +26,21 @@ static const WCHAR cp2uni[256] =
     0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
     0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
     0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
-    0x00a0, 0x0126, 0x02d8, 0x00a3, 0x00a4, 0x003f, 0x0124, 0x00a7,
+    0x00a0, 0x0126, 0x02d8, 0x00a3, 0x00a4, 0xf7f5, 0x0124, 0x00a7,
-    0x00a8, 0x0130, 0x015e, 0x011e, 0x0134, 0x00ad, 0x003f, 0x017b,
+    0x00a8, 0x0130, 0x015e, 0x011e, 0x0134, 0x00ad, 0xf7f6, 0x017b,
     0x00b0, 0x0127, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x0125, 0x00b7,
-    0x00b8, 0x0131, 0x015f, 0x011f, 0x0135, 0x00bd, 0x00be, 0x017c,
+    0x00b8, 0x0131, 0x015f, 0x011f, 0x0135, 0x00bd, 0xf7f7, 0x017c,
-    0x00c0, 0x00c1, 0x00c2, 0x003f, 0x00c4, 0x010a, 0x0108, 0x00c7,
+    0x00c0, 0x00c1, 0x00c2, 0xf7f8, 0x00c4, 0x010a, 0x0108, 0x00c7,
     0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-    0x003f, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x0120, 0x00d6, 0x00d7,
+    0xf7f9, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x0120, 0x00d6, 0x00d7,
     0x011c, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x016c, 0x015c, 0x00df,
-    0x00e0, 0x00e1, 0x00e2, 0x003f, 0x00e4, 0x010b, 0x0109, 0x00e7,
+    0x00e0, 0x00e1, 0x00e2, 0xf7fa, 0x00e4, 0x010b, 0x0109, 0x00e7,
     0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-    0x003f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x0121, 0x00f6, 0x00f7,
+    0xf7fb, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x0121, 0x00f6, 0x00f7,
     0x011d, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x016d, 0x015d, 0x02d9
 };
 
-static const unsigned char uni2cp_low[4884] =
+static const unsigned char uni2cp_low[5136] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -66,7 +66,7 @@ static const unsigned char uni2cp_low[4884] =
     0xa0, 0x21, 0x63, 0xa3, 0xa4, 0x59, 0x7c, 0xa7,
     0xa8, 0x63, 0x61, 0x3c, 0x3f, 0xad, 0x72, 0x2d,
     0xb0, 0x3f, 0xb2, 0xb3, 0xb4, 0xb5, 0x3f, 0xb7,
-    0xb8, 0x31, 0x6f, 0x3e, 0x3f, 0xbd, 0xbe, 0x3f,
+    0xb8, 0x31, 0x6f, 0x3e, 0x3f, 0xbd, 0x3f, 0x3f,
     0xc0, 0xc1, 0xc2, 0x41, 0xc4, 0x41, 0x41, 0xc7,
     0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
     0x44, 0xd1, 0xd2, 0xd3, 0xd4, 0x4f, 0xd6, 0xd7,
@@ -523,12 +523,7 @@ static const unsigned char uni2cp_low[4884] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0xa1, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf706 .. 0xf7ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -555,7 +550,45 @@ static const unsigned char uni2cp_low[4884] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa5,
+    0xae, 0xbe, 0xc3, 0xd0, 0xe3, 0xf0, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb04 .. 0xfbff */
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0x2d, 0x2d, 0x2d, 0x2d, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0x2d,
@@ -648,38 +681,38 @@ static const unsigned char uni2cp_low[4884] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x03d5, 0x04d5, 0x05cf,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x03d5, 0x04d5, 0x05cf,
-    0x06cf, 0x07cd, 0x08c8, 0x09c5, 0x0a65, 0x0b65, 0x1114, 0x1114,
+    0x06cf, 0x07cd, 0x08c8, 0x09c5, 0x0a65, 0x0b65, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x0c55, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x0c55, 0x1210, 0x1210, 0x1210,
-    0x0d55, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x0d55, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x0d75,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x0d75,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x0e6f,
-    0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025
+    0x1210, 0x1210, 0x1210, 0x0f6b, 0x1210, 0x1210, 0x1022, 0x1121
 };
 
 const struct sbcs_table cptable_28593 =

libs/wine/c_28596.c

@@ -26,21 +26,21 @@ static const WCHAR cp2uni[256] =
     0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
     0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
     0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
-    0x00a0, 0x003f, 0x003f, 0x003f, 0x00a4, 0x003f, 0x003f, 0x00a7,
+    0x00a0, 0xf7c8, 0xf7c9, 0xf7ca, 0x00a4, 0xf7cb, 0xf7cc, 0xf7cd,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x060c, 0x00ad, 0x003f, 0x003f,
+    0xf7ce, 0xf7cf, 0xf7d0, 0xf7d1, 0x060c, 0x00ad, 0xf7d2, 0xf7d3,
-    0x00b0, 0x00b1, 0x003f, 0x003f, 0x003f, 0x003f, 0x00b6, 0x00b7,
+    0xf7d4, 0xf7d5, 0xf7d6, 0xf7d7, 0xf7d8, 0xf7d9, 0xf7da, 0xf7db,
-    0x003f, 0x003f, 0x003f, 0x061b, 0x00bc, 0x00bd, 0x00be, 0x061f,
+    0xf7dc, 0xf7dd, 0xf7de, 0x061b, 0xf7df, 0xf7e0, 0xf7e1, 0x061f,
-    0x003f, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+    0xf7e2, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
     0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f,
     0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,
-    0x0638, 0x0639, 0x063a, 0x003f, 0x003f, 0x003f, 0x00de, 0x00df,
+    0x0638, 0x0639, 0x063a, 0xf7e3, 0xf7e4, 0xf7e5, 0xf7e6, 0xf7e7,
     0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,
     0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f,
-    0x0650, 0x0651, 0x0652, 0x003f, 0x003f, 0x003f, 0x003f, 0x00f7,
+    0x0650, 0x0651, 0x0652, 0xf7e8, 0xf7e9, 0xf7ea, 0xf7eb, 0xf7ec,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x00fe, 0x003f
+    0xf7ed, 0xf7ee, 0xf7ef, 0xf7f0, 0xf7f1, 0xf7f2, 0xf7f3, 0xf7f4
 };
 
-static const unsigned char uni2cp_low[5127] =
+static const unsigned char uni2cp_low[5372] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -63,18 +63,18 @@ static const unsigned char uni2cp_low[5127] =
     0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
     0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-    0xa0, 0x21, 0x63, 0x4c, 0xa4, 0x59, 0x7c, 0xa7,
+    0xa0, 0x21, 0x63, 0x4c, 0xa4, 0x59, 0x7c, 0x3f,
     0x22, 0x63, 0x61, 0x3c, 0x3f, 0xad, 0x72, 0x2d,
-    0xb0, 0xb1, 0x32, 0x33, 0x27, 0x75, 0xb6, 0xb7,
+    0x3f, 0x3f, 0x32, 0x33, 0x27, 0x75, 0x3f, 0x3f,
-    0x2c, 0x31, 0x6f, 0x3e, 0xbc, 0xbd, 0xbe, 0x3f,
+    0x2c, 0x31, 0x6f, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f,
     0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x43,
     0x45, 0x45, 0x45, 0x45, 0x49, 0x49, 0x49, 0x49,
     0x44, 0x4e, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x78,
-    0x4f, 0x55, 0x55, 0x55, 0x55, 0x59, 0xde, 0xdf,
+    0x4f, 0x55, 0x55, 0x55, 0x55, 0x59, 0x3f, 0x3f,
     0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x63,
     0x65, 0x65, 0x65, 0x65, 0x69, 0x69, 0x69, 0x69,
-    0x64, 0x6e, 0x6f, 0x6f, 0x6f, 0x6f, 0x6f, 0xf7,
+    0x64, 0x6e, 0x6f, 0x6f, 0x6f, 0x6f, 0x6f, 0x3f,
-    0x6f, 0x75, 0x75, 0x75, 0x75, 0x79, 0xfe, 0x79,
+    0x6f, 0x75, 0x75, 0x75, 0x75, 0x79, 0x3f, 0x79,
     /* 0x0100 .. 0x01ff */
     0x41, 0x61, 0x41, 0x61, 0x41, 0x61, 0x43, 0x63,
     0x43, 0x63, 0x43, 0x63, 0x43, 0x63, 0x44, 0x64,
@@ -555,13 +555,7 @@ static const unsigned char uni2cp_low[5127] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x48, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf706 .. 0xf7ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -586,8 +580,46 @@ static const unsigned char uni2cp_low[5127] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0xa1, 0xa2, 0xa3, 0xa5, 0xa6, 0xa7,
+    0xa8, 0xa9, 0xaa, 0xab, 0xae, 0xaf, 0xb0, 0xb1,
+    0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9,
+    0xba, 0xbc, 0xbd, 0xbe, 0xc0, 0xdb, 0xdc, 0xdd,
+    0xde, 0xdf, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+    0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb0b .. 0xfbff */
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x2b, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0x2d, 0x2d, 0x2d, 0x2d, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0x2d,
@@ -680,38 +712,38 @@ static const unsigned char uni2cp_low[5127] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x1207, 0x1207, 0x03f4, 0x1207,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x12fc, 0x12fc, 0x03f4, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x04c8, 0x05c8, 0x06c2,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x04c8, 0x05c8, 0x06c2,
-    0x07c2, 0x08c0, 0x09bb, 0x0ab8, 0x0b58, 0x0c58, 0x1207, 0x1207,
+    0x07c2, 0x08c0, 0x09bb, 0x0ab8, 0x0b58, 0x0c58, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x0d48, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x0d48, 0x12fc, 0x12fc, 0x12fc,
-    0x0e48, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x0e48, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x0e68,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x0e68,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x12fc, 0x0f62,
-    0x1207, 0x1207, 0x1207, 0x0f62, 0x1207, 0x1207, 0x1019, 0x1118
+    0x12fc, 0x12fc, 0x12fc, 0x1057, 0x12fc, 0x12fc, 0x110e, 0x120d
 };
 
 const struct sbcs_table cptable_28596 =

libs/wine/c_28597.c

@@ -27,20 +27,20 @@ static const WCHAR cp2uni[256] =
     0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
     0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
     0x00a0, 0x2018, 0x2019, 0x00a3, 0x20ac, 0x20af, 0x00a6, 0x00a7,
-    0x00a8, 0x00a9, 0x037a, 0x00ab, 0x00ac, 0x00ad, 0x003f, 0x2015,
+    0x00a8, 0x00a9, 0x037a, 0x00ab, 0x00ac, 0x00ad, 0xf7c5, 0x2015,
     0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x0384, 0x0385, 0x0386, 0x00b7,
     0x0388, 0x0389, 0x038a, 0x00bb, 0x038c, 0x00bd, 0x038e, 0x038f,
     0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
     0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f,
-    0x03a0, 0x03a1, 0x003f, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7,
+    0x03a0, 0x03a1, 0xf7c6, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7,
     0x03a8, 0x03a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af,
     0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7,
     0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf,
     0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7,
-    0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0x003f
+    0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0xf7c7
 };
 
-static const unsigned char uni2cp_low[4927] =
+static const unsigned char uni2cp_low[5142] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -528,12 +528,7 @@ static const unsigned char uni2cp_low[4927] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x48, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf706 .. 0xf7ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -557,10 +552,43 @@ static const unsigned char uni2cp_low[4927] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xae,
+    0xd2, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb29 .. 0xfbff */
+    0x2b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0xaf, 0xaf, 0xaf, 0xaf, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0xaf,
@@ -653,38 +681,38 @@ static const unsigned char uni2cp_low[4927] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x03fa, 0x04fa, 0x05fa,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x03fa, 0x04fa, 0x05fa,
-    0x06fa, 0x07f8, 0x08f3, 0x09f0, 0x0a90, 0x0b90, 0x113f, 0x113f,
+    0x06fa, 0x07f8, 0x08f3, 0x09f0, 0x0a90, 0x0b90, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x0c80, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x0c80, 0x1216, 0x1216, 0x1216,
-    0x0d80, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x0d80, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x0da0,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x0da0,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216,
-    0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f, 0x113f,
+    0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x1216, 0x0e9a,
-    0x113f, 0x113f, 0x113f, 0x0e9a, 0x113f, 0x113f, 0x0f51, 0x1050
+    0x1216, 0x1216, 0x1216, 0x0f71, 0x1216, 0x1216, 0x1028, 0x1127
 };
 
 const struct sbcs_table cptable_28597 =

libs/wine/c_28598.c

@@ -26,21 +26,21 @@ static const WCHAR cp2uni[256] =
     0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
     0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
     0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
-    0x00a0, 0x003f, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
+    0x00a0, 0xf79c, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
     0x00a8, 0x00a9, 0x00d7, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
     0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
-    0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
+    0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0xf79d,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
+    0xf79e, 0xf79f, 0xf7a0, 0xf7a1, 0xf7a2, 0xf7a3, 0xf7a4, 0xf7a5,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
+    0xf7a6, 0xf7a7, 0xf7a8, 0xf7a9, 0xf7aa, 0xf7ab, 0xf7ac, 0xf7ad,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f,
+    0xf7ae, 0xf7af, 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5,
-    0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x00de, 0x2017,
+    0xf7b6, 0xf7b7, 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0x2017,
     0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7,
     0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df,
     0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7,
-    0x05e8, 0x05e9, 0x05ea, 0x003f, 0x003f, 0x200e, 0x200f, 0x003f
+    0x05e8, 0x05e9, 0x05ea, 0xf7bd, 0xf7be, 0x200e, 0x200f, 0xf7bf
 };
 
-static const unsigned char uni2cp_low[5119] =
+static const unsigned char uni2cp_low[5346] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -66,11 +66,11 @@ static const unsigned char uni2cp_low[5119] =
     0xa0, 0x21, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
     0xa8, 0xa9, 0x61, 0xab, 0xac, 0xad, 0xae, 0xaf,
     0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-    0xb8, 0xb9, 0x6f, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+    0xb8, 0xb9, 0x6f, 0xbb, 0xbc, 0xbd, 0xbe, 0x3f,
     0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x43,
     0x45, 0x45, 0x45, 0x45, 0x49, 0x49, 0x49, 0x49,
     0x44, 0x4e, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0xaa,
-    0x4f, 0x55, 0x55, 0x55, 0x55, 0x59, 0xde, 0x3f,
+    0x4f, 0x55, 0x55, 0x55, 0x55, 0x59, 0x3f, 0x3f,
     0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x63,
     0x65, 0x65, 0x65, 0x65, 0x69, 0x69, 0x69, 0x69,
     0x64, 0x6e, 0x6f, 0x6f, 0x6f, 0x6f, 0x6f, 0xba,
@@ -554,17 +554,7 @@ static const unsigned char uni2cp_low[5119] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x48, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf706 .. 0xf7ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xe9,
-    0x3f, 0x3f, 0xf2, 0xe0, 0xe3, 0xe4, 0xeb, 0xec,
-    0xed, 0xf8, 0xfa, 0x2b, 0xf9, 0xf9, 0xf9, 0xf9,
-    0xe0, 0xe0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5,
-    0xe6, 0x3f, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0x3f,
-    0xee, 0x3f, 0xf0, 0xf1, 0x3f, 0xf3, 0xf4, 0x3f,
-    0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xe5, 0xe1, 0xeb,
-    0xf4, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -583,10 +573,50 @@ static const unsigned char uni2cp_low[5119] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa1, 0xbf,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xfb,
+    0xfc, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb1d .. 0xfbff */
+    0xe9, 0x3f, 0x3f, 0xf2, 0xe0, 0xe3, 0xe4, 0xeb,
+    0xec, 0xed, 0xf8, 0xfa, 0x2b, 0xf9, 0xf9, 0xf9,
+    0xf9, 0xe0, 0xe0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4,
+    0xe5, 0xe6, 0x3f, 0xe8, 0xe9, 0xea, 0xeb, 0xec,
+    0x3f, 0xee, 0x3f, 0xf0, 0xf1, 0x3f, 0xf3, 0xf4,
+    0x3f, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xe5, 0xe1,
+    0xeb, 0xf4, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0xaf, 0xaf, 0xaf, 0xaf, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0x2d,
@@ -679,38 +709,38 @@ static const unsigned char uni2cp_low[5119] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x11ff, 0x03d5, 0x11ff, 0x11ff,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x12e2, 0x03d5, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x04c0, 0x05c0, 0x06ba,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x04c0, 0x05c0, 0x06ba,
-    0x07ba, 0x08b8, 0x09b3, 0x0ab0, 0x0b50, 0x0c50, 0x11ff, 0x11ff,
+    0x07ba, 0x08b8, 0x09b3, 0x0ab0, 0x0b50, 0x0c50, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x0d40, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x0d40, 0x12e2, 0x12e2, 0x12e2,
-    0x0e40, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x0e40, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x0e60,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x0e60,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2,
-    0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff, 0x11ff,
+    0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x12e2, 0x0f5a,
-    0x11ff, 0x11ff, 0x11ff, 0x0f5a, 0x11ff, 0x11ff, 0x1011, 0x1110
+    0x12e2, 0x12e2, 0x12e2, 0x103d, 0x12e2, 0x12e2, 0x10f4, 0x11f3
 };
 
 const struct sbcs_table cptable_28598 =

libs/wine/c_857.c

@@ -32,11 +32,11 @@ static const WCHAR cp2uni[512] =
     0x00a9, 0x2563, 0x2551, 0x2557, 0x255d, 0x00a2, 0x00a5, 0x2510,
     0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x00e3, 0x00c3,
     0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x00a4,
-    0x00ba, 0x00aa, 0x00ca, 0x00cb, 0x00c8, 0x003f, 0x00cd, 0x00ce,
+    0x00ba, 0x00aa, 0x00ca, 0x00cb, 0x00c8, 0xf8bb, 0x00cd, 0x00ce,
     0x00cf, 0x2518, 0x250c, 0x2588, 0x2584, 0x00a6, 0x00cc, 0x2580,
-    0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0x003f,
+    0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0xf8bc,
     0x00d7, 0x00da, 0x00db, 0x00d9, 0x00ec, 0x00ff, 0x00af, 0x00b4,
-    0x00ad, 0x00b1, 0x003f, 0x00be, 0x00b6, 0x00a7, 0x00f7, 0x00b8,
+    0x00ad, 0x00b1, 0xf8bd, 0x00be, 0x00b6, 0x00a7, 0x00f7, 0x00b8,
     0x00b0, 0x00a8, 0x00b7, 0x00b9, 0x00b3, 0x00b2, 0x25a0, 0x00a0,
     /* glyphs */
     0x0000, 0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
@@ -65,15 +65,15 @@ static const WCHAR cp2uni[512] =
     0x00a9, 0x2563, 0x2551, 0x2557, 0x255d, 0x00a2, 0x00a5, 0x2510,
     0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x00e3, 0x00c3,
     0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x00a4,
-    0x00ba, 0x00aa, 0x00ca, 0x00cb, 0x00c8, 0x003f, 0x00cd, 0x00ce,
+    0x00ba, 0x00aa, 0x00ca, 0x00cb, 0x00c8, 0xf8bb, 0x00cd, 0x00ce,
     0x00cf, 0x2518, 0x250c, 0x2588, 0x2584, 0x00a6, 0x00cc, 0x2580,
-    0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0x003f,
+    0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0xf8bc,
     0x00d7, 0x00da, 0x00db, 0x00d9, 0x00ec, 0x00ff, 0x00af, 0x00b4,
-    0x00ad, 0x00b1, 0x003f, 0x00be, 0x00b6, 0x00a7, 0x00f7, 0x00b8,
+    0x00ad, 0x00b1, 0xf8bd, 0x00be, 0x00b6, 0x00a7, 0x00f7, 0x00b8,
     0x00b0, 0x00a8, 0x00b7, 0x00b9, 0x00b3, 0x00b2, 0x25a0, 0x00a0
 };
 
-static const unsigned char uni2cp_low[4884] =
+static const unsigned char uni2cp_low[5099] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -556,12 +556,7 @@ static const unsigned char uni2cp_low[4884] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x48, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf806 .. 0xf8ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -584,11 +579,44 @@ static const unsigned char uni2cp_low[4884] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xd5, 0xe7, 0xf2,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb29 .. 0xfbff */
+    0x2b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0xee, 0xee, 0xee, 0xee, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0x2d,
@@ -681,38 +709,38 @@ static const unsigned char uni2cp_low[4884] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x03d5, 0x04d5, 0x05cf,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x03d5, 0x04d5, 0x05cf,
-    0x06cf, 0x07cd, 0x08c8, 0x09c5, 0x0a65, 0x0b65, 0x1114, 0x1114,
+    0x06cf, 0x07cd, 0x08c8, 0x09c5, 0x0a65, 0x0b65, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x0c55, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x0c55, 0x11eb, 0x11eb, 0x11eb,
-    0x0d55, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x0d55, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x0d75,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x0d75,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114, 0x1114,
+    0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb, 0x11eb,
-    0x1114, 0x1114, 0x1114, 0x0e6f, 0x1114, 0x1114, 0x0f26, 0x1025
+    0x0e6f, 0x11eb, 0x11eb, 0x0f46, 0x11eb, 0x11eb, 0x0ffd, 0x10fc
 };
 
 const struct sbcs_table cptable_857 =

libs/wine/c_864.c

@@ -25,8 +25,8 @@ static const WCHAR cp2uni[256] =
     0x00b0, 0x00b7, 0x2219, 0x221a, 0x2592, 0x2500, 0x2502, 0x253c,
     0x2524, 0x252c, 0x251c, 0x2534, 0x2510, 0x250c, 0x2514, 0x2518,
     0x03b2, 0x221e, 0x03c6, 0x00b1, 0x00bd, 0x00bc, 0x2248, 0x00ab,
-    0x00bb, 0xfef7, 0xfef8, 0x009b, 0x009c, 0xfefb, 0xfefc, 0x009f,
+    0x00bb, 0xfef7, 0xfef8, 0xf8bb, 0xf8bc, 0xfefb, 0xfefc, 0xf8bd,
-    0x00a0, 0x00ad, 0xfe82, 0x00a3, 0x00a4, 0xfe84, 0x003f, 0x00a7,
+    0x00a0, 0x00ad, 0xfe82, 0x00a3, 0x00a4, 0xfe84, 0xf8be, 0xf8bf,
     0xfe8e, 0xfe8f, 0xfe95, 0xfe99, 0x060c, 0xfe9d, 0xfea1, 0xfea5,
     0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667,
     0x0668, 0x0669, 0xfed1, 0x061b, 0xfeb1, 0xfeb5, 0xfeb9, 0x061f,
@@ -37,10 +37,10 @@ static const WCHAR cp2uni[256] =
     0x0640, 0xfed3, 0xfed7, 0xfedb, 0xfedf, 0xfee3, 0xfee7, 0xfeeb,
     0xfeed, 0xfeef, 0xfef3, 0xfebd, 0xfecc, 0xfece, 0xfecd, 0xfee1,
     0xfe7d, 0x0651, 0xfee5, 0xfee9, 0xfeec, 0xfef0, 0xfef2, 0xfed0,
-    0xfed5, 0xfef5, 0xfef6, 0xfedd, 0xfed9, 0xfef1, 0x25a0, 0x003f
+    0xfed5, 0xfef5, 0xfef6, 0xfedd, 0xfed9, 0xfef1, 0x25a0, 0xf8c0
 };
 
-static const unsigned char uni2cp_low[5127] =
+static const unsigned char uni2cp_low[5342] =
 {
     /* 0x0000 .. 0x00ff */
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -62,8 +62,8 @@ static const unsigned char uni2cp_low[5127] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x9b, 0x9c, 0x3f, 0x3f, 0x9f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0xa0, 0x21, 0xc0, 0xa3, 0xa4, 0x59, 0xdb, 0xa7,
+    0xa0, 0x21, 0xc0, 0xa3, 0xa4, 0x59, 0xdb, 0x3f,
     0x22, 0x63, 0x61, 0x97, 0xdc, 0xa1, 0x72, 0x2d,
     0x80, 0x93, 0x32, 0x33, 0x27, 0x75, 0x3f, 0x81,
     0x2c, 0x31, 0x6f, 0x98, 0x95, 0x94, 0x3f, 0x3f,
@@ -555,12 +555,7 @@ static const unsigned char uni2cp_low[5127] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x48, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    /* 0xfb06 .. 0xfbff */
+    /* 0xf806 .. 0xf8ff */
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x3f, 0x3f, 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
@@ -583,11 +578,44 @@ static const unsigned char uni2cp_low[5127] =
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x9b, 0x9c, 0x9f,
+    0xa6, 0xa7, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x3f, 0x3f,
+    /* 0xfb29 .. 0xfbff */
+    0x2b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     /* 0xfe49 .. 0xfeff */
     0x2d, 0x2d, 0x2d, 0x2d, 0x5f, 0x5f, 0x5f, 0x2c,
     0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, 0x2d,
@@ -680,38 +708,38 @@ static const unsigned char uni2cp_low[5127] =
 
 static const unsigned short uni2cp_high[256] =
 {
-    0x0000, 0x0100, 0x0200, 0x0300, 0x1207, 0x1207, 0x03f4, 0x1207,
+    0x0000, 0x0100, 0x0200, 0x0300, 0x12de, 0x12de, 0x03f4, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x04c8, 0x05c8, 0x06c2,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x04c8, 0x05c8, 0x06c2,
-    0x07c2, 0x08c0, 0x09bb, 0x0ab8, 0x0b58, 0x0c58, 0x1207, 0x1207,
+    0x07c2, 0x08c0, 0x09bb, 0x0ab8, 0x0b58, 0x0c58, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x0d48, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x0d48, 0x12de, 0x12de, 0x12de,
-    0x0e48, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x0e48, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x0e68,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x0e68,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207, 0x1207,
+    0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de, 0x12de,
-    0x1207, 0x1207, 0x1207, 0x0f62, 0x1207, 0x1207, 0x1019, 0x1118
+    0x0f62, 0x12de, 0x12de, 0x1039, 0x12de, 0x12de, 0x10f0, 0x11ef
 };
 
 const struct sbcs_table cptable_864 =

tools/make_unicode

@@ -41,34 +41,34 @@ my $DEF_CHAR = ord '?';
 
 my @allfiles =
 (
-    [ 37,    "VENDORS/MICSFT/EBCDIC/CP037.TXT",   0, "IBM EBCDIC US Canada", 0x6f ],
+    [ 37,    "VENDORS/MICSFT/EBCDIC/CP037.TXT",   0, "IBM EBCDIC US Canada", 0, 0x6f ],
     [ 424,   "VENDORS/MISC/CP424.TXT",            0, "IBM EBCDIC Hebrew" ],
     [ 437,   "VENDORS/MICSFT/PC/CP437.TXT",       1, "OEM United States" ],
-    [ 500,   "VENDORS/MICSFT/EBCDIC/CP500.TXT",   0, "IBM EBCDIC International", 0x6f ],
+    [ 500,   "VENDORS/MICSFT/EBCDIC/CP500.TXT",   0, "IBM EBCDIC International", 0, 0x6f ],
     [ 737,   "VENDORS/MICSFT/PC/CP737.TXT",       1, "OEM Greek 437G" ],
     [ 775,   "VENDORS/MICSFT/PC/CP775.TXT",       1, "OEM Baltic" ],
     [ 850,   "VENDORS/MICSFT/PC/CP850.TXT",       1, "OEM Multilingual Latin 1" ],
     [ 852,   "VENDORS/MICSFT/PC/CP852.TXT",       1, "OEM Slovak Latin 2" ],
     [ 855,   "VENDORS/MICSFT/PC/CP855.TXT",       1, "OEM Cyrillic" ],
     [ 856,   "VENDORS/MISC/CP856.TXT",            0, "Hebrew PC" ],
-    [ 857,   "VENDORS/MICSFT/PC/CP857.TXT",       1, "OEM Turkish" ],
+    [ 857,   "VENDORS/MICSFT/PC/CP857.TXT",       1, "OEM Turkish", 0xf8bb ],
     [ 860,   "VENDORS/MICSFT/PC/CP860.TXT",       1, "OEM Portuguese" ],
     [ 861,   "VENDORS/MICSFT/PC/CP861.TXT",       1, "OEM Icelandic" ],
     [ 862,   "VENDORS/MICSFT/PC/CP862.TXT",       1, "OEM Hebrew" ],
     [ 863,   "VENDORS/MICSFT/PC/CP863.TXT",       1, "OEM Canadian French" ],
-    [ 864,   "VENDORS/MICSFT/PC/CP864.TXT",       0, "OEM Arabic" ],
+    [ 864,   "VENDORS/MICSFT/PC/CP864.TXT",       0, "OEM Arabic", 0xf8bb ],
     [ 865,   "VENDORS/MICSFT/PC/CP865.TXT",       1, "OEM Nordic" ],
     [ 866,   "VENDORS/MICSFT/PC/CP866.TXT",       1, "OEM Russian" ],
     [ 869,   "VENDORS/MICSFT/PC/CP869.TXT",       1, "OEM Greek" ],
     [ 874,   "VENDORS/MICSFT/WindowsBestFit/bestfit874.txt",  1, "ANSI/OEM Thai" ],
-    [ 875,   "VENDORS/MICSFT/EBCDIC/CP875.TXT",               0, "IBM EBCDIC Greek", 0x6f ],
+    [ 875,   "VENDORS/MICSFT/EBCDIC/CP875.TXT",               0, "IBM EBCDIC Greek", 0, 0x6f ],
     [ 878,   "VENDORS/MISC/KOI8-R.TXT",                       0, "Russian KOI8" ],
     [ 932,   "VENDORS/MICSFT/WindowsBestFit/bestfit932.txt",  0, "ANSI/OEM Japanese Shift-JIS" ],
     [ 936,   "VENDORS/MICSFT/WindowsBestFit/bestfit936.txt",  0, "ANSI/OEM Simplified Chinese GBK" ],
     [ 949,   "VENDORS/MICSFT/WindowsBestFit/bestfit949.txt",  0, "ANSI/OEM Korean Unified Hangul" ],
     [ 950,   "VENDORS/MICSFT/WindowsBestFit/bestfit950.txt",  0, "ANSI/OEM Traditional Chinese Big5" ],
     [ 1006,  "VENDORS/MISC/CP1006.TXT",                       0, "IBM Arabic" ],
-    [ 1026,  "VENDORS/MICSFT/EBCDIC/CP1026.TXT",              0, "IBM EBCDIC Latin 5 Turkish", 0x6f ],
+    [ 1026,  "VENDORS/MICSFT/EBCDIC/CP1026.TXT",              0, "IBM EBCDIC Latin 5 Turkish", 0, 0x6f ],
     [ 1250,  "VENDORS/MICSFT/WindowsBestFit/bestfit1250.txt", 0, "ANSI Eastern Europe" ],
     [ 1251,  "VENDORS/MICSFT/WindowsBestFit/bestfit1251.txt", 0, "ANSI Cyrillic" ],
     [ 1252,  "VENDORS/MICSFT/WindowsBestFit/bestfit1252.txt", 0, "ANSI Latin 1" ],
@@ -82,7 +82,7 @@ my @allfiles =
     [ 10000, "VENDORS/MICSFT/MAC/ROMAN.TXT",      0, "Mac Roman" ],
     [ 10001, "VENDORS/APPLE/JAPANESE.TXT",        0, "Mac Japanese" ],
     [ 10002, "VENDORS/APPLE/CHINTRAD.TXT",        0, "Mac Traditional Chinese" ],
-    [ 10003, "VENDORS/APPLE/KOREAN.TXT",          0, "Mac Korean" ],
+    [ 10003, "VENDORS/APPLE/KOREAN.TXT",          0, "Mac Korean", 0xf8e5 ],
     [ 10006, "VENDORS/MICSFT/MAC/GREEK.TXT",      0, "Mac Greek" ],
     [ 10007, "VENDORS/MICSFT/MAC/CYRILLIC.TXT",   0, "Mac Cyrillic" ],
     [ 10008, "VENDORS/APPLE/CHINSIMP.TXT",        0, "Mac Simplified Chinese" ],
@@ -91,20 +91,20 @@ my @allfiles =
     [ 10021, "VENDORS/APPLE/THAI.TXT",            0, "Mac Thai" ],
     [ 10029, "VENDORS/MICSFT/MAC/LATIN2.TXT",     0, "Mac Latin 2" ],
     [ 10079, "VENDORS/MICSFT/MAC/ICELAND.TXT",    0, "Mac Icelandic" ],
-    [ 10081, "VENDORS/MICSFT/MAC/TURKISH.TXT",    0, "Mac Turkish" ],
+    [ 10081, "VENDORS/MICSFT/MAC/TURKISH.TXT",    0, "Mac Turkish", 0xf89f ],
     [ 10082, "VENDORS/APPLE/CROATIAN.TXT",        0, "Mac Croatian" ],
     [ 20127, undef,                               0, "US-ASCII (7bit)" ],
     [ 20866, "VENDORS/MISC/KOI8-R.TXT",           0, "Russian KOI8" ],
-    [ 20932, "OBSOLETE/EASTASIA/JIS/JIS0208.TXT", 0, "EUC-JP", 0x3f, 0x30fb  ],
+    [ 20932, "OBSOLETE/EASTASIA/JIS/JIS0208.TXT", 0, "EUC-JP", 0, 0x3f, 0x30fb  ],
     [ 21866, "VENDORS/MISC/KOI8-U.TXT",           0, "Ukrainian KOI8" ],
     [ 28591, "ISO8859/8859-1.TXT",                0, "ISO 8859-1 Latin 1" ],
     [ 28592, "ISO8859/8859-2.TXT",                0, "ISO 8859-2 Latin 2 (East European)" ],
-    [ 28593, "ISO8859/8859-3.TXT",                0, "ISO 8859-3 Latin 3 (South European)" ],
+    [ 28593, "ISO8859/8859-3.TXT",                0, "ISO 8859-3 Latin 3 (South European)", 0xf7f5 ],
     [ 28594, "ISO8859/8859-4.TXT",                0, "ISO 8859-4 Latin 4 (Baltic old)" ],
     [ 28595, "ISO8859/8859-5.TXT",                0, "ISO 8859-5 Cyrillic" ],
-    [ 28596, "ISO8859/8859-6.TXT",                0, "ISO 8859-6 Arabic" ],
+    [ 28596, "ISO8859/8859-6.TXT",                0, "ISO 8859-6 Arabic", 0xf7c8 ],
-    [ 28597, "ISO8859/8859-7.TXT",                0, "ISO 8859-7 Greek" ],
+    [ 28597, "ISO8859/8859-7.TXT",                0, "ISO 8859-7 Greek", 0xf7c5 ],
-    [ 28598, "ISO8859/8859-8.TXT",                0, "ISO 8859-8 Hebrew" ],
+    [ 28598, "ISO8859/8859-8.TXT",                0, "ISO 8859-8 Hebrew", 0xf79c ],
     [ 28599, "ISO8859/8859-9.TXT",                0, "ISO 8859-9 Latin 5 (Turkish)" ],
     [ 28600, "ISO8859/8859-10.TXT",               0, "ISO 8859-10 Latin 6 (Nordic)" ],
     [ 28603, "ISO8859/8859-13.TXT",               0, "ISO 8859-13 Latin 7 (Baltic)" ],
@@ -825,8 +825,10 @@ sub DUMP_SORTKEYS($@)
 
 ################################################################
 # add default mappings once the file had been read
-sub ADD_DEFAULT_MAPPINGS()
+sub add_default_mappings($)
 {
+    my $first_private = shift;
+
     # Apply aliases
 
     foreach my $alias (@unicode_aliases)
@@ -865,6 +867,19 @@ sub ADD_DEFAULT_MAPPINGS()
         if (defined($uni2cp[$target])) { $uni2cp[$src] = $uni2cp[$target]; }
     }
 
+    # Add a private char mapping for undefined chars
+
+    if ($first_private)
+    {
+        for (my $i = 32; $i < 256; $i++)
+        {
+            next if defined($cp2uni[$i]);
+            $cp2uni[$i] = $first_private;
+            $uni2cp[$first_private] = $i;
+            $first_private++;
+        }
+    }
+
     # Add an identity mapping for all undefined chars
 
     for (my $i = 0; $i < 256; $i++)
@@ -2019,7 +2034,7 @@ sub read_bestfit_file($)
 # read an input file and generate the corresponding .c file
 sub HANDLE_FILE(@)
 {
-    my ($codepage,$filename,$has_glyphs,$comment,$def,$defw) = @_;
+    my ($codepage,$filename,$has_glyphs,$comment,$first_private,$def,$defw) = @_;
 
     @cp2uni = ();
     @lead_bytes = ();
@@ -2031,27 +2046,29 @@ sub HANDLE_FILE(@)
     if ($codepage == 20932)
     {
         READ_JIS0208_FILE( $filename );
-        ADD_DEFAULT_MAPPINGS();
+        add_default_mappings( $first_private );
     }
     elsif ($codepage == 20127)
     {
         fill_20127_codepage();
-        ADD_DEFAULT_MAPPINGS();
+        add_default_mappings( $first_private );
     }
     elsif ($filename =~ /\/bestfit/)
     {
         read_bestfit_file( $filename );
     }
-    elsif ($codepage == 10001)
-    {
-        read_codepage_file( $filename );
-        # add Shift-JIS mappings
-        read_bestfit_file( "VENDORS/MICSFT/WindowsBestFit/bestfit932.txt" );
-    }
     else
     {
         read_codepage_file( $filename );
-        ADD_DEFAULT_MAPPINGS();
+        if ($codepage == 10001)
+        {
+            # add Shift-JIS mappings
+            read_bestfit_file( "VENDORS/MICSFT/WindowsBestFit/bestfit932.txt" );
+        }
+        else
+        {
+            add_default_mappings( $first_private );
+        }
     }
 
     output_codepage_file( $codepage, $filename, $comment, $has_glyphs );
@@ -2085,14 +2102,14 @@ sub output_cptable($)
 
     foreach my $file (@allfiles)
     {
-        my ($codepage,$filename,$comment) = @$file;
+        my ($codepage,$filename) = @$file;
         push @tables_decl, sprintf("extern union cptable cptable_%03d;\n",$codepage);
     }
 
     push @tables_decl, sprintf("\nstatic const union cptable * const cptables[%d] =\n{\n",$#allfiles+1);
     foreach my $file (@allfiles)
     {
-        my ($codepage,$filename,$comment) = @$file;
+        my ($codepage,$filename) = @$file;
         push @tables_decl, sprintf("    &cptable_%03d,\n", $codepage);
     }
     push @tables_decl, "};";