Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[hpoussin] 31018: Add missing include file
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 21:21:11 2007 New Revision: 31018 URL: http://svn.reactos.org/svn/reactos?rev=31018&view=rev Log: Add missing include file Modified: trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h (original) +++ trunk/reactos/include/ndk/cmfuncs.h Wed Dec 5 21:21:11 2007 @@ -23,6 +23,7 @@ // Dependencies // #include <umtypes.h> +#include <cmtypes.h> // // Native calls Modified: trunk/reactos/include/ndk/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/readme.txt?rev… ============================================================================== --- trunk/reactos/include/ndk/readme.txt (original) +++ trunk/reactos/include/ndk/readme.txt Wed Dec 5 21:21:11 2007 @@ -175,7 +175,7 @@ 3.3 CAVEATS * winternl.h: This header, part of the PSDK, was released by Microsoft as part of one of the governmen - lawsuits against it, and documents a certain (minimal) part of the Native API and/or types. Unforunately, + lawsuits against it, and documents a certain (minimal) part of the Native API and/or types. Unfortunately, Microsoft decided to hack the Native Types and to define them incorrectly, replacing real members by "reserved" ones. As such, you 'cannot include winternl.h in any project that uses the NDK. Note however, that the NDK fully replaces it and retains compatibility with any project that used it.

1 0

[hpoussin] 31017: Do not add twice a link to crt library
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 19:53:14 2007 New Revision: 31017 URL: http://svn.reactos.org/svn/reactos?rev=31017&view=rev Log: Do not add twice a link to crt library Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Dec 5 19:53:14 2007 @@ -2887,10 +2887,23 @@ { } +static bool +LinksToCrt( Module &module ) +{ + for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) + { + Library& library = *module.non_if_data.libraries[i]; + if ( library.name == "libcntpr" || library.name == "crt" ) + return true; + } + return false; +} + static void MingwAddImplicitLibraries( Module &module ) { Library* pLibrary; + bool links_to_crt; if ( module.type != Win32DLL && module.type != Win32OCX @@ -2902,20 +2915,21 @@ return; } - if ( module.name == "ntdll" ) - { - // no implicit libraries - return; - } + links_to_crt = LinksToCrt ( module ); if ( !module.isDefaultEntryPoint ) { if ( module.GetEntryPoint(false) == "0" ) { - pLibrary = new Library ( module, "mingw_common" ); - module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() , pLibrary ); - pLibrary = new Library ( module, "msvcrt" ); - module.non_if_data.libraries.push_back ( pLibrary ); + if ( !links_to_crt ) + { + pLibrary = new Library ( module, "mingw_common" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() , pLibrary ); + + pLibrary = new Library ( module, "msvcrt" ); + module.non_if_data.libraries.push_back ( pLibrary ); + links_to_crt = true; + } } return; } @@ -2934,7 +2948,7 @@ pLibrary = new Library ( module, "mingw_common" ); module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() + 1, pLibrary ); - if ( module.name != "msvcrt" ) + if ( !links_to_crt ) { // always link in msvcrt to get the basic routines pLibrary = new Library ( module, "msvcrt" );

1 0

[hpoussin] 31016: Don't add implicit dependencies for ntdll
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 19:17:51 2007 New Revision: 31016 URL: http://svn.reactos.org/svn/reactos?rev=31016&view=rev Log: Don't add implicit dependencies for ntdll Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Dec 5 19:17:51 2007 @@ -2902,6 +2902,12 @@ return; } + if ( module.name == "ntdll" ) + { + // no implicit libraries + return; + } + if ( !module.isDefaultEntryPoint ) { if ( module.GetEntryPoint(false) == "0" )

1 0

[hpoussin] 31015: Send correct data to MiDereferenceImports()
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 19:04:47 2007 New Revision: 31015 URL: http://svn.reactos.org/svn/reactos?rev=31015&view=rev Log: Send correct data to MiDereferenceImports() Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Dec 5 19:04:47 2007 @@ -177,15 +177,23 @@ NTAPI MiDereferenceImports(IN PLOAD_IMPORTS ImportList) { + SIZE_T i; + /* Check if there's no imports or if we're a boot driver */ - if ((ImportList == (PVOID)-1) || (ImportList == (PVOID)-2)) + if ((ImportList == (PVOID)-1) || + (ImportList == (PVOID)-2) || + (ImportList->Count == 0)) { /* Then there's nothing to do */ return STATUS_SUCCESS; } /* Otherwise, FIXME */ - DPRINT1("Imports not dereferenced!\n"); + DPRINT1("%u imports not dereferenced!\n", ImportList->Count); + for (i = 0; i < ImportList->Count; i++) + { + DPRINT1("%wZ <%wZ>\n", &ImportList->Entry[i]->FullDllName, &ImportList->Entry[i]->BaseDllName); + } return STATUS_UNSUCCESSFUL; } @@ -813,9 +821,8 @@ TAG_LDR_WSTR); if (LoadedImports) { - /* Zero it and set the count */ + /* Zero it */ RtlZeroMemory(LoadedImports, LoadedImportsSize); - LoadedImports->Count = ImportCount; } } else @@ -1006,8 +1013,8 @@ if (!(LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)) { /* Add the entry */ - LoadedImports->Entry[ImportCount] = LdrEntry; - ImportCount++; + LoadedImports->Entry[LoadedImports->Count] = LdrEntry; + LoadedImports->Count++; } } @@ -1104,17 +1111,17 @@ if (NewImports) { /* Set count */ - NewImports->Count = ImportCount; + NewImports->Count = 0; /* Loop all the imports */ - for (i = 0, ImportCount = 0; i < LoadedImports->Count; i++) + for (i = 0; i < LoadedImports->Count; i++) { /* Make sure it's valid */ if (LoadedImports->Entry[i]) { /* Copy it */ - NewImports->Entry[i] = LoadedImports->Entry[i]; - ImportCount++; + NewImports->Entry[NewImports->Count] = LoadedImports->Entry[i]; + NewImports->Count++; } }

1 0

[hpoussin] 31014: Implement GetLargePageMinimum()
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 17:55:52 2007 New Revision: 31014 URL: http://svn.reactos.org/svn/reactos?rev=31014&view=rev Log: Implement GetLargePageMinimum() Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 5 17:55:52 2007 @@ -1364,11 +1364,3 @@ STUB; return FALSE; } -SIZE_T -WINAPI -GetLargePageMinimum(void) -{ - STUB; - return 0; -} - Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Wed Dec 5 17:55:52 2007 @@ -19,6 +19,16 @@ #define PV_NT351 0x00030033 + +/* + * @implemented + */ +SIZE_T +WINAPI +GetLargePageMinimum(VOID) +{ + return SharedUserData->LargePageMinimum; +} /* * @unimplemented

1 0

[cwittich] 31013: fix formatting
by cwittich＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: cwittich Date: Wed Dec 5 17:51:06 2007 New Revision: 31013 URL: http://svn.reactos.org/svn/reactos?rev=31013&view=rev Log: fix formatting Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 5 17:51:06 2007 @@ -1327,8 +1327,7 @@ BOOL STDCALL SetClientTimeZoneInformation( - CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation - ) + CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) { STUB; return 0; @@ -1369,7 +1368,7 @@ WINAPI GetLargePageMinimum(void) { - STUB; - return 0; -} - + STUB; + return 0; +} +

1 0

[cwittich] 31012: add stub for GetLargePageMinimum
by cwittich＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: cwittich Date: Wed Dec 5 17:48:19 2007 New Revision: 31012 URL: http://svn.reactos.org/svn/reactos?rev=31012&view=rev Log: add stub for GetLargePageMinimum Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Wed Dec 5 17:48:19 2007 @@ -412,6 +412,7 @@ GetGeoInfoW@20 GetHandleContext@4 GetHandleInformation@8 +GetLargePageMinimum@0 GetLargestConsoleWindowSize@4 GetLastError@0 ;GetLinguistLangSize Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 5 17:48:19 2007 @@ -1365,3 +1365,11 @@ STUB; return FALSE; } +SIZE_T +WINAPI +GetLargePageMinimum(void) +{ + STUB; + return 0; +} +

1 0

[hpoussin] 31011: Revert r29433, it's wrong Thanks Alex ; )
by hpoussin＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: hpoussin Date: Wed Dec 5 16:40:14 2007 New Revision: 31011 URL: http://svn.reactos.org/svn/reactos?rev=31011&view=rev Log: Revert r29433, it's wrong Thanks Alex ;) Modified: trunk/reactos/dll/ntdll/ntdll.rbuild Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Wed Dec 5 16:40:14 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="ntdll" type="nativedll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> +<module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include>

1 0

[fireball] 31010: Andrey Korotaev <unc0rr@mail.ru>: - Never trust MaximumLength passed from usermode when copying a unicode string (fixes a wide amount of crashes, tested with CdrLabel 4.1).
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Wed Dec 5 01:52:05 2007 New Revision: 31010 URL: http://svn.reactos.org/svn/reactos?rev=31010&view=rev Log: Andrey Korotaev <unc0rr(a)mail.ru>: - Never trust MaximumLength passed from usermode when copying a unicode string (fixes a wide amount of crashes, tested with CdrLabel 4.1). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Dec 5 01:52:05 2007 @@ -2397,10 +2397,10 @@ Src = Dest->Buffer; Dest->Buffer = NULL; + Dest->MaximumLength = Dest->Length; if(Dest->Length > 0 && Src) { - Dest->MaximumLength = Dest->Length; Dest->Buffer = ExAllocatePoolWithTag(PagedPool, Dest->MaximumLength, TAG_STRING); if(!Dest->Buffer) { @@ -2443,6 +2443,7 @@ Src = Dest->Buffer; Dest->Buffer = NULL; + Dest->MaximumLength = 0; if(Dest->Length > 0 && Src) {

1 0

[fireball] 31009: - Finish correct definition of CM_KEY_NODE. - Fix broken CmpTestRegistryLock functions, they could return FALSE even if the lock was held. - Enable some extra assertions. - Update KCB flags as well when updating keynode flags in CmpDoCreate. - Update KCB Last write time as well when updating keynode lastwritetime in CmpDoCreate. - Do CmpDoOpen with the registry lock held, and tell CmpCreateKeycontrolBlock to lock the KCB exclusively. - Enable link-node create code to set the Ch
by fireball＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: fireball Date: Wed Dec 5 00:39:15 2007 New Revision: 31009 URL: http://svn.reactos.org/svn/reactos?rev=31009&view=rev Log: - Finish correct definition of CM_KEY_NODE. - Fix broken CmpTestRegistryLock functions, they could return FALSE even if the lock was held. - Enable some extra assertions. - Update KCB flags as well when updating keynode flags in CmpDoCreate. - Update KCB Last write time as well when updating keynode lastwritetime in CmpDoCreate. - Do CmpDoOpen with the registry lock held, and tell CmpCreateKeycontrolBlock to lock the KCB exclusively. - Enable link-node create code to set the ChildHiveRefernece values. This is used to "escape" the current Hive when a KEY_HIVE_EXIT node is detected (an internal symlink) and required for new parsing semantics. - Implement CmpHandleExitNode to test how "escaping" from an exit node into a link hive works (it does). - Plug that function into the new parse routine for testing purposes. - Enable CmpDoOpen path in the new parse routine, only used for link node creation for now. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=310… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Wed Dec 5 00:39:15 2007 @@ -103,7 +103,7 @@ HCELL_INDEX SubKeyLists[HTYPE_COUNT]; CHILD_LIST ValueList; }; - //CM_KEY_REFERENCE ChildHiveReference; + CM_KEY_REFERENCE ChildHiveReference; }; HCELL_INDEX Security; HCELL_INDEX Class; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Wed Dec 5 00:39:15 2007 @@ -379,11 +379,12 @@ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); ASSERT(KeyBody->KeyControlBlock->ParentKcb == ParentKcb); - //ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); + ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); KeyNode->LastWriteTime = TimeStamp; + KeyBody->KeyControlBlock->ParentKcb->KcbLastWriteTime = TimeStamp; /* Check if we need to update name maximum */ if (KeyNode->MaxNameLen < Name->Length) @@ -413,6 +414,7 @@ /* Update the flags */ CellData->u.KeyNode.Flags |= KEY_SYM_LINK; + KeyBody->KeyControlBlock->Flags = CellData->u.KeyNode.Flags; HvReleaseCell(Hive, KeyCell); } } @@ -448,6 +450,9 @@ /* It is, don't touch it */ return STATUS_OBJECT_NAME_NOT_FOUND; } + + /* Do this in the registry lock */ + CmpLockRegistry(); /* If we have a KCB, make sure it's locked */ //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); @@ -457,13 +462,16 @@ Cell, Node, *CachedKcb, - CMP_LOCK_HASHES_FOR_KCB, + 0, KeyName); if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; /* Make sure it's also locked, and set the pointer */ //ASSERT(CmpIsKcbLockedExclusive(Kcb)); *CachedKcb = Kcb; + + /* Release the registry lock */ + CmpUnlockRegistry(); /* Allocate the key object */ Status = ObCreateObject(AccessMode, @@ -671,8 +679,8 @@ KeyNode->ClassLength = 0; /* Reference the root node */ - //KeyNode->ChildHiveReference.KeyHive = Context->ChildHive.KeyHive; - //KeyNode->ChildHiveReference.KeyCell = ChildCell; + KeyNode->ChildHiveReference.KeyHive = Context->ChildHive.KeyHive; + KeyNode->ChildHiveReference.KeyCell = ChildCell; HvReleaseCell(Hive, LinkCell); /* Get the parent node */ @@ -698,7 +706,7 @@ /* Sanity checks */ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); - //ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); + ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); @@ -725,6 +733,42 @@ ExReleasePushLock((PVOID)&((PCMHIVE)Context->ChildHive.KeyHive)->FlusherLock); ExReleasePushLock((PVOID)&((PCMHIVE)Hive)->FlusherLock); return Status; +} + +VOID +NTAPI +CmpHandleExitNode(IN OUT PHHIVE *Hive, + IN OUT HCELL_INDEX *Cell, + IN OUT PCM_KEY_NODE *KeyNode, + IN OUT PHHIVE *ReleaseHive, + IN OUT HCELL_INDEX *ReleaseCell) +{ + /* Check if we have anything to release */ + if (*ReleaseCell != HCELL_NIL) + { + /* Release it */ + ASSERT(*ReleaseHive != NULL); + HvReleaseCell((*ReleaseHive), *ReleaseCell); + } + + /* Get the link references */ + *Hive = (*KeyNode)->ChildHiveReference.KeyHive; + *Cell = (*KeyNode)->ChildHiveReference.KeyCell; + + /* Get the new node */ + *KeyNode = (PCM_KEY_NODE)HvGetCell((*Hive), *Cell); + if (*KeyNode) + { + /* Set the new release values */ + *ReleaseCell = *Cell; + *ReleaseHive = *Hive; + } + else + { + /* Nothing to release */ + *ReleaseCell = HCELL_NIL; + *ReleaseHive = NULL; + } } NTSTATUS @@ -775,11 +819,13 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, OUT PVOID *Object) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; PCM_KEY_CONTROL_BLOCK Kcb, ParentKcb; PHHIVE Hive = NULL; PCM_KEY_NODE Node = NULL; HCELL_INDEX Cell = HCELL_NIL, NextCell; + PHHIVE HiveToRelease = NULL; + HCELL_INDEX CellToRelease = HCELL_NIL; UNICODE_STRING Current, NextName; PCM_PARSE_CONTEXT ParseContext = Context; ULONG TotalRemainingSubkeys = 0, MatchRemainSubkeyLevel = 0, TotalSubkeys = 0; @@ -852,7 +898,7 @@ DPRINT1("Node Parse: %p\n", Node); /* Start parsing */ - Status = STATUS_SUCCESS; + Status = STATUS_NOT_IMPLEMENTED; while (TRUE) { /* Get the next component */ @@ -865,7 +911,7 @@ { /* Find the subkey */ NextCell = CmpFindSubKeyByName(Hive, Node, &NextName); - DPRINT1("NextCell Parse: %lx\n", NextCell); + DPRINT1("NextCell Parse: %lx %wZ\n", NextCell, &NextName); if (NextCell != HCELL_NIL) { /* Get the new node */ @@ -877,17 +923,57 @@ /* Check if this was the last key */ if (Last) { - /* Shouldn't happen yet */ - DPRINT1("Unhandled: Open of last key\n"); + /* Is this an exit node */ + if (Node->Flags & KEY_HIVE_EXIT) + { + /* Handle it */ + DPRINT1("Exit node\n"); + CmpHandleExitNode(&Hive, + &Cell, + &Node, + &HiveToRelease, + &CellToRelease); + DPRINT1("Node Parse: %p\n", Node); + if (!Node) ASSERT(FALSE); + } + + /* Do the open */ + Status = CmpDoOpen(Hive, + Cell, + Node, + AccessState, + AccessMode, + Attributes, + ParseContext, + 0, + &Kcb, + &NextName, + Object); + if (Status == STATUS_REPARSE) + { + /* Not implemented */ + DPRINT1("Parsing sym link\n"); + while (TRUE); + } + + /* We are done */ + DPRINT1("Open of last key\n"); break; } - /* Get hive and cell from reference */ - //Hive = Node->ChildHiveReference.KeyHive; - //Cell = Node->ChildHiveReference.KeyCell; - Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); - DPRINT1("Node Parse: %p\n", Node); - if (!Node) ASSERT(FALSE); + /* Is this an exit node */ + if (Node->Flags & KEY_HIVE_EXIT) + { + /* Handle it */ + DPRINT1("Exit node: %lx\n", Node->Flags); + CmpHandleExitNode(&Hive, + &Cell, + &Node, + &HiveToRelease, + &CellToRelease); + DPRINT1("Node Parse: %p\n", Node); + if (!Node) ASSERT(FALSE); + } /* Create a KCB for this key */ Kcb = CmpCreateKeyControlBlock(Hive, @@ -959,5 +1045,5 @@ /* Unlock the registry */ CmpUnlockRegistry(); - return STATUS_NOT_IMPLEMENTED; + return Status; } Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Wed Dec 5 00:39:15 2007 @@ -1580,7 +1580,7 @@ CmpTestRegistryLock(VOID) { /* Test the lock */ - return (BOOLEAN)ExIsResourceAcquiredSharedLite(&CmpRegistryLock); + return !ExIsResourceAcquiredSharedLite(&CmpRegistryLock) ? FALSE : TRUE; } BOOLEAN @@ -1588,7 +1588,7 @@ CmpTestRegistryLockExclusive(VOID) { /* Test the lock */ - return ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock); + return !ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock) ? FALSE : TRUE; } VOID

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007