From 2f5c0b93219058b5e1610475b04be8dddc6acd89 Mon Sep 17 00:00:00 2001 From: Bruno Jesus <00cpxxx@gmail.com> Date: Mon, 23 Nov 2015 21:47:56 +0800 Subject: [PATCH] comctl32: Respect an assert in TREEVIEW_RemoveAllChildren. Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/comctl32/treeview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6adafc46b2f..dc196555ffb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1441,11 +1441,13 @@ TREEVIEW_RemoveAllChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *parentIt static void TREEVIEW_UnlinkItem(const TREEVIEW_ITEM *item) { - TREEVIEW_ITEM *parentItem = item->parent; + TREEVIEW_ITEM *parentItem; assert(item != NULL); assert(item->parent != NULL); /* i.e. it must not be the root */ + parentItem = item->parent; + if (parentItem->firstChild == item) parentItem->firstChild = item->nextSibling; -- 2.11.4.GIT