dwrite: Silence warning for name entries with platform 3/encoding 10.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Silence warning for name entries with platform 3/encoding 10.
bb91e877 · Nikolay Sivov · Alexandre Julliard · 8962f822 · bb91e877
Commit bb91e877 authored May 22, 2020 by Nikolay Sivov Committed by Alexandre Julliard May 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

No files found.
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -778,7 +778,7 @@ typedef struct {
 enum TT_NAME_WINDOWS_ENCODING_ID
 {
    TT_NAME_WINDOWS_ENCODING_SYMBOL = 0,
-    TT_NAME_WINDOWS_ENCODING_UCS2,
+    TT_NAME_WINDOWS_ENCODING_UNICODE_BMP,
    TT_NAME_WINDOWS_ENCODING_SJIS,
    TT_NAME_WINDOWS_ENCODING_PRC,
    TT_NAME_WINDOWS_ENCODING_BIG5,
@@ -787,7 +787,7 @@ enum TT_NAME_WINDOWS_ENCODING_ID
    TT_NAME_WINDOWS_ENCODING_RESERVED1,
    TT_NAME_WINDOWS_ENCODING_RESERVED2,
    TT_NAME_WINDOWS_ENCODING_RESERVED3,
-    TT_NAME_WINDOWS_ENCODING_UCS4
+    TT_NAME_WINDOWS_ENCODING_UNICODE_FULL
 };

 enum TT_NAME_MAC_ENCODING_ID
@@ -1972,7 +1972,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT 
        switch (encoding)
        {
            case TT_NAME_WINDOWS_ENCODING_SYMBOL:
-            case TT_NAME_WINDOWS_ENCODING_UCS2:
+            case TT_NAME_WINDOWS_ENCODING_UNICODE_BMP:
+            case TT_NAME_WINDOWS_ENCODING_UNICODE_FULL:
                break;
            case TT_NAME_WINDOWS_ENCODING_SJIS:
                codepage = 932;