- Implement RtlInitializeUnicodePrefix and RtlNextUnicodePrefix. The UnicodePrefix package is needed by MUP and NPFS drivers.

- Add some of the splay tree functions/macros to the NDK.

svn path=/trunk/; revision=19033
This commit is contained in:
Alex Ionescu 2005-11-07 01:01:29 +00:00
parent b4fc288d14
commit ac26f7ca11
3 changed files with 189 additions and 28 deletions

View file

@ -19,6 +19,13 @@
typedef PVOID PRTL_HEAP_PARAMETERS; typedef PVOID PRTL_HEAP_PARAMETERS;
typedef struct _RTL_SPLAY_LINKS
{
struct _RTL_SPLAY_LINKS *Parent;
struct _RTL_SPLAY_LINKS *LeftChild;
struct _RTL_SPLAY_LINKS *RightChild;
} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS;
#if defined(USE_LPC6432) #if defined(USE_LPC6432)
#define LPC_CLIENT_ID CLIENT_ID64 #define LPC_CLIENT_ID CLIENT_ID64
#define LPC_SIZE_T ULONGLONG #define LPC_SIZE_T ULONGLONG

View file

@ -14,8 +14,68 @@
#include "extypes.h" #include "extypes.h"
#include "rtltypes.h" #include "rtltypes.h"
/* MACROS ********************************************************************/
/* FIXME: Eventually move the ones in rtltypes.h here... */
/*
* Splay Tree Macros
*/
#define RtlIsLeftChild(Links) \
(RtlLeftChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links))
#define RtlIsRoot(Links) \
(RtlParent(Links) == (PRTL_SPLAY_LINKS)(Links))
#define RtlLeftChild(Links) \
(PRTL_SPLAY_LINKS)(Links)->LeftChild
#define RtlParent(Links) \
(PRTL_SPLAY_LINKS)(Links)->Parent
/* PROTOTYPES ****************************************************************/ /* PROTOTYPES ****************************************************************/
/*
* Splay Tree Functions
*/
NTSYSAPI
PRTL_SPLAY_LINKS
NTAPI
RtlSplay(PRTL_SPLAY_LINKS Links);
NTSYSAPI
PRTL_SPLAY_LINKS
NTAPI
RtlDelete(PRTL_SPLAY_LINKS Links);
NTSYSAPI
VOID
NTAPI
RtlDeleteNoSplay(
PRTL_SPLAY_LINKS Links,
PRTL_SPLAY_LINKS *Root
);
NTSYSAPI
PRTL_SPLAY_LINKS
NTAPI
RtlSubtreeSuccessor(PRTL_SPLAY_LINKS Links);
NTSYSAPI
PRTL_SPLAY_LINKS
NTAPI
RtlSubtreePredecessor(PRTL_SPLAY_LINKS Links);
NTSYSAPI
PRTL_SPLAY_LINKS
NTAPI
RtlRealSuccessor(PRTL_SPLAY_LINKS Links);
NTSYSAPI
PRTL_SPLAY_LINKS
NTAPI
RtlRealPredecessor(PRTL_SPLAY_LINKS Links);
/* /*
* Error and Exception Functions * Error and Exception Functions
*/ */

View file

@ -2,8 +2,8 @@
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
* PURPOSE: Unicode Prefix implementation * PURPOSE: Unicode Prefix implementation
* FILE: lib/rtl/unicodeprfx.c * FILE: lib/rtl/unicodeprefix.c
* PROGRAMMER: * PROGRAMMER: Alex Ionescu (alex@relsoft.net)
*/ */
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
@ -13,33 +13,62 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
/*
* FIXME: Try to find the official names and add to NDK
* Definitions come from fastfat driver.
*/
typedef USHORT NODE_TYPE_CODE;
#define PFX_NTC_TABLE ((NODE_TYPE_CODE)0x0800)
#define PFX_NTC_ROOT ((NODE_TYPE_CODE)0x0801)
#define PFX_NTC_CHILD ((NODE_TYPE_CODE)0x0802)
#define PFX_NTC_CASE_MATCH ((NODE_TYPE_CODE)0x0803)
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/
/*STATIC*/
ULONG
NTAPI
ComputeUnicodeNameLength(IN PUNICODE_STRING UnicodeName)
{
ULONG Chars = UnicodeName->Length / sizeof(WCHAR);
ULONG i, NamesFound = 1;
/* Loop the string */
for (i = 0; i < (Chars - 1); i++)
{
/* Check if we found a backslash, meaning another name */
if (UnicodeName->Buffer[i] == '\\') NamesFound++;
}
/* Return the number of names found */
return NamesFound;
}
/* /*
* @unimplemented * @unimplemented
*/ */
PUNICODE_PREFIX_TABLE_ENTRY PUNICODE_PREFIX_TABLE_ENTRY
NTAPI NTAPI
RtlFindUnicodePrefix ( RtlFindUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable,
PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_STRING FullName,
PUNICODE_STRING FullName, ULONG CaseInsensitiveIndex)
ULONG CaseInsensitiveIndex
)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return 0; return 0;
} }
/* /*
* @unimplemented * @implemented
*/ */
VOID VOID
NTAPI NTAPI
RtlInitializeUnicodePrefix ( RtlInitializeUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable)
PUNICODE_PREFIX_TABLE PrefixTable
)
{ {
UNIMPLEMENTED; /* Setup the table */
PrefixTable->NameLength = 0;
PrefixTable->LastNextEntry = NULL;
PrefixTable->NodeTypeCode = PFX_NTC_TABLE;
PrefixTable->NextPrefixTree = (PUNICODE_PREFIX_TABLE_ENTRY)PrefixTable;
} }
/* /*
@ -47,28 +76,95 @@ RtlInitializeUnicodePrefix (
*/ */
BOOLEAN BOOLEAN
NTAPI NTAPI
RtlInsertUnicodePrefix ( RtlInsertUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable,
PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_STRING Prefix,
PUNICODE_STRING Prefix, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry)
PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry
)
{ {
/*
* implementation notes:
* - get name length (number of names)
* - init splay links
* - find a matching tree
* - if !found, insert a new NTC_ROOT entry and return TRUE;
* - if found, loop tree and compare strings:
* if equal, handle casematch/nomatch
* if greater or lesser equal, then add left/right childs accordingly
* - splay the tree
*/
UNIMPLEMENTED; UNIMPLEMENTED;
return FALSE; return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
PUNICODE_PREFIX_TABLE_ENTRY PUNICODE_PREFIX_TABLE_ENTRY
NTAPI NTAPI
RtlNextUnicodePrefix ( RtlNextUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable,
PUNICODE_PREFIX_TABLE PrefixTable, BOOLEAN Restart)
BOOLEAN Restart
)
{ {
UNIMPLEMENTED; PRTL_SPLAY_LINKS SplayLinks;
return 0; PUNICODE_PREFIX_TABLE_ENTRY Entry;
PUNICODE_PREFIX_TABLE_ENTRY CaseMatchEntry;
/* We might need this entry 2/3rd of the time, so cache it now */
CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch;
/* Check if this is a restart or if we don't have a last entry */
if ((Restart) || !(PrefixTable->LastNextEntry))
{
/* Get the next entry and validate it */
Entry = PrefixTable->NextPrefixTree;
if (Entry->NodeTypeCode == PFX_NTC_TABLE) return NULL;
/* Now get the Splay Tree Links */
SplayLinks = &Entry->Links;
/* Loop until we get the first node in the tree */
while (RtlLeftChild(SplayLinks)) SplayLinks = RtlLeftChild(SplayLinks);
/* Get the entry from it */
Entry = CONTAINING_RECORD(SplayLinks,
UNICODE_PREFIX_TABLE_ENTRY,
Links);
}
else if (CaseMatchEntry->NodeTypeCode == PFX_NTC_CASE_MATCH)
{
/* If the last entry was a Case Match, then return it */
Entry = CaseMatchEntry;
}
else
{
/* Find the successor */
SplayLinks = RtlRealSuccessor(&CaseMatchEntry->Links);
if (!SplayLinks)
{
/* Didn't find one, we'll have to search the tree */
SplayLinks = &PrefixTable->LastNextEntry->Links;
/* Get the topmost node (root) */
while (!RtlIsRoot(SplayLinks)) SplayLinks = RtlParent(SplayLinks);
Entry = CONTAINING_RECORD(SplayLinks,
UNICODE_PREFIX_TABLE_ENTRY,
Links);
/* Get its tree and make sure somethign is in it */
Entry = Entry->NextPrefixTree;
if (Entry->NameLength <= 0) return NULL;
/* Select these new links and find the first node */
while (RtlLeftChild(SplayLinks)) SplayLinks = RtlLeftChild(SplayLinks);
}
/* Get the entry from it */
Entry = CONTAINING_RECORD(SplayLinks,
UNICODE_PREFIX_TABLE_ENTRY,
Links);
}
/* Save this entry as the last one returned, and return it */
PrefixTable->LastNextEntry = Entry;
return Entry;
} }
/* /*
@ -76,10 +172,8 @@ RtlNextUnicodePrefix (
*/ */
VOID VOID
NTAPI NTAPI
RtlRemoveUnicodePrefix ( RtlRemoveUnicodePrefix(PUNICODE_PREFIX_TABLE PrefixTable,
PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry)
PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry
)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
} }