mirror of
https://github.com/reactos/reactos.git
synced 2024-10-01 06:57:08 +00:00
[SHELL32]
- Correctly initialize LVITEM::iSubItem before LVM_GETITEM/LVM_SETITEM CORE-10403 #resolve svn path=/trunk/; revision=69692
This commit is contained in:
parent
465a34000b
commit
c662ceada7
|
@ -855,11 +855,13 @@ BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew
|
||||||
{
|
{
|
||||||
lvItem.mask = LVIF_PARAM; /* only the pidl */
|
lvItem.mask = LVIF_PARAM; /* only the pidl */
|
||||||
lvItem.iItem = nItem;
|
lvItem.iItem = nItem;
|
||||||
|
lvItem.iSubItem = 0;
|
||||||
m_ListView.GetItem(&lvItem);
|
m_ListView.GetItem(&lvItem);
|
||||||
|
|
||||||
SHFree(reinterpret_cast<LPVOID>(lvItem.lParam));
|
SHFree(reinterpret_cast<LPVOID>(lvItem.lParam));
|
||||||
lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
|
lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
|
||||||
lvItem.iItem = nItem;
|
lvItem.iItem = nItem;
|
||||||
|
lvItem.iSubItem = 0;
|
||||||
lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidlNew)); /* set the item's data */
|
lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidlNew)); /* set the item's data */
|
||||||
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0);
|
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0);
|
||||||
m_ListView.SetItem(&lvItem);
|
m_ListView.SetItem(&lvItem);
|
||||||
|
@ -886,6 +888,7 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
|
||||||
{
|
{
|
||||||
lvItem.mask = LVIF_IMAGE;
|
lvItem.mask = LVIF_IMAGE;
|
||||||
lvItem.iItem = nItem;
|
lvItem.iItem = nItem;
|
||||||
|
lvItem.iSubItem = 0;
|
||||||
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0);
|
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0);
|
||||||
m_ListView.SetItem(&lvItem);
|
m_ListView.SetItem(&lvItem);
|
||||||
m_ListView.Update(nItem);
|
m_ListView.Update(nItem);
|
||||||
|
@ -1913,6 +1916,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
|
||||||
{
|
{
|
||||||
lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
|
lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
|
||||||
lvItem.iItem = lpdi->item.iItem;
|
lvItem.iItem = lpdi->item.iItem;
|
||||||
|
lvItem.iSubItem = 0;
|
||||||
lvItem.lParam = reinterpret_cast<LPARAM>(pidlNew);
|
lvItem.lParam = reinterpret_cast<LPARAM>(pidlNew);
|
||||||
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0);
|
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0);
|
||||||
m_ListView.SetItem(&lvItem);
|
m_ListView.SetItem(&lvItem);
|
||||||
|
|
Loading…
Reference in a new issue