Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 26782: - Fix debug print macros (by hpoussin).
by fireball＠svn.reactos.org 14 May '07

14 May '07

Author: fireball Date: Tue May 15 00:01:05 2007 New Revision: 26782 URL: http://svn.reactos.org/svn/reactos?rev=26782&view=rev Log: - Fix debug print macros (by hpoussin). Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Tue May 15 00:01:05 2007 @@ -77,8 +77,8 @@ #else #define DebugInit() - #define DbgPrint(_x_) - #define DPRINT1(_x_) + #define DbgPrint(_x_) { if (0) printf _x_; } + #define DPRINT1(_x_) { if (0) printf _x_; } #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)

1 0

[ion] 26781: - Implement CmpFindSubKeyByNumber and CmpDoFindSubKeyByNumber. - Make NtEnumerateKey a simpler wrapper around CmEnumerateKey. - Implement CmEnumerateKey by using the same API as previously, CmpQueryKeyData instead of duplicating code like the previous version did. Use CmpFindSubKeyByNumber to convert from index to key node. - Remove CmiGetValueFromKeyByIndex, CmiGetKeyFromHashByIndex, CmiCopyPackedName: deprecated.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 23:35:58 2007 New Revision: 26781 URL: http://svn.reactos.org/svn/reactos?rev=26781&view=rev Log: - Implement CmpFindSubKeyByNumber and CmpDoFindSubKeyByNumber. - Make NtEnumerateKey a simpler wrapper around CmEnumerateKey. - Implement CmEnumerateKey by using the same API as previously, CmpQueryKeyData instead of duplicating code like the previous version did. Use CmpFindSubKeyByNumber to convert from index to key node. - Remove CmiGetValueFromKeyByIndex, CmiGetKeyFromHashByIndex, CmiCopyPackedName: deprecated. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26781… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 23:35:58 2007 @@ -163,39 +163,6 @@ NTSTATUS STDCALL CmUnRegisterCallback(IN LARGE_INTEGER Cookie); -NTSTATUS STDCALL -CmpParseKey(IN PVOID ParsedObject, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING FullPath, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *NextObject); - -VOID STDCALL -CmpDeleteKeyObject(PVOID DeletedObject); - -NTSTATUS STDCALL -CmpSecurityMethod(PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - PSECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength, - PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - POOL_TYPE PoolType, - PGENERIC_MAPPING GenericMapping); - -NTSTATUS STDCALL -CmpQueryKeyName (PVOID ObjectBody, - IN BOOLEAN HasObjectName, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength, - IN KPROCESSOR_MODE PreviousMode); - VOID CmiAddKeyToList(IN PKEY_OBJECT ParentKey, IN PKEY_OBJECT NewKey); @@ -265,12 +232,6 @@ OUT HCELL_INDEX *VBOffset); NTSTATUS -CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN ULONG Index, - OUT PCM_KEY_VALUE *ValueCell); - -NTSTATUS NTAPI CmDeleteValueKey(IN PKEY_OBJECT KeyControlBlock, IN UNICODE_STRING ValueName); @@ -310,16 +271,20 @@ IN PULONG ResultLength); NTSTATUS +NTAPI +CmEnumerateKey(IN PKEY_OBJECT KeyObject, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG Length, + IN PULONG ResultLength); + +NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, IN ULONG HashTableSize, IN HV_STORAGE_TYPE Storage); - -PCM_KEY_NODE -CmiGetKeyFromHashByIndex(PEREGISTRY_HIVE RegistryHive, - PHASH_TABLE_CELL HashBlock, - ULONG Index); NTSTATUS CmiAddKeyToHashTable(PEREGISTRY_HIVE RegistryHive, @@ -363,16 +328,7 @@ ); VOID -CmiCopyPackedName(PWCHAR NameBuffer, - PUCHAR PackedNameBuffer, - ULONG PackedNameSize); - -VOID CmiSyncHives(VOID); - - -NTSTATUS -CmiCreateTempHive(PEREGISTRY_HIVE *RegistryHive); NTSTATUS CmiSaveTempHive (PEREGISTRY_HIVE Hive, @@ -389,45 +345,6 @@ IN PACCESS_STATE AccessState, IN PVOID ParseContext ); -PVOID CMAPI -CmpAllocate( - ULONG Size, - BOOLEAN Paged); - -VOID CMAPI -CmpFree( - PVOID Ptr); - -BOOLEAN CMAPI -CmpFileRead( - PHHIVE RegistryHive, - ULONG FileType, - ULONGLONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength); - -BOOLEAN CMAPI -CmpFileWrite( - PHHIVE RegistryHive, - ULONG FileType, - ULONGLONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength); - -BOOLEAN CMAPI -CmpFileSetSize( - PHHIVE RegistryHive, - ULONG FileType, - ULONGLONG FileSize); - -BOOLEAN CMAPI -CmpFileFlush( - PHHIVE RegistryHive, - ULONG FileType); - -VOID -CmiCheckKey(BOOLEAN Verbose, - HANDLE Key); NTSTATUS NTAPI @@ -449,31 +366,6 @@ OUT PEREGISTRY_HIVE *Hive, IN OUT PBOOLEAN New, IN ULONG CheckFlags); - -#if 0 -static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) -{ - DPRINT1("xHvGetCell @ %s:%d %x @ %x\n", file, line, Cell, Hive); - return HvGetCell(Hive, Cell); -} - -static __inline VOID xHvFreeCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) -{ - DPRINT1("xHvFreeCell @ %s:%d %x @ %x\n", file, line, Cell, Hive); - HvFreeCell(Hive, Cell); -} - -static __inline HCELL_INDEX xHvAllocateCell(char *file, int line, PHHIVE Hive, SIZE_T Size) -{ - HCELL_INDEX Offset = HvAllocateCell(Hive, Size); - DPRINT1("xHvAllocateCell @ %s:%d (%x) %x @ %x\n", file, line, Size, Offset, Hive); - return Offset; -} - -#define HvGetCell(hive, cell) xHvGetCell(__FILE__, __LINE__, hive, cell) -#define HvFreeCell(hive, cell) xHvFreeCell(__FILE__, __LINE__, hive, cell) -#define HvAllocateCell(hive, size) xHvAllocateCell(__FILE__, __LINE__, hive, size) -#endif // Some Ob definitions for debug messages in Cm #define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount 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 Mon May 14 23:35:58 2007 @@ -525,309 +525,60 @@ return Status; } - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtEnumerateKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - PCM_KEY_NODE KeyCell, SubKeyCell; - PHASH_TABLE_CELL HashTableBlock; - PKEY_BASIC_INFORMATION BasicInformation; - PKEY_NODE_INFORMATION NodeInformation; - PKEY_FULL_INFORMATION FullInformation; - PVOID ClassCell; - ULONG NameSize, ClassSize; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - HV_STORAGE_TYPE Storage; - ULONG BaseIndex; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - DPRINT("KH 0x%p I %d KIC %x KI 0x%p L %d RL 0x%p\n", - KeyHandle, - Index, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_ENUMERATE_SUB_KEYS, - CmpKeyObjectType, - PreviousMode, - (PVOID *) &KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with status %x\n", Status); - return(Status); - } - - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Index = Index; - EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; - EnumerateKeyInfo.Length = Length; - EnumerateKeyInfo.ResultLength = ResultLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to KeyCell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - - /* Check for hightest possible sub key index */ - if (Index >= KeyCell->SubKeyCounts[HvStable] + - KeyCell->SubKeyCounts[HvVolatile]) - { - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = STATUS_NO_MORE_ENTRIES; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - DPRINT("No more volatile entries\n"); - return STATUS_NO_MORE_ENTRIES; - } - - /* Get pointer to SubKey */ - if (Index >= KeyCell->SubKeyCounts[HvStable]) - { - Storage = HvVolatile; - BaseIndex = Index - KeyCell->SubKeyCounts[HvStable]; - } - else - { - Storage = HvStable; - BaseIndex = Index; - } - - if (KeyCell->SubKeyLists[Storage] == HCELL_NULL) - { - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = STATUS_NO_MORE_ENTRIES; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return STATUS_NO_MORE_ENTRIES; - } - - ASSERT(KeyCell->SubKeyLists[Storage] != HCELL_NULL); - HashTableBlock = HvGetCell (&RegistryHive->Hive, KeyCell->SubKeyLists[Storage]); - - SubKeyCell = CmiGetKeyFromHashByIndex(RegistryHive, - HashTableBlock, - BaseIndex); - - Status = STATUS_SUCCESS; - switch (KeyInformationClass) - { - case KeyBasicInformation: - /* Check size of buffer */ - NameSize = SubKeyCell->NameSize; - if (SubKeyCell->Flags & REG_KEY_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - - *ResultLength = FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]) + NameSize; - - /* - * NOTE: It's perfetly valid to call NtEnumerateKey to get - * all the information but name. Actually the NT4 sound - * framework does that while querying parameters from registry. - * -- Filip Navara, 19/07/2004 - */ - if (Length < FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - /* Fill buffer with requested info */ - BasicInformation = (PKEY_BASIC_INFORMATION) KeyInformation; - BasicInformation->LastWriteTime.u.LowPart = SubKeyCell->LastWriteTime.u.LowPart; - BasicInformation->LastWriteTime.u.HighPart = SubKeyCell->LastWriteTime.u.HighPart; - BasicInformation->TitleIndex = Index; - BasicInformation->NameLength = NameSize; - - if (Length - FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]) < NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (SubKeyCell->Flags & REG_KEY_NAME_PACKED) - { - CmiCopyPackedName(BasicInformation->Name, - SubKeyCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(BasicInformation->Name, - SubKeyCell->Name, - NameSize); - } - } - break; - - case KeyNodeInformation: - /* Check size of buffer */ - NameSize = SubKeyCell->NameSize; - if (SubKeyCell->Flags & REG_KEY_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - ClassSize = SubKeyCell->ClassSize; - - *ResultLength = FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) + - NameSize + ClassSize; - - if (Length < FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - /* Fill buffer with requested info */ - NodeInformation = (PKEY_NODE_INFORMATION) KeyInformation; - NodeInformation->LastWriteTime.u.LowPart = SubKeyCell->LastWriteTime.u.LowPart; - NodeInformation->LastWriteTime.u.HighPart = SubKeyCell->LastWriteTime.u.HighPart; - NodeInformation->TitleIndex = Index; - NodeInformation->ClassOffset = sizeof(KEY_NODE_INFORMATION) + NameSize; - NodeInformation->ClassLength = SubKeyCell->ClassSize; - NodeInformation->NameLength = NameSize; - - if (Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) < NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]); - ClassSize = 0; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - else if (Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - - NameSize < ClassSize) - { - ClassSize = Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - - NameSize; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (SubKeyCell->Flags & REG_KEY_NAME_PACKED) - { - CmiCopyPackedName(NodeInformation->Name, - SubKeyCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(NodeInformation->Name, - SubKeyCell->Name, - NameSize); - } - - if (ClassSize != 0) - { - ClassCell = HvGetCell (&KeyObject->RegistryHive->Hive, - SubKeyCell->ClassNameOffset); - RtlCopyMemory (NodeInformation->Name + SubKeyCell->NameSize, - ClassCell, - ClassSize); - } - } - break; - - case KeyFullInformation: - ClassSize = SubKeyCell->ClassSize; - - *ResultLength = FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0]) + - ClassSize; - - /* Check size of buffer */ - if (Length < FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - /* Fill buffer with requested info */ - FullInformation = (PKEY_FULL_INFORMATION) KeyInformation; - FullInformation->LastWriteTime.u.LowPart = SubKeyCell->LastWriteTime.u.LowPart; - FullInformation->LastWriteTime.u.HighPart = SubKeyCell->LastWriteTime.u.HighPart; - FullInformation->TitleIndex = Index; - FullInformation->ClassOffset = sizeof(KEY_FULL_INFORMATION) - - sizeof(WCHAR); - FullInformation->ClassLength = SubKeyCell->ClassSize; - FullInformation->SubKeys = CmiGetNumberOfSubKeys(KeyObject); //SubKeyCell->SubKeyCounts; - FullInformation->MaxNameLen = CmiGetMaxNameLength(&RegistryHive->Hive, SubKeyCell); - FullInformation->MaxClassLen = CmiGetMaxClassLength(&RegistryHive->Hive, SubKeyCell); - FullInformation->Values = SubKeyCell->ValueList.Count; - FullInformation->MaxValueNameLen = - CmiGetMaxValueNameLength(&RegistryHive->Hive, SubKeyCell); - FullInformation->MaxValueDataLen = - CmiGetMaxValueDataLength(&RegistryHive->Hive, SubKeyCell); - - if (Length - FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0]) < ClassSize) - { - ClassSize = Length - FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ClassSize != 0) - { - ClassCell = HvGetCell (&KeyObject->RegistryHive->Hive, - SubKeyCell->ClassNameOffset); - RtlCopyMemory (FullInformation->Class, - ClassCell, - ClassSize); - } - } - break; - - default: - DPRINT1("Not handling 0x%x\n", KeyInformationClass); - break; - } - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); - - ObDereferenceObject(KeyObject); - - DPRINT("Returning status %x\n", Status); - - return(Status); + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + (KeyInformationClass != + KeyNameInformation) ? + KEY_QUERY_VALUE : 0, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Index = Index; + EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; + EnumerateKeyInfo.Length = Length; + EnumerateKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateKey(KeyObject, + Index, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Mon May 14 23:35:58 2007 @@ -621,39 +621,6 @@ } NTSTATUS -CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN ULONG Index, - OUT PCM_KEY_VALUE *ValueCell) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE CurValueCell; - - *ValueCell = NULL; - - if (KeyCell->ValueList.List == (HCELL_INDEX)-1) - { - return STATUS_NO_MORE_ENTRIES; - } - - if (Index >= KeyCell->ValueList.Count) - { - return STATUS_NO_MORE_ENTRIES; - } - - - ValueListCell = HvGetCell (&RegistryHive->Hive, KeyCell->ValueList.List); - - VERIFY_VALUE_LIST_CELL(ValueListCell); - - CurValueCell = HvGetCell (&RegistryHive->Hive, ValueListCell->ValueOffset[Index]); - - *ValueCell = CurValueCell; - - return STATUS_SUCCESS; -} - -NTSTATUS CmiAllocateHashTableCell (IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, @@ -684,20 +651,6 @@ } return Status; -} - -PCM_KEY_NODE -CmiGetKeyFromHashByIndex(PEREGISTRY_HIVE RegistryHive, - PHASH_TABLE_CELL HashBlock, - ULONG Index) -{ - HCELL_INDEX KeyOffset; - PCM_KEY_NODE KeyCell; - - KeyOffset = HashBlock->Table[Index].KeyOffset; - KeyCell = HvGetCell (&RegistryHive->Hive, KeyOffset); - - return KeyCell; } NTSTATUS @@ -744,17 +697,6 @@ return STATUS_UNSUCCESSFUL; } -VOID -CmiCopyPackedName(PWCHAR NameBuffer, - PUCHAR PackedNameBuffer, - ULONG PackedNameSize) -{ - ULONG i; - - for (i = 0; i < PackedNameSize; i++) - NameBuffer[i] = (WCHAR)PackedNameBuffer[i]; -} - NTSTATUS CmiSaveTempHive (PEREGISTRY_HIVE Hive, HANDLE FileHandle) 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 Mon May 14 23:35:58 2007 @@ -1115,6 +1115,14 @@ IN PUNICODE_STRING SearchName ); +HCELL_INDEX +NTAPI +CmpFindSubKeyByNumber( + IN PHHIVE Hive, + IN PCM_KEY_NODE Node, + IN ULONG Number +); + ULONG NTAPI CmpComputeHashKey( Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 23:35:58 2007 @@ -640,7 +640,7 @@ USHORT NameLength; /* Check if the value is compressed */ - if (Node->Flags & VALUE_COMP_NAME) + if (Node->Flags & KEY_COMP_NAME) { /* Get the compressed name size */ NameLength = CmpCompressedNameSize(Node->Name, Node->NameLength); @@ -917,3 +917,69 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmEnumerateKey(IN PKEY_OBJECT KeyObject, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG Length, + IN PULONG ResultLength) +{ + NTSTATUS Status; + PHHIVE Hive; + PCM_KEY_NODE Parent, Child; + HCELL_INDEX ChildCell; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive and parent */ + Hive = &KeyObject->RegistryHive->Hive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, KeyObject->KeyCellOffset); + if (!Parent) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Get the child cell */ + ChildCell = CmpFindSubKeyByNumber(Hive, Parent, Index); + + /* Release the parent cell */ + HvReleaseCell(Hive, KeyObject->KeyCellOffset); + + /* Check if we found the child */ + if (ChildCell == HCELL_NIL) + { + /* We didn't, fail */ + Status = STATUS_NO_MORE_ENTRIES; + goto Quickie; + } + + /* Now get the actual child node */ + Child = (PCM_KEY_NODE)HvGetCell(Hive, ChildCell); + if (!Child) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Query the data requested */ + Status = CmpQueryKeyData(Hive, + Child, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + +Quickie: + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Mon May 14 23:35:58 2007 @@ -516,6 +516,139 @@ HCELL_INDEX NTAPI +CmpDoFindSubKeyByNumber(IN PHHIVE Hive, + IN PCM_KEY_INDEX Index, + IN ULONG Number) +{ + ULONG i; + HCELL_INDEX LeafCell = 0; + PCM_KEY_INDEX Leaf = NULL; + PCM_KEY_FAST_INDEX FastIndex; + HCELL_INDEX Result; + + /* Check if this is a root */ + if (Index->Signature == CM_KEY_INDEX_ROOT) + { + /* Loop the index */ + for (i = 0; i < Index->Count; i++) + { + /* Check if this isn't the first iteration */ + if (i) + { + /* Make sure we had something valid, and release it */ + ASSERT(Leaf != NULL ); + ASSERT(LeafCell == Index->List[i - 1]); + HvReleaseCell(Hive, LeafCell); + } + + /* Get the leaf cell and the leaf for this index */ + LeafCell = Index->List[i]; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) return HCELL_NIL; + + /* Check if the index may be inside it */ + if (Number < Leaf->Count) + { + /* Check if this is a fast or hash leaf */ + if ((Leaf->Signature == CM_KEY_FAST_LEAF) || + (Leaf->Signature == CM_KEY_HASH_LEAF)) + { + /* Get the fast index */ + FastIndex = (PCM_KEY_FAST_INDEX)Leaf; + + /* Look inside the list to get our actual cell */ + Result = FastIndex->List[Number].Cell; + HvReleaseCell(Hive, LeafCell); + return Result; + } + else + { + /* Regular leaf, so just use the index directly */ + Result = Leaf->List[Number]; + + /* Release and return it */ + HvReleaseCell(Hive,LeafCell); + return Result; + } + } + else + { + /* Otherwise, skip this leaf */ + Number = Number - Leaf->Count; + } + } + + /* Should never get here */ + ASSERT(FALSE); + } + + /* If we got here, then the cell is in this index */ + ASSERT(Number < Index->Count); + + /* Check if we're a fast or hash leaf */ + if ((Index->Signature == CM_KEY_FAST_LEAF) || + (Index->Signature == CM_KEY_HASH_LEAF)) + { + /* We are, get the fast index and get the cell from the list */ + FastIndex = (PCM_KEY_FAST_INDEX)Index; + return FastIndex->List[Number].Cell; + } + else + { + /* We aren't, so use the index directly to grab the cell */ + return Index->List[Number]; + } +} + +HCELL_INDEX +NTAPI +CmpFindSubKeyByNumber(IN PHHIVE Hive, + IN PCM_KEY_NODE Node, + IN ULONG Number) +{ + PCM_KEY_INDEX Index; + HCELL_INDEX Result = HCELL_NIL; + + /* Check if it's in the stable list */ + if (Number < Node->SubKeyCounts[HvStable]) + { + /* Get the actual key index */ + Index = (PCM_KEY_INDEX)HvGetCell(Hive, Node->SubKeyLists[HvStable]); + if (!Index) return HCELL_NIL; + + /* Do a search inside it */ + Result = CmpDoFindSubKeyByNumber(Hive, Index, Number); + + /* Release the cell and return the result */ + HvReleaseCell(Hive, Node->SubKeyLists[HvStable]); + return Result; + } + else if (Hive->StorageTypeCount > HvVolatile) + { + /* It's in the volatile list */ + Number = Number - Node->SubKeyCounts[HvStable]; + if (Number < Node->SubKeyCounts[HvVolatile]) + { + /* Get the actual key index */ + Index = (PCM_KEY_INDEX)HvGetCell(Hive, + Node->SubKeyLists[HvVolatile]); + if (!Index) return HCELL_NIL; + + /* Do a search inside it */ + Result = CmpDoFindSubKeyByNumber(Hive, Index, Number); + + /* Release the cell and return the result */ + HvReleaseCell(Hive, Node->SubKeyLists[HvVolatile]); + return Result; + } + } + + /* Nothing was found */ + return HCELL_NIL; +} + +HCELL_INDEX +NTAPI CmpFindSubKeyByHash(IN PHHIVE Hive, IN PCM_KEY_FAST_INDEX FastIndex, IN PUNICODE_STRING SearchName)

1 0

[ion] 26780: - Make CmiGetMaxClassLength, CmiGetMaxNameLength, CmiGetMaxValueDataLength, CmiGetMaxValueNameLength use PHHIVE and PCM_KEY_NODE instead of PKEY_OBJECT or PERGSITRY_HIVE/PCM_KEY_NDOE so they're consistent. - Implement NtQueryKey as a simple wrapper around CmQueryKey. - Implement CmQueryKey based on previous code, and handle only the classes that the previous code handled, through CmpQueryKeyData. - The CmiGetMax* routines will be depreated soon since they're a perf hit and we should
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 22:12:57 2007 New Revision: 26780 URL: http://svn.reactos.org/svn/reactos?rev=26780&view=rev Log: - Make CmiGetMaxClassLength, CmiGetMaxNameLength, CmiGetMaxValueDataLength, CmiGetMaxValueNameLength use PHHIVE and PCM_KEY_NODE instead of PKEY_OBJECT or PERGSITRY_HIVE/PCM_KEY_NDOE so they're consistent. - Implement NtQueryKey as a simple wrapper around CmQueryKey. - Implement CmQueryKey based on previous code, and handle only the classes that the previous code handled, through CmpQueryKeyData. - The CmiGetMax* routines will be depreated soon since they're a perf hit and we should be reading the key node's values instead. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26780… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 22:12:57 2007 @@ -221,17 +221,17 @@ CmiGetNumberOfSubKeys(PKEY_OBJECT KeyObject); ULONG -CmiGetMaxNameLength(IN PKEY_OBJECT KeyObject); +CmiGetMaxNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); ULONG -CmiGetMaxClassLength(IN PKEY_OBJECT KeyObject); +CmiGetMaxClassLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); ULONG -CmiGetMaxValueNameLength(IN PEREGISTRY_HIVE RegistryHive, +CmiGetMaxValueNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); ULONG -CmiGetMaxValueDataLength(IN PEREGISTRY_HIVE RegistryHive, +CmiGetMaxValueDataLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); NTSTATUS @@ -300,6 +300,14 @@ IN ULONG Type, IN PVOID Data, IN ULONG DataSize); + +NTSTATUS +NTAPI +CmQueryKey(IN PKEY_OBJECT KeyObject, + IN KEY_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG Length, + IN PULONG ResultLength); NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, 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 Mon May 14 22:12:57 2007 @@ -786,13 +786,13 @@ sizeof(WCHAR); FullInformation->ClassLength = SubKeyCell->ClassSize; FullInformation->SubKeys = CmiGetNumberOfSubKeys(KeyObject); //SubKeyCell->SubKeyCounts; - FullInformation->MaxNameLen = CmiGetMaxNameLength(KeyObject); - FullInformation->MaxClassLen = CmiGetMaxClassLength(KeyObject); + FullInformation->MaxNameLen = CmiGetMaxNameLength(&RegistryHive->Hive, SubKeyCell); + FullInformation->MaxClassLen = CmiGetMaxClassLength(&RegistryHive->Hive, SubKeyCell); FullInformation->Values = SubKeyCell->ValueList.Count; FullInformation->MaxValueNameLen = - CmiGetMaxValueNameLength(RegistryHive, SubKeyCell); + CmiGetMaxValueNameLength(&RegistryHive->Hive, SubKeyCell); FullInformation->MaxValueDataLen = - CmiGetMaxValueDataLength(RegistryHive, SubKeyCell); + CmiGetMaxValueDataLength(&RegistryHive->Hive, SubKeyCell); if (Length - FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0]) < ClassSize) { @@ -1094,232 +1094,58 @@ return Status; } - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtQueryKey(IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - PKEY_BASIC_INFORMATION BasicInformation; - PKEY_NODE_INFORMATION NodeInformation; - PKEY_FULL_INFORMATION FullInformation; - PEREGISTRY_HIVE RegistryHive; - PVOID ClassCell; - PKEY_OBJECT KeyObject; - PCM_KEY_NODE KeyCell; - ULONG NameSize, ClassSize; - NTSTATUS Status; - REG_QUERY_KEY_INFORMATION QueryKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - - PAGED_CODE(); - - DPRINT("NtQueryKey(KH 0x%p KIC %x KI 0x%p L %d RL 0x%p)\n", - KeyHandle, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - (KeyInformationClass != KeyNameInformation ? KEY_QUERY_VALUE : 0), - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *) &KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - PostOperationInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.KeyInformationClass = KeyInformationClass; - QueryKeyInfo.KeyInformation = KeyInformation; - QueryKeyInfo.Length = Length; - QueryKeyInfo.ResultLength = ResultLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to KeyCell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - - Status = STATUS_SUCCESS; - switch (KeyInformationClass) - { - case KeyBasicInformation: - NameSize = KeyObject->Name.Length; - - *ResultLength = FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); - - /* Check size of buffer */ - if (Length < FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - /* Fill buffer with requested info */ - BasicInformation = (PKEY_BASIC_INFORMATION) KeyInformation; - BasicInformation->LastWriteTime.u.LowPart = KeyCell->LastWriteTime.u.LowPart; - BasicInformation->LastWriteTime.u.HighPart = KeyCell->LastWriteTime.u.HighPart; - BasicInformation->TitleIndex = 0; - BasicInformation->NameLength = KeyObject->Name.Length; - - if (Length - FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]) < - NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_BASIC_INFORMATION, Name[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - RtlCopyMemory(BasicInformation->Name, - KeyObject->Name.Buffer, - NameSize); - } - break; - - case KeyNodeInformation: - NameSize = KeyObject->Name.Length; - ClassSize = KeyCell->ClassSize; - - *ResultLength = FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) + - NameSize + ClassSize; - - /* Check size of buffer */ - if (Length < *ResultLength) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - /* Fill buffer with requested info */ - NodeInformation = (PKEY_NODE_INFORMATION) KeyInformation; - NodeInformation->LastWriteTime.u.LowPart = KeyCell->LastWriteTime.u.LowPart; - NodeInformation->LastWriteTime.u.HighPart = KeyCell->LastWriteTime.u.HighPart; - NodeInformation->TitleIndex = 0; - NodeInformation->ClassOffset = sizeof(KEY_NODE_INFORMATION) + - KeyObject->Name.Length; - NodeInformation->ClassLength = KeyCell->ClassSize; - NodeInformation->NameLength = KeyObject->Name.Length; - - if (Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) < NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]); - ClassSize = 0; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - else if (Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - - NameSize < ClassSize) - { - ClassSize = Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - - NameSize; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - RtlCopyMemory(NodeInformation->Name, - KeyObject->Name.Buffer, - NameSize); - - if (ClassSize != 0) - { - ClassCell = HvGetCell (&KeyObject->RegistryHive->Hive, - KeyCell->ClassNameOffset); - RtlCopyMemory (NodeInformation->Name + KeyObject->Name.Length, - ClassCell, - ClassSize); - } - } - break; - - case KeyFullInformation: - ClassSize = KeyCell->ClassSize; - - *ResultLength = FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + - ClassSize; - - /* Check size of buffer */ - if (Length < FIELD_OFFSET(KEY_FULL_INFORMATION, Class)) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - /* Fill buffer with requested info */ - FullInformation = (PKEY_FULL_INFORMATION) KeyInformation; - FullInformation->LastWriteTime.u.LowPart = KeyCell->LastWriteTime.u.LowPart; - FullInformation->LastWriteTime.u.HighPart = KeyCell->LastWriteTime.u.HighPart; - FullInformation->TitleIndex = 0; - FullInformation->ClassOffset = sizeof(KEY_FULL_INFORMATION) - sizeof(WCHAR); - FullInformation->ClassLength = KeyCell->ClassSize; - FullInformation->SubKeys = CmiGetNumberOfSubKeys(KeyObject); //KeyCell->SubKeyCounts; - FullInformation->MaxNameLen = CmiGetMaxNameLength(KeyObject); - FullInformation->MaxClassLen = CmiGetMaxClassLength(KeyObject); - FullInformation->Values = KeyCell->ValueList.Count; - FullInformation->MaxValueNameLen = - CmiGetMaxValueNameLength(RegistryHive, KeyCell); - FullInformation->MaxValueDataLen = - CmiGetMaxValueDataLength(RegistryHive, KeyCell); - - if (Length - FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0]) < ClassSize) - { - ClassSize = Length - FIELD_OFFSET(KEY_FULL_INFORMATION, Class[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ClassSize) - { - ClassCell = HvGetCell (&KeyObject->RegistryHive->Hive, - KeyCell->ClassNameOffset); - RtlCopyMemory (FullInformation->Class, - ClassCell, ClassSize); - } - } - break; - - case KeyNameInformation: - case KeyCachedInformation: - case KeyFlagsInformation: - DPRINT1("Key information class 0x%x not yet implemented!\n", KeyInformationClass); - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - DPRINT1("Not handling 0x%x\n", KeyInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); - - ObDereferenceObject(KeyObject); - - return(Status); + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_KEY_INFORMATION QueryKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + (KeyInformationClass != + KeyNameInformation) ? + KEY_QUERY_VALUE : 0, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.KeyInformationClass = KeyInformationClass; + QueryKeyInfo.KeyInformation = KeyInformation; + QueryKeyInfo.Length = Length; + QueryKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryKey(KeyObject, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; } NTSTATUS @@ -1371,6 +1197,7 @@ CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); } + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; } Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Mon May 14 22:12:57 2007 @@ -124,32 +124,27 @@ ULONG -CmiGetMaxNameLength(PKEY_OBJECT KeyObject) +CmiGetMaxNameLength(PHHIVE Hive, + PCM_KEY_NODE KeyCell) { PHASH_TABLE_CELL HashBlock; PCM_KEY_NODE CurSubKeyCell; - PCM_KEY_NODE KeyCell; ULONG MaxName; ULONG NameSize; ULONG i; ULONG Storage; - VERIFY_KEY_OBJECT(KeyObject); - - KeyCell = KeyObject->KeyCell; - VERIFY_KEY_CELL(KeyCell); - MaxName = 0; for (Storage = HvStable; Storage < HvMaxStorageType; Storage++) { if (KeyCell->SubKeyLists[Storage] != HCELL_NULL) { - HashBlock = HvGetCell (&KeyObject->RegistryHive->Hive, KeyCell->SubKeyLists[Storage]); + HashBlock = HvGetCell (Hive, KeyCell->SubKeyLists[Storage]); ASSERT(HashBlock->Id == REG_HASH_TABLE_CELL_ID); for (i = 0; i < KeyCell->SubKeyCounts[Storage]; i++) { - CurSubKeyCell = HvGetCell (&KeyObject->RegistryHive->Hive, + CurSubKeyCell = HvGetCell (Hive, HashBlock->Table[i].KeyOffset); NameSize = CurSubKeyCell->NameSize; if (CurSubKeyCell->Flags & REG_KEY_NAME_PACKED) @@ -167,32 +162,27 @@ ULONG -CmiGetMaxClassLength(PKEY_OBJECT KeyObject) +CmiGetMaxClassLength(PHHIVE Hive, + PCM_KEY_NODE KeyCell) { PHASH_TABLE_CELL HashBlock; PCM_KEY_NODE CurSubKeyCell; - PCM_KEY_NODE KeyCell; ULONG MaxClass; ULONG i; ULONG Storage; - VERIFY_KEY_OBJECT(KeyObject); - - KeyCell = KeyObject->KeyCell; - VERIFY_KEY_CELL(KeyCell); - MaxClass = 0; for (Storage = HvStable; Storage < HvMaxStorageType; Storage++) { if (KeyCell->SubKeyLists[Storage] != HCELL_NULL) { - HashBlock = HvGetCell (&KeyObject->RegistryHive->Hive, + HashBlock = HvGetCell (Hive, KeyCell->SubKeyLists[Storage]); ASSERT(HashBlock->Id == REG_HASH_TABLE_CELL_ID); for (i = 0; i < KeyCell->SubKeyCounts[Storage]; i++) { - CurSubKeyCell = HvGetCell (&KeyObject->RegistryHive->Hive, + CurSubKeyCell = HvGetCell (Hive, HashBlock->Table[i].KeyOffset); if (MaxClass < CurSubKeyCell->ClassSize) @@ -208,7 +198,7 @@ ULONG -CmiGetMaxValueNameLength(PEREGISTRY_HIVE RegistryHive, +CmiGetMaxValueNameLength(PHHIVE Hive, PCM_KEY_NODE KeyCell) { PVALUE_LIST_CELL ValueListCell; @@ -225,12 +215,12 @@ } MaxValueName = 0; - ValueListCell = HvGetCell (&RegistryHive->Hive, + ValueListCell = HvGetCell (Hive, KeyCell->ValueList.List); for (i = 0; i < KeyCell->ValueList.Count; i++) { - CurValueCell = HvGetCell (&RegistryHive->Hive, + CurValueCell = HvGetCell (Hive, ValueListCell->ValueOffset[i]); if (CurValueCell == NULL) { @@ -256,7 +246,7 @@ ULONG -CmiGetMaxValueDataLength(PEREGISTRY_HIVE RegistryHive, +CmiGetMaxValueDataLength(PHHIVE Hive, PCM_KEY_NODE KeyCell) { PVALUE_LIST_CELL ValueListCell; @@ -272,11 +262,11 @@ } MaxValueData = 0; - ValueListCell = HvGetCell (&RegistryHive->Hive, KeyCell->ValueList.List); + ValueListCell = HvGetCell (Hive, KeyCell->ValueList.List); for (i = 0; i < KeyCell->ValueList.Count; i++) { - CurValueCell = HvGetCell (&RegistryHive->Hive, + CurValueCell = HvGetCell (Hive, ValueListCell->ValueOffset[i]); if ((MaxValueData < (LONG)(CurValueCell->DataSize & REG_DATA_SIZE_MASK))) { 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 Mon May 14 22:12:57 2007 @@ -675,6 +675,16 @@ }; } KEY_VALUE_INFORMATION, *PKEY_VALUE_INFORMATION; +typedef struct _KEY_INFORMATION +{ + union + { + KEY_BASIC_INFORMATION KeyBasicInformation; + KEY_FULL_INFORMATION KeyFullInformation; + KEY_NODE_INFORMATION KeyNodeInformation; + }; +} KEY_INFORMATION, *PKEY_INFORMATION; + /////////////////////////////////////////////////////////////////////////////// // // BUGBUG Old Hive Stuff for Temporary Support @@ -718,6 +728,10 @@ VOID NTAPI CmiWorkerThread(IN PVOID Param); PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); +ULONG CmiGetMaxNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); +ULONG CmiGetMaxClassLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); +ULONG CmiGetMaxValueNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); +ULONG CmiGetMaxValueDataLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); VOID CmiSyncHives(VOID); #define HIVE_NO_FILE 0x00000002 /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 22:12:57 2007 @@ -624,3 +624,296 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmpQueryKeyData(IN PHHIVE Hive, + IN PCM_KEY_NODE Node, + IN KEY_INFORMATION_CLASS KeyInformationClass, + IN OUT PVOID KeyInformation, + IN ULONG Length, + IN OUT PULONG ResultLength) +{ + NTSTATUS Status; + ULONG Size, SizeLeft, MinimumSize; + PKEY_INFORMATION Info = (PKEY_INFORMATION)KeyInformation; + USHORT NameLength; + + /* Check if the value is compressed */ + if (Node->Flags & VALUE_COMP_NAME) + { + /* Get the compressed name size */ + NameLength = CmpCompressedNameSize(Node->Name, Node->NameLength); + } + else + { + /* Get the real size */ + NameLength = Node->NameLength; + } + + /* Check what kind of information is being requested */ + switch (KeyInformationClass) + { + /* Basic information */ + case KeyBasicInformation: + + /* This is the size we need */ + Size = FIELD_OFFSET(KEY_BASIC_INFORMATION, Name) + NameLength; + + /* And this is the minimum we can work with */ + MinimumSize = FIELD_OFFSET(KEY_BASIC_INFORMATION, Name); + + /* Let the caller know and assume success */ + *ResultLength = Size; + Status = STATUS_SUCCESS; + + /* Check if the bufer we got is too small */ + if (Length < MinimumSize) + { + /* Let the caller know and fail */ + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Copy the basic information */ + Info->KeyBasicInformation.LastWriteTime = Node->LastWriteTime; + Info->KeyBasicInformation.TitleIndex = 0; + Info->KeyBasicInformation.NameLength = NameLength; + + /* Only the name is left */ + SizeLeft = Length - MinimumSize; + Size = NameLength; + + /* Check if we don't have enough space for the name */ + if (SizeLeft < Size) + { + /* Truncate the name we'll return, and tell the caller */ + Size = SizeLeft; + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Check if this is a compressed key */ + if (Node->Flags & KEY_COMP_NAME) + { + /* Copy the compressed name */ + CmpCopyCompressedName(Info->KeyBasicInformation.Name, + SizeLeft, + Node->Name, + Node->NameLength); + } + else + { + /* Otherwise, copy the raw name */ + RtlCopyMemory(Info->KeyBasicInformation.Name, + Node->Name, + Size); + } + break; + + /* Node information */ + case KeyNodeInformation: + + /* Calculate the size we need */ + Size = FIELD_OFFSET(KEY_NODE_INFORMATION, Name) + + NameLength + + Node->ClassLength; + + /* And the minimum size we can support */ + MinimumSize = FIELD_OFFSET(KEY_NODE_INFORMATION, Name); + + /* Return the size to the caller and assume succes */ + *ResultLength = Size; + Status = STATUS_SUCCESS; + + /* Check if the caller's buffer is too small */ + if (Length < MinimumSize) + { + /* Let them know, and fail */ + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Copy the basic information */ + Info->KeyNodeInformation.LastWriteTime = Node->LastWriteTime; + Info->KeyNodeInformation.TitleIndex = 0; + Info->KeyNodeInformation.ClassLength = Node->ClassLength; + Info->KeyNodeInformation.NameLength = NameLength; + + /* Now the name is left */ + SizeLeft = Length - MinimumSize; + Size = NameLength; + + /* Check if the name can fit entirely */ + if (SizeLeft < Size) + { + /* It can't, we'll have to truncate. Tell the caller */ + Size = SizeLeft; + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Check if the key node name is compressed */ + if (Node->Flags & KEY_COMP_NAME) + { + /* Copy the compressed name */ + CmpCopyCompressedName(Info->KeyNodeInformation.Name, + SizeLeft, + Node->Name, + Node->NameLength); + } + else + { + /* It isn't, so copy the raw name */ + RtlCopyMemory(Info->KeyNodeInformation.Name, + Node->Name, + Size); + } + + /* Check if the node has a class */ + if (Node->ClassLength > 0) + { + /* It does. We don't support these yet */ + ASSERTMSG("Classes not supported\n", FALSE); + } + else + { + /* It doesn't, so set offset to -1, not 0! */ + Info->KeyNodeInformation.ClassOffset = 0xFFFFFFFF; + } + break; + + /* Full information requsted */ + case KeyFullInformation: + + /* This is the size we need */ + Size = FIELD_OFFSET(KEY_FULL_INFORMATION, Class) + + Node->ClassLength; + + /* This is what we can work with */ + MinimumSize = FIELD_OFFSET(KEY_FULL_INFORMATION, Class); + + /* Return it to caller and assume success */ + *ResultLength = Size; + Status = STATUS_SUCCESS; + + /* Check if the caller's buffer is to small */ + if (Length < MinimumSize) + { + /* Let them know and fail */ + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Now copy all the basic information */ + Info->KeyFullInformation.LastWriteTime = Node->LastWriteTime; + Info->KeyFullInformation.TitleIndex = 0; + Info->KeyFullInformation.ClassLength = Node->ClassLength; + Info->KeyFullInformation.SubKeys = Node->SubKeyCounts[HvStable] + + Node->SubKeyCounts[HvVolatile]; + Info->KeyFullInformation.Values = Node->ValueList.Count; + Info->KeyFullInformation.MaxNameLen = CmiGetMaxNameLength(Hive, Node); + Info->KeyFullInformation.MaxClassLen = CmiGetMaxClassLength(Hive, Node); + Info->KeyFullInformation.MaxValueNameLen = CmiGetMaxValueNameLength(Hive, Node); + Info->KeyFullInformation.MaxValueDataLen = CmiGetMaxValueDataLength(Hive, Node); + DPRINT("%d %d %d %d\n", + CmiGetMaxNameLength(Hive, Node), + CmiGetMaxValueDataLength(Hive, Node), + CmiGetMaxValueNameLength(Hive, Node), + CmiGetMaxClassLength(Hive, Node)); + //Info->KeyFullInformation.MaxNameLen = Node->MaxNameLen; + //Info->KeyFullInformation.MaxClassLen = Node->MaxClassLen; + //Info->KeyFullInformation.MaxValueNameLen = Node->MaxValueNameLen; + //Info->KeyFullInformation.MaxValueDataLen = Node->MaxValueDataLen; + + /* Check if we have a class */ + if (Node->ClassLength > 0) + { + /* We do, but we currently don't support this */ + ASSERTMSG("Classes not supported\n", FALSE); + } + else + { + /* We don't have a class, so set offset to -1, not 0! */ + Info->KeyNodeInformation.ClassOffset = 0xFFFFFFFF; + } + break; + + /* Any other class that got sent here is invalid! */ + default: + + /* Set failure code */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +CmQueryKey(IN PKEY_OBJECT KeyObject, + IN KEY_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG Length, + IN PULONG ResultLength) +{ + NTSTATUS Status; + PHHIVE Hive; + PCM_KEY_NODE Parent; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive and parent */ + Hive = &KeyObject->RegistryHive->Hive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, KeyObject->KeyCellOffset); + if (!Parent) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Check what class we got */ + switch (KeyInformationClass) + { + /* Typical information */ + case KeyFullInformation: + case KeyBasicInformation: + case KeyNodeInformation: + + /* Call the internal API */ + Status = CmpQueryKeyData(Hive, + Parent, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + break; + + /* Unsupported classes for now */ + case KeyNameInformation: + case KeyCachedInformation: + case KeyFlagsInformation: + + /* Print message and fail */ + DPRINT1("Unsupported class: %d!\n", KeyInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Illegal classes */ + default: + + /* Print message and fail */ + DPRINT1("Unsupported class: %d!\n", KeyInformationClass); + Status = STATUS_INVALID_INFO_CLASS; + break; + } + +Quickie: + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +}

1 0

[arty] 26779: Load address bug: offset from the real target, not kernel start.
by arty＠svn.reactos.org 14 May '07

14 May '07

Author: arty Date: Mon May 14 12:46:34 2007 New Revision: 26779 URL: http://svn.reactos.org/svn/reactos?rev=26779&view=rev Log: Load address bug: offset from the real target, not kernel start. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon May 14 12:46:34 2007 @@ -406,9 +406,9 @@ if (shdr->sh_type == TYPE_PEHEADER) { FsSetFilePointer(KernelImage, shdr->sh_offset); - FsReadFile(KernelImage, shdr->sh_size, NULL, KernelMemory); - ImageHeader = (PIMAGE_DOS_HEADER)KernelMemory; - NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)KernelMemory + SWAPD(ImageHeader->e_lfanew)); + FsReadFile(KernelImage, shdr->sh_size, NULL, MemLoadAddr); + ImageHeader = (PIMAGE_DOS_HEADER)MemLoadAddr; + NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)MemLoadAddr + SWAPD(ImageHeader->e_lfanew)); printf("NtHeader at %x\n", SWAPD(ImageHeader->e_lfanew)); printf("SectionAlignment %x\n", SWAPD(NtHeader->OptionalHeader.SectionAlignment)); @@ -449,15 +449,15 @@ if (shdr->sh_type != SHT_NOBITS) { /* Content area */ - printf("Loading section %d at %x (real: %x:%d)\n", i, KernelAddr + SectionAddr, KernelMemory+SectionAddr, shdr->sh_size); + printf("Loading section %d at %x (real: %x:%d)\n", i, KernelAddr + SectionAddr, MemLoadAddr+SectionAddr, shdr->sh_size); FsSetFilePointer(KernelImage, shdr->sh_offset); - FsReadFile(KernelImage, shdr->sh_size, NULL, KernelMemory + SectionAddr); + FsReadFile(KernelImage, shdr->sh_size, NULL, MemLoadAddr + SectionAddr); } else { /* Zero it out */ printf("BSS section %d at %x\n", i, KernelAddr + SectionAddr); - memset(KernelMemory + SectionAddr, 0, + memset(MemLoadAddr + SectionAddr, 0, ROUND_UP(shdr->sh_size, SWAPD(NtHeader->OptionalHeader.SectionAlignment))); } @@ -517,7 +517,7 @@ A = reloc.r_addend; P = reloc.r_offset + ELF_SECTION(targetSection)->sh_addr; - Target32 = (ULONG*)(((PCHAR)KernelMemory) + P); + Target32 = (ULONG*)(((PCHAR)MemLoadAddr) + P); Target16 = (USHORT *)Target32; x = *Target32; @@ -553,7 +553,7 @@ #if 0 printf("reloc[%d:%x]: (type %x sym %d val %d) off %x add %x (old %x new %x)\n", j, - ((ULONG)Target32) - ((ULONG)KernelMemory), + ((ULONG)Target32) - ((ULONG)MemLoadAddr), ELF32_R_TYPE(reloc.r_info), ELF32_R_SYM(reloc.r_info), symbol.st_value, @@ -568,7 +568,7 @@ MmFreeMemory(sptr); - ModuleData->ModStart = (ULONG)KernelMemory; + ModuleData->ModStart = (ULONG)MemLoadAddr; /* Increase the next Load Base */ NextModuleBase = ROUND_UP((ULONG)MemLoadAddr + ImageSize, PAGE_SIZE); ModuleData->ModEnd = NextModuleBase;

1 0

[ion] 26778: - Implement NtEnumerateValueKey as a simpler wrapper. - Implement CmEnumerateValueKey. Simply calls already-existing Value Cache routines (CmpGetValueListFromCache, CmpGetValueKeyFromCache and CmpQueryKeyValueData) to do all the work.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 10:40:40 2007 New Revision: 26778 URL: http://svn.reactos.org/svn/reactos?rev=26778&view=rev Log: - Implement NtEnumerateValueKey as a simpler wrapper. - Implement CmEnumerateValueKey. Simply calls already-existing Value Cache routines (CmpGetValueListFromCache, CmpGetValueKeyFromCache and CmpQueryKeyValueData) to do all the work. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26778… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 10:40:40 2007 @@ -285,6 +285,23 @@ IN PULONG ResultLength); NTSTATUS +NTAPI +CmEnumerateValueKey(IN PKEY_OBJECT KeyObject, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + IN PULONG ResultLength); + +NTSTATUS +NTAPI +CmSetValueKey(IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING ValueName, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize); + +NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, @@ -303,14 +320,6 @@ HV_STORAGE_TYPE StorageType, PCM_KEY_NODE NewKeyCell, HCELL_INDEX NKBOffset); - -NTSTATUS -NTAPI -CmSetValueKey(IN PKEY_OBJECT KeyObject, - IN PUNICODE_STRING ValueName, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataSize); NTSTATUS CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, 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 Mon May 14 10:40:40 2007 @@ -830,276 +830,60 @@ return(Status); } - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtEnumerateValueKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - PCM_KEY_NODE KeyCell; - PCM_KEY_VALUE ValueCell; - PVOID DataCell; - ULONG NameSize, DataSize; - REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; - PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; - PKEY_VALUE_FULL_INFORMATION ValueFullInformation; - - PAGED_CODE(); - - DPRINT("KH 0x%p I %d KVIC %x KVI 0x%p L %d RL 0x%p\n", - KeyHandle, - Index, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *) &KeyObject, - NULL); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Index = Index; - EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; - EnumerateValueKeyInfo.Length = Length; - EnumerateValueKeyInfo.ResultLength = ResultLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, &EnumerateValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to KeyCell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - - /* Get Value block of interest */ - Status = CmiGetValueFromKeyByIndex(RegistryHive, - KeyCell, - Index, - &ValueCell); - - if (!NT_SUCCESS(Status)) - { - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - ObDereferenceObject(KeyObject); - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - return Status; - } - - if (ValueCell != NULL) - { - switch (KeyValueInformationClass) - { - case KeyValueBasicInformation: - NameSize = ValueCell->NameSize; - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - - *ResultLength = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]) + NameSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValueBasicInformation = (PKEY_VALUE_BASIC_INFORMATION) - KeyValueInformation; - ValueBasicInformation->TitleIndex = 0; - ValueBasicInformation->Type = ValueCell->DataType; - ValueBasicInformation->NameLength = NameSize; - - if (Length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]) < - NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - CmiCopyPackedName(ValueBasicInformation->Name, - ValueCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(ValueBasicInformation->Name, - ValueCell->Name, - NameSize); - } - } - break; - - case KeyValuePartialInformation: - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - *ResultLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + - DataSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValuePartialInformation = (PKEY_VALUE_PARTIAL_INFORMATION) - KeyValueInformation; - ValuePartialInformation->TitleIndex = 0; - ValuePartialInformation->Type = ValueCell->DataType; - ValuePartialInformation->DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - if (Length - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) < - DataSize) - { - DataSize = Length - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - RtlCopyMemory(ValuePartialInformation->Data, - DataCell, - DataSize); - } - else - { - RtlCopyMemory(ValuePartialInformation->Data, - &ValueCell->DataOffset, - DataSize); - } - } - break; - - case KeyValueFullInformation: - NameSize = ValueCell->NameSize; - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - *ResultLength = ROUND_UP(FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) + NameSize, sizeof(PVOID)) + DataSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValueFullInformation = (PKEY_VALUE_FULL_INFORMATION) - KeyValueInformation; - ValueFullInformation->TitleIndex = 0; - ValueFullInformation->Type = ValueCell->DataType; - ValueFullInformation->NameLength = NameSize; - ValueFullInformation->DataOffset = - (ULONG_PTR)ValueFullInformation->Name - - (ULONG_PTR)ValueFullInformation + - ValueFullInformation->NameLength; - ValueFullInformation->DataOffset = - ROUND_UP(ValueFullInformation->DataOffset, sizeof(PVOID)); - ValueFullInformation->DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - if (Length < ValueFullInformation->DataOffset) - { - NameSize = Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); - DataSize = 0; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - else if (Length - ValueFullInformation->DataOffset < DataSize) - { - DataSize = Length - ValueFullInformation->DataOffset; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - CmiCopyPackedName(ValueFullInformation->Name, - ValueCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(ValueFullInformation->Name, - ValueCell->Name, - NameSize); - } - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - RtlCopyMemory((PCHAR) ValueFullInformation - + ValueFullInformation->DataOffset, - DataCell, DataSize); - } - else - { - RtlCopyMemory((PCHAR) ValueFullInformation - + ValueFullInformation->DataOffset, - &ValueCell->DataOffset, DataSize); - } - } - break; - - default: - DPRINT1("Not handling 0x%x\n", KeyValueInformationClass); - break; - } - } - else - { - Status = STATUS_UNSUCCESSFUL; - } - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - ObDereferenceObject(KeyObject); - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - - return Status; -} - + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Index = Index; + EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; + EnumerateValueKeyInfo.Length = Length; + EnumerateValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, + &EnumerateValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateValueKey(KeyObject, + Index, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; +} NTSTATUS STDCALL NtFlushKey(IN HANDLE KeyHandle) 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 Mon May 14 10:40:40 2007 @@ -769,6 +769,28 @@ OUT PNTSTATUS Status ); +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueListFromCache( + IN PKEY_OBJECT KeyObject, + OUT PCELL_DATA *CellData, + OUT BOOLEAN *IndexIsCached, + OUT PHCELL_INDEX ValueListToRelease +); + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueKeyFromCache( + IN PKEY_OBJECT KeyObject, + IN PCELL_DATA CellData, + IN ULONG Index, + OUT PCM_CACHED_VALUE **CachedValue, + OUT PCM_KEY_VALUE *Value, + IN BOOLEAN IndexIsCached, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease +); + // // Registry Validation Functions // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 10:40:40 2007 @@ -519,3 +519,108 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmEnumerateValueKey(IN PKEY_OBJECT KeyObject, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + IN PULONG ResultLength) +{ + NTSTATUS Status; + PHHIVE Hive; + PCM_KEY_NODE Parent; + HCELL_INDEX CellToRelease = HCELL_NIL, CellToRelease2 = HCELL_NIL; + VALUE_SEARCH_RETURN_TYPE Result; + BOOLEAN IndexIsCached, ValueIsCached = FALSE; + PCELL_DATA CellData; + PCM_CACHED_VALUE *CachedValue; + PCM_KEY_VALUE ValueData; + PAGED_CODE(); + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive and parent */ + Hive = &KeyObject->RegistryHive->Hive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, KeyObject->KeyCellOffset); + if (!Parent) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Make sure the index is valid */ + //if (Index >= KeyObject->ValueCache.Count) + if (Index >= KeyObject->KeyCell->ValueList.Count) + { + /* Release the cell and fail */ + HvReleaseCell(Hive, KeyObject->KeyCellOffset); + Status = STATUS_NO_MORE_ENTRIES; + goto Quickie; + } + + /* Find the value list */ + Result = CmpGetValueListFromCache(KeyObject, + &CellData, + &IndexIsCached, + &CellToRelease); + if (Result != SearchSuccess) + { + /* Sanity check */ + ASSERT(CellData == NULL); + + /* Release the cell and fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Now get the key value */ + Result = CmpGetValueKeyFromCache(KeyObject, + CellData, + Index, + &CachedValue, + &ValueData, + IndexIsCached, + &ValueIsCached, + &CellToRelease2); + if (Result != SearchSuccess) + { + /* Sanity check */ + ASSERT(CellToRelease2 == HCELL_NIL); + + /* Release the cells and fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Query the information requested */ + Result = CmpQueryKeyValueData(KeyObject, + CachedValue, + ValueData, + ValueIsCached, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength, + &Status); + +Quickie: + /* If we have a cell to release, do so */ + if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); + + /* Release the parent cell */ + HvReleaseCell(Hive, KeyObject->KeyCellOffset); + + /* If we have a cell to release, do so */ + if (CellToRelease2 != HCELL_NIL) HvReleaseCell(Hive, CellToRelease2); + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +}

1 0

[arty] 26777: Subtle bug.
by arty＠svn.reactos.org 14 May '07

14 May '07

Author: arty Date: Mon May 14 10:29:19 2007 New Revision: 26777 URL: http://svn.reactos.org/svn/reactos?rev=26777&view=rev Log: Subtle bug. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon May 14 10:29:19 2007 @@ -570,7 +570,7 @@ ModuleData->ModStart = (ULONG)KernelMemory; /* Increase the next Load Base */ - NextModuleBase = ROUND_UP((ULONG)KernelMemory + ImageSize, PAGE_SIZE); + NextModuleBase = ROUND_UP((ULONG)MemLoadAddr + ImageSize, PAGE_SIZE); ModuleData->ModEnd = NextModuleBase; ModuleData->String = (ULONG)MmAllocateMemory(strlen(ImageName)+1); strcpy((PCHAR)ModuleData->String, ImageName); @@ -622,6 +622,8 @@ LPSTR NameBuffer; LPSTR TempName; + printf("Load module %s at %x\n", ModuleName, (ULONG)NextModuleBase - (ULONG)KernelMemory + KernelBase); + /* Get current module data structure and module name string array */ ModuleData = &reactos_modules[LoaderBlock.ModsCount];

1 0

[arty] 26776: Process all boot drivers as elf. This makes things much easier and more regular in kernel land.
by arty＠svn.reactos.org 14 May '07

14 May '07

Author: arty Date: Mon May 14 10:00:32 2007 New Revision: 26776 URL: http://svn.reactos.org/svn/reactos?rev=26776&view=rev Log: Process all boot drivers as elf. This makes things much easier and more regular in kernel land. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon May 14 10:00:32 2007 @@ -357,6 +357,12 @@ Elf32_Ehdr ehdr; Elf32_Shdr *shdr; + if(!KernelAddr) + KernelAddr = (ULONG)NextModuleBase - (ULONG)KernelMemory + KernelBase; + if(!MemLoadAddr) + MemLoadAddr = (PCHAR)NextModuleBase; + + ModuleData = &reactos_modules[LoaderBlock.ModsCount]; printf("Loading file (elf at %x)\n", KernelAddr); /* Load the first 1024 bytes of the kernel image so we can read the PE header */ @@ -438,6 +444,8 @@ printf("Section %d (NT Header) is elf section %d\n", i, SWAPD(Section->PointerToRawData)); + Section->PointerToRawData = SWAPD((Section->VirtualAddress - KernelAddr)); + if (shdr->sh_type != SHT_NOBITS) { /* Content area */ @@ -560,7 +568,6 @@ MmFreeMemory(sptr); - ModuleData = &reactos_modules[LoaderBlock.ModsCount]; ModuleData->ModStart = (ULONG)KernelMemory; /* Increase the next Load Base */ NextModuleBase = ROUND_UP((ULONG)KernelMemory + ImageSize, PAGE_SIZE); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h Mon May 14 10:00:32 2007 @@ -62,6 +62,7 @@ BOOLEAN NTAPI FrLdrMapKernel(FILE *KernelImage); ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName); ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); +BOOLEAN NTAPI FrLdrMapModule(FILE *ModuleImage, PCHAR ModuleName, PCHAR MemLoadAddr, ULONG KernelAddr); BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID NTAPI FrLdrStartup(ULONG Magic); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c Mon May 14 10:00:32 2007 @@ -308,6 +308,8 @@ CHAR value[256]; LPSTR p; + printf("Loading driver %s\n", szFileName); + /* Open the Driver */ FilePointer = FsOpenFile(szFileName); @@ -336,7 +338,7 @@ UiDrawStatusText(value); /* Load the driver */ - FrLdrLoadModule(FilePointer, szFileName, NULL); + FrLdrMapModule(FilePointer, szFileName, 0, 0); /* Update status and return */ UiDrawProgressBarCenter(nPos, 100, szLoadingMsg);

1 0

[ion] 26775: - Delete CmiGetPackedNameLength, CmiComparePackedNames, CmiCompareHash, CmiCompareHashI, CmiCompareKeyNames, CmiCompareKeyNamesI; dead code.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 09:43:27 2007 New Revision: 26775 URL: http://svn.reactos.org/svn/reactos?rev=26775&view=rev Log: - Delete CmiGetPackedNameLength, CmiComparePackedNames, CmiCompareHash, CmiCompareHashI, CmiCompareKeyNames, CmiCompareKeyNamesI; dead code. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26775… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 09:43:27 2007 @@ -210,15 +210,9 @@ PKEY_OBJECT* ReturnedObject); NTSTATUS -CmiCreateVolatileHive(PEREGISTRY_HIVE *RegistryHive); - -NTSTATUS CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes, PUNICODE_STRING FileName, ULONG Flags); - -NTSTATUS -CmiRemoveRegistryHive(PEREGISTRY_HIVE RegistryHive); NTSTATUS CmiFlushRegistryHive(PEREGISTRY_HIVE RegistryHive); @@ -335,16 +329,6 @@ NTSTATUS CmiInitHives(BOOLEAN SetupBoot); -ULONG -CmiGetPackedNameLength(IN PUNICODE_STRING Name, - OUT PBOOLEAN Packable); - -BOOLEAN -CmiComparePackedNames(IN PUNICODE_STRING Name, - IN PUCHAR NameBuffer, - IN USHORT NameBufferSize, - IN BOOLEAN NamePacked); - HCELL_INDEX NTAPI CmpFindValueByName( @@ -365,23 +349,6 @@ CmiCopyPackedName(PWCHAR NameBuffer, PUCHAR PackedNameBuffer, ULONG PackedNameSize); - -BOOLEAN -CmiCompareHash(PUNICODE_STRING KeyName, - PCHAR HashString); - -BOOLEAN -CmiCompareHashI(PUNICODE_STRING KeyName, - PCHAR HashString); - -BOOLEAN -CmiCompareKeyNames(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell); - -BOOLEAN -CmiCompareKeyNamesI(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell); - VOID CmiSyncHives(VOID); Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Mon May 14 09:43:27 2007 @@ -527,7 +527,6 @@ return(Status); } - NTSTATUS CmiRemoveSubKey(PEREGISTRY_HIVE RegistryHive, PKEY_OBJECT ParentKey, @@ -697,7 +696,6 @@ return Status; } - PCM_KEY_NODE CmiGetKeyFromHashByIndex(PEREGISTRY_HIVE RegistryHive, PHASH_TABLE_CELL HashBlock, @@ -711,7 +709,6 @@ return KeyCell; } - NTSTATUS CmiAddKeyToHashTable(PEREGISTRY_HIVE RegistryHive, @@ -735,7 +732,6 @@ return STATUS_SUCCESS; } - NTSTATUS CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, PHASH_TABLE_CELL HashBlock, @@ -758,67 +754,6 @@ return STATUS_UNSUCCESSFUL; } -ULONG -CmiGetPackedNameLength(IN PUNICODE_STRING Name, - OUT PBOOLEAN Packable) -{ - ULONG i; - - if (Packable != NULL) - *Packable = TRUE; - - for (i = 0; i < Name->Length / sizeof(WCHAR); i++) - { - if (Name->Buffer[i] & 0xFF00) - { - if (Packable != NULL) - *Packable = FALSE; - return Name->Length; - } - } - - return (Name->Length / sizeof(WCHAR)); -} - - -BOOLEAN -CmiComparePackedNames(IN PUNICODE_STRING Name, - IN PUCHAR NameBuffer, - IN USHORT NameBufferSize, - IN BOOLEAN NamePacked) -{ - PWCHAR UNameBuffer; - ULONG i; - - if (NamePacked == TRUE) - { - if (Name->Length != NameBufferSize * sizeof(WCHAR)) - return(FALSE); - - for (i = 0; i < Name->Length / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(Name->Buffer[i]) != RtlUpcaseUnicodeChar((WCHAR)NameBuffer[i])) - return(FALSE); - } - } - else - { - if (Name->Length != NameBufferSize) - return(FALSE); - - UNameBuffer = (PWCHAR)NameBuffer; - - for (i = 0; i < Name->Length / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(Name->Buffer[i]) != RtlUpcaseUnicodeChar(UNameBuffer[i])) - return(FALSE); - } - } - - return(TRUE); -} - - VOID CmiCopyPackedName(PWCHAR NameBuffer, PUCHAR PackedNameBuffer, @@ -830,113 +765,6 @@ NameBuffer[i] = (WCHAR)PackedNameBuffer[i]; } - -BOOLEAN -CmiCompareHash(PUNICODE_STRING KeyName, - PCHAR HashString) -{ - CHAR Buffer[4]; - - Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; - Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; - Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; - Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; - - return (strncmp(Buffer, HashString, 4) == 0); -} - - -BOOLEAN -CmiCompareHashI(PUNICODE_STRING KeyName, - PCHAR HashString) -{ - CHAR Buffer[4]; - - Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; - Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; - Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; - Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; - - return (_strnicmp(Buffer, HashString, 4) == 0); -} - - -BOOLEAN -CmiCompareKeyNames(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell) -{ - PWCHAR UnicodeName; - USHORT i; - - DPRINT("Flags: %hx\n", KeyCell->Flags); - - if (KeyCell->Flags & REG_KEY_NAME_PACKED) - { - if (KeyName->Length != KeyCell->NameSize * sizeof(WCHAR)) - return FALSE; - - for (i = 0; i < KeyCell->NameSize; i++) - { - if (KeyName->Buffer[i] != (WCHAR)KeyCell->Name[i]) - return FALSE; - } - } - else - { - if (KeyName->Length != KeyCell->NameSize) - return FALSE; - - UnicodeName = (PWCHAR)KeyCell->Name; - for (i = 0; i < KeyCell->NameSize / sizeof(WCHAR); i++) - { - if (KeyName->Buffer[i] != UnicodeName[i]) - return FALSE; - } - } - - return TRUE; -} - - -BOOLEAN -CmiCompareKeyNamesI(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell) -{ - PWCHAR UnicodeName; - USHORT i; - - DPRINT("Flags: %hx\n", KeyCell->Flags); - - if (KeyCell->Flags & REG_KEY_NAME_PACKED) - { - if (KeyName->Length != KeyCell->NameSize * sizeof(WCHAR)) - return FALSE; - - for (i = 0; i < KeyCell->NameSize; i++) - { - if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) != - RtlUpcaseUnicodeChar((WCHAR)KeyCell->Name[i])) - return FALSE; - } - } - else - { - if (KeyName->Length != KeyCell->NameSize) - return FALSE; - - UnicodeName = (PWCHAR)KeyCell->Name; - for (i = 0; i < KeyCell->NameSize / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) != - RtlUpcaseUnicodeChar(UnicodeName[i])) - return FALSE; - } - } - - return TRUE; -} - - NTSTATUS CmiSaveTempHive (PEREGISTRY_HIVE Hive, HANDLE FileHandle)

1 0

[ion] 26774: - Implement NtQueryValueKey as a simple wrapper around CmQueryValueKey (same idea as always). - Add cmvalche.c to deal with Value Caches. Cm implements these to quickly look up either the value list and/or the value index and/or the value data itself. The routines fallback on non-cached access, which is what we currently do, since we don't have value caches yet. - Implement CmQueryValueKey and CmpQueryKeyValueData based on previous code, but update to use value caches and new routin
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 09:36:25 2007 New Revision: 26774 URL: http://svn.reactos.org/svn/reactos?rev=26774&view=rev Log: - Implement NtQueryValueKey as a simple wrapper around CmQueryValueKey (same idea as always). - Add cmvalche.c to deal with Value Caches. Cm implements these to quickly look up either the value list and/or the value index and/or the value data itself. The routines fallback on non-cached access, which is what we currently do, since we don't have value caches yet. - Implement CmQueryValueKey and CmpQueryKeyValueData based on previous code, but update to use value caches and new routines. Added: trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26774… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 09:36:25 2007 @@ -48,6 +48,20 @@ #define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) #define IsNoSynchHive(Hive) ((Hive)->Flags & HIVE_NO_SYNCH) +// +// Cached Child List +// +typedef struct _CACHED_CHILD_LIST +{ + ULONG Count; + union + { + ULONG ValueList; + //struct _CM_KEY_CONTROL_BLOCK *RealKcb; + struct _KEY_OBJECT *RealKcb; + }; +} CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; + /* KEY_OBJECT.Flags */ /* When set, the key is scheduled for deletion, and all @@ -96,6 +110,8 @@ /* List entry for connected hives */ LIST_ENTRY HiveList; + + CACHED_CHILD_LIST ValueCache; } KEY_OBJECT, *PKEY_OBJECT; /* Bits 31-22 (top 10 bits) of the cell index is the directory index */ @@ -264,6 +280,15 @@ NTAPI CmDeleteValueKey(IN PKEY_OBJECT KeyControlBlock, IN UNICODE_STRING ValueName); + +NTSTATUS +NTAPI +CmQueryValueKey(IN PKEY_OBJECT KeyObject, + IN UNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + IN PULONG ResultLength); NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, 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 Mon May 14 09:36:25 2007 @@ -385,6 +385,8 @@ KeyObject->KeyCell->Parent = KeyObject->ParentKey->KeyCellOffset; KeyObject->KeyCell->SecurityKeyOffset = KeyObject->ParentKey->KeyCell->SecurityKeyOffset; + KeyObject->ValueCache.ValueList = KeyObject->KeyCell->ValueList.List; + KeyObject->ValueCache.Count = KeyObject->KeyCell->ValueList.Count; DPRINT("RemainingPath: %wZ\n", &RemainingPath); @@ -1536,267 +1538,57 @@ return(Status); } - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtQueryValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - ULONG NameSize, DataSize; - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - PCM_KEY_NODE KeyCell; - PCM_KEY_VALUE ValueCell; - PVOID DataCell; - PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; - PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; - PKEY_VALUE_FULL_INFORMATION ValueFullInformation; - REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - - PAGED_CODE(); - - DPRINT("NtQueryValueKey(KeyHandle 0x%p ValueName %S Length %x)\n", - KeyHandle, ValueName->Buffer, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByHandle() failed with status %x %p\n", Status, KeyHandle); - return Status; - } - - PostOperationInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.ValueName = ValueName; - QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - QueryValueKeyInfo.Length = Length; - QueryValueKeyInfo.ResultLength = ResultLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to KeyCell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - - /* Get value cell by name */ - Status = CmiScanKeyForValue(RegistryHive, - KeyCell, - ValueName, - &ValueCell, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiScanKeyForValue() failed with status %x\n", Status); - goto ByeBye; - } - - Status = STATUS_SUCCESS; - switch (KeyValueInformationClass) - { - case KeyValueBasicInformation: - NameSize = ValueCell->NameSize; - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - - *ResultLength = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]) + - NameSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValueBasicInformation = (PKEY_VALUE_BASIC_INFORMATION) - KeyValueInformation; - ValueBasicInformation->TitleIndex = 0; - ValueBasicInformation->Type = ValueCell->DataType; - ValueBasicInformation->NameLength = NameSize; - - if (Length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]) < - NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - CmiCopyPackedName(ValueBasicInformation->Name, - ValueCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(ValueBasicInformation->Name, - ValueCell->Name, - NameSize); - } - } - break; - - case KeyValuePartialInformation: - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - *ResultLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + - DataSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValuePartialInformation = (PKEY_VALUE_PARTIAL_INFORMATION) - KeyValueInformation; - ValuePartialInformation->TitleIndex = 0; - ValuePartialInformation->Type = ValueCell->DataType; - ValuePartialInformation->DataLength = DataSize; - - if (Length - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) < - DataSize) - { - DataSize = Length - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - RtlCopyMemory(ValuePartialInformation->Data, - DataCell, - DataSize); - } - else - { - RtlCopyMemory(ValuePartialInformation->Data, - &ValueCell->DataOffset, - DataSize); - } - } - break; - - case KeyValueFullInformation: - NameSize = ValueCell->NameSize; - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - *ResultLength = ROUND_UP(FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) + NameSize, sizeof(PVOID)) + DataSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValueFullInformation = (PKEY_VALUE_FULL_INFORMATION) - KeyValueInformation; - ValueFullInformation->TitleIndex = 0; - ValueFullInformation->Type = ValueCell->DataType; - ValueFullInformation->NameLength = NameSize; - ValueFullInformation->DataOffset = - (ULONG_PTR)ValueFullInformation->Name - - (ULONG_PTR)ValueFullInformation + - ValueFullInformation->NameLength; - ValueFullInformation->DataOffset = - ROUND_UP(ValueFullInformation->DataOffset, sizeof(PVOID)); - ValueFullInformation->DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - if (Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) < - NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); - DataSize = 0; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - else if (ROUND_UP(Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) - NameSize, sizeof(PVOID)) < DataSize) - { - DataSize = ROUND_UP(Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) - NameSize, sizeof(PVOID)); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - CmiCopyPackedName(ValueFullInformation->Name, - ValueCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(ValueFullInformation->Name, - ValueCell->Name, - NameSize); - } - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - RtlCopyMemory((PCHAR) ValueFullInformation - + ValueFullInformation->DataOffset, - DataCell, - DataSize); - } - else - { - RtlCopyMemory((PCHAR) ValueFullInformation - + ValueFullInformation->DataOffset, - &ValueCell->DataOffset, - DataSize); - } - } - break; - - default: - DPRINT1("Not handling 0x%x\n", KeyValueInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - -ByeBye:; - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - - return Status; + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.ValueName = ValueName; + QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + QueryValueKeyInfo.Length = Length; + QueryValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryValueKey(KeyObject, + *ValueName, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; } NTSTATUS 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 Mon May 14 09:36:25 2007 @@ -158,6 +158,11 @@ #define CMP_LOCK_HASHES_FOR_KCB 0x2 // +// Maximum size of Value Cache +// +#define MAXIMUM_CACHED_DATA 2 * PAGE_SIZE + +// // Number of items that can fit inside an Allocation Page // #define CM_KCBS_PER_PAGE \ @@ -166,6 +171,16 @@ PAGE_SIZE / sizeof(CM_DELAYED_CLOSE_ENTRY) #ifndef __INCLUDE_CM_H + +// +// Value Search Results +// +typedef enum _VALUE_SEARCH_RETURN_TYPE +{ + SearchSuccess, + SearchNeedExclusiveLock, + SearchFail +} VALUE_SEARCH_RETURN_TYPE; // // Key Hash @@ -238,7 +253,8 @@ union { ULONG ValueList; - struct _CM_KEY_CONTROL_BLOCK *RealKcb; + //struct _CM_KEY_CONTROL_BLOCK *RealKcb; + struct _KEY_OBJECT *RealKcb; }; } CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; @@ -595,6 +611,7 @@ { USHORT DataCacheType; USHORT ValueKeySize; + ULONG HashKey; CM_KEY_VALUE KeyValue; } CM_CACHED_VALUE, *PCM_CACHED_VALUE; @@ -643,6 +660,20 @@ PULONG BufferLength; PULONG Type; } CM_SYSTEM_CONTROL_VECTOR, *PCM_SYSTEM_CONTROL_VECTOR; + +// +// Structure for CmpQueryValueDataFromCache +// +typedef struct _KEY_VALUE_INFORMATION +{ + union + { + KEY_VALUE_BASIC_INFORMATION KeyValueBasicInformation; + KEY_VALUE_FULL_INFORMATION KeyValueFullInformation; + KEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInformation; + KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 KeyValuePartialInformationAlign64; + }; +} KEY_VALUE_INFORMATION, *PKEY_VALUE_INFORMATION; /////////////////////////////////////////////////////////////////////////////// // @@ -679,6 +710,7 @@ struct _KEY_OBJECT **SubKeys; ULONG TimeStamp; LIST_ENTRY HiveList; + CACHED_CHILD_LIST ValueCache; } KEY_OBJECT, *PKEY_OBJECT; extern PEREGISTRY_HIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; @@ -706,6 +738,35 @@ NTAPI CmpInitSecurityCache( IN PCMHIVE Hive +); + +// +// Value Cache Functions +// +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpFindValueByNameFromCache( + IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING Name, + OUT PCM_CACHED_VALUE **CachedValue, + OUT ULONG *Index, + OUT PCM_KEY_VALUE *Value, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease +); + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpQueryKeyValueData( + IN PKEY_OBJECT KeyObject, + IN PCM_CACHED_VALUE *CachedValue, + IN PCM_KEY_VALUE ValueKey, + IN BOOLEAN ValueIsCached, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength, + OUT PNTSTATUS Status ); // @@ -955,6 +1016,22 @@ USHORT NTAPI +CmpCompressedNameSize( + IN PWCHAR Name, + IN ULONG Length +); + +VOID +NTAPI +CmpCopyCompressedName( + IN PWCHAR Destination, + IN ULONG DestinationLength, + IN PWCHAR Source, + IN ULONG SourceLength +); + +USHORT +NTAPI CmpCopyName( IN PHHIVE Hive, IN PWCHAR Destination, @@ -1000,6 +1077,14 @@ IN PHHIVE Hive, IN PCM_KEY_NODE Parent, IN PUNICODE_STRING SearchName +); + +ULONG +NTAPI +CmpComputeHashKey( + IN ULONG Hash, + IN PUNICODE_STRING Name, + IN BOOLEAN AllowSeparators ); // @@ -1070,6 +1155,17 @@ IN PHHIVE Hive, IN ULONG Index, IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpGetValueData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + IN PULONG Length, + OUT PVOID *Buffer, + OUT PBOOLEAN BufferAllocated, + OUT PHCELL_INDEX CellToRelease ); // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 09:36:25 2007 @@ -433,7 +433,7 @@ Parent->MaxValueDataLen = 0; } - /* Change default status to success */ + /* Change default Status to success */ Status = STATUS_SUCCESS; } @@ -454,3 +454,68 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmQueryValueKey(IN PKEY_OBJECT KeyObject, + IN UNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + IN PULONG ResultLength) +{ + NTSTATUS Status; + PCM_KEY_VALUE ValueData; + ULONG Index; + BOOLEAN ValueCached = FALSE; + PCM_CACHED_VALUE *CachedValue; + HCELL_INDEX CellToRelease; + VALUE_SEARCH_RETURN_TYPE Result; + PHHIVE Hive; + PAGED_CODE(); + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Find the key value */ + Result = CmpFindValueByNameFromCache(KeyObject, + &ValueName, + &CachedValue, + &Index, + &ValueData, + &ValueCached, + &CellToRelease); + if (Result == SearchSuccess) + { + /* Sanity check */ + ASSERT(ValueData != NULL); + + /* Query the information requested */ + Result = CmpQueryKeyValueData(KeyObject, + CachedValue, + ValueData, + ValueCached, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength, + &Status); + } + else + { + /* Failed to find the value */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* If we have a cell to release, do so */ + if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Mon May 14 09:36:25 2007 @@ -52,6 +52,24 @@ return Source->Length / sizeof(WCHAR); } +VOID +NTAPI +CmpCopyCompressedName(IN PWCHAR Destination, + IN ULONG DestinationLength, + IN PWCHAR Source, + IN ULONG SourceLength) +{ + ULONG i, Length; + + /* Get the actual length to copy */ + Length = min(DestinationLength / sizeof(WCHAR), SourceLength); + for (i = 0; i < Length; i++) + { + /* Copy each character */ + Destination[i] = (WCHAR)((PCHAR)Source)[i]; + } +} + USHORT NTAPI CmpNameSize(IN PHHIVE Hive, @@ -71,6 +89,20 @@ /* Compressed name, return length */ return Name->Length / sizeof(WCHAR); +} + +USHORT +NTAPI +CmpCompressedNameSize(IN PWCHAR Name, + IN ULONG Length) +{ + /* + * Don't remove this: compressed names are "opaque" and just because + * the current implementation turns them into ansi-names doesn't mean + * that it will remain that way forever, so -never- assume this code + * below internally! + */ + return Length * sizeof(WCHAR); } LONG Added: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (added) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Mon May 14 09:36:25 2007 @@ -1,0 +1,643 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmvalche.c + * PURPOSE: Configuration Manager - Value Cell Cache + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +FORCEINLINE +BOOLEAN +CmpIsValueCached(IN HCELL_INDEX CellIndex) +{ + /* Make sure that the cell is valid in the first place */ + if (CellIndex == HCELL_NIL) return FALSE; + + /*Is this cell actually a pointer to the cached value data? */ + if (CellIndex & 1) return TRUE; + + /* This is a regular cell */ + return FALSE; +} + +FORCEINLINE +VOID +CmpSetValueCached(IN PHCELL_INDEX CellIndex) +{ + /* Set the cached bit */ + *CellIndex |= 1; +} + +#define ASSERT_VALUE_CACHE() \ + ASSERTMSG("Cached Values Not Yet Supported!", FALSE); + +/* FUNCTIONS *****************************************************************/ + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueListFromCache(IN PKEY_OBJECT KeyObject, + OUT PCELL_DATA *CellData, + OUT BOOLEAN *IndexIsCached, + OUT PHCELL_INDEX ValueListToRelease) +{ + PHHIVE Hive; + PCACHED_CHILD_LIST ChildList; + HCELL_INDEX CellToRelease; + + /* Set defaults */ + *ValueListToRelease = HCELL_NIL; + *IndexIsCached = FALSE; + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Get the child value cache */ + //ChildList = &KeyObject->ValueCache; + ChildList = (PCACHED_CHILD_LIST)&KeyObject->KeyCell->ValueList; + + /* Check if the value is cached */ + if (CmpIsValueCached(ChildList->ValueList)) + { + /* It is: we don't expect this yet! */ + ASSERT_VALUE_CACHE(); + *IndexIsCached = TRUE; + *CellData = NULL; + } + else + { + /* Select the value list as our cell, and get the actual list array */ + CellToRelease = ChildList->ValueList; + *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); + if (!(*CellData)) return SearchFail; + + /* Return the cell to be released */ + *ValueListToRelease = CellToRelease; + } + + /* If we got here, then the value list was found */ + return SearchSuccess; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueKeyFromCache(IN PKEY_OBJECT KeyObject, + IN PCELL_DATA CellData, + IN ULONG Index, + OUT PCM_CACHED_VALUE **CachedValue, + OUT PCM_KEY_VALUE *Value, + IN BOOLEAN IndexIsCached, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease) +{ + PHHIVE Hive; + PCM_KEY_VALUE KeyValue; + HCELL_INDEX Cell; + + /* Set defaults */ + *CellToRelease = HCELL_NIL; + *Value = NULL; + *ValueIsCached = FALSE; + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Check if the index was cached */ + if (IndexIsCached) + { + /* Not expected yet! */ + ASSERT_VALUE_CACHE(); + *ValueIsCached = TRUE; + } + else + { + /* Get the cell index and the key value associated to it */ + Cell = CellData->u.KeyList[Index]; + KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, Cell); + if (!KeyValue) return SearchFail; + + /* Return the cell and the actual key value */ + *CellToRelease = Cell; + *Value = KeyValue; + } + + /* If we got here, then we found the key value */ + return SearchSuccess; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueDataFromCache(IN PKEY_OBJECT KeyObject, + IN PCM_CACHED_VALUE *CachedValue, + IN PCELL_DATA ValueKey, + IN BOOLEAN ValueIsCached, + OUT PVOID *DataPointer, + OUT PBOOLEAN Allocated, + OUT PHCELL_INDEX CellToRelease) +{ + PHHIVE Hive; + ULONG Length; + + /* Sanity checks */ + ASSERT(MAXIMUM_CACHED_DATA < CM_KEY_VALUE_BIG); + ASSERT((ValueKey->u.KeyValue.DataLength & CM_KEY_VALUE_SPECIAL_SIZE) == 0); + + /* Set defaults */ + *DataPointer = NULL; + *Allocated = FALSE; + *CellToRelease = HCELL_NIL; + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Check it the value is cached */ + if (ValueIsCached) + { + /* This isn't expected! */ + ASSERT_VALUE_CACHE(); + } + else + { + /* It's not, get the value data using the typical routine */ + if (!CmpGetValueData(Hive, + &ValueKey->u.KeyValue, + &Length, + DataPointer, + Allocated, + CellToRelease)) + { + /* Nothing found: make sure no data was allocated */ + ASSERT(*Allocated == FALSE); + ASSERT(*DataPointer == NULL); + return SearchFail; + } + } + + /* We found the actual data, return success */ + return SearchSuccess; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpFindValueByNameFromCache(IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING Name, + OUT PCM_CACHED_VALUE **CachedValue, + OUT ULONG *Index, + OUT PCM_KEY_VALUE *Value, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease) +{ + PHHIVE Hive; + VALUE_SEARCH_RETURN_TYPE SearchResult = SearchFail; + LONG Result; + UNICODE_STRING SearchName; + PCELL_DATA CellData; + PCACHED_CHILD_LIST ChildList; + PCM_KEY_VALUE KeyValue; + BOOLEAN IndexIsCached; + ULONG i = 0; + HCELL_INDEX Cell = HCELL_NIL; + + /* Set defaults */ + *CellToRelease = HCELL_NIL; + *Value = NULL; + + /* Get the hive and child list */ + Hive = &KeyObject->RegistryHive->Hive; + //ChildList = &KeyObject->ValueCache; + ChildList = (PCACHED_CHILD_LIST)&KeyObject->KeyCell->ValueList; + + /* Check if the child list has any entries */ + if (ChildList->Count != 0) + { + /* Get the value list associated to this child list */ + SearchResult = CmpGetValueListFromCache(KeyObject, + &CellData, + &IndexIsCached, + &Cell); + if (SearchResult != SearchSuccess) return SearchResult; + + /* The index shouldn't be cached right now */ + if (IndexIsCached) ASSERT_VALUE_CACHE(); + + /* Loop every value */ + while (TRUE) + { + /* Check if there's any cell to release */ + if (*CellToRelease != HCELL_NIL) + { + /* Release it now */ + HvReleaseCell(Hive, *CellToRelease); + *CellToRelease = HCELL_NIL; + } + + /* Get the key value for this index */ + SearchResult = CmpGetValueKeyFromCache(KeyObject, + CellData, + i, + CachedValue, + Value, + IndexIsCached, + ValueIsCached, + CellToRelease); + if (SearchResult != SearchSuccess) return SearchResult; + + /* Check if the both the index and the value are cached */ + if ((IndexIsCached) && (*ValueIsCached)) + { + /* We don't expect this yet */ + ASSERT_VALUE_CACHE(); + Result = -1; + } + else + { + /* No cache, so try to compare the name. Is it compressed? */ + KeyValue = *Value; + if (KeyValue->Flags & VALUE_COMP_NAME) + { + /* It is, do a compressed name comparison */ + Result = CmpCompareCompressedName(Name, + KeyValue->Name, + KeyValue->NameLength); + } + else + { + /* It's not compressed, so do a standard comparison */ + SearchName.Length = KeyValue->NameLength; + SearchName.MaximumLength = SearchName.Length; + SearchName.Buffer = KeyValue->Name; + Result = RtlCompareUnicodeString(Name, &SearchName, TRUE); + } + } + + /* Check if we found the value data */ + if (!Result) + { + /* We have, return the index of the value and success */ + *Index = i; + SearchResult = SearchSuccess; + goto Quickie; + } + + /* We didn't find it, try the next entry */ + if (++i == ChildList->Count) + { + /* The entire list was parsed, fail */ + *Value = NULL; + SearchResult = SearchFail; + goto Quickie; + } + } + } + + /* We should only get here if the child list is empty */ + ASSERT(ChildList->Count == 0); + +Quickie: + /* Release the value list cell if required, and return search result */ + if (Cell != HCELL_NIL) HvReleaseCell(Hive, Cell); + return SearchResult; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpQueryKeyValueData(IN PKEY_OBJECT KeyObject, + IN PCM_CACHED_VALUE *CachedValue, + IN PCM_KEY_VALUE ValueKey, + IN BOOLEAN ValueIsCached, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength, + OUT PNTSTATUS Status) +{ + PHHIVE Hive; + PKEY_VALUE_INFORMATION Info = (PKEY_VALUE_INFORMATION)KeyValueInformation; + PCELL_DATA CellData; + USHORT NameSize; + ULONG Size, MinimumSize, SizeLeft, KeySize, AlignedData = 0, DataOffset; + PVOID Buffer; + BOOLEAN IsSmall, BufferAllocated = FALSE; + HCELL_INDEX CellToRelease = HCELL_NIL; + VALUE_SEARCH_RETURN_TYPE Result = SearchSuccess; + + /* Get the hive and cell data */ + Hive = &KeyObject->RegistryHive->Hive; + CellData = (PCELL_DATA)ValueKey; + + /* Check if the value is compressed */ + if (CellData->u.KeyValue.Flags & VALUE_COMP_NAME) + { + /* Get the compressed name size */ + NameSize = CmpCompressedNameSize(CellData->u.KeyValue.Name, + CellData->u.KeyValue.NameLength); + } + else + { + /* Get the real size */ + NameSize = CellData->u.KeyValue.NameLength; + } + + /* Check what kind of information the caller is requesting */ + switch (KeyValueInformationClass) + { + /* Basic information */ + case KeyValueBasicInformation: + + /* This is how much size we'll need */ + Size = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name) + NameSize; + + /* This is the minimum we can work with */ + MinimumSize = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name); + + /* Return the size we'd like, and assume success */ + *ResultLength = Size; + *Status = STATUS_SUCCESS; + + /* Check if the caller gave us below our minimum */ + if (Length < MinimumSize) + { + /* Then we must fail */ + *Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill out the basic information */ + Info->KeyValueBasicInformation.TitleIndex = 0; + Info->KeyValueBasicInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValueBasicInformation.NameLength = NameSize; + + /* Now only the name is left */ + SizeLeft = Length - MinimumSize; + Size = NameSize; + + /* Check if the remaining buffer is too small for the name */ + if (SizeLeft < Size) + { + /* Copy only as much as can fit, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Check if this is a compressed name */ + if (CellData->u.KeyValue.Flags & VALUE_COMP_NAME) + { + /* Copy as much as we can of the compressed name */ + CmpCopyCompressedName(Info->KeyValueBasicInformation.Name, + Size, + CellData->u.KeyValue.Name, + CellData->u.KeyValue.NameLength); + } + else + { + /* Copy as much as we can of the raw name */ + RtlCopyMemory(Info->KeyValueBasicInformation.Name, + CellData->u.KeyValue.Name, + Size); + } + + /* We're all done */ + break; + + /* Full key information */ + case KeyValueFullInformation: + + /* Check if this is a small key and compute key size */ + IsSmall = CmpIsKeyValueSmall(&KeySize, + CellData->u.KeyValue.DataLength); + + /* Calculate the total size required */ + Size = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name) + + NameSize + + KeySize; + + /* And this is the least we can work with */ + MinimumSize = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name); + + /* Check if there's any key data */ + if (KeySize > 0) + { + /* Calculate the data offset */ + DataOffset = Size - KeySize; + + /* Align the offset to 4 bytes */ + AlignedData = ALIGN_UP(DataOffset, ULONG); + + /* If alignment was required, we'll need more space */ + if (AlignedData > DataOffset) Size += (AlignedData-DataOffset); + } + + /* Tell the caller the size we'll finally need, and set success */ + *ResultLength = Size; + *Status = STATUS_SUCCESS; + + /* Check if the caller is giving us too little */ + if (Length < MinimumSize) + { + /* Then fail right now */ + *Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill out the basic information */ + Info->KeyValueFullInformation.TitleIndex = 0; + Info->KeyValueFullInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValueFullInformation.DataLength = KeySize; + Info->KeyValueFullInformation.NameLength = NameSize; + + /* Only the name is left now */ + SizeLeft = Length - MinimumSize; + Size = NameSize; + + /* Check if the name fits */ + if (SizeLeft < Size) + { + /* It doesn't, truncate what we'll copy, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Check if this key value is compressed */ + if (CellData->u.KeyValue.Flags & VALUE_COMP_NAME) + { + /* It is, copy the compressed name */ + CmpCopyCompressedName(Info->KeyValueFullInformation.Name, + Size, + CellData->u.KeyValue.Name, + CellData->u.KeyValue.NameLength); + } + else + { + /* It's not, copy the raw name */ + RtlCopyMemory(Info->KeyValueFullInformation.Name, + CellData->u.KeyValue.Name, + Size); + } + + /* Now check if the key had any data */ + if (KeySize > 0) + { + /* Was it a small key? */ + if (IsSmall) + { + /* Then the data is directly into the cell */ + Buffer = &CellData->u.KeyValue.Data; + } + else + { + /* Otherwise, we must retrieve it from the value cache */ + Result = CmpGetValueDataFromCache(KeyObject, + CachedValue, + CellData, + ValueIsCached, + &Buffer, + &BufferAllocated, + &CellToRelease); + if (Result != SearchSuccess) + { + /* We failed, nothing should be allocated */ + ASSERT(Buffer == NULL); + ASSERT(BufferAllocated == FALSE); + *Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* Now that we know we truly have data, set its offset */ + Info->KeyValueFullInformation.DataOffset = AlignedData; + + /* Only the data remains to be copied */ + SizeLeft = max(0, Length - AlignedData); + Size = KeySize; + + /* Check if the caller has no space for it */ + if (SizeLeft < Size) + { + /* Truncate what we'll copy, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Sanity check */ + ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + + /* Make sure we have a valid buffer */ + if (Buffer) + { + /* Copy the data into the aligned offset */ + RtlCopyMemory((PVOID)((ULONG_PTR)Info + AlignedData), + Buffer, + Size); + } + } + else + { + /* We don't have any data, set the offset to -1, not 0! */ + Info->KeyValueFullInformation.DataOffset = 0xFFFFFFFF; + } + + /* We're done! */ + break; + + /* Partial information requested (no name or alignment!) */ + case KeyValuePartialInformation: + + /* Check if this is a small key and compute key size */ + IsSmall = CmpIsKeyValueSmall(&KeySize, + CellData->u.KeyValue.DataLength); + + /* Calculate the total size required */ + Size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + KeySize; + + /* And this is the least we can work with */ + MinimumSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Tell the caller the size we'll finally need, and set success */ + *ResultLength = Size; + *Status = STATUS_SUCCESS; + + /* Check if the caller is giving us too little */ + if (Length < MinimumSize) + { + /* Then fail right now */ + *Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill out the basic information */ + Info->KeyValuePartialInformation.TitleIndex = 0; + Info->KeyValuePartialInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValuePartialInformation.DataLength = KeySize; + + /* Now check if the key had any data */ + if (KeySize > 0) + { + /* Was it a small key? */ + if (IsSmall) + { + /* Then the data is directly into the cell */ + Buffer = &CellData->u.KeyValue.Data; + } + else + { + /* Otherwise, we must retrieve it from the value cache */ + Result = CmpGetValueDataFromCache(KeyObject, + CachedValue, + CellData, + ValueIsCached, + &Buffer, + &BufferAllocated, + &CellToRelease); + if (Result != SearchSuccess) + { + /* We failed, nothing should be allocated */ + ASSERT(Buffer == NULL); + ASSERT(BufferAllocated == FALSE); + *Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* Only the data remains to be copied */ + SizeLeft = Length - MinimumSize; + Size = KeySize; + + /* Check if the caller has no space for it */ + if (SizeLeft < Size) + { + /* Truncate what we'll copy, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Sanity check */ + ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + + /* Make sure we have a valid buffer */ + if (Buffer) + { + /* Copy the data into the aligned offset */ + RtlCopyMemory(Info->KeyValuePartialInformation.Data, + Buffer, + Size); + } + } + + /* We're done! */ + break; + + /* Other information class */ + default: + + /* We got some class that we don't support */ + *Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Return the search result as well */ + return Result; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon May 14 09:36:25 2007 @@ -106,6 +106,7 @@ <file>cmsecach.c</file> <file>cmsysini.c</file> <file>cmvalue.c</file> + <file>cmvalche.c</file> <file>cmwraprs.c</file> </directory> <directory name="cm">

1 0

[jimtabor] 26773: Implement FLOATOBJ_GetFloat and Long, SetFloat and Long, and Neg.
by jimtabor＠svn.reactos.org 14 May '07

14 May '07

Author: jimtabor Date: Mon May 14 07:55:28 2007 New Revision: 26773 URL: http://svn.reactos.org/svn/reactos?rev=26773&view=rev Log: Implement FLOATOBJ_GetFloat and Long, SetFloat and Long, and Neg. Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Mon May 14 07:55:28 2007 @@ -26,10 +26,33 @@ * REVISION HISTORY: */ +/* INCLUDES *****************************************************************/ + #include <w32k.h> #define NDEBUG #include <debug.h> + +/* DEFINES *****************************************************************/ + +#ifdef __GNUC__ +#define FLOAT_TO_INT(in,out) \ + __asm__ __volatile__ ("fistpl %0" : "=m" (out) : "t" (in) : "st"); +#else +#define FLOAT_TO_INT(in,out) \ + __asm fld in \ + __asm fistp out +#endif + +/* the following deal with IEEE single-precision numbers */ +#define EXCESS 126L +#define SIGNBIT 0x80000000L +#define SIGN(fp) ((fp) & SIGNBIT) +#define EXP(fp) (((fp) >> 23L) & 0xFF) +#define MANT(fp) ((fp) & 0x7FFFFFL) +#define PACK(s,e,m) ((s) | ((e) << 23L) | (m)) + +/* FUNCTIONS *****************************************************************/ BOOL STDCALL @@ -75,6 +98,59 @@ } VOID +FASTCALL +EF_Negate(EFLOAT_S * efp) +{ +// Do it this way since ReactOS uses real FP. + if (SIGN(efp->lMant)) efp->lMant = efp->lMant & ~SIGNBIT; + else efp->lMant = efp->lMant | SIGNBIT; +} + +LONG +FASTCALL +EFtoF( EFLOAT_S * efp) +{ + long Mant, Exp, Sign = 0; + + if (!efp->lMant) return 0; + + Mant = efp->lMant; + Exp = efp->lExp; + Sign = SIGN(Mant); + +//// M$ storage emulation + Mant = ((Mant & 0x3fffffff)>>7); + Exp += (1 - EXCESS); +//// + Mant = MANT(Mant); + return PACK(Sign, Exp, Mant); +} + +VOID +FASTCALL +FtoEF( EFLOAT_S * efp, FLOATL f) +{ + long Mant, Exp; + gxf_long worker; + +#ifdef _X86_ + worker.l = f; // It's a float stored in a long. +#else + worker.f = f; +#endif + + Exp = EXP(worker.l); + Mant = MANT(worker.l); + +//// M$ storage emulation + Mant = ((Mant << 7) | 0x40000000 | SIGN(worker.l)); + Exp -= (1 - EXCESS); +//// + efp->lMant = Mant; + efp->lExp = Exp; +} + +VOID STDCALL FLOATOBJ_Add ( IN OUT PFLOATOBJ pf, @@ -169,8 +245,8 @@ FLOATOBJ_GetFloat ( IN PFLOATOBJ pf ) { // www.osr.com/ddk/graphics/gdifncs_4d5z.htm - UNIMPLEMENTED; - return 0; + EFLOAT_S * efp = (EFLOAT_S *)pf; + return EFtoF(efp); } LONG @@ -178,8 +254,14 @@ FLOATOBJ_GetLong ( IN PFLOATOBJ pf ) { // www.osr.com/ddk/graphics/gdifncs_0tgn.htm - UNIMPLEMENTED; - return 0; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + long l; + + f.l = EFtoF( efp ); + FLOAT_TO_INT(f.f, l); // Let FPP handle it the fasty haxy way. + + return l; } BOOL @@ -268,7 +350,8 @@ FLOATOBJ_Neg ( IN OUT PFLOATOBJ pf ) { // www.osr.com/ddk/graphics/gdifncs_14pz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EF_Negate(efp); } VOID @@ -279,7 +362,8 @@ ) { // www.osr.com/ddk/graphics/gdifncs_1prb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + FtoEF( efp, f); } VOID @@ -290,7 +374,14 @@ ) { // www.osr.com/ddk/graphics/gdifncs_0gpz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.f = (float) l; // Convert it now. +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID

1 0

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