Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[weiden] 29991: Fix freeing callproc handles when freeing window classes
by weiden＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: weiden Date: Wed Oct 31 04:25:42 2007 New Revision: 29991 URL: http://svn.reactos.org/svn/reactos?rev=29991&view=rev Log: Fix freeing callproc handles when freeing window classes Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Wed Oct 31 04:25:42 2007 @@ -69,7 +69,7 @@ CallProc->Next = NULL; DestroyCallProc(NULL, - Class->CallProc); + CallProc); CallProc = NextCallProc; }

1 0

[weiden] 29990: Remove unused code
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Wed Oct 31 01:56:59 2007 New Revision: 29990 URL: http://svn.reactos.org/svn/reactos?rev=29990&view=rev Log: Remove unused code Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Oct 31 01:56:59 2007 @@ -36,7 +36,6 @@ WNDPROC WndProcExtra; PCALLPROC CallProc; }; - PCALLPROC CallProc2; PCALLPROC CallProcList; INT ClsExtra; INT WndExtra; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Wed Oct 31 01:56:59 2007 @@ -545,7 +545,6 @@ if (!Class->System) Clone->CallProc = Class->CallProc; - Clone->CallProc2 = Class->CallProc2; Clone = Clone->Next; }

1 0

[weiden] 29989: Silence possible uninitialized variable warning when compiled with full optimizations
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Wed Oct 31 01:38:43 2007 New Revision: 29989 URL: http://svn.reactos.org/svn/reactos?rev=29989&view=rev Log: Silence possible uninitialized variable warning when compiled with full optimizations Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Wed Oct 31 01:38:43 2007 @@ -264,7 +264,7 @@ IN ULONG Count, IN ULONG Flags) { - ULONG_PTR Stack, NewStack, StackBegin, StackEnd; + ULONG_PTR Stack, NewStack, StackBegin, StackEnd = 0; ULONG Eip; BOOLEAN Result, StopSearch = FALSE; ULONG i = 0;

1 0

[weiden] 29988: fix compilation with full optimizations
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Wed Oct 31 01:03:37 2007 New Revision: 29988 URL: http://svn.reactos.org/svn/reactos?rev=29988&view=rev Log: fix compilation with full optimizations Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=29988&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Wed Oct 31 01:03:37 2007 @@ -138,8 +138,8 @@ RtlCopySecurityDescriptor(IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor) { - PSID Owner, Group; - PACL Dacl, Sacl; + PSID Owner = NULL, Group = NULL; + PACL Dacl = NULL, Sacl = NULL; BOOLEAN Defaulted, Present; DWORD OwnerLength, GroupLength; PSECURITY_DESCRIPTOR srcSD = pSourceSecurityDescriptor;

1 0

[cfinck] 29987: Try to unbreak build by adding the -Iinclude/psdk line again. Build has been broken by hpoussin's commit in r29976. As stated before, Wine components like the "winnt.h" file in include/reactos/wine still refer to include/psdk components (in this case by an #include_next "winnt.h" line). This has to be fixed first. Build probably worked successfully with older RosBE-Windows versions, since they put the include directory to the bundled w32api header files in the global C_INCLUDE_PA
by cfinck＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: cfinck Date: Wed Oct 31 00:23:11 2007 New Revision: 29987 URL: http://svn.reactos.org/svn/reactos?rev=29987&view=rev Log: Try to unbreak build by adding the -Iinclude/psdk line again. Build has been broken by hpoussin's commit in r29976. As stated before, Wine components like the "winnt.h" file in include/reactos/wine still refer to include/psdk components (in this case by an #include_next "winnt.h" line). This has to be fixed first. Build probably worked successfully with older RosBE-Windows versions, since they put the include directory to the bundled w32api header files in the global C_INCLUDE_PATH environment variable. Modified: trunk/reactos/tools/widl/widl.mak Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=29… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Oct 31 00:23:11 2007 @@ -59,7 +59,7 @@ WIDL_HOST_CFLAGS = \ -DINT16=SHORT -DYYDEBUG=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude/psdk \ -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[fireball] 29986: - Start using members inside the KCB instead of the PKEY_OBJECT. - Remove DummyKcb hacks since we now have a real, valid KCB. - Get rid of the cm worker thread and related code, this should fix a couple of random registry bugchecks and corruption. - This is a slow transition to using CM_KEY_BODY and KCB.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 23:50:18 2007 New Revision: 29986 URL: http://svn.reactos.org/svn/reactos?rev=29986&view=rev Log: - Start using members inside the KCB instead of the PKEY_OBJECT. - Remove DummyKcb hacks since we now have a real, valid KCB. - Get rid of the cm worker thread and related code, this should fix a couple of random registry bugchecks and corruption. - This is a slow transition to using CM_KEY_BODY and KCB. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Tue Oct 30 23:50:18 2007 @@ -149,6 +149,7 @@ KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedClass = {0}; HANDLE hKey; + PCM_KEY_NODE Node, ParentNode; PAGED_CODE(); @@ -237,7 +238,7 @@ if (RemainingPath.Length == 0) { /* Fail if the key has been deleted */ - if (((PKEY_OBJECT) Object)->Flags & KO_MARKED_FOR_DELETE) + if (((PKEY_OBJECT) Object)->KeyControlBlock->Delete) { PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; @@ -305,8 +306,8 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Create the key */ - Status = CmpDoCreate(&((PKEY_OBJECT)Object)->RegistryHive->Hive, - ((PKEY_OBJECT)Object)->KeyCellOffset, + Status = CmpDoCreate(((PKEY_OBJECT)Object)->KeyControlBlock->KeyHive, + ((PKEY_OBJECT)Object)->KeyControlBlock->KeyCell, NULL, &RemainingPath, KernelMode, @@ -332,10 +333,17 @@ RtlCreateUnicodeString(&KeyObject->Name, Start); - KeyObject->KeyCell->Parent = KeyObject->ParentKey->KeyCellOffset; - KeyObject->KeyCell->Security = KeyObject->ParentKey->KeyCell->Security; - KeyObject->ValueCache.ValueList = KeyObject->KeyCell->ValueList.List; - KeyObject->ValueCache.Count = KeyObject->KeyCell->ValueList.Count; + ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->ParentKey->KeyControlBlock->KeyHive, + KeyObject->ParentKey->KeyControlBlock->KeyCell); + + Node = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->KeyHive, + KeyObject->KeyControlBlock->KeyCell); + + Node->Parent = KeyObject->ParentKey->KeyControlBlock->KeyCell; + Node->Security = ParentNode->Security; + + KeyObject->KeyControlBlock->ValueCache.ValueList = Node->ValueList.List; + KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; DPRINT("RemainingPath: %wZ\n", &RemainingPath); @@ -435,7 +443,7 @@ VERIFY_KEY_OBJECT(KeyObject); - RegistryHive = KeyObject->RegistryHive; + RegistryHive = (PCMHIVE)KeyObject->KeyControlBlock->KeyHive; /* Acquire hive lock */ KeEnterCriticalRegion(); @@ -576,7 +584,7 @@ RtlFreeUnicodeString(&RemainingPath); /* Fail if the key has been deleted */ - if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) + if (((PKEY_OBJECT)Object)->KeyControlBlock->Delete) { Status = STATUS_UNSUCCESSFUL; goto openkey_cleanup; @@ -708,17 +716,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmDeleteKey(&DummyKcb); + Status = CmDeleteKey(KeyObject->KeyControlBlock); /* Remove the keep-alive reference */ ObDereferenceObject(KeyObject); - if (KeyObject->RegistryHive != KeyObject->ParentKey->RegistryHive) + if (KeyObject->KeyControlBlock->KeyHive != + KeyObject->ParentKey->KeyControlBlock->KeyHive) { /* Dereference again */ ObDereferenceObject(KeyObject); @@ -777,13 +781,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmEnumerateKey(&DummyKcb, + Status = CmEnumerateKey(KeyObject->KeyControlBlock, Index, KeyInformationClass, KeyInformation, @@ -845,13 +844,8 @@ &EnumerateValueKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmEnumerateValueKey(&DummyKcb, + Status = CmEnumerateValueKey(KeyObject->KeyControlBlock, Index, KeyValueInformationClass, KeyValueInformation, @@ -911,13 +905,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmQueryKey(&DummyKcb, + Status = CmQueryKey(KeyObject->KeyControlBlock, KeyInformationClass, KeyInformation, Length, @@ -976,13 +965,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmQueryValueKey(&DummyKcb, + Status = CmQueryValueKey(KeyObject->KeyControlBlock, *ValueName, KeyValueInformationClass, KeyValueInformation, @@ -1044,14 +1028,9 @@ /* Do the callback */ Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); if (NT_SUCCESS(Status)) - { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - + { /* Call the internal API */ - Status = CmSetValueKey(&DummyKcb, + Status = CmSetValueKey(KeyObject->KeyControlBlock, ValueName, Type, Data, @@ -1100,13 +1079,8 @@ &DeleteValueKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmDeleteValueKey(&DummyKcb, *ValueName); + Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); /* Do the post callback */ PostOperationInfo.Object = (PVOID)KeyObject; Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Tue Oct 30 23:50:18 2007 @@ -34,10 +34,8 @@ ERESOURCE CmpRegistryLock; -KTIMER CmiWorkerTimer; LIST_ENTRY CmiKeyObjectListHead; LIST_ENTRY CmiConnectedHiveList; -ULONG CmiTimer = 0; /* gets incremented every 5 seconds (CmiWorkerTimer) */ volatile BOOLEAN CmiHiveSyncEnabled = FALSE; volatile BOOLEAN CmiHiveSyncPending = FALSE; @@ -53,136 +51,6 @@ extern LIST_ENTRY CmiCallbackHead; extern FAST_MUTEX CmiCallbackLock; - -/* FUNCTIONS ****************************************************************/ - -/* Debugging helper functions: */ -/* CmiVerifyHiveListIntegrity */ -/* CmiVerifyHiveListIntegrityWhileLocked */ -/* These functions are normally unused. However, should any of the asserts */ -/* checking for registry loops in CmiWorkerThread start to trigger, it is */ -/* recommended to add liberal amounts of calls to this function throughout */ -/* suspect code. This function is due to its iterative nature not intended */ -/* to be called during normal circumstances, but as a debugging aid. */ -static -VOID -NTAPI -CmipVerifyHiveListIntegrity(BOOLEAN IsLocked) -{ - PLIST_ENTRY CurrentEntry; - if (!IsLocked) - { - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - } - - if (IsListEmpty(&CmiKeyObjectListHead)) - { - ASSERT(CmiKeyObjectListHead.Blink == CmiKeyObjectListHead.Flink); - } - /* walk the list both forwards and backwards */ - CurrentEntry = CmiKeyObjectListHead.Flink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - ASSERT(CurrentEntry->Blink != CurrentEntry); - ASSERT(CurrentEntry->Flink != CurrentEntry); - CurrentEntry = CurrentEntry->Flink; - } - - CurrentEntry = CmiKeyObjectListHead.Blink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - ASSERT(CurrentEntry->Blink != CurrentEntry); - ASSERT(CurrentEntry->Flink != CurrentEntry); - CurrentEntry = CurrentEntry->Blink; - } - - if (!IsLocked) - { - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - } -} - -VOID NTAPI CmiVerifyHiveListIntegrity() { CmipVerifyHiveListIntegrity(FALSE); } -VOID NTAPI CmiVerifyHiveListIntegrityWhileLocked() { CmipVerifyHiveListIntegrity(TRUE); } - - - -VOID -NTAPI -CmiWorkerThread(PVOID Param) -{ - NTSTATUS Status; - PLIST_ENTRY CurrentEntry; - PKEY_OBJECT CurrentKey; - ULONG Count; /* how many objects have been dereferenced each pass */ - - /* Loop forever, getting woken up every 5 seconds by CmiWorkerTimer */ - - while (1) - { - Status = KeWaitForSingleObject(&CmiWorkerTimer, - Executive, - KernelMode, - FALSE, - NULL); - if (Status == STATUS_SUCCESS) - { - DPRINT("CmiWorkerThread\n"); - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - CmiTimer++; - - Count = 0; - CurrentEntry = CmiKeyObjectListHead.Blink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); - if (CurrentKey->TimeStamp + 120 > CmiTimer) - { - /* The object was accessed in the last 10min */ - break; - } - if (1 == ObGetObjectPointerCount(CurrentKey) && - !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) - { - /* PointerCount is 1, and it's not marked for delete */ - ObDereferenceObject(CurrentKey); - if (CurrentEntry == CmiKeyObjectListHead.Blink) - { - DPRINT("Registry loop detected! Crashing\n"); - KEBUGCHECK(0); - } - CurrentEntry = CmiKeyObjectListHead.Blink; - Count++; - } - else - { - /* PointerCount was not 1, or it was marked for delete */ - if (CurrentEntry == CurrentEntry->Blink) - { - DPRINT("Registry loop detected! Crashing\n"); - KEBUGCHECK(0); - } - CurrentEntry = CurrentEntry->Blink; - } - } - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - DPRINT("Removed %d key objects\n", Count); - } - else - { - KEBUGCHECK(0); - } - } -} PVOID NTAPI @@ -234,7 +102,7 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Insert it into the global list (we don't have KCBs here) */ - InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); + InsertTailList(&CmiKeyObjectListHead, &KeyObject->KeyBodyList); ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); @@ -338,8 +206,8 @@ DPRINT ("SubName %S\n", SubName); /* Create the key */ - Status = CmpDoCreate(&ParentKey->RegistryHive->Hive, - ParentKey->KeyCellOffset, + Status = CmpDoCreate(ParentKey->KeyControlBlock->KeyHive, + ParentKey->KeyControlBlock->KeyCell, NULL, &RemainingPath, KernelMode, @@ -356,9 +224,8 @@ return STATUS_INSUFFICIENT_RESOURCES; } - NewKey->KeyCellOffset = RegistryHive->Hive.BaseBlock->RootCell; - NewKey->KeyCell = (PVOID)HvGetCell(&RegistryHive->Hive, NewKey->KeyCellOffset); - NewKey->RegistryHive = RegistryHive; + NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; Status = RtlpCreateUnicodeString(&NewKey->Name, SubName, NonPagedPool); Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue Oct 30 23:50:18 2007 @@ -366,7 +366,8 @@ UNICODE_STRING KeyName; PWSTR *Path = &RemainingName->Buffer; PCM_KEY_CONTROL_BLOCK ParentKcb = NULL, Kcb; - + PCM_KEY_NODE Node; + ParsedKey = ParsedObject; VERIFY_KEY_OBJECT(ParsedKey); @@ -422,8 +423,11 @@ if (FoundObject == NULL) { /* Search for the subkey */ - BlockOffset = CmpFindSubKeyByName(&ParsedKey->RegistryHive->Hive, - ParsedKey->KeyCell, + Node = (PCM_KEY_NODE)HvGetCell(ParsedKey->KeyControlBlock->KeyHive, + ParsedKey->KeyControlBlock->KeyCell); + + BlockOffset = CmpFindSubKeyByName(ParsedKey->KeyControlBlock->KeyHive, + Node, &KeyName); if (BlockOffset == HCELL_NIL) { @@ -434,13 +438,13 @@ } /* Get the node */ - SubKeyCell = (PCM_KEY_NODE)HvGetCell(&ParsedKey->RegistryHive->Hive, BlockOffset); + SubKeyCell = (PCM_KEY_NODE)HvGetCell(ParsedKey->KeyControlBlock->KeyHive, BlockOffset); if ((SubKeyCell->Flags & KEY_SYM_LINK) && !((Attributes & OBJ_OPENLINK) && (EndPtr == NULL))) { RtlInitUnicodeString(&LinkPath, NULL); - Status = CmiGetLinkTarget(ParsedKey->RegistryHive, + Status = CmiGetLinkTarget((PCMHIVE)ParsedKey->KeyControlBlock->KeyHive, SubKeyCell, &LinkPath); if (NT_SUCCESS(Status)) @@ -520,7 +524,7 @@ ObReferenceObject(FoundObject); /* Create the KCB */ - Kcb = CmpCreateKeyControlBlock(&ParsedKey->RegistryHive->Hive, + Kcb = CmpCreateKeyControlBlock(ParsedKey->KeyControlBlock->KeyHive, BlockOffset, SubKeyCell, ParentKcb, @@ -535,25 +539,25 @@ } FoundObject->KeyControlBlock = Kcb; - FoundObject->Flags = 0; - FoundObject->KeyCell = SubKeyCell; - FoundObject->KeyCellOffset = BlockOffset; - FoundObject->RegistryHive = ParsedKey->RegistryHive; - InsertTailList(&CmiKeyObjectListHead, &FoundObject->ListEntry); + ASSERT(FoundObject->KeyControlBlock->KeyHive == ParsedKey->KeyControlBlock->KeyHive); + InsertTailList(&CmiKeyObjectListHead, &FoundObject->KeyBodyList); RtlpCreateUnicodeString(&FoundObject->Name, KeyName.Buffer, NonPagedPool); CmiAddKeyToList(ParsedKey, FoundObject); DPRINT("Created object 0x%p\n", FoundObject); } else { - if ((FoundObject->KeyCell->Flags & KEY_SYM_LINK) && + Node = (PCM_KEY_NODE)HvGetCell(FoundObject->KeyControlBlock->KeyHive, + FoundObject->KeyControlBlock->KeyCell); + + if ((Node->Flags & KEY_SYM_LINK) && !((Attributes & OBJ_OPENLINK) && (EndPtr == NULL))) { DPRINT("Found link\n"); RtlInitUnicodeString(&LinkPath, NULL); - Status = CmiGetLinkTarget(FoundObject->RegistryHive, - FoundObject->KeyCell, + Status = CmiGetLinkTarget((PCMHIVE)FoundObject->KeyControlBlock->KeyHive, + Node, &LinkPath); if (NT_SUCCESS(Status)) { @@ -598,9 +602,8 @@ } } - RemoveEntryList(&FoundObject->ListEntry); - InsertHeadList(&CmiKeyObjectListHead, &FoundObject->ListEntry); - FoundObject->TimeStamp = CmiTimer; + RemoveEntryList(&FoundObject->KeyBodyList); + InsertHeadList(&CmiKeyObjectListHead, &FoundObject->KeyBodyList); ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); @@ -650,10 +653,10 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - RemoveEntryList(&KeyObject->ListEntry); + RemoveEntryList(&KeyObject->KeyBodyList); RtlFreeUnicodeString(&KeyObject->Name); - ASSERT((KeyObject->Flags & KO_MARKED_FOR_DELETE) == FALSE); + ASSERT((KeyObject->KeyControlBlock->Delete) == FALSE); ObDereferenceObject (ParentKeyObject); @@ -812,7 +815,7 @@ if (Index < Parent->SubKeyCounts) { - if (CurKey->Flags & KO_MARKED_FOR_DELETE) + if (CurKey->KeyControlBlock->Delete) { CHECKPOINT; *ReturnedObject = NULL; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Tue Oct 30 23:50:18 2007 @@ -505,21 +505,13 @@ #define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) typedef struct _KEY_OBJECT { - CSHORT Type; - CSHORT Size; - ULONG Flags; + ULONG Type; UNICODE_STRING Name; - PCMHIVE RegistryHive; - HCELL_INDEX KeyCellOffset; - PCM_KEY_NODE KeyCell; struct _KEY_OBJECT *ParentKey; - LIST_ENTRY ListEntry; + LIST_ENTRY KeyBodyList; ULONG SubKeyCounts; ULONG SizeOfSubKeys; struct _KEY_OBJECT **SubKeys; - ULONG TimeStamp; - LIST_ENTRY HiveList; - CACHED_CHILD_LIST ValueCache; PCM_KEY_CONTROL_BLOCK KeyControlBlock; } KEY_OBJECT, *PKEY_OBJECT; extern PCMHIVE CmiVolatileHive; 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 Tue Oct 30 23:50:18 2007 @@ -230,15 +230,11 @@ /* Now fill out the Cm object */ KeyBody->KeyControlBlock = Kcb; - KeyBody->KeyCell = KeyNode; - KeyBody->KeyCellOffset = *KeyCell; - KeyBody->Flags = 0; KeyBody->SubKeyCounts = 0; KeyBody->SubKeys = NULL; KeyBody->SizeOfSubKeys = 0; KeyBody->ParentKey = Parent; - KeyBody->RegistryHive = KeyBody->ParentKey->RegistryHive; - InsertTailList(&CmiKeyObjectListHead, &KeyBody->ListEntry); + InsertTailList(&CmiKeyObjectListHead, &KeyBody->KeyBodyList); Quickie: /* Check if we got here because of failure */ @@ -290,8 +286,7 @@ ExAcquirePushLockShared((PVOID)&((PCMHIVE)Hive)->FlusherLock); /* Check if the parent is being deleted */ - #define KO_MARKED_FOR_DELETE 0x00000001 - if (Parent->Flags & KO_MARKED_FOR_DELETE) + if (Parent->KeyControlBlock->Delete) { /* It has, quit */ ASSERT(FALSE); @@ -319,7 +314,7 @@ } /* Sanity check */ - ASSERT(Cell == Parent->KeyCellOffset); + ASSERT(Cell == Parent->KeyControlBlock->KeyCell); /* Get the parent type */ ParentType = HvGetCellType(Cell); @@ -332,7 +327,7 @@ } /* Don't allow children under symlinks */ - if (Parent->Flags & KEY_SYM_LINK) + if (Parent->KeyControlBlock->Flags & KEY_SYM_LINK) { /* Fail */ ASSERT(FALSE); @@ -376,8 +371,8 @@ } /* Sanity checks */ - ASSERT(KeyBody->ParentKey->KeyCellOffset == Cell); - ASSERT(&KeyBody->ParentKey->RegistryHive->Hive == Hive); + ASSERT(KeyBody->ParentKey->KeyControlBlock->KeyCell == Cell); + ASSERT(KeyBody->ParentKey->KeyControlBlock->KeyHive == Hive); ASSERT(KeyBody->ParentKey == Parent); /* Update the timestamp */ 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 Tue Oct 30 23:50:18 2007 @@ -708,19 +708,14 @@ if (!Kcb) return FALSE; /* Initialize the object */ -#if 0 RootKey->Type = TAG('k', 'v', '0', '2'); RootKey->KeyControlBlock = Kcb; +#if 0 RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); #else RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); - RootKey->KeyControlBlock = Kcb; - RootKey->RegistryHive = CmiVolatileHive; - RootKey->KeyCellOffset = RootIndex; - RootKey->KeyCell = KeyCell; RootKey->ParentKey = RootKey; - RootKey->Flags = 0; RootKey->SubKeyCounts = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0; @@ -759,9 +754,6 @@ UNICODE_STRING KeyName; HANDLE KeyHandle; NTSTATUS Status; - LARGE_INTEGER DueTime; - HANDLE ThreadHandle; - CLIENT_ID ThreadId; PCMHIVE HardwareHive; PVOID BaseAddress; ULONG Length; @@ -806,23 +798,6 @@ /* OLD CM: Initialize the key object list */ InitializeListHead(&CmiKeyObjectListHead); InitializeListHead(&CmiConnectedHiveList); - - /* OLD CM: Initialize the worker timer */ - KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); - - /* OLD CM: Initialize the worker thread */ - Status = PsCreateSystemThread(&ThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &ThreadId, - CmiWorkerThread, - NULL); - if (!NT_SUCCESS(Status)) return FALSE; - - /* OLD CM: Start the timer */ - DueTime.QuadPart = -1; - KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ #endif /* Create the key object types */

1 0

[fireball] 29985: - Fix my mistakes when changing type of the Name field. LiveCD / make install_registry now works again. - Convert one more sizeof to FIELD_OFFSET (though sizeof() was operating properly in this particular case). See issue #2780 for more details.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 23:24:27 2007 New Revision: 29985 URL: http://svn.reactos.org/svn/reactos?rev=29985&view=rev Log: - Fix my mistakes when changing type of the Name field. LiveCD / make install_registry now works again. - Convert one more sizeof to FIELD_OFFSET (though sizeof() was operating properly in this particular case). See issue #2780 for more details. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=299… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Tue Oct 30 23:24:27 2007 @@ -278,7 +278,7 @@ Status = STATUS_SUCCESS; Storage = (CreateOptions & REG_OPTION_VOLATILE) ? Volatile : Stable; - NewBlockSize = sizeof(CM_KEY_NODE) + NameLength; + NewBlockSize = FIELD_OFFSET(CM_KEY_NODE, Name) + NameLength; NKBOffset = HvAllocateCell(&RegistryHive->Hive, NewBlockSize, Storage, HCELL_NIL); if (NKBOffset == HCELL_NIL) { @@ -450,7 +450,7 @@ for (i = 0; i < KeyCell->NameLength; i++) { - if (((PCHAR)KeyName->Buffer)[i] != (WCHAR)KeyCell->Name[i]) + if (KeyName->Buffer[i] != ((PCHAR)KeyCell->Name)[i]) return FALSE; } } @@ -488,8 +488,8 @@ /* FIXME: use _strnicmp */ for (i = 0; i < KeyCell->NameLength; i++) { - if (RtlUpcaseUnicodeChar(((PCHAR)KeyName->Buffer)[i]) != - RtlUpcaseUnicodeChar((WCHAR)KeyCell->Name[i])) + if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) != + RtlUpcaseUnicodeChar(((PCHAR)KeyCell->Name)[i])) return FALSE; } }

1 0

[janderwald] 29984: - silence debug messages
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 22:09:27 2007 New Revision: 29984 URL: http://svn.reactos.org/svn/reactos?rev=29984&view=rev Log: - silence debug messages Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Tue Oct 30 22:09:27 2007 @@ -295,7 +295,7 @@ PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames; - DPRINT1("LsaLookupSids(): stub. Always returning 'Administrator'\n"); + DPRINT("LsaLookupSids(): stub. Always returning 'Administrator'\n"); if (Count != 1) return STATUS_NONE_MAPPED; LocalDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_SID)); @@ -354,7 +354,7 @@ static int count = 0; if (count++ < 20) { - DPRINT1("LsaOpenPolicy - stub\n"); + DPRINT("LsaOpenPolicy - stub\n"); } return STATUS_SUCCESS; }

1 0

[janderwald] 29983: - fix identation
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 22:08:00 2007 New Revision: 29983 URL: http://svn.reactos.org/svn/reactos?rev=29983&view=rev Log: - fix identation Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Tue Oct 30 22:08:00 2007 @@ -254,7 +254,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "Zeichentabelle.lnk" + IDS_SHORT_CHARMAP "Zeichentabelle.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" END

1 0

[fireball] 29982: - Fix incorrect size calculation.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 21:41:34 2007 New Revision: 29982 URL: http://svn.reactos.org/svn/reactos?rev=29982&view=rev Log: - Fix incorrect size calculation. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=299… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Tue Oct 30 21:41:34 2007 @@ -201,7 +201,7 @@ Status = STATUS_SUCCESS; *HashBlock = NULL; - NewHashSize = sizeof(CM_KEY_FAST_INDEX) + + NewHashSize = FIELD_OFFSET(CM_KEY_FAST_INDEX, List) + (SubKeyCount * sizeof(CM_INDEX)); *HBOffset = HvAllocateCell(&RegistryHive->Hive, NewHashSize, Storage, HCELL_NIL);

1 0

← Newer
1
2
3
4
5
6
7
8
...
71
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 2007