[pschweitzer] 36770: Merged r36663 with pierre-fsd

Author: pschweitzer
Date: Thu Oct 16 13:18:24 2008
New Revision: 36770

URL: http://svn.reactos.org/svn/reactos?rev=36770&view=rev
Log:
Merged r36663 with pierre-fsd

Modified:
    branches/pierre-fsd/lib/rtl/generictable.c
    branches/pierre-fsd/lib/rtl/splaytree.c

Modified: branches/pierre-fsd/lib/rtl/generictable.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/generictable....
==============================================================================
--- branches/pierre-fsd/lib/rtl/generictable.c [iso-8859-1] (original)
+++ branches/pierre-fsd/lib/rtl/generictable.c [iso-8859-1] Thu Oct 16 13:18:24 2008
@@ -352,7 +352,7 @@
     else
     {
         /* Otherwise, try using the real successor */
-        FoundNode = RtlRealSuccessor(Table->TableRoot);
+        FoundNode = RtlRealSuccessor(*RestartKey);
         if (FoundNode) Table->TableRoot = RtlSplay(FoundNode);
     }

Modified: branches/pierre-fsd/lib/rtl/splaytree.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/splaytree.c?r...
==============================================================================
--- branches/pierre-fsd/lib/rtl/splaytree.c [iso-8859-1] (original)
+++ branches/pierre-fsd/lib/rtl/splaytree.c [iso-8859-1] Thu Oct 16 13:18:24 2008
@@ -40,7 +40,7 @@
     if (!(RtlLeftChild(N)) && !(RtlRightChild(N)))
     {
         /* If we are also the root, then the tree is gone */
-        return NULL;
+        if (RtlIsRoot(N)) return NULL;

/* Get our parent */
         P = RtlParent(N);