Skip to content

W
wine-cw
Commit f2b8873b authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

libwine: Add C1_DEFINED to our C1 types and set it properly.

parent 49a4e8df
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 31 deletions
include/winnls.h
View file @ f2b8873b
...@@ -378,6 +378,7 @@ extern "C" { ...@@ -378,6 +378,7 @@ extern "C" {
#define C1_BLANK 0x0040 #define C1_BLANK 0x0040
#define C1_XDIGIT 0x0080 #define C1_XDIGIT 0x0080
#define C1_ALPHA 0x0100 #define C1_ALPHA 0x0100
#define C1_DEFINED 0x0200
/* Type 2 flags */ /* Type 2 flags */
#define C2_LEFTTORIGHT 0x0001 #define C2_LEFTTORIGHT 0x0001
......
libs/wine/cpmap.pl
View file @ f2b8873b
...@@ -111,41 +111,42 @@ my %ctype = ...@@ -111,41 +111,42 @@ my %ctype =
"cntrl" => 0x0020, "cntrl" => 0x0020,
"blank" => 0x0040, "blank" => 0x0040,
"xdigit" => 0x0080, "xdigit" => 0x0080,
"alpha" => 0x0100 "alpha" => 0x0100,
"defin" => 0x0200
); );
my %categories = my %categories =
( (
"Lu" => $ctype{"alpha"}|$ctype{"upper"}, # Letter, Uppercase "Lu" => $ctype{"defin"}|$ctype{"alpha"}|$ctype{"upper"}, # Letter, Uppercase
"Ll" => $ctype{"alpha"}|$ctype{"lower"}, # Letter, Lowercase "Ll" => $ctype{"defin"}|$ctype{"alpha"}|$ctype{"lower"}, # Letter, Lowercase
"Lt" => $ctype{"alpha"}|$ctype{"upper"}|$ctype{"lower"}, # Letter, Titlecase "Lt" => $ctype{"defin"}|$ctype{"alpha"}|$ctype{"upper"}|$ctype{"lower"}, # Letter, Titlecase
"Mn" => 0, # Mark, Non-Spacing "Mn" => $ctype{"defin"}, # Mark, Non-Spacing
"Mc" => 0, # Mark, Spacing Combining "Mc" => $ctype{"defin"}, # Mark, Spacing Combining
"Me" => 0, # Mark, Enclosing "Me" => $ctype{"defin"}, # Mark, Enclosing
"Nd" => $ctype{"digit"}, # Number, Decimal Digit "Nd" => $ctype{"defin"}|$ctype{"digit"}, # Number, Decimal Digit
"Nl" => $ctype{"alpha"}, # Number, Letter "Nl" => $ctype{"defin"}|$ctype{"alpha"}, # Number, Letter
"No" => 0, # Number, Other "No" => $ctype{"defin"}, # Number, Other
"Zs" => $ctype{"space"}, # Separator, Space "Zs" => $ctype{"defin"}|$ctype{"space"}, # Separator, Space
"Zl" => $ctype{"space"}, # Separator, Line "Zl" => $ctype{"defin"}|$ctype{"space"}, # Separator, Line
"Zp" => $ctype{"space"}, # Separator, Paragraph "Zp" => $ctype{"defin"}|$ctype{"space"}, # Separator, Paragraph
"Cc" => $ctype{"cntrl"}, # Other, Control "Cc" => $ctype{"defin"}|$ctype{"cntrl"}, # Other, Control
"Cf" => $ctype{"cntrl"}, # Other, Format "Cf" => $ctype{"defin"}|$ctype{"cntrl"}, # Other, Format
"Cs" => 0, # Other, Surrogate "Cs" => $ctype{"defin"}, # Other, Surrogate
"Co" => 0, # Other, Private Use "Co" => $ctype{"defin"}, # Other, Private Use
"Cn" => 0, # Other, Not Assigned "Cn" => $ctype{"defin"}, # Other, Not Assigned
"Lm" => $ctype{"alpha"}, # Letter, Modifier "Lm" => $ctype{"defin"}|$ctype{"alpha"}, # Letter, Modifier
"Lo" => $ctype{"alpha"}, # Letter, Other "Lo" => $ctype{"defin"}|$ctype{"alpha"}, # Letter, Other
"Pc" => $ctype{"punct"}, # Punctuation, Connector "Pc" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Connector
"Pd" => $ctype{"punct"}, # Punctuation, Dash "Pd" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Dash
"Ps" => $ctype{"punct"}, # Punctuation, Open "Ps" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Open
"Pe" => $ctype{"punct"}, # Punctuation, Close "Pe" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Close
"Pi" => $ctype{"punct"}, # Punctuation, Initial quote "Pi" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Initial quote
"Pf" => $ctype{"punct"}, # Punctuation, Final quote "Pf" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Final quote
"Po" => $ctype{"punct"}, # Punctuation, Other "Po" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Other
"Sm" => 0, # Symbol, Math "Sm" => $ctype{"defin"}, # Symbol, Math
"Sc" => 0, # Symbol, Currency "Sc" => $ctype{"defin"}, # Symbol, Currency
"Sk" => 0, # Symbol, Modifier "Sk" => $ctype{"defin"}, # Symbol, Modifier
"So" => 0 # Symbol, Other "So" => $ctype{"defin"} # Symbol, Other
); );
# a few characters need additional categories that cannot be determined automatically # a few characters need additional categories that cannot be determined automatically
......
libs/wine/wctype.c
View file @ f2b8873b
This source diff could not be displayed because it is too large. You can view the blob instead.
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