ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Simplify the reordering of glyphs.

Browse Source
This commit is contained in:
Huw Davies 2013-01-11 11:09:19 +00:00 committed by Alexandre Julliard
parent 3197e36413
commit 83cbc07141
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/usp10/usp10.c
View File

@ -3239,6 +3239,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
HRESULT hr = S_OK; HRESULT hr = S_OK;
INT i; INT i;
INT *lpDx; INT *lpDx;
WORD *reordered_glyphs = (WORD *)pwGlyphs;
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",
hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs,
@ -3253,8 +3254,22 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */
lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2);
if (!lpDx) return E_OUTOFMEMORY;
fuOptions |= ETO_PDY; fuOptions |= ETO_PDY;
if (psa->fRTL && psa->fLogicalOrder)
{
reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) );
if (!reordered_glyphs)
{
heap_free( lpDx );
return E_OUTOFMEMORY;
}
for (i = 0; i < cGlyphs; i++)
reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i];
}
for (i = 0; i < cGlyphs; i++) for (i = 0; i < cGlyphs; i++)
{ {
lpDx[i * 2] = piAdvance[i]; lpDx[i * 2] = piAdvance[i];
@ -3269,29 +3284,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
} }
} }
if (psa->fRTL && psa->fLogicalOrder) if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, reordered_glyphs, cGlyphs, lpDx))
{ hr = S_FALSE;
int i;
WORD *rtlGlyphs;
rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD));
if (!rtlGlyphs)
{
heap_free(lpDx);
return E_OUTOFMEMORY;
}
for (i = 0; i < cGlyphs; i++)
rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i];
if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, lpDx))
hr = S_FALSE;
heap_free(rtlGlyphs);
}
else
if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, lpDx))
hr = S_FALSE;
if (reordered_glyphs != pwGlyphs) heap_free( reordered_glyphs );
heap_free(lpDx); heap_free(lpDx);
return hr; return hr;