From 5eccb1322d09362c5431911bcdc5a4d218ee98fb Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 13 Mar 2015 21:24:49 +0300 Subject: [PATCH] dwrite: Actually return NULL names pointer and error code when failed to read them. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 12ce3ca1a24..32ed7123918 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -773,7 +773,7 @@ HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index { const void *name_table = NULL; void *name_context; - HRESULT hr = S_OK; + HRESULT hr = E_FAIL; opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); if (name_table) { @@ -781,7 +781,7 @@ HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); } else - names = NULL; + *names = NULL; return hr; } -- 2.11.4.GIT