Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[ion] 24543: - Implement RtlLookupElementGenericTableFull. - Implement RtlEnumerateGenericTable.
by ion＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: ion Date: Mon Oct 16 07:47:47 2006 New Revision: 24543 URL: http://svn.reactos.org/svn/reactos?rev=24543&view=rev Log: - Implement RtlLookupElementGenericTableFull. - Implement RtlEnumerateGenericTable. Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Mon Oct 16 07:47:47 2006 @@ -258,7 +258,7 @@ } /* - * @unimplemented + * @implemented */ PVOID NTAPI @@ -267,8 +267,22 @@ OUT PVOID *NodeOrParent, OUT TABLE_SEARCH_RESULT *SearchResult) { - UNIMPLEMENTED; - return 0; + /* Do the initial lookup */ + *SearchResult = RtlpFindGenericTableNodeOrParent(Table, + Buffer, + (PRTL_SPLAY_LINKS *) + NodeOrParent); + + /* Check if we found anything */ + if ((*SearchResult == TableEmptyTree) || (*SearchResult != TableFoundNode)) + { + /* Nothing found */ + return NULL; + } + + /* Otherwise, splay the tree and return this entry */ + Table->TableRoot = RtlSplay(*NodeOrParent); + return &((PTABLE_ENTRY_HEADER)*NodeOrParent)->UserData; } /* @@ -305,15 +319,41 @@ } /* - * @unimplemented + * @implemented */ PVOID NTAPI RtlEnumerateGenericTable(IN PRTL_GENERIC_TABLE Table, IN BOOLEAN Restart) { - UNIMPLEMENTED; - return 0; + PRTL_SPLAY_LINKS FoundNode; + + /* Check if the table is empty */ + if (RtlIsGenericTableEmpty(Table)) return NULL; + + /* Check if we have to restart */ + if (Restart) + { + /* Then find the leftmost element */ + FoundNode = Table->TableRoot; + do + { + /* Get the left child */ + FoundNode = RtlLeftChild(FoundNode); + } while(RtlLeftChild(FoundNode)); + + /* Splay it */ + Table->TableRoot = RtlSplay(FoundNode); + } + else + { + /* Otherwise, try using the real successor */ + FoundNode = RtlRealSuccessor(Table->TableRoot); + if (FoundNode) Table->TableRoot = RtlSplay(FoundNode); + } + + /* Check if we found the node and return it */ + return FoundNode ? &((PTABLE_ENTRY_HEADER)FoundNode)->UserData : NULL; } /*

1 0

[ion] 24542: - Implement RtlIsGenericTableEmpty, RtlNumberGenericTableElements. - Implement RtlLookupElementGenericTable. - Implement RtlDeleteElementGenericTable
by ion＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: ion Date: Mon Oct 16 07:39:49 2006 New Revision: 24542 URL: http://svn.reactos.org/svn/reactos?rev=24542&view=rev Log: - Implement RtlIsGenericTableEmpty, RtlNumberGenericTableElements. - Implement RtlLookupElementGenericTable. - Implement RtlDeleteElementGenericTable Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Oct 16 07:39:49 2006 @@ -2533,6 +2533,15 @@ IN PRTL_GENERIC_TABLE Table ); +PVOID +NTAPI +RtlLookupElementGenericTableFull( + IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + OUT PVOID *NodeOrParent, + OUT TABLE_SEARCH_RESULT *SearchResult +); + // // Handle Table Functions // Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Mon Oct 16 07:39:49 2006 @@ -115,7 +115,7 @@ } /* - * @unimplemented + * @implemented */ PVOID NTAPI @@ -140,7 +140,7 @@ } /* - * @unimplemented + * @implemented */ PVOID NTAPI @@ -218,14 +218,14 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI RtlIsGenericTableEmpty(IN PRTL_GENERIC_TABLE Table) { - UNIMPLEMENTED; - return FALSE; + /* Check if the table root is empty */ + return (Table->TableRoot) ? FALSE: TRUE; } /* @@ -235,19 +235,26 @@ NTAPI RtlNumberGenericTableElements(IN PRTL_GENERIC_TABLE Table) { + /* Return the number of elements */ return Table->NumberGenericTableElements; } /* - * @unimplemented + * @implemented */ PVOID NTAPI RtlLookupElementGenericTable(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer) { - UNIMPLEMENTED; - return 0; + PRTL_SPLAY_LINKS NodeOrParent; + TABLE_SEARCH_RESULT Result; + + /* Call the full version */ + return RtlLookupElementGenericTableFull(Table, + Buffer, + &NodeOrParent, + &Result); } /* @@ -265,15 +272,36 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI RtlDeleteElementGenericTable(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer) { - UNIMPLEMENTED; - return FALSE; + PRTL_SPLAY_LINKS NodeOrParent; + TABLE_SEARCH_RESULT Result; + + /* Get the splay links and table search result immediately */ + Result = RtlpFindGenericTableNodeOrParent(Table, Buffer, &NodeOrParent); + if ((Result == TableEmptyTree) || (Result != TableFoundNode)) + { + /* Nothing to delete */ + return FALSE; + } + + /* Delete the entry */ + Table->TableRoot = RtlDelete(NodeOrParent); + RemoveEntryList(&((PTABLE_ENTRY_HEADER)NodeOrParent)->ListEntry); + + /* Update accounting data */ + Table->NumberGenericTableElements--; + Table->WhichOrderedElement = 0; + Table->OrderedPointer = &Table->InsertOrderList; + + /* Free the entry */ + Table->FreeRoutine(Table, NodeOrParent); + return TRUE; } /*

1 0

[ion] 24541: - Added some generic table routines to rtlfuncs.h so that they can be used in user-mode. - Implemented RtlInsertElementGenericTable and RtlInsertElementGenericTableFull (Splay-Tree versions). Also implemented a helper function RtlpFindGenericTableNodeOrParent when we're not given one and need to locate it manually. - Defined structure for generic table entries so that we can properly return user data and do the right allocations.
by ion＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: ion Date: Mon Oct 16 07:19:14 2006 New Revision: 24541 URL: http://svn.reactos.org/svn/reactos?rev=24541&view=rev Log: - Added some generic table routines to rtlfuncs.h so that they can be used in user-mode. - Implemented RtlInsertElementGenericTable and RtlInsertElementGenericTableFull (Splay-Tree versions). Also implemented a helper function RtlpFindGenericTableNodeOrParent when we're not given one and need to locate it manually. - Defined structure for generic table entries so that we can properly return user data and do the right allocations. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Oct 16 07:19:14 2006 @@ -212,51 +212,74 @@ #endif #endif -// -// This macro does nothing in kernel mode +#ifdef NTOS_KERNEL_RUNTIME + +// +// Executing RTL functions at DISPATCH_LEVEL or higher will result in a +// bugcheck. +// +#define RTL_PAGED_CODE PAGED_CODE + +#else + +// +// This macro does nothing in user mode // #define RTL_PAGED_CODE NOP_FUNCTION +#endif + // // RTL Splay Tree Functions // NTSYSAPI PRTL_SPLAY_LINKS NTAPI -RtlSplay(PRTL_SPLAY_LINKS Links); +RtlSplay( + IN PRTL_SPLAY_LINKS Links +); NTSYSAPI PRTL_SPLAY_LINKS NTAPI -RtlDelete(PRTL_SPLAY_LINKS Links); +RtlDelete(IN PRTL_SPLAY_LINKS Links +); NTSYSAPI VOID NTAPI RtlDeleteNoSplay( - PRTL_SPLAY_LINKS Links, - PRTL_SPLAY_LINKS *Root + IN PRTL_SPLAY_LINKS Links, + OUT PRTL_SPLAY_LINKS *Root ); NTSYSAPI PRTL_SPLAY_LINKS NTAPI -RtlSubtreeSuccessor(PRTL_SPLAY_LINKS Links); +RtlSubtreeSuccessor( + IN PRTL_SPLAY_LINKS Links +); NTSYSAPI PRTL_SPLAY_LINKS NTAPI -RtlSubtreePredecessor(PRTL_SPLAY_LINKS Links); +RtlSubtreePredecessor( + IN PRTL_SPLAY_LINKS Links +); NTSYSAPI PRTL_SPLAY_LINKS NTAPI -RtlRealSuccessor(PRTL_SPLAY_LINKS Links); +RtlRealSuccessor( + IN PRTL_SPLAY_LINKS Links +); NTSYSAPI PRTL_SPLAY_LINKS NTAPI -RtlRealPredecessor(PRTL_SPLAY_LINKS Links); +RtlRealPredecessor( + IN PRTL_SPLAY_LINKS Links +); #define RtlIsLeftChild(Links) \ (RtlLeftChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links)) @@ -304,16 +327,6 @@ _SplayParent->RightChild = _SplayChild; \ _SplayChild->Parent = _SplayParent; \ } -#endif - -#ifdef NTOS_KERNEL_RUNTIME - -// -// Executing RTL functions at DISPATCH_LEVEL or higher will result in a -// bugcheck. -// -#define RTL_PAGED_CODE PAGED_CODE - #endif // @@ -2492,6 +2505,35 @@ DbgBreakPoint(VOID); // +// Generic Table Functions +// +PVOID +NTAPI +RtlInsertElementGenericTable( + IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL +); + +PVOID +NTAPI +RtlInsertElementGenericTableFull( + IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL, + IN PVOID NodeOrParent, + IN TABLE_SEARCH_RESULT SearchResult +); + +BOOLEAN +NTAPI +RtlIsGenericTableEmpty( + IN PRTL_GENERIC_TABLE Table +); + +// // Handle Table Functions // NTSYSAPI Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Mon Oct 16 07:19:14 2006 @@ -14,7 +14,82 @@ #define NDEBUG #include <debug.h> -/* FUNCTIONS *****************************************************************/ +/* Internal header for table entries */ +typedef struct _TABLE_ENTRY_HEADER +{ + RTL_SPLAY_LINKS SplayLinks; + LIST_ENTRY ListEntry; + LONGLONG UserData; +} TABLE_ENTRY_HEADER, *PTABLE_ENTRY_HEADER; + +/* PRIVATE FUNCTIONS *********************************************************/ + +TABLE_SEARCH_RESULT +NTAPI +RtlpFindGenericTableNodeOrParent(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + OUT PRTL_SPLAY_LINKS *NodeOrParent) +{ + PRTL_SPLAY_LINKS CurrentNode, ChildNode; + RTL_GENERIC_COMPARE_RESULTS Result; + + /* Quick check to see if the table is empty */ + if (RtlIsGenericTableEmpty(Table)) return TableEmptyTree; + + /* Set the current node */ + CurrentNode = Table->TableRoot; + + /* Start compare loop */ + while (TRUE) + { + /* Do the compare */ + Result = Table->CompareRoutine(Table, + Buffer, + &((PTABLE_ENTRY_HEADER)CurrentNode)-> + UserData); + if (Result == GenericLessThan) + { + /* We're less, check if this is the left child */ + if ((ChildNode = RtlLeftChild(CurrentNode))) + { + /* Continue searching from this node */ + ChildNode = CurrentNode; + } + else + { + /* Otherwise, the element isn't in this tree */ + *NodeOrParent = CurrentNode; + return TableInsertAsLeft; + } + } + else if (Result == GenericGreaterThan) + { + /* We're more, check if this is the right child */ + if ((ChildNode = RtlRightChild(CurrentNode))) + { + /* Continue searching from this node */ + ChildNode = CurrentNode; + } + else + { + /* Otherwise, the element isn't in this tree */ + *NodeOrParent = CurrentNode; + return TableInsertAsRight; + } + } + else + { + /* We should've found the node */ + ASSERT(Result == GenericEqual); + + /* Return node found */ + *NodeOrParent = CurrentNode; + return TableFoundNode; + } + } +} + +/* SPLAY FUNCTIONS ***********************************************************/ /* * @implemented @@ -49,8 +124,19 @@ IN ULONG BufferSize, OUT PBOOLEAN NewElement OPTIONAL) { - UNIMPLEMENTED; - return 0; + PRTL_SPLAY_LINKS NodeOrParent; + TABLE_SEARCH_RESULT Result; + + /* Get the splay links and table search result immediately */ + Result = RtlpFindGenericTableNodeOrParent(Table, Buffer, &NodeOrParent); + + /* Now call the routine to do the full insert */ + return RtlInsertElementGenericTableFull(Table, + Buffer, + BufferSize, + NewElement, + NodeOrParent, + Result); } /* @@ -65,8 +151,70 @@ IN PVOID NodeOrParent, IN TABLE_SEARCH_RESULT SearchResult) { - UNIMPLEMENTED; - return 0; + PRTL_SPLAY_LINKS NewNode; + + /* Check if the entry wasn't already found */ + if (SearchResult != TableFoundNode) + { + /* We're doing an allocation, sanity check */ + ASSERT(Table->NumberGenericTableElements != (MAXULONG - 1)); + + /* Allocate a node */ + NewNode = Table->AllocateRoutine(Table, + BufferSize + + FIELD_OFFSET(TABLE_ENTRY_HEADER, + UserData)); + if (!NewNode) + { + /* No memory or other allocation error, fail */ + if (NewElement) *NewElement = FALSE; + return NULL; + } + + /* Initialize the new inserted element */ + RtlInitializeSplayLinks(NewNode); + InsertTailList(&Table->InsertOrderList, + &((PTABLE_ENTRY_HEADER)NewNode)->ListEntry); + + /* Increase element count */ + Table->NumberGenericTableElements++; + + /* Check where we should insert the entry */ + if (SearchResult == TableEmptyTree) + { + /* This is the new root node */ + Table->TableRoot = NewNode; + } + else if (SearchResult == TableInsertAsLeft) + { + /* Insert it left */ + RtlInsertAsLeftChild(NodeOrParent, NewNode); + } + else + { + /* Right node */ + RtlInsertAsRightChild(NodeOrParent, NewNode); + } + + /* Copy user buffer */ + RtlCopyMemory(&((PTABLE_ENTRY_HEADER)NewNode)->UserData, + Buffer, + BufferSize); + } + else + { + /* Return the node we already found */ + NewNode = NodeOrParent; + } + + /* Splay the tree */ + Table->TableRoot = RtlSplay(NewNode); + + /* Return status */ + if (NewElement) *NewElement = (SearchResult == TableFoundNode); + + /* Return pointer to user data */ + return &((PTABLE_ENTRY_HEADER)NewNode)->UserData; } /* @@ -289,6 +437,7 @@ RtlEnumerateGenericTableWithoutSplayingAvl(IN PRTL_AVL_TABLE Table, IN OUT PVOID *RestartKey) { + /* FIXME! */ return RtlEnumerateGenericTableWithoutSplayingAvl(Table, RestartKey); }

1 0

[ion] 24540: - Organize file by AVL/Splay routines. - Add RtlLookupFirstMatchingElementGenericTableAvl stub. - Fixup some formatting/tag spacing and prototype definitions.
by ion＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: ion Date: Mon Oct 16 06:49:23 2006 New Revision: 24540 URL: http://svn.reactos.org/svn/reactos?rev=24540&view=rev Log: - Organize file by AVL/Splay routines. - Add RtlLookupFirstMatchingElementGenericTableAvl stub. - Fixup some formatting/tag spacing and prototype definitions. Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Mon Oct 16 06:49:23 2006 @@ -1,281 +1,33 @@ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Generic Table Implementation - * FILE: lib/rtl/genertictbl.c - * PROGRAMMERS: arty - */ - -/* INCLUDES *****************************************************************/ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: lib/rtl/generictable.c +* PURPOSE: Splay Tree and AVL Tree Generic Table Implementation +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Art Yerks (ayerkes(a)speakeasy.net) +*/ + +/* INCLUDES ******************************************************************/ #include <rtl.h> #include "austin/avl.h" - #define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ /* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTable ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTableFull ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @implemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTableFullAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult - ) -{ - PRTL_BALANCED_LINKS OurNodeOrParent; - TABLE_SEARCH_RESULT OurSearchResult; - - if( !Table->NumberGenericTableElements ) - { - *SearchResult = TableEmptyTree; - *NodeOrParent = NULL; - return NULL; - } - - OurSearchResult = avl_search - (Table, Buffer, - Table->BalancedRoot.LeftChild, &OurNodeOrParent); - - if(SearchResult) *SearchResult = OurSearchResult; - if(NodeOrParent) *NodeOrParent = OurNodeOrParent; - - if(OurSearchResult == TableFoundNode) - return avl_data(OurNodeOrParent); - else - return NULL; -} - - -/* -* @implemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTableAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer - ) -{ - PRTL_BALANCED_LINKS OurNodeOrParent; - TABLE_SEARCH_RESULT OurSearchResult; - return RtlLookupElementGenericTableFullAvl - (Table, Buffer, (PVOID *)&OurNodeOrParent, &OurSearchResult); -} - - -/* -* @unimplemented -*/ -BOOLEAN -NTAPI -RtlDeleteElementGenericTable ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* -* @implemented -*/ -BOOLEAN -NTAPI -RtlDeleteElementGenericTableAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer - ) -{ - TABLE_SEARCH_RESULT Result; - PRTL_BALANCED_LINKS Node; - - RtlLookupElementGenericTableFullAvl - ( Table, Buffer, (PVOID *)&Node, &Result ); - - if( Result == TableFoundNode ) - { - avl_delete_node(Table, Node); - Table->FreeRoutine(Table, Node); - if( Table->NumberGenericTableElements == 0 ) - avl_deinit(Table); - return TRUE; - } - else - { - return FALSE; - } -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlEnumerateGenericTable ( - PRTL_GENERIC_TABLE Table, - BOOLEAN Restart - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @implemented -*/ -PVOID -NTAPI -RtlEnumerateGenericTableAvl ( - PRTL_AVL_TABLE Table, - BOOLEAN Restart - ) -{ - if( Table->NumberGenericTableElements == 0 ) - return NULL; - - if( Restart ) - { - Table->RestartKey = avl_first(Table); - } - else - { - Table->RestartKey = avl_next(Table, Table->RestartKey); - } - if( !Table->RestartKey ) - return NULL; - else - return avl_data(Table->RestartKey); -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlEnumerateGenericTableLikeADirectory ( - IN PRTL_AVL_TABLE Table, - IN PRTL_AVL_MATCH_FUNCTION MatchFunction, - IN PVOID MatchData, - IN ULONG NextFlag, - IN OUT PVOID *RestartKey, - IN OUT PULONG DeleteCount, - IN OUT PVOID Buffer - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlEnumerateGenericTableWithoutSplaying ( - PRTL_GENERIC_TABLE Table, - PVOID *RestartKey - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @implemented -*/ -PVOID -NTAPI -RtlEnumerateGenericTableWithoutSplayingAvl ( - PRTL_AVL_TABLE Table, - PVOID *RestartKey - ) -{ - return RtlEnumerateGenericTableWithoutSplayingAvl(Table, RestartKey); -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlGetElementGenericTable( - PRTL_GENERIC_TABLE Table, - ULONG I - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @implemented -*/ -PVOID -NTAPI -RtlGetElementGenericTableAvl ( - PRTL_AVL_TABLE Table, - ULONG I - ) -{ - PRTL_BALANCED_LINKS Node; - - if( I >= Table->NumberGenericTableElements ) return NULL; - else - { - Node = avl_first(Table); - while(I--) Node = avl_next(Table, Node); - return avl_data(Node); - } -} - -/* -* @implemented -*/ + * @implemented + */ VOID NTAPI -RtlInitializeGenericTable(PRTL_GENERIC_TABLE Table, - PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, - PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, - PRTL_GENERIC_FREE_ROUTINE FreeRoutine, - PVOID TableContext) -{ - /* Initialize the table to default and passed values */ +RtlInitializeGenericTable(IN PRTL_GENERIC_TABLE Table, + IN PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, + IN PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, + IN PRTL_GENERIC_FREE_ROUTINE FreeRoutine, + IN PVOID TableContext) +{ + /* Initialize the table to default and passed values */ InitializeListHead(&Table->InsertOrderList); Table->TableRoot = NULL; Table->NumberGenericTableElements = 0; @@ -287,74 +39,308 @@ Table->TableContext = TableContext; } - -/* - * @implemented - */ -VOID NTAPI +/* + * @unimplemented + */ +PVOID +NTAPI +RtlInsertElementGenericTable(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlInsertElementGenericTableFull(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL, + IN PVOID NodeOrParent, + IN TABLE_SEARCH_RESULT SearchResult) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +RtlIsGenericTableEmpty(IN PRTL_GENERIC_TABLE Table) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlNumberGenericTableElements(IN PRTL_GENERIC_TABLE Table) +{ + return Table->NumberGenericTableElements; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlLookupElementGenericTable(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlLookupElementGenericTableFull(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer, + OUT PVOID *NodeOrParent, + OUT TABLE_SEARCH_RESULT *SearchResult) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +RtlDeleteElementGenericTable(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlEnumerateGenericTable(IN PRTL_GENERIC_TABLE Table, + IN BOOLEAN Restart) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlEnumerateGenericTableLikeADirectory(IN PRTL_AVL_TABLE Table, + IN PRTL_AVL_MATCH_FUNCTION MatchFunction, + IN PVOID MatchData, + IN ULONG NextFlag, + IN OUT PVOID *RestartKey, + IN OUT PULONG DeleteCount, + IN OUT PVOID Buffer) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlEnumerateGenericTableWithoutSplaying(IN PRTL_GENERIC_TABLE Table, + IN OUT PVOID *RestartKey) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table, + IN ULONG I) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlLookupElementGenericTableFullAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN OUT PVOID *NodeOrParent, + IN OUT TABLE_SEARCH_RESULT *SearchResult) +{ + PRTL_BALANCED_LINKS OurNodeOrParent; + TABLE_SEARCH_RESULT OurSearchResult; + + if( !Table->NumberGenericTableElements ) + { + *SearchResult = TableEmptyTree; + *NodeOrParent = NULL; + return NULL; + } + + OurSearchResult = avl_search + (Table, Buffer, + Table->BalancedRoot.LeftChild, &OurNodeOrParent); + + if(SearchResult) *SearchResult = OurSearchResult; + if(NodeOrParent) *NodeOrParent = OurNodeOrParent; + + if(OurSearchResult == TableFoundNode) + return avl_data(OurNodeOrParent); + else + return NULL; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlLookupElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer) +{ + PRTL_BALANCED_LINKS OurNodeOrParent; + TABLE_SEARCH_RESULT OurSearchResult; + return RtlLookupElementGenericTableFullAvl + (Table, Buffer, (PVOID *)&OurNodeOrParent, &OurSearchResult); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlDeleteElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer) +{ + TABLE_SEARCH_RESULT Result; + PRTL_BALANCED_LINKS Node; + + RtlLookupElementGenericTableFullAvl + ( Table, Buffer, (PVOID *)&Node, &Result ); + + if( Result == TableFoundNode ) + { + avl_delete_node(Table, Node); + Table->FreeRoutine(Table, Node); + if( Table->NumberGenericTableElements == 0 ) + avl_deinit(Table); + return TRUE; + } + else + { + return FALSE; + } +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlEnumerateGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN BOOLEAN Restart) +{ + if( Table->NumberGenericTableElements == 0 ) + return NULL; + + if( Restart ) + { + Table->RestartKey = avl_first(Table); + } + else + { + Table->RestartKey = avl_next(Table, Table->RestartKey); + } + if( !Table->RestartKey ) + return NULL; + else + return avl_data(Table->RestartKey); +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlEnumerateGenericTableWithoutSplayingAvl(IN PRTL_AVL_TABLE Table, + IN OUT PVOID *RestartKey) +{ + return RtlEnumerateGenericTableWithoutSplayingAvl(Table, RestartKey); +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlGetElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN ULONG I) +{ + PRTL_BALANCED_LINKS Node; + + if( I >= Table->NumberGenericTableElements ) return NULL; + else + { + Node = avl_first(Table); + while(I--) Node = avl_next(Table, Node); + return avl_data(Node); + } +} + +/* + * @implemented + */ +VOID +NTAPI RtlInitializeGenericTableAvl(IN OUT PRTL_AVL_TABLE Table, IN PRTL_AVL_COMPARE_ROUTINE CompareRoutine, IN PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine, IN PRTL_AVL_FREE_ROUTINE FreeRoutine, IN PVOID TableContext) { - RtlZeroMemory(Table, - sizeof(RTL_AVL_TABLE)); - Table->BalancedRoot.Parent = &Table->BalancedRoot; - Table->CompareRoutine = CompareRoutine; - Table->AllocateRoutine = AllocateRoutine; - Table->FreeRoutine = FreeRoutine; - Table->TableContext = TableContext; -} - - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlInsertElementGenericTable ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer, - ULONG BufferSize, - PBOOLEAN NewElement OPTIONAL - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlInsertElementGenericTableFull ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer, - ULONG BufferSize, - PBOOLEAN NewElement OPTIONAL, - PVOID NodeOrParent, - TABLE_SEARCH_RESULT SearchResult - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @implemented -*/ -PVOID -NTAPI -RtlInsertElementGenericTableFullAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer, - ULONG BufferSize, - PBOOLEAN NewElement OPTIONAL, - PVOID *NodeOrParent, - TABLE_SEARCH_RESULT *SearchResult - ) + RtlZeroMemory(Table, sizeof(RTL_AVL_TABLE)); + Table->BalancedRoot.Parent = &Table->BalancedRoot; + Table->CompareRoutine = CompareRoutine; + Table->AllocateRoutine = AllocateRoutine; + Table->FreeRoutine = FreeRoutine; + Table->TableContext = TableContext; +} + +/* + * @implemented + */ +PVOID +NTAPI +RtlInsertElementGenericTableFullAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL, + IN OUT PVOID *NodeOrParent, + IN OUT TABLE_SEARCH_RESULT *SearchResult) { PRTL_BALANCED_LINKS OurNodeOrParent; TABLE_SEARCH_RESULT OurSearchResult; @@ -400,16 +386,14 @@ } /* -* @implemented -*/ -PVOID -NTAPI -RtlInsertElementGenericTableAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer, - ULONG BufferSize, - PBOOLEAN NewElement OPTIONAL - ) + * @implemented + */ +PVOID +NTAPI +RtlInsertElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PBOOLEAN NewElement OPTIONAL) { PVOID NodeOrParent; TABLE_SEARCH_RESULT SearchResult; @@ -418,50 +402,37 @@ (Table, Buffer, BufferSize, NewElement, &NodeOrParent, &SearchResult); } +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlIsGenericTableEmptyAvl(PRTL_AVL_TABLE Table) +{ + return Table->NumberGenericTableElements == 0; +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlNumberGenericTableElementsAvl(IN PRTL_AVL_TABLE Table) +{ + return Table->NumberGenericTableElements; +} /* * @unimplemented */ -BOOLEAN -NTAPI -RtlIsGenericTableEmpty ( - PRTL_GENERIC_TABLE Table - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* -* @unimplemented -*/ -BOOLEAN -NTAPI -RtlIsGenericTableEmptyAvl ( - PRTL_AVL_TABLE Table - ) -{ - return Table->NumberGenericTableElements == 0; -} - - -/* - * @implemented - */ -ULONG NTAPI -RtlNumberGenericTableElements(IN PRTL_GENERIC_TABLE Table) -{ - return Table->NumberGenericTableElements; -} - - -/* - * @implemented - */ -ULONG NTAPI -RtlNumberGenericTableElementsAvl(IN PRTL_AVL_TABLE Table) -{ - return Table->NumberGenericTableElements; +PVOID +NTAPI +RtlLookupFirstMatchingElementGenericTableAvl(IN PRTL_AVL_TABLE Table, + IN PVOID Buffer, + OUT PVOID *RestartKey) +{ + UNIMPLEMENTED; + return NULL; } /* EOF */

1 0

[ion] 24539: - Fix a definition
by ion＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: ion Date: Mon Oct 16 06:05:39 2006 New Revision: 24539 URL: http://svn.reactos.org/svn/reactos?rev=24539&view=rev Log: - Fix a definition Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Mon Oct 16 06:05:39 2006 @@ -222,7 +222,7 @@ { ULONG Count; HCELL_INDEX List; -} CHILD_LIST, *PCM_CHILD_LIST; +} CHILD_LIST, *PCHILD_LIST; // // Cached Child List

1 0

[ion] 24538: - Fix a bug in FreeLdr key creation (patch by Filip Navara). - Make cmlib use the StorageTypeCount value since my new Cm code needs it.
by ion＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: ion Date: Mon Oct 16 06:04:09 2006 New Revision: 24538 URL: http://svn.reactos.org/svn/reactos?rev=24538&view=rev Log: - Fix a bug in FreeLdr key creation (patch by Filip Navara). - Make cmlib use the StorageTypeCount value since my new Cm code needs it. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Mon Oct 16 06:04:09 2006 @@ -275,7 +275,7 @@ CmpResult = _wcsnicmp(SearchKey->Name, name, subkeyLength); if (CmpResult == 0 && SearchKey->NameSize == NameSize) break; - else if (CmpResult == 1) + else if (CmpResult == -1) break; Ptr = Ptr->Flink; Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Mon Oct 16 06:04:09 2006 @@ -30,7 +30,6 @@ * the other bits specify index into the hive file. The value HCELL_NULL * (-1) is reserved for marking invalid cells. */ - typedef ULONG HCELL_INDEX, *PHCELL_INDEX; #define HCELL_NULL ((HCELL_INDEX)-1) Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Mon Oct 16 06:04:09 2006 @@ -333,6 +333,7 @@ Hive->FileWrite = FileWrite; Hive->FileSetSize = FileSetSize; Hive->FileFlush = FileFlush; + Hive->StorageTypeCount = 2; switch (Operation) {

1 0

[hpoussin] 24537: Add some missing exports
by hpoussin＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: hpoussin Date: Mon Oct 16 06:02:51 2006 New Revision: 24537 URL: http://svn.reactos.org/svn/reactos?rev=24537&view=rev Log: Add some missing exports Modified: trunk/reactos/dll/ntdll/def/ntdll.def Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Mon Oct 16 06:02:51 2006 @@ -83,6 +83,7 @@ NtCompleteConnectPort@4 NtConnectPort@32 NtContinue@8 +NtCreateDebugObject@16 NtCreateDirectoryObject@12 NtCreateEvent@20 NtCreateEventPair@12 @@ -105,6 +106,7 @@ NtCreateToken@52 NtCreateWaitablePort@20 NtCurrentTeb=_NtCurrentTeb@0 +NtDebugContinue@12 NtDelayExecution@8 NtDeleteAtom@4 NtDeleteFile@4 @@ -217,9 +219,9 @@ NtRemoveIoCompletion@20 NtReplaceKey@12 NtReplyPort@8 -NtReplyWaitReplyPort@8 NtReplyWaitReceivePort@16 NtReplyWaitReceivePortEx@20 +NtReplyWaitReplyPort@8 NtRequestPort@8 NtRequestWaitReplyPort@12 NtResetEvent@8 @@ -228,8 +230,8 @@ NtResumeThread@8 NtSaveKey@8 NtSecureConnectPort@36 +NtSetContextThread@8 NtSetDebugFilterState@12 -NtSetContextThread@8 NtSetDefaultHardErrorPort@4 NtSetDefaultLocale@8 NtSetDefaultUILanguage@4 @@ -742,6 +744,7 @@ ZwAllocateLocallyUniqueId@4 ZwAllocateUuids@16 ZwAllocateVirtualMemory@24 +ZwAssignProcessToJobObject@8 ZwCallbackReturn@12 ZwCancelIoFile@8 ZwCancelTimer@8 @@ -758,6 +761,7 @@ ZwCreateEventPair@12 ZwCreateFile@44 ZwCreateIoCompletion@16 +ZwCreateJobObject@12 ZwCreateKey@28 ZwCreateMailslotFile@32 ZwCreateMutant@16 @@ -772,6 +776,7 @@ ZwCreateThread@32 ZwCreateTimer@16 ZwCreateToken@52 +ZwCreateWaitablePort@20 ZwDebugContinue@12 ZwDelayExecution@8 ZwDeleteAtom@4 @@ -801,6 +806,7 @@ ZwImpersonateClientOfPort@8 ZwImpersonateThread@12 ZwInitializeRegistry@4 +ZwIsProcessInJob@8 ZwListenPort@8 ZwLoadDriver@4 ZwLoadKey@8 @@ -816,6 +822,7 @@ ZwOpenEventPair@12 ZwOpenFile@24 ZwOpenIoCompletion@12 +ZwOpenJobObject@12 ZwOpenKey@12 ZwOpenMutant@12 ZwOpenObjectAuditAlarm@48 @@ -828,14 +835,14 @@ ZwOpenThreadToken@16 ZwOpenTimer@12 ZwPlugPlayControl@12 +ZwPowerInformation@20 ZwPrivilegeCheck@12 ZwPrivilegedServiceAuditAlarm@20 ZwPrivilegeObjectAuditAlarm@24 ZwProtectVirtualMemory@20 ZwPulseEvent@8 -ZwQueueApcThread@20 -ZwQueryInformationAtom@20 ZwQueryAttributesFile@8 +ZwQueryDebugFilterState@8 ZwQueryDefaultLocale@8 ZwQueryDefaultUILanguage@4 ZwQueryDirectoryFile@44 @@ -843,7 +850,9 @@ ZwQueryEaFile@36 ZwQueryEvent@20 ZwQueryFullAttributesFile@8 +ZwQueryInformationAtom@20 ZwQueryInformationFile@20 +ZwQueryInformationJobObject@20 ZwQueryInformationPort@20 ZwQueryInformationProcess@20 ZwQueryInformationThread@20 @@ -868,6 +877,7 @@ ZwQueryValueKey@24 ZwQueryVirtualMemory@24 ZwQueryVolumeInformationFile@20 +ZwQueueApcThread@20 ZwRaiseException@12 ZwRaiseHardError@24 ZwReadFile@36 @@ -892,6 +902,7 @@ ZwSaveKey@8 ZwSecureConnectPort@36 ZwSetContextThread@8 +ZwSetDebugFilterState@12 ZwSetDefaultHardErrorPort@4 ZwSetDefaultLocale@8 ZwSetDefaultUILanguage@4 @@ -899,7 +910,9 @@ ZwSetEvent@8 ZwSetHighEventPair@4 ZwSetHighWaitLowEventPair@4 +ZwSetInformationDebugObject@20 ZwSetInformationFile@20 +ZwSetInformationJobObject@16 ZwSetInformationKey@16 ZwSetInformationObject@16 ZwSetInformationProcess@16 @@ -927,6 +940,7 @@ ZwSuspendProcess@4 ZwSuspendThread@8 ZwSystemDebugControl@24 +ZwTerminateJobObject@8 ZwTerminateProcess@8 ZwTerminateThread@8 ZwTestAlert@0 @@ -936,6 +950,7 @@ ZwUnlockVirtualMemory@16 ZwUnmapViewOfSection@8 ZwVdmControl@8 +ZwWaitForDebugEvent@16 ZwWaitForMultipleObjects@20 ZwWaitForSingleObject@12 ZwWaitHighEventPair@4

1 0

[jimtabor] 24536: Add object type COLORSPACE mask.
by jimtabor＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: jimtabor Date: Mon Oct 16 05:39:34 2006 New Revision: 24536 URL: http://svn.reactos.org/svn/reactos?rev=24536&view=rev Log: Add object type COLORSPACE mask. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Oct 16 05:39:34 2006 @@ -42,6 +42,7 @@ #define GDI_OBJECT_TYPE_EMF 0x00210000 #define GDI_OBJECT_TYPE_PEN 0x00300000 #define GDI_OBJECT_TYPE_EXTPEN 0x00500000 +#define GDI_OBJECT_TYPE_COLORSPACE 0x00090000 /* Following object types made up for ROS */ #define GDI_OBJECT_TYPE_METADC 0x00710000 #define GDI_OBJECT_TYPE_METAFILE 0x00720000

1 0

[jimtabor] 24535: First of the Win32k-Gdi compatibility changes.
by jimtabor＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: jimtabor Date: Mon Oct 16 05:29:27 2006 New Revision: 24535 URL: http://svn.reactos.org/svn/reactos?rev=24535&view=rev Log: First of the Win32k-Gdi compatibility changes. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon Oct 16 05:29:27 2006 @@ -45,6 +45,7 @@ { GdiGetRelAbs = 1, GdiGetArcDirection = 4, + GdiGetIsMemDc = 7, } GETDCDWORD, *PGETDCDWORD; typedef enum _GETSETDCDWORD

1 0

[jimtabor] 24534: Fix text line.
by jimtabor＠svn.reactos.org 16 Oct '06

16 Oct '06

Author: jimtabor Date: Mon Oct 16 05:22:21 2006 New Revision: 24534 URL: http://svn.reactos.org/svn/reactos?rev=24534&view=rev Log: Fix text line. Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntusrtyp.h (original) +++ trunk/reactos/include/reactos/win32k/ntusrtyp.h Mon Oct 16 05:22:21 2006 @@ -164,8 +164,7 @@ /* ----------- Extra ----------- */ RECT Rect; /* Item area (relative to menu window) */ UINT XTab; /* X position of text after Tab */ - LPWSTR Text; /* Copy of the text pointer in MenuItem->Text - */ + LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */ } ROSMENUITEMINFO, *PROSMENUITEMINFO; #endif

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
36
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006