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>

gdi32: Cleanup otmfsType bit mask from reserved bits.
533d800d · Nikolay Sivov · Alexandre Julliard · be287422 · 533d800d · 533d800d
Commit 533d800d authored Mar 05, 2017 by Nikolay Sivov Committed by Alexandre Julliard Mar 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

freetype.c dlls/gdi32/freetype.c +2 -1

font.c dlls/gdi32/tests/font.c +0 -1

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -7914,7 +7914,8 @@ static BOOL get_outline_text_metrics(GdiFont *font)
        font->potm->otmfsSelection |= 1;
    if (font->fake_bold)
        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->otmsCharSlopeRun = pHori->caret_Slope_Run;
    font->potm->otmItalicAngle = 0; /* POST table */

--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -5676,7 +5676,6 @@ static void test_fstype_fixup(void)

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

    HeapFree(GetProcessHeap(), 0, otm);