usp10: Remove redundant code from ScriptTextOut.
This commit is contained in:
parent
f263b637a9
commit
20ae9be595
|
@ -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,
|
int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance,
|
||||||
const int *piJustify, const GOFFSET *pGoffset)
|
const int *piJustify, const GOFFSET *pGoffset)
|
||||||
{
|
{
|
||||||
HFONT hfont;
|
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr = S_OK;
|
||||||
|
|
||||||
TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n",
|
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 (!hdc && psc && !*psc) return E_INVALIDARG;
|
||||||
if (!piAdvance || !psa || !pwGlyphs) 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;
|
fuOptions &= ETO_CLIPPED + ETO_OPAQUE;
|
||||||
if (!psa->fNoGlyphIndex) /* Have Glyphs? */
|
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))
|
if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL))
|
||||||
hr = S_FALSE;
|
hr = S_FALSE;
|
||||||
|
|
||||||
unselect_cached_font(psc, hfont);
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue