From 83ef90789fe3c41a6ed9925aa6facf3015235b11 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 21 Sep 2011 09:01:04 +0200 Subject: [PATCH] msi: Support reading version information from OpenType/CFF fonts. --- dlls/msi/font.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index df7b4e70d17..a7778f7b7d6 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -111,7 +111,8 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) ttOffsetTable.uMajorVersion = SWAPWORD(ttOffsetTable.uMajorVersion); ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion); - if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) + if ((ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) && + (ttOffsetTable.uMajorVersion != 0x4f54 || ttOffsetTable.uMinorVersion != 0x544f)) goto end; for (i=0; i< ttOffsetTable.uNumOfTables; i++) @@ -192,8 +193,10 @@ WCHAR *msi_font_version_from_file( const WCHAR *filename ) WCHAR *version, *p, *ret = NULL; int len; - if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) + if ((version = load_ttf_name_id( filename, NAME_ID_VERSION ))) { + if ((p = strchrW( version, ';' ))) *p = 0; + p = version; while (*p && !isdigitW( *p )) p++; len = strlenW( p ) + strlenW(dotzerodotzeroW) + 1; ret = msi_alloc( len * sizeof(WCHAR) ); -- 2.11.4.GIT