mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 20:17:22 +00:00
gdiplus: Accept newer version in OpenType header.
Signed-off-by: Esme Povirk <esme@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
42f5ff44bd
commit
7d118a25c0
|
@ -106,7 +106,7 @@ typedef struct
|
||||||
#define GET_BE_DWORD(x) (x)
|
#define GET_BE_DWORD(x) (x)
|
||||||
#else
|
#else
|
||||||
#define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x))
|
#define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x))
|
||||||
#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x)));
|
#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x)))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \
|
#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \
|
||||||
|
@ -1150,14 +1150,16 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON
|
||||||
#define NAME_ID_FULL_FONT_NAME 4
|
#define NAME_ID_FULL_FONT_NAME 4
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
USHORT major_version;
|
ULONG version;
|
||||||
USHORT minor_version;
|
|
||||||
USHORT tables_no;
|
USHORT tables_no;
|
||||||
USHORT search_range;
|
USHORT search_range;
|
||||||
USHORT entry_selector;
|
USHORT entry_selector;
|
||||||
USHORT range_shift;
|
USHORT range_shift;
|
||||||
} tt_header;
|
} tt_header;
|
||||||
|
|
||||||
|
#define TT_HEADER_VERSION_1 0x00010000
|
||||||
|
#define TT_HEADER_VERSION_CFF 0x4f54544f
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char tag[4]; /* table name */
|
char tag[4]; /* table name */
|
||||||
ULONG check_sum; /* Check sum */
|
ULONG check_sum; /* Check sum */
|
||||||
|
@ -1402,7 +1404,8 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id )
|
||||||
header = (const tt_header*)mem;
|
header = (const tt_header*)mem;
|
||||||
count = GET_BE_WORD(header->tables_no);
|
count = GET_BE_WORD(header->tables_no);
|
||||||
|
|
||||||
if (GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0)
|
if (GET_BE_DWORD(header->version) != TT_HEADER_VERSION_1 &&
|
||||||
|
GET_BE_DWORD(header->version) != TT_HEADER_VERSION_CFF)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
pos = sizeof(*header);
|
pos = sizeof(*header);
|
||||||
|
|
Loading…
Reference in a new issue