From 20ae9be59516b28efd1389b6b6c2314b6cf9bfcc Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Thu, 1 May 2008 17:41:46 +0200 Subject: [PATCH] usp10: Remove redundant code from ScriptTextOut. --- dlls/usp10/usp10.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e8e9bf07f9..5e6b1471f3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1407,7 +1407,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HFONT hfont; HRESULT hr = S_OK; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", @@ -1416,9 +1415,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc && psc && !*psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); fuOptions &= ETO_CLIPPED + ETO_OPAQUE; if (!psa->fNoGlyphIndex) /* Have Glyphs? */ @@ -1427,7 +1423,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) hr = S_FALSE; - unselect_cached_font(psc, hfont); return hr; } -- 2.32.0.93.g670b81a890