Nikolay Sivov : dwrite: Improve error handling in ConvertFontToLOGFONT() ( Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 15485f538da86264ec1148543174eb480cd8950d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15485f538da86264ec11485431...

Author: Nikolay Sivov <bunglehead(a)gmail.com>
Date:   Mon Feb  8 12:31:46 2016 +0300

dwrite: Improve error handling in ConvertFontToLOGFONT() (Coverity).

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dwrite/gdiinterop.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c
index 794ebee..dcc2f7a 100644
--- a/dlls/dwrite/gdiinterop.c
+++ b/dlls/dwrite/gdiinterop.c
@@ -711,11 +711,11 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface,
     if (FAILED(hr) || !exists)
         return hr;
 
-    IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists);
-    IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR));
+    hr = IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists);
+    if (hr == S_OK)
+        hr = IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR));
     IDWriteLocalizedStrings_Release(name);
-
-    return S_OK;
+    return hr;
 }
 
 static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface,