[PATCH] tools: Update unicode to 6.1.0

[Detlef Riekenberg]

code 0x0604 is no longer undefined:
http://www.unicode.org/reports/tr44/tr44-8.html#Default_Ignorable_Code_Point
http://www.unicode.org/reports/tr44/tr44-8.html#Unicode_6.1.0

--
By by ... Detlef
---
 dlls/kernel32/tests/locale.c |    7 ++++---
 tools/make_unicode           |    6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index f5b77f7..da73268 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2662,7 +2662,7 @@ static void test_GetStringTypeW(void)
                                     C1_SPACE | C1_BLANK,
                                     C1_SPACE | C1_BLANK};
 
-    static const WCHAR undefined[] = {0x378, 0x379, 0x604, 0xfff8, 0xfffe};
+    static const WCHAR undefined[] = {0x378, 0x379, 0xfff8, 0xfffe};
 
                                   /* Lu, Ll, Lt */
     static const WCHAR alpha[] = {0x47, 0x67, 0x1c5};
@@ -2719,9 +2719,10 @@ static void test_GetStringTypeW(void)
     GetStringTypeW(CT_CTYPE1, alpha, 3, types);
     for (i = 0; i < 3; i++)
         ok(types[i] == (C1_DEFINED | alpha_old[i]) || broken(types[i] == alpha_old[i]) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",alpha[i], types[i],(C1_DEFINED | alpha_old[i]));
+
     memset(types,0,sizeof(types));
-    GetStringTypeW(CT_CTYPE1, undefined, 5, types);
-    for (i = 0; i < 5; i++)
+    GetStringTypeW(CT_CTYPE1, undefined, (sizeof(undefined)/sizeof(undefined[0])), types);
+    for (i = 0; i < (sizeof(undefined)/sizeof(undefined[0])); i++)
         ok(types[i] == 0, "incorrect types returned for %x -> (%x != 0)\n",undefined[i], types[i]);
 
     memset(types,0,sizeof(types));
diff --git a/tools/make_unicode b/tools/make_unicode
index 2a8c648..fb12be8 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -23,7 +23,7 @@ use strict;
 
 # base URLs for www.unicode.org files
 my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS";
-my $UNIDATA = "http://www.unicode.org/Public/6.0.0/ucd";
+my $UNIDATA = "http://www.unicode.org/Public/6.1.0/ucd";
 
 # Sort keys file
 my $SORTKEYS = "http://www.unicode.org/reports/tr10/allkeys.txt";
@@ -196,7 +196,9 @@ my %break_types =
     "BA"  => 0x0022,
     "SA"  => 0x0023,
     "AI"  => 0x0024,
-    "B2"  => 0x0025
+    "B2"  => 0x0025,
+    "HL"  => 0x0026,
+    "CJ"  => 0x0027
 );
 
 my %categories =
-- 
1.7.5.4