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

comctl32/listview: Remove parameter check from winproc for LVM_SETITEMPOSITION32.

This commit is contained in:
Nikolay Sivov 2009-11-26 23:01:54 +03:00 committed by Alexandre Julliard
parent 62c610df3c
commit 8d43bdd2ee
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/comctl32/listview.c
View File

@ -8489,34 +8489,35 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl
* SUCCESS : TRUE * SUCCESS : TRUE
* FAILURE : FALSE * FAILURE : FALSE
*/ */
static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, POINT pt) static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, POINT *pt)
{ {
POINT Origin; POINT Origin, Pt;
TRACE("(nItem=%d, &pt=%s\n", nItem, wine_dbgstr_point(&pt)); TRACE("(nItem=%d, pt=%s\n", nItem, wine_dbgstr_point(pt));
if (nItem < 0 || nItem >= infoPtr->nItemCount || if (!pt || nItem < 0 || nItem >= infoPtr->nItemCount ||
!(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE; !(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE;
Pt = *pt;
LISTVIEW_GetOrigin(infoPtr, &Origin); LISTVIEW_GetOrigin(infoPtr, &Origin);
/* This point value seems to be an undocumented feature. /* This point value seems to be an undocumented feature.
* The best guess is that it means either at the origin, * The best guess is that it means either at the origin,
* or at true beginning of the list. I will assume the origin. */ * or at true beginning of the list. I will assume the origin. */
if ((pt.x == -1) && (pt.y == -1)) if ((Pt.x == -1) && (Pt.y == -1))
pt = Origin; Pt = Origin;
if (infoPtr->uView == LV_VIEW_ICON) if (infoPtr->uView == LV_VIEW_ICON)
{ {
pt.x -= (infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2; Pt.x -= (infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2;
pt.y -= ICON_TOP_PADDING; Pt.y -= ICON_TOP_PADDING;
} }
pt.x -= Origin.x; Pt.x -= Origin.x;
pt.y -= Origin.y; Pt.y -= Origin.y;
infoPtr->bAutoarrange = FALSE; infoPtr->bAutoarrange = FALSE;
return LISTVIEW_MoveIconTo(infoPtr, nItem, &pt, FALSE); return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE);
} }
/*** /***
@ -11124,12 +11125,11 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
POINT pt; POINT pt;
pt.x = (short)LOWORD(lParam); pt.x = (short)LOWORD(lParam);
pt.y = (short)HIWORD(lParam); pt.y = (short)HIWORD(lParam);
return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, pt); return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, &pt);
} }
case LVM_SETITEMPOSITION32: case LVM_SETITEMPOSITION32:
if (lParam == 0) return FALSE; return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, (POINT*)lParam);
return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, *((POINT*)lParam));
case LVM_SETITEMSTATE: case LVM_SETITEMSTATE:
if (lParam == 0) return FALSE; if (lParam == 0) return FALSE;