Alexandre Julliard : gdi32: Add support for loading name strings in Apple Unicode format.
Alexandre Julliard
julliard at winehq.org
Thu Jun 20 15:31:16 CDT 2013
Module: wine
Branch: master
Commit: 102b2785f4e9d892fa4ae7a84ccc57792000e5e2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=102b2785f4e9d892fa4ae7a84ccc57792000e5e2
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 20 21:07:33 2013 +0200
gdi32: Add support for loading name strings in Apple Unicode format.
---
dlls/gdi32/freetype.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 468ea4b..2ec7335 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1325,6 +1325,19 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang )
if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0;
name_lang = mac_langid_table[name->language_id];
break;
+ case TT_PLATFORM_APPLE_UNICODE:
+ switch (name->encoding_id)
+ {
+ case TT_APPLE_ID_DEFAULT:
+ case TT_APPLE_ID_ISO_10646:
+ case TT_APPLE_ID_UNICODE_2_0:
+ if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0;
+ name_lang = mac_langid_table[name->language_id];
+ break;
+ default:
+ return 0;
+ }
+ break;
default:
return 0;
}
@@ -1342,6 +1355,7 @@ static WCHAR *copy_name_table_string( const FT_SfntName *name )
switch (name->platform_id)
{
+ case TT_PLATFORM_APPLE_UNICODE:
case TT_PLATFORM_MICROSOFT:
ret = HeapAlloc( GetProcessHeap(), 0, name->string_len + sizeof(WCHAR) );
for (i = 0; i < name->string_len / 2; i++)
More information about the wine-cvs
mailing list