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

usp10: Store per-item ABC structure directly. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-10-02 10:46:59 +03:00 committed by Alexandre Julliard
parent 82ed7410cb
commit abf71afdff
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/usp10/usp10.c
View File

@ -683,7 +683,7 @@ typedef struct {
int* piAdvance; int* piAdvance;
SCRIPT_VISATTR* psva; SCRIPT_VISATTR* psva;
GOFFSET* pGoffset; GOFFSET* pGoffset;
ABC* abc; ABC abc;
int iMaxPosX; int iMaxPosX;
HFONT fallbackFont; HFONT fallbackFont;
} StringGlyphs; } StringGlyphs;
@ -2029,7 +2029,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs);
SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs);
GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs);
ABC *abc = heap_alloc_zero(sizeof(ABC));
int numGlyphsReturned; int numGlyphsReturned;
HFONT originalFont = 0x0; HFONT originalFont = 0x0;
@ -2037,7 +2036,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
const WCHAR* pStr = (const WCHAR*)pString; const WCHAR* pStr = (const WCHAR*)pString;
analysis->glyphs[i].fallbackFont = NULL; analysis->glyphs[i].fallbackFont = NULL;
if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset)
{ {
heap_free (BidiLevel); heap_free (BidiLevel);
heap_free (glyphs); heap_free (glyphs);
@ -2045,7 +2044,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
heap_free (piAdvance); heap_free (piAdvance);
heap_free (psva); heap_free (psva);
heap_free (pGoffset); heap_free (pGoffset);
heap_free (abc);
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
goto error; goto error;
} }
@ -2078,7 +2076,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs,
&analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned);
hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a,
piAdvance, pGoffset, abc); piAdvance, pGoffset, &analysis->glyphs[i].abc);
if (originalFont) if (originalFont)
SelectObject(hdc,originalFont); SelectObject(hdc,originalFont);
@ -2099,7 +2097,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
analysis->glyphs[i].piAdvance = piAdvance; analysis->glyphs[i].piAdvance = piAdvance;
analysis->glyphs[i].psva = psva; analysis->glyphs[i].psva = psva;
analysis->glyphs[i].pGoffset = pGoffset; analysis->glyphs[i].pGoffset = pGoffset;
analysis->glyphs[i].abc = abc;
analysis->glyphs[i].iMaxPosX= -1; analysis->glyphs[i].iMaxPosX= -1;
BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel;
@ -2516,7 +2513,6 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa)
heap_free(analysis->glyphs[i].piAdvance); heap_free(analysis->glyphs[i].piAdvance);
heap_free(analysis->glyphs[i].psva); heap_free(analysis->glyphs[i].psva);
heap_free(analysis->glyphs[i].pGoffset); heap_free(analysis->glyphs[i].pGoffset);
heap_free(analysis->glyphs[i].abc);
if (analysis->glyphs[i].fallbackFont) if (analysis->glyphs[i].fallbackFont)
DeleteObject(analysis->glyphs[i].fallbackFont); DeleteObject(analysis->glyphs[i].fallbackFont);
ScriptFreeCache((SCRIPT_CACHE *)&analysis->glyphs[i].sc); ScriptFreeCache((SCRIPT_CACHE *)&analysis->glyphs[i].sc);