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

Fix a crash when doing sorted inserts at top level.

This commit is contained in:
Alex Priem 1999-07-03 15:42:33 +00:00 committed by Alexandre Julliard
parent 60c78f143b
commit 124b61904f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/comctl32/treeview.c
View File

@ -1266,6 +1266,7 @@ TREEVIEW_GetCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
/*************************************************************************** /***************************************************************************
* This method does the chaining of the insertion of a treeview item * This method does the chaining of the insertion of a treeview item
* before an item. * before an item.
* If parent is NULL, we're inserting at the root of the list.
*/ */
static void TREEVIEW_InsertBefore( static void TREEVIEW_InsertBefore(
TREEVIEW_INFO *infoPtr, TREEVIEW_INFO *infoPtr,
@ -1280,9 +1281,6 @@ static void TREEVIEW_InsertBefore(
if (newItem == NULL) if (newItem == NULL)
ERR("NULL newItem, impossible condition\n"); ERR("NULL newItem, impossible condition\n");
if (parent == NULL)
ERR("NULL parent, impossible condition\n");
if (sibling != NULL) /* Insert before this sibling for this parent */ if (sibling != NULL) /* Insert before this sibling for this parent */
{ {
/* Store the new item sibling up sibling and sibling tem handle */ /* Store the new item sibling up sibling and sibling tem handle */
@ -1304,15 +1302,20 @@ static void TREEVIEW_InsertBefore(
upSibling->sibling = newItem->hItem; upSibling->sibling = newItem->hItem;
else else
/* this item is the first child of this parent, adjust parent pointers */ /* this item is the first child of this parent, adjust parent pointers */
parent->firstChild = newItem->hItem; if (parent)
parent->firstChild = newItem->hItem;
else
infoPtr->TopRootItem= newItem->hItem;
} }
else /* Insert as first child of this parent */ else /* Insert as first child of this parent */
parent->firstChild = newItem->hItem; if (parent)
parent->firstChild = newItem->hItem;
} }
/*************************************************************************** /***************************************************************************
* This method does the chaining of the insertion of a treeview item * This method does the chaining of the insertion of a treeview item
* after an item. * after an item.
* If parent is NULL, we're inserting at the root of the list.
*/ */
static void TREEVIEW_InsertAfter( static void TREEVIEW_InsertAfter(
TREEVIEW_INFO *infoPtr, TREEVIEW_INFO *infoPtr,
@ -1324,12 +1327,10 @@ static void TREEVIEW_InsertAfter(
HTREEITEM siblingHandle = 0; HTREEITEM siblingHandle = 0;
TREEVIEW_ITEM *sibling = NULL; TREEVIEW_ITEM *sibling = NULL;
if (newItem == NULL) if (newItem == NULL)
ERR("NULL newItem, impossible condition\n"); ERR("NULL newItem, impossible condition\n");
if (parent == NULL)
ERR("NULL parent, impossible condition\n");
if (upSibling != NULL) /* Insert after this upsibling for this parent */ if (upSibling != NULL) /* Insert after this upsibling for this parent */
{ {
/* Store the new item up sibling and sibling item handle */ /* Store the new item up sibling and sibling item handle */
@ -1355,7 +1356,8 @@ static void TREEVIEW_InsertAfter(
*/ */
} }
else /* Insert as first child of this parent */ else /* Insert as first child of this parent */
parent->firstChild = newItem->hItem; if (parent)
parent->firstChild = newItem->hItem;
} }
/*************************************************************************** /***************************************************************************
@ -1630,11 +1632,16 @@ TREEVIEW_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
break; break;
else else
{ {
TREEVIEW_ITEM *aChild = TREEVIEW_ITEM *aChild;
&infoPtr->items[(INT)parentItem->firstChild];
TREEVIEW_ITEM *previousChild = NULL; TREEVIEW_ITEM *previousChild = NULL;
BOOL bItemInserted = FALSE; BOOL bItemInserted = FALSE;
if (parentItem)
aChild = &infoPtr->items[(INT)parentItem->firstChild];
else
aChild = &infoPtr->items[(INT)infoPtr->TopRootItem];
/* Iterate the parent children to see where we fit in */ /* Iterate the parent children to see where we fit in */
while ( aChild != NULL ) while ( aChild != NULL )
@ -3556,7 +3563,7 @@ TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return TREEVIEW_VScroll (hwnd, wParam, lParam); return TREEVIEW_VScroll (hwnd, wParam, lParam);
case WM_DRAWITEM: case WM_DRAWITEM:
printf ("drawItem\n"); TRACE ("drawItem\n");
return DefWindowProcA (hwnd, uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam);
default: default: