Skip to content

W
wine-winehq
Commit 333e6b3c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

make_unicode: Avoid including wine/unicode.h in generated files.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d68f8d7b
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
dlls/dwrite/bracket.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] =
{ {
......
dlls/dwrite/linebreak.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] =
{ {
......
dlls/dwrite/mirror.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3544] = const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3544] =
{ {
......
dlls/dwrite/scripts.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6736] = const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6736] =
{ {
......
dlls/gdi32/vertical.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] =
{ {
......
dlls/kernel32/nameprep.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.rfc-editor.org/rfc/rfc3454.txt */ /* generated from http://www.rfc-editor.org/rfc/rfc3454.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN nameprep_char_type[4432] = const unsigned short DECLSPEC_HIDDEN nameprep_char_type[4432] =
{ {
......
dlls/usp10/bracket.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] =
{ {
......
dlls/usp10/indicsyllable.c
View file @ 333e6b3c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* and from http://www.unicode.org/Public/12.0.0/ucd/IndicPositionalCategory.txt */ /* and from http://www.unicode.org/Public/12.0.0/ucd/IndicPositionalCategory.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3344] = const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3344] =
{ {
......
dlls/usp10/linebreak.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] =
{ {
......
dlls/usp10/mirror.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3544] = const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3544] =
{ {
......
dlls/usp10/shaping.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/ArabicShaping.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/ArabicShaping.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2944] = const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2944] =
{ {
......
dlls/wineps.drv/vertical.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] =
{ {
......
libs/port/casemap.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const WCHAR wine_casemap_lower[4259] = const WCHAR wine_casemap_lower[4259] =
{ {
......
libs/port/collation.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned int DECLSPEC_HIDDEN collation_table[12800] = const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
{ {
......
libs/port/combclass.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN combining_class_table[2208] = const unsigned short DECLSPEC_HIDDEN combining_class_table[2208] =
{ {
......
libs/port/compose.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
static const WCHAR table[0x85e] = static const WCHAR table[0x85e] =
{ {
......
libs/port/digitmap.c
View file @ 333e6b3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const WCHAR DECLSPEC_HIDDEN wine_digitmap[5933] = const WCHAR DECLSPEC_HIDDEN wine_digitmap[5933] =
{ {
......
libs/port/wctype.c
View file @ 333e6b3c
/* Unicode ctype tables */ /* Unicode ctype tables */
/* Automatically generated; DO NOT EDIT!! */ /* Automatically generated; DO NOT EDIT!! */
#include "wine/unicode.h" #include "windef.h"
const unsigned short wine_wctype_table[17152] = const unsigned short wine_wctype_table[17152] =
{ {
......
tools/make_unicode
View file @ 333e6b3c
...@@ -922,7 +922,7 @@ sub dump_sortkeys($@) ...@@ -922,7 +922,7 @@ sub dump_sortkeys($@)
printf OUTPUT "/* Unicode collation element table */\n"; printf OUTPUT "/* Unicode collation element table */\n";
printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS"; printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS";
printf OUTPUT "/* DO NOT EDIT!! */\n\n"; printf OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
printf OUTPUT "const unsigned int DECLSPEC_HIDDEN collation_table[%d] =\n{\n", $ranges*256; printf OUTPUT "const unsigned int DECLSPEC_HIDDEN collation_table[%d] =\n{\n", $ranges*256;
printf OUTPUT " /* index */\n"; printf OUTPUT " /* index */\n";
...@@ -1326,7 +1326,7 @@ sub dump_indic($) ...@@ -1326,7 +1326,7 @@ sub dump_indic($)
print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n"; print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n";
print OUTPUT "/* and from $UNIDATA/IndicPositionalCategory.txt */\n"; print OUTPUT "/* and from $UNIDATA/IndicPositionalCategory.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "indic_syllabic_table", $indic_types{'Other'}, @indic_table ); dump_two_level_mapping( "indic_syllabic_table", $indic_types{'Other'}, @indic_table );
...@@ -1391,7 +1391,7 @@ sub dump_linebreak($) ...@@ -1391,7 +1391,7 @@ sub dump_linebreak($)
print OUTPUT "/* Unicode Line Break Properties */\n"; print OUTPUT "/* Unicode Line Break Properties */\n";
print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n"; print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "wine_linebreak_table", $break_types{'XX'}, @break_table ); dump_two_level_mapping( "wine_linebreak_table", $break_types{'XX'}, @break_table );
...@@ -1618,7 +1618,7 @@ sub dump_scripts($) ...@@ -1618,7 +1618,7 @@ sub dump_scripts($)
print OUTPUT "/* Unicode Script IDs */\n"; print OUTPUT "/* Unicode Script IDs */\n";
print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n"; print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "wine_scripts_table", 0, @scripts_table ); dump_two_level_mapping( "wine_scripts_table", 0, @scripts_table );
close OUTPUT; close OUTPUT;
...@@ -1652,7 +1652,7 @@ sub dump_mirroring($) ...@@ -1652,7 +1652,7 @@ sub dump_mirroring($)
print OUTPUT "/* Unicode BiDi mirroring */\n"; print OUTPUT "/* Unicode BiDi mirroring */\n";
print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n"; print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_case_table( "DECLSPEC_HIDDEN wine_mirror_map", @mirror_table ); dump_case_table( "DECLSPEC_HIDDEN wine_mirror_map", @mirror_table );
close OUTPUT; close OUTPUT;
save_file($filename); save_file($filename);
...@@ -1689,7 +1689,7 @@ sub dump_bracket($) ...@@ -1689,7 +1689,7 @@ sub dump_bracket($)
print OUTPUT "/* Unicode Bidirectional Bracket table */\n"; print OUTPUT "/* Unicode Bidirectional Bracket table */\n";
print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n"; print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "bidi_bracket_table", 0, @bracket_table ); dump_two_level_mapping( "bidi_bracket_table", 0, @bracket_table );
...@@ -1730,7 +1730,7 @@ sub dump_shaping($) ...@@ -1730,7 +1730,7 @@ sub dump_shaping($)
print OUTPUT "/* Unicode Arabic shaping */\n"; print OUTPUT "/* Unicode Arabic shaping */\n";
print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n"; print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "wine_shaping_table", 0, @joining_table ); dump_two_level_mapping( "wine_shaping_table", 0, @joining_table );
...@@ -1791,7 +1791,7 @@ sub dump_vertical($) ...@@ -1791,7 +1791,7 @@ sub dump_vertical($)
print OUTPUT "/* Unicode Vertical Orientation */\n"; print OUTPUT "/* Unicode Vertical Orientation */\n";
print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n"; print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "vertical_orientation_table", $vertical_types{'R'}, @vertical_table ); dump_two_level_mapping( "vertical_orientation_table", $vertical_types{'R'}, @vertical_table );
...@@ -1809,7 +1809,7 @@ sub dump_digit_folding($) ...@@ -1809,7 +1809,7 @@ sub dump_digit_folding($)
print OUTPUT "/* Unicode digit folding mappings */\n"; print OUTPUT "/* Unicode digit folding mappings */\n";
print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_case_table( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); dump_case_table( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table );
print OUTPUT "\n"; print OUTPUT "\n";
...@@ -1829,7 +1829,7 @@ sub dump_case_mappings($) ...@@ -1829,7 +1829,7 @@ sub dump_case_mappings($)
print OUTPUT "/* Unicode case mappings */\n"; print OUTPUT "/* Unicode case mappings */\n";
print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_case_table( "wine_casemap_lower", @tolower_table ); dump_case_table( "wine_casemap_lower", @tolower_table );
print OUTPUT "\n"; print OUTPUT "\n";
...@@ -2151,7 +2151,7 @@ sub dump_nameprep($) ...@@ -2151,7 +2151,7 @@ sub dump_nameprep($)
print OUTPUT "/* Nameprep algorithm related data */\n"; print OUTPUT "/* Nameprep algorithm related data */\n";
print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "nameprep_char_type", 0, @flags_table ); dump_two_level_mapping( "nameprep_char_type", 0, @flags_table );
...@@ -2293,7 +2293,7 @@ sub dump_ctype_tables($) ...@@ -2293,7 +2293,7 @@ sub dump_ctype_tables($)
printf "Building $filename\n"; printf "Building $filename\n";
printf OUTPUT "/* Unicode ctype tables */\n"; printf OUTPUT "/* Unicode ctype tables */\n";
printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n";
printf OUTPUT "#include \"wine/unicode.h\"\n\n"; printf OUTPUT "#include \"windef.h\"\n\n";
my @table = @category_table; my @table = @category_table;
...@@ -2321,7 +2321,7 @@ sub dump_compose_table($) ...@@ -2321,7 +2321,7 @@ sub dump_compose_table($)
print OUTPUT "/* Unicode char composition */\n"; print OUTPUT "/* Unicode char composition */\n";
print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
my @filled = (); my @filled = ();
foreach my $i (@compose_table) foreach my $i (@compose_table)
...@@ -2641,7 +2641,7 @@ sub dump_combining_class($) ...@@ -2641,7 +2641,7 @@ sub dump_combining_class($)
print OUTPUT "/* Unicode Combining Classes */\n"; print OUTPUT "/* Unicode Combining Classes */\n";
print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "combining_class_table", 0, @combining_class_table ); dump_two_level_mapping( "combining_class_table", 0, @combining_class_table );
close OUTPUT; close OUTPUT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment