libwine: Add support for codepage 10001 (Mac Japanese).

libs/wine/Makefile.in

@@ -10,6 +10,7 @@ INSTALLDIRS = $(DESTDIR)$(libdir)
 C_SRCS = \
 	c_037.c \
 	c_10000.c \
+	c_10001.c \
 	c_10006.c \
 	c_10007.c \
 	c_10029.c \

libs/wine/cptable.c

@@ -63,6 +63,7 @@ extern union cptable cptable_1257;
 extern union cptable cptable_1258;
 extern union cptable cptable_1361;
 extern union cptable cptable_10000;
+extern union cptable cptable_10001;
 extern union cptable cptable_10006;
 extern union cptable cptable_10007;
 extern union cptable cptable_10029;
@@ -87,7 +88,7 @@ extern union cptable cptable_28604;
 extern union cptable cptable_28605;
 extern union cptable cptable_28606;
 
-static const union cptable * const cptables[62] =
+static const union cptable * const cptables[63] =
 {
     &cptable_037,
     &cptable_424,
@@ -128,6 +129,7 @@ static const union cptable * const cptables[62] =
     &cptable_1258,
     &cptable_1361,
     &cptable_10000,
+    &cptable_10001,
     &cptable_10006,
     &cptable_10007,
     &cptable_10029,

tools/make_unicode

@@ -80,6 +80,7 @@ my @allfiles =
     [ 1258,  "VENDORS/MICSFT/WindowsBestFit/bestfit1258.txt", 0, "ANSI/OEM Viet Nam" ],
     [ 1361,  "OBSOLETE/EASTASIA/KSC/JOHAB.TXT",   0, "Korean Johab" ],
     [ 10000, "VENDORS/MICSFT/MAC/ROMAN.TXT",      0, "Mac Roman" ],
+    [ 10001, "VENDORS/APPLE/JAPANESE.TXT",        0, "Mac Japanese" ],
     [ 10006, "VENDORS/MICSFT/MAC/GREEK.TXT",      0, "Mac Greek" ],
     [ 10007, "VENDORS/MICSFT/MAC/CYRILLIC.TXT",   0, "Mac Cyrillic" ],
     [ 10029, "VENDORS/MICSFT/MAC/LATIN2.TXT",     0, "Mac Latin 2" ],
@@ -543,6 +544,18 @@ sub read_codepage_file($)
             add_mapping( hex $1, hex $2 );
             next;
         }
+        # 0x12 0x3456+0x7890
+        if (/^0x([0-9a-fA-F]+)\s+0x([0-9a-fA-F]+)\+.*\s+(\#.*)?/)
+        {
+            add_mapping( hex $1, hex $2 );
+            next;
+        }
+        # 0x12 <LR>+0x3456
+        if (/^0x([0-9a-fA-F]+)\s+<[LR]+>\+0x([0-9a-fA-F]+)\s+(\#.*)?/)
+        {
+            add_mapping( hex $1, hex $2 );
+            next;
+        }
         die "$name: Unrecognized line $_\n";
     }
     close $INPUT;
@@ -2000,6 +2013,12 @@ sub HANDLE_FILE(@)
     {
         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 );