lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-30 05:51:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[LPK] Added more error handling code (#622).

Browse Source 
- Added a codepath if both glyphs and reordered_str arrays are NULL.
- Move variables back to the beginning of function.

CORE-14732
This commit is contained in:
Baruch Rutman
2018-06-18 17:54:15 +03:00
committed by Hermès Bélusca-Maïto
parent 7fe6a14ede
commit e054a053ff
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dll/win32/lpk/lpk.c
View File

@@ -63,6 +63,11 @@ LpkExtTextOut(
const INT *lpDx,
INT unknown)
{
LPWORD glyphs = NULL;
LPWSTR reordered_str = NULL;
INT cGlyphs;
BOOL bResult;
UNREFERENCED_PARAMETER(unknown);
if (!(fuOptions & ETO_IGNORELANGUAGE))
@@ -78,10 +83,7 @@ LpkExtTextOut(
/* Check if the string requires complex script processing and not a "glyph indices" array */
if (ScriptIsComplex(lpString, uCount, SIC_COMPLEX) == S_OK && !(fuOptions & ETO_GLYPH_INDEX))
{
LPWORD glyphs = NULL;
LPWSTR reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR));
INT cGlyphs;
BOOL bResult;
reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR));
BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER,
(fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR,
@@ -90,13 +92,17 @@ LpkExtTextOut(
if (glyphs)
{
fuOptions |= ETO_GLYPH_INDEX;
if (uCount != cGlyphs)
uCount = cGlyphs;
uCount = cGlyphs;
}
bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc,
glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx);
if (glyphs || reordered_str)
{
bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc,
glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx);
}
else
bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, uCount, lpDx);
HeapFree(GetProcessHeap(), 0, glyphs);
HeapFree(GetProcessHeap(), 0, reordered_str);