From c662ceada758ed0ec65805426ffbf55077e1b477 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 25 Oct 2015 11:49:12 +0000 Subject: [PATCH] [SHELL32] - Correctly initialize LVITEM::iSubItem before LVM_GETITEM/LVM_SETITEM CORE-10403 #resolve svn path=/trunk/; revision=69692 --- reactos/dll/win32/shell32/CDefView.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/reactos/dll/win32/shell32/CDefView.cpp b/reactos/dll/win32/shell32/CDefView.cpp index 1bb5b494ff1..558c8e15754 100644 --- a/reactos/dll/win32/shell32/CDefView.cpp +++ b/reactos/dll/win32/shell32/CDefView.cpp @@ -855,11 +855,13 @@ BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew { lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; + lvItem.iSubItem = 0; m_ListView.GetItem(&lvItem); SHFree(reinterpret_cast(lvItem.lParam)); lvItem.mask = LVIF_PARAM|LVIF_IMAGE; lvItem.iItem = nItem; + lvItem.iSubItem = 0; lvItem.lParam = reinterpret_cast(ILClone(pidlNew)); /* set the item's data */ lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0); m_ListView.SetItem(&lvItem); @@ -886,6 +888,7 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl) { lvItem.mask = LVIF_IMAGE; lvItem.iItem = nItem; + lvItem.iSubItem = 0; lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); m_ListView.SetItem(&lvItem); 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.iItem = lpdi->item.iItem; + lvItem.iSubItem = 0; lvItem.lParam = reinterpret_cast(pidlNew); lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0); m_ListView.SetItem(&lvItem);