From 3bd4ef3363f38e05514cd23cda575699db908601 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 27 Jun 2004 11:24:43 +0000 Subject: [PATCH] - Better handling of error cases when no fonts are present in the system. svn path=/trunk/; revision=9904 --- reactos/lib/comctl32/listview.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/lib/comctl32/listview.c b/reactos/lib/comctl32/listview.c index 8914a44abd2..6799434d182 100644 --- a/reactos/lib/comctl32/listview.c +++ b/reactos/lib/comctl32/listview.c @@ -2024,7 +2024,8 @@ calc_label: infoPtr->iconSize.cy + ICON_BOTTOM_PADDING; Label.right = Label.left + labelSize.cx; Label.bottom = Label.top + infoPtr->nItemHeight; - if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight) + if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight && + infoPtr->ntmHeight) { labelSize.cy = min(Box.bottom - Label.top, labelSize.cy); labelSize.cy /= infoPtr->ntmHeight; @@ -9516,7 +9517,8 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, hOldFont = SelectObject(hdc, infoPtr->hFont); /*Get String Length in pixels */ - GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz); + if(!GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz)) + sz.cx = 0; /*Add Extra spacing for the next character */ GetTextMetricsW(hdc, &textMetric);