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

Alexandre Julliard julliard at winehq.org
Fri May 22 13:51:09 CDT 2020


Module: wine
Branch: master
Commit: bb91e877b3d06d17c6da45b020ec3b79ac4a72a4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bb91e877b3d06d17c6da45b020ec3b79ac4a72a4

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri May 22 13:58:08 2020 +0300

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

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

---

 dlls/dwrite/opentype.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index cb1743c5cc..35b02d5573 100644
--- 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;




More information about the wine-cvs mailing list