Module: wine Branch: master Commit: 3316f90418dd87c6d5c13f6658ce56e41039448c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3316f90418dd87c6d5c13f6658...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sun Dec 4 19:22:12 2016 +0300
dwrite: Return zeroed fsCsb for OS/2 table of version 0.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dwrite/opentype.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3205b7f..3fe4690 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1923,8 +1923,14 @@ HRESULT opentype_get_font_signature(struct file_stream_desc *stream_desc, FONTSI fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4);
- fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + if (GET_BE_WORD(tt_os2->version) == 0) { + fontsig->fsCsb[0] = 0; + fontsig->fsCsb[1] = 0; + } + else { + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + }
IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 12327a5..8df6f44 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6267,8 +6267,14 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4);
- fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + if (GET_BE_WORD(tt_os2->version) == 0) { + fontsig->fsCsb[0] = 0; + fontsig->fsCsb[1] = 0; + } + else { + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + }
IDWriteFontFace_ReleaseFontTable(fontface, os2_context); }