dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.

Signed-off-by: Charles Davis <cdavis5x@gmail.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit dcca411a) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
ac418d52 · Charles Davis · Michael Stefaniuc · 32c91225 · ac418d52
Commit ac418d52 authored Feb 12, 2016 by Charles Davis Committed by Michael Stefaniuc Apr 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 36 additions and 3 deletions

opentype.c dlls/dwrite/opentype.c +36 -3

No files found.
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID
    TT_NAME_MAC_LANGID_LAO,
    TT_NAME_MAC_LANGID_VIETNAMESE,
    TT_NAME_MAC_LANGID_INDONESIAN,
-    TT_NAME_MAC_LANGID_TAGALONG,
+    TT_NAME_MAC_LANGID_TAGALOG,
    TT_NAME_MAC_LANGID_MALAY_ROMAN,
    TT_NAME_MAC_LANGID_MALAY_ARABIC,
    TT_NAME_MAC_LANGID_AMHARIC,
@@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID
    TT_NAME_MAC_LANGID_NYANJA,
    TT_NAME_MAC_LANGID_MALAGASY,
    TT_NAME_MAC_LANGID_ESPERANTO,
-    TT_NAME_MAC_LANGID_WELSH,
+    TT_NAME_MAC_LANGID_WELSH = 128,
    TT_NAME_MAC_LANGID_BASQUE,
    TT_NAME_MAC_LANGID_CATALAN,
    TT_NAME_MAC_LANGID_LATIN,
-    TT_NAME_MAC_LANGID_QUENCHUA,
+    TT_NAME_MAC_LANGID_QUECHUA,
    TT_NAME_MAC_LANGID_GUARANI,
    TT_NAME_MAC_LANGID_AYMARA,
    TT_NAME_MAC_LANGID_TATAR,
@@ -605,6 +605,39 @@ static const char name_mac_langid_to_locale[][10] = {
    "",
    "",
    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
    "cy-GB",
    "eu-ES",
    "ca-ES",