Alexandre Julliard : libport: Move the digitmap table back to libwine and stop updating it.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 599166bd3536513dc43bba1b4ec2058760200a42
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=599166bd3536513dc43bba1b4...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Feb  5 09:00:40 2020 +0100

libport: Move the digitmap table back to libwine and stop updating it.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/port/Makefile.in          |  1 -
 libs/wine/Makefile.in          |  1 +
 libs/{port => wine}/digitmap.c |  6 ++++++
 tools/make_unicode             | 24 +++---------------------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 6e3edcf719..260140a391 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -79,7 +79,6 @@ C_SRCS = \
 	compose.c \
 	cptable.c \
 	decompose.c \
-	digitmap.c \
 	ffs.c \
 	fstatvfs.c \
 	getopt.c \
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 9b2b8f643d..d26f0c2589 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -5,6 +5,7 @@ C_SRCS = \
 	config.c \
 	cpsymbol.c \
 	debug.c \
+	digitmap.c \
 	fold.c \
 	ldt.c \
 	loader.c \
diff --git a/libs/port/digitmap.c b/libs/wine/digitmap.c
similarity index 99%
rename from libs/port/digitmap.c
rename to libs/wine/digitmap.c
index ea21fb0ab9..41689f4413 100644
--- a/libs/port/digitmap.c
+++ b/libs/wine/digitmap.c
@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "windef.h"
 
 const unsigned short DECLSPEC_HIDDEN wine_digitmap[619] =
@@ -287,3 +291,5 @@ const WCHAR DECLSPEC_HIDDEN wine_compatmap[1497] =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/tools/make_unicode b/tools/make_unicode
index 3f1d3e55a9..cd2f406793 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -409,7 +409,6 @@ my @unicode_aliases = ();
 my @tolower_table = ();
 my @toupper_table = ();
 my @digitmap_table = ();
-my @compatmap_table = ();
 my @category_table = ();
 my @joining_table = ();
 my @direction_table = ();
@@ -582,11 +581,6 @@ sub load_data($)
         if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/)
         {
             # decomposition of the form "<foo> 1234" -> use char if type is known
-            if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))
-            {
-                # Single char decomposition in the compatibility range
-                $compatmap_table[$src] = hex $2;
-            }
             if ($1 eq "isolated" || $1 eq "final" || $1 eq "initial" || $1 eq "medial")
             {
                 ${joining_forms{$1}}[hex $2] = $src;
@@ -623,12 +617,6 @@ sub load_data($)
             {
                 # Single char decomposition
                 $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ];
-
-                if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))
-                {
-                    # Single char decomposition in the compatibility range
-                    $compatmap_table[$src] = hex $1;
-                }
             }
         }
         else
@@ -1816,9 +1804,9 @@ sub dump_vertical($)
 
 ################################################################
 # dump the digit folding tables
-sub dump_digit_folding($$)
+sub dump_digit_folding($)
 {
-    my ($filename, $compat) = @_;
+    my ($filename) = shift;
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode digit folding mappings */\n";
@@ -1827,11 +1815,6 @@ sub dump_digit_folding($$)
     print OUTPUT "#include \"windef.h\"\n\n";
 
     dump_two_level_mapping( "wine_digitmap", 0, 16, @digitmap_table );
-    if ($compat)
-    {
-        print OUTPUT "\n";
-        dump_case_table( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table );
-    }
     close OUTPUT;
     save_file($filename);
 }
@@ -2755,8 +2738,7 @@ dump_bidi_dir_table( "dlls/gdi32/direction.c" );
 dump_bidi_dir_table( "dlls/usp10/direction.c" );
 dump_bidi_dir_table( "dlls/dwrite/direction.c" );
 dump_string_type_table( "dlls/kernelbase/wctype.c" );
-dump_digit_folding( "libs/port/digitmap.c", 1 );
-dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 );
+dump_digit_folding( "dlls/kernelbase/digitmap.c" );
 dump_combining_class( "dlls/ntdll/combclass.c" );
 dump_mirroring( "dlls/usp10/mirror.c" );
 dump_mirroring( "dlls/dwrite/mirror.c" );