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

- Effective optimization in GetNextItem (speeds up Xnews). 

- Misc cleanups.
This commit is contained in:
Dimitrie O. Paun 2002-10-05 17:43:26 +00:00 committed by Alexandre Julliard
parent a656944875
commit 3547087c70
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/comctl32/listview.c
View File

@ -994,7 +994,7 @@ static void LISTVIEW_UpdateHeaderSize(LISTVIEW_INFO *infoPtr, INT nNewScrollPos)
RECT winRect; RECT winRect;
POINT point[2]; POINT point[2];
TRACE("nNewScrollPos=%d", nNewScrollPos); TRACE("nNewScrollPos=%d\n", nNewScrollPos);
GetWindowRect(infoPtr->hwndHeader, &winRect); GetWindowRect(infoPtr->hwndHeader, &winRect);
point[0].x = winRect.left; point[0].x = winRect.left;
@ -3230,7 +3230,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD cdmode
TEXTATTR tmpTa, oldTa; TEXTATTR tmpTa, oldTa;
COLUMNCACHE *lpCols; COLUMNCACHE *lpCols;
LVCOLUMNW lvColumn; LVCOLUMNW lvColumn;
LVITEMW lvItem; LVITEMW item;
POINT ptOrig; POINT ptOrig;
TRACE("()\n"); TRACE("()\n");
@ -3307,7 +3307,6 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD cdmode
if (lStyle & LVS_OWNERDRAWFIXED) if (lStyle & LVS_OWNERDRAWFIXED)
{ {
DRAWITEMSTRUCT dis; DRAWITEMSTRUCT dis;
LVITEMW item;
TRACE("Owner Drawn\n"); TRACE("Owner Drawn\n");
@ -3333,6 +3332,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD cdmode
dis.rcItem.bottom = dis.rcItem.top + infoPtr->nItemHeight; dis.rcItem.bottom = dis.rcItem.top + infoPtr->nItemHeight;
OffsetRect(&dis.rcItem, ptOrig.x, 0); OffsetRect(&dis.rcItem, ptOrig.x, 0);
TRACE("item=%s, rcItem=%s\n", debuglvitem_t(&item, TRUE), debugrect(&dis.rcItem));
if (SendMessageW(GetParent(infoPtr->hwndSelf), WM_DRAWITEM, uID, (LPARAM)&dis)) if (SendMessageW(GetParent(infoPtr->hwndSelf), WM_DRAWITEM, uID, (LPARAM)&dis))
continue; continue;
} }
@ -3340,14 +3340,14 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD cdmode
/* compute the full select rectangle, if needed */ /* compute the full select rectangle, if needed */
if (bFullSelected) if (bFullSelected)
{ {
lvItem.mask = LVIF_IMAGE | LVIF_STATE | LVIF_INDENT; item.mask = LVIF_IMAGE | LVIF_STATE | LVIF_INDENT;
lvItem.stateMask = LVIS_SELECTED; item.stateMask = LVIS_SELECTED;
lvItem.iItem = nItem; item.iItem = nItem;
lvItem.iSubItem = 0; item.iSubItem = 0;
if (!LISTVIEW_GetItemW(infoPtr, &lvItem, TRUE)) continue; if (!LISTVIEW_GetItemW(infoPtr, &item, TRUE)) continue;
rcFullSelect.left = lpCols[0].rc.left + REPORT_MARGINX + rcFullSelect.left = lpCols[0].rc.left + REPORT_MARGINX +
infoPtr->iconSize.cx * lvItem.iIndent + infoPtr->iconSize.cx * item.iIndent +
(infoPtr->himlSmall ? infoPtr->iconSize.cx : 0); (infoPtr->himlSmall ? infoPtr->iconSize.cx : 0);
rcFullSelect.right = max(rcFullSelect.left, lpCols[nColumnCount - 1].rc.right - REPORT_MARGINX); rcFullSelect.right = max(rcFullSelect.left, lpCols[nColumnCount - 1].rc.right - REPORT_MARGINX);
rcFullSelect.top = nDrawPosY; rcFullSelect.top = nDrawPosY;
@ -3356,8 +3356,8 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD cdmode
} }
/* draw the background of the selection rectangle, if need be */ /* draw the background of the selection rectangle, if need be */
select_text_attr(infoPtr, hdc, bFullSelected && (lvItem.state & LVIS_SELECTED), &tmpTa); select_text_attr(infoPtr, hdc, bFullSelected && (item.state & LVIS_SELECTED), &tmpTa);
if (bFullSelected && (lvItem.state & LVIS_SELECTED)) if (bFullSelected && (item.state & LVIS_SELECTED))
ExtTextOutW(hdc, rcFullSelect.left, rcFullSelect.top, ETO_OPAQUE, &rcFullSelect, 0, 0, 0); ExtTextOutW(hdc, rcFullSelect.left, rcFullSelect.top, ETO_OPAQUE, &rcFullSelect, 0, 0, 0);
/* iterate through the invalidated columns */ /* iterate through the invalidated columns */
@ -5276,8 +5276,11 @@ static LRESULT LISTVIEW_GetItemTextT(LISTVIEW_INFO *infoPtr, INT nItem, LPLVITEM
* *
* PARAMETER(S): * PARAMETER(S):
* [I] infoPtr : valid pointer to the listview structure * [I] infoPtr : valid pointer to the listview structure
* [I] INT : item index * [I] nItem : item index
* [I] INT : relationship flag * [I] uFlags : relationship flag
*
* FIXME:
* This function is ver, very inefficient! Needs work.
* *
* RETURN: * RETURN:
* SUCCESS : item index * SUCCESS : item index
@ -5291,8 +5294,8 @@ static LRESULT LISTVIEW_GetNextItem(LISTVIEW_INFO *infoPtr, INT nItem, UINT uFla
INT nCountPerColumn; INT nCountPerColumn;
INT i; INT i;
if ((nItem >= -1) && (nItem < GETITEMCOUNT(infoPtr))) if ((nItem < -1) || (nItem >= GETITEMCOUNT(infoPtr))) return -1;
{
ZeroMemory(&lvFindInfo, sizeof(lvFindInfo)); ZeroMemory(&lvFindInfo, sizeof(lvFindInfo));
if (uFlags & LVNI_CUT) if (uFlags & LVNI_CUT)
@ -5307,6 +5310,14 @@ static LRESULT LISTVIEW_GetNextItem(LISTVIEW_INFO *infoPtr, INT nItem, UINT uFla
if (uFlags & LVNI_SELECTED) if (uFlags & LVNI_SELECTED)
uMask |= LVIS_SELECTED; uMask |= LVIS_SELECTED;
/* if we're asked for the focused item, that's only one,
* so it's worth optimizing */
if (uFlags & LVNI_FOCUSED)
{
if (!(LISTVIEW_GetItemState(infoPtr, infoPtr->nFocusedItem, uMask) & uMask) == uMask) return -1;
return (infoPtr->nFocusedItem == nItem) ? -1 : infoPtr->nFocusedItem;
}
if (uFlags & LVNI_ABOVE) if (uFlags & LVNI_ABOVE)
{ {
if ((uView == LVS_LIST) || (uView == LVS_REPORT)) if ((uView == LVS_LIST) || (uView == LVS_REPORT))
@ -5412,7 +5423,6 @@ static LRESULT LISTVIEW_GetNextItem(LISTVIEW_INFO *infoPtr, INT nItem, UINT uFla
return i; return i;
} }
} }
}
return -1; return -1;
} }
@ -6822,14 +6832,15 @@ static BOOL LISTVIEW_SetItemTextT(LISTVIEW_INFO *infoPtr, INT nItem, LPLVITEMW l
{ {
LVITEMW lvItem; LVITEMW lvItem;
TRACE("(nItem=%d, lpLVItem=%s, isW=%d)\n", nItem, debuglvitem_t(lpLVItem, isW), isW);
if ((nItem < 0) && (nItem >= GETITEMCOUNT(infoPtr))) return FALSE; if ((nItem < 0) && (nItem >= GETITEMCOUNT(infoPtr))) return FALSE;
lvItem.iItem = nItem; lvItem.iItem = nItem;
lvItem.iSubItem = lpLVItem->iSubItem; lvItem.iSubItem = lpLVItem->iSubItem;
lvItem.mask = LVIF_TEXT; lvItem.mask = LVIF_TEXT;
lvItem.pszText = lpLVItem->pszText; lvItem.pszText = lpLVItem->pszText;
lvItem.cchTextMax = lpLVItem->cchTextMax;
TRACE("(nItem=%d, lpLVItem=%s, isW=%d)\n", nItem, debuglvitem_t(&lvItem, isW), isW);
return LISTVIEW_SetItemT(infoPtr, &lvItem, isW); return LISTVIEW_SetItemT(infoPtr, &lvItem, isW);
} }