Changeset 295 for trunk/src/comctl32/treeview.c

Timestamp:

Jul 12, 1999, 5:58:51 PM (26 years ago)

Author:

cbratschi

Message:

wine-990704 updates, TBCUSTOMIZE implemented

File:

• trunk/src/comctl32/treeview.c (modified) (8 diffs)

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.7 1999-06-30 15:52:19 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.8 1999-07-12 15:58:49 cbratschi Exp $ */
 /* Treeview control
  *
@@ -42 +42 @@
  */
 
+/* CB: todo
+ - fix ffs();
+*/
 
 #include <string.h>
@@ -1268 +1271 @@
  * This method does the chaining of the insertion of a treeview item
  * before an item.
+ * If parent is NULL, we're inserting at the root of the list.
  */
 static void TREEVIEW_InsertBefore(
@@ -1305 +1309 @@
       upSibling->sibling = newItem->hItem;
     else
+    if (parent)
       /* this item is the first child of this parent, adjust parent pointers */
       parent->firstChild = newItem->hItem;
+    else infoPtr->TopRootItem = newItem->hItem;
   }
   else /* Insert as first child of this parent */
+  if (parent)
     parent->firstChild = newItem->hItem;
 }
@@ -1314 +1321 @@
 /***************************************************************************
  * This method does the chaining of the insertion of a treeview item
+ * If parent is NULL, we're inserting at the root of the list.
  * after an item.
  */
@@ -1357 +1365 @@
   }
   else /* Insert as first child of this parent */
+  if (parent)
     parent->firstChild = newItem->hItem;
 }
@@ -1390 +1399 @@
   /* Obtain the TVSORTBC struct */
   infoPtr->pCallBackSort = (LPTVSORTCB)lParam;
+
+  /* Check for a valid handle to the parent item */
+  if (!TREEVIEW_ValidItem(infoPtr, infoPtr->pCallBackSort->hParent))
+  {
+//    ERR ("invalid item hParent=%d\n", (INT)infoPtr->pCallBackSort->hParent);
+    return FALSE;
+  }
 
   /* Obtain the parent node to sort */
@@ -1627 +1643 @@
       else
       {
-        TREEVIEW_ITEM *aChild        =
-          &infoPtr->items[(INT)parentItem->firstChild];
+        TREEVIEW_ITEM *aChild;
 
         TREEVIEW_ITEM *previousChild = NULL;
         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 */