Nikolay Sivov : dwrite: Actually return NULL names pointer and error code when failed to read them.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 16 10:34:23 CDT 2015
Module: wine
Branch: master
Commit: 5eccb1322d09362c5431911bcdc5a4d218ee98fb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eccb1322d09362c5431911bcdc5a4d218ee98fb
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Mar 13 21:24:49 2015 +0300
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 12ce3ca..32ed712 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;
}
More information about the wine-cvs
mailing list