system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 07:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwrite: Return zeroed fsCsb for OS/2 table of version 0.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-12-04 19:22:12 +03:00 committed by Alexandre Julliard
parent f6de3806a7
commit 3316f90418
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/dwrite/opentype.c
View file

@ -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);
}

10
dlls/dwrite/tests/font.c
View file

@ -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);
}