From 4c7e136013cbfd3d9a27b0c78a2d230584bc452c Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Sun, 6 Nov 2016 13:56:41 +0300
Subject: [PATCH] dwrite: Update script list with latest additions.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/dwrite/analyzer.c | 12 ++++++++++++
 dlls/dwrite/scripts.h  | 14 +++++++++++++-
 tools/make_unicode     | 13 +++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
index 3f146c56fb1..72ce8136da7 100644
--- a/dlls/dwrite/analyzer.c
+++ b/dlls/dwrite/analyzer.c
@@ -169,6 +169,18 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last
     { /* Sidd */ { 0x64646953, 302,  8, 0x0020, 1, 0, 1, 1, 0, 0, 0 }, _OT('s','i','d','d') },
     { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, _OT('t','i','r','h') },
     { /* Wara */ { 0x61726157, 262,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('w','a','r','a') },
+    { /* Adlm */ { 0x6d6c6441, 166,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','d','l','m') },
+    { /* Ahom */ { 0x6d6f6841, 338,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','h','o','m') },
+    { /* Hluw */ { 0x77756c48,  80,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','l','u','w') },
+    { /* Bhks */ { 0x736b6842, 334,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('b','h','k','s') },
+    { /* Hatr */ { 0x72746148, 127,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','a','t','r') },
+    { /* Marc */ { 0x6372614d, 332,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','a','r','c') },
+    { /* Mult */ { 0x746c754d, 323,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','u','l','t') },
+    { /* Newa */ { 0x6177654e, 333,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('n','e','w','a') },
+    { /* Hung */ { 0x676e7548, 176,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','u','n','g') },
+    { /* Osge */ { 0x6567734f, 219,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('o','s','g','e') },
+    { /* Sgnw */ { 0x776e6753,  95,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('s','g','n','w') },
+    { /* Tang */ { 0x676e6154, 520,  8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('t','a','n','g') },
 };
 #undef _OT
 
diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h
index 2adb98beaae..1e905048279 100644
--- a/dlls/dwrite/scripts.h
+++ b/dlls/dwrite/scripts.h
@@ -129,5 +129,17 @@ enum unicode_script_id {
     Script_Siddham = 123,
     Script_Tirhuta = 124,
     Script_Warang_Citi = 125,
-    Script_LastId = 125
+    Script_Adlam = 126,
+    Script_Ahom = 127,
+    Script_Anatolian_Hieroglyphs = 128,
+    Script_Bhaiksuki = 129,
+    Script_Hatran = 130,
+    Script_Marchen = 131,
+    Script_Multani = 132,
+    Script_Newa = 133,
+    Script_Old_Hungarian = 134,
+    Script_Osage = 135,
+    Script_SignWriting = 136,
+    Script_Tangut = 137,
+    Script_LastId = 137
 };
diff --git a/tools/make_unicode b/tools/make_unicode
index a0bcf8f7a7f..ab8e82b62bd 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -1450,6 +1450,19 @@ my %scripts =
     "Siddham"                => 123,
     "Tirhuta"                => 124,
     "Warang_Citi"            => 125,
+    # Win10 RS1
+    "Adlam"                  => 126,
+    "Ahom"                   => 127,
+    "Anatolian_Hieroglyphs"  => 128,
+    "Bhaiksuki"              => 129,
+    "Hatran"                 => 130,
+    "Marchen"                => 131,
+    "Multani"                => 132,
+    "Newa"                   => 133,
+    "Old_Hungarian"          => 134,
+    "Osage"                  => 135,
+    "SignWriting"            => 136,
+    "Tangut"                 => 137
 );
 
 ################################################################