ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Cleanup otmfsType bit mask from reserved bits. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-03-05 13:44:59 +03:00 committed by Alexandre Julliard
parent be287422ce
commit 533d800d42
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/freetype.c
View File

@ -7914,7 +7914,8 @@ static BOOL get_outline_text_metrics(GdiFont *font)
font->potm->otmfsSelection |= 1; font->potm->otmfsSelection |= 1;
if (font->fake_bold) if (font->fake_bold)
font->potm->otmfsSelection |= 1 << 5; font->potm->otmfsSelection |= 1 << 5;
font->potm->otmfsType = pOS2->fsType; /* Only return valid bits that define embedding and subsetting restrictions */
font->potm->otmfsType = pOS2->fsType & 0x30e;
font->potm->otmsCharSlopeRise = pHori->caret_Slope_Rise; font->potm->otmsCharSlopeRise = pHori->caret_Slope_Rise;
font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run; font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run;
font->potm->otmItalicAngle = 0; /* POST table */ font->potm->otmItalicAngle = 0; /* POST table */

1
dlls/gdi32/tests/font.c
View File

@ -5676,7 +5676,6 @@ static void test_fstype_fixup(void)
/* Test font has fsType set to 0x7fff, test that reserved bits are filtered out, /* Test font has fsType set to 0x7fff, test that reserved bits are filtered out,
valid bits are 1, 2, 3, 8, 9. */ valid bits are 1, 2, 3, 8, 9. */
todo_wine
ok((otm->otmfsType & ~0x30e) == 0, "fsType %#x\n", otm->otmfsType); ok((otm->otmfsType & ~0x30e) == 0, "fsType %#x\n", otm->otmfsType);
HeapFree(GetProcessHeap(), 0, otm); HeapFree(GetProcessHeap(), 0, otm);