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>

dwrite: Return zeroed fsCsb for OS/2 table of version 0.
3316f904 · Nikolay Sivov · Alexandre Julliard · f6de3806 · 3316f904 · 3316f904
Commit 3316f904 authored Dec 04, 2016 by Nikolay Sivov Committed by Alexandre Julliard Dec 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 4 deletions

opentype.c dlls/dwrite/opentype.c +8 -2

font.c dlls/dwrite/tests/font.c +8 -2

No files found.
--- 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);
    }

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