Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[hpoussin] 26786: One more fix for release build

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue May 15 01:09:52 2007 New Revision: 26786 URL: http://svn.reactos.org/svn/reactos?rev=26786&view=rev Log: One more fix for release build Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Tue May 15 01:09:52 2007 @@ -22,9 +22,9 @@ #define NDEBUG #include <debug.h> -#ifdef DBG ULONG AllocationCount = 0; +#ifdef DBG VOID VerifyHeap(VOID); VOID DumpMemoryAllocMap(VOID); VOID IncrementAllocationCount(VOID);

17 years, 5 months

[hpoussin] 26785: Try to fix release build

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue May 15 00:28:26 2007 New Revision: 26785 URL: http://svn.reactos.org/svn/reactos?rev=26785&view=rev Log: Try to fix release build 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:28:26 2007 @@ -76,8 +76,10 @@ #else + inline VOID DebugPrint(ULONG Mask, char *format, ...) {} + #define DebugInit() - #define DbgPrint(_x_) { if (0) printf _x_; } + #define DbgPrint(_x_) { if (0) DebugPrint _x_; } #define DPRINT1(_x_) { if (0) printf _x_; } #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)

17 years, 5 months

[ion] 26784: - Re-organize regobj.c so that new APIs are at the bottom. - Make NtDeleteKey delete the key in-line instead of waiting for the Ob callback.

by ion＠svn.reactos.org

Author: ion Date: Tue May 15 00:24:12 2007 New Revision: 26784 URL: http://svn.reactos.org/svn/reactos?rev=26784&view=rev Log: - Re-organize regobj.c so that new APIs are at the bottom. - Make NtDeleteKey delete the key in-line instead of waiting for the Ob callback. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Tue May 15 00:24:12 2007 @@ -489,9 +489,28 @@ } else { - /* Set the marked for delete bit in the key object */ - KeyObject->Flags |= KO_MARKED_FOR_DELETE; - Status = STATUS_SUCCESS; + PKEY_OBJECT ParentKeyObject = KeyObject->ParentKey; + + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + DPRINT1("Key not found in parent list ???\n"); + } + + CmiRemoveSubKey(KeyObject->RegistryHive, + ParentKeyObject, + KeyObject); + + KeQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); + HvMarkCellDirty(&ParentKeyObject->RegistryHive->Hive, + ParentKeyObject->KeyCellOffset); + + if (!IsNoFileHive (KeyObject->RegistryHive) || + !IsNoFileHive (ParentKeyObject->RegistryHive)) + { + CmiSyncHives (); + } + + Status = STATUS_SUCCESS; } /* Release hive lock */ @@ -521,6 +540,274 @@ * CmpDeleteKeyObject() (in regobj.c) after all key-related structures * have been released. */ + + return Status; +} + +NTSTATUS STDCALL +NtFlushKey(IN HANDLE KeyHandle) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + PEREGISTRY_HIVE RegistryHive; + KPROCESSOR_MODE PreviousMode; + + PAGED_CODE(); + + DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); + + PreviousMode = ExGetPreviousMode(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + 0, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + VERIFY_KEY_OBJECT(KeyObject); + + RegistryHive = KeyObject->RegistryHive; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + if (IsNoFileHive(RegistryHive)) + { + Status = STATUS_SUCCESS; + } + else + { + /* Flush non-volatile hive */ + Status = CmiFlushRegistryHive(RegistryHive); + } + + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + + ObDereferenceObject(KeyObject); + + return STATUS_SUCCESS; +} + + +NTSTATUS STDCALL +NtOpenKey(OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + UNICODE_STRING RemainingPath; + KPROCESSOR_MODE PreviousMode; + PVOID Object = NULL; + HANDLE hKey = NULL; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + REG_PRE_OPEN_KEY_INFORMATION PreOpenKeyInfo; + REG_POST_OPEN_KEY_INFORMATION PostOpenKeyInfo; + + PAGED_CODE(); + + DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n", + KeyHandle, + DesiredAccess, + ObjectAttributes, + ObjectAttributes ? ObjectAttributes->ObjectName : NULL); + + /* Check place for result handle, if it's null - return immediately */ + if (KeyHandle == NULL) + return(STATUS_INVALID_PARAMETER); + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeAndZeroHandle(KeyHandle); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + /* WINE checks for the length also */ + /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) + return(STATUS_BUFFER_OVERFLOW);*/ + + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(ObjectAttributes, + PreviousMode, + FALSE, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } + + if (ObjectName.Buffer && + ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') + { + ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; + ObjectName.Length -= sizeof(WCHAR); + ObjectName.MaximumLength -= sizeof(WCHAR); + } + + PostOpenKeyInfo.CompleteName = &ObjectName; + PreOpenKeyInfo.CompleteName = &ObjectName; + Status = CmiCallRegisteredCallbacks(RegNtPreOpenKey, &PreOpenKeyInfo); + if (!NT_SUCCESS(Status)) + { + PostOpenKeyInfo.Object = NULL; + PostOpenKeyInfo.Status = Status; + CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + return Status; + } + + + RemainingPath.Buffer = NULL; + + Status = CmFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&Object, + &RemainingPath, + CmpKeyObjectType, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("CmpFindObject() returned 0x%08lx\n", Status); + Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ + goto openkey_cleanup; + } + + VERIFY_KEY_OBJECT((PKEY_OBJECT) Object); + + DPRINT("RemainingPath '%wZ'\n", &RemainingPath); + + if ((RemainingPath.Buffer != NULL) && (RemainingPath.Buffer[0] != 0)) + { + RtlFreeUnicodeString(&RemainingPath); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto openkey_cleanup; + } + + RtlFreeUnicodeString(&RemainingPath); + + /* Fail if the key has been deleted */ + if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) + { + Status = STATUS_UNSUCCESSFUL; + goto openkey_cleanup; + } + + Status = CmpCreateHandle(Object, + DesiredAccess, + ObjectCreateInfo.Attributes, + &hKey); + +openkey_cleanup: + + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; + PostOpenKeyInfo.Status = Status; + CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); + if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + + if (Object) + { + ObDereferenceObject(Object); + } + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + *KeyHandle = hKey; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; +} + +/* + * NOTE: + * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and + * KeyObjectAttributes->Name specifies the name of the key to load. + * Flags can be 0 or REG_NO_LAZY_FLUSH. + */ +NTSTATUS STDCALL +NtLoadKey2 (IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes, + IN ULONG Flags) +{ + NTSTATUS Status; + PAGED_CODE(); + DPRINT ("NtLoadKey2() called\n"); + +#if 0 + if (!SeSinglePrivilegeCheck (SeRestorePrivilege, ExGetPreviousMode ())) + return STATUS_PRIVILEGE_NOT_HELD; +#endif + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + Status = CmiLoadHive (KeyObjectAttributes, + FileObjectAttributes->ObjectName, + Flags); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("CmiLoadHive() failed (Status %lx)\n", Status); + } + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + + return Status; +} + +NTSTATUS STDCALL +NtInitializeRegistry (IN BOOLEAN SetUpBoot) +{ + NTSTATUS Status; + + PAGED_CODE(); + + if (CmiRegistryInitialized == TRUE) + return STATUS_ACCESS_DENIED; + + /* Save boot log file */ + IopSaveBootLogToFile(); + + Status = CmiInitHives (SetUpBoot); + + CmiRegistryInitialized = TRUE; return Status; } @@ -636,215 +923,6 @@ return Status; } -NTSTATUS STDCALL -NtFlushKey(IN HANDLE KeyHandle) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - KPROCESSOR_MODE PreviousMode; - - PAGED_CODE(); - - DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); - - PreviousMode = ExGetPreviousMode(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - 0, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - VERIFY_KEY_OBJECT(KeyObject); - - RegistryHive = KeyObject->RegistryHive; - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - if (IsNoFileHive(RegistryHive)) - { - Status = STATUS_SUCCESS; - } - else - { - /* Flush non-volatile hive */ - Status = CmiFlushRegistryHive(RegistryHive); - } - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - ObDereferenceObject(KeyObject); - - return STATUS_SUCCESS; -} - - -NTSTATUS STDCALL -NtOpenKey(OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) -{ - UNICODE_STRING RemainingPath; - KPROCESSOR_MODE PreviousMode; - PVOID Object = NULL; - HANDLE hKey = NULL; - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - REG_PRE_OPEN_KEY_INFORMATION PreOpenKeyInfo; - REG_POST_OPEN_KEY_INFORMATION PostOpenKeyInfo; - - PAGED_CODE(); - - DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n", - KeyHandle, - DesiredAccess, - ObjectAttributes, - ObjectAttributes ? ObjectAttributes->ObjectName : NULL); - - /* Check place for result handle, if it's null - return immediately */ - if (KeyHandle == NULL) - return(STATUS_INVALID_PARAMETER); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeAndZeroHandle(KeyHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - /* WINE checks for the length also */ - /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) - return(STATUS_BUFFER_OVERFLOW);*/ - - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(ObjectAttributes, - PreviousMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; - } - - if (ObjectName.Buffer && - ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') - { - ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; - ObjectName.Length -= sizeof(WCHAR); - ObjectName.MaximumLength -= sizeof(WCHAR); - } - - PostOpenKeyInfo.CompleteName = &ObjectName; - PreOpenKeyInfo.CompleteName = &ObjectName; - Status = CmiCallRegisteredCallbacks(RegNtPreOpenKey, &PreOpenKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOpenKeyInfo.Object = NULL; - PostOpenKeyInfo.Status = Status; - CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - return Status; - } - - - RemainingPath.Buffer = NULL; - - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&Object, - &RemainingPath, - CmpKeyObjectType, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmpFindObject() returned 0x%08lx\n", Status); - Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ - goto openkey_cleanup; - } - - VERIFY_KEY_OBJECT((PKEY_OBJECT) Object); - - DPRINT("RemainingPath '%wZ'\n", &RemainingPath); - - if ((RemainingPath.Buffer != NULL) && (RemainingPath.Buffer[0] != 0)) - { - RtlFreeUnicodeString(&RemainingPath); - Status = STATUS_OBJECT_NAME_NOT_FOUND; - goto openkey_cleanup; - } - - RtlFreeUnicodeString(&RemainingPath); - - /* Fail if the key has been deleted */ - if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) - { - Status = STATUS_UNSUCCESSFUL; - goto openkey_cleanup; - } - - Status = CmpCreateHandle(Object, - DesiredAccess, - ObjectCreateInfo.Attributes, - &hKey); - -openkey_cleanup: - - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; - PostOpenKeyInfo.Status = Status; - CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - - if (Object) - { - ObDereferenceObject(Object); - } - - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - *KeyHandle = hKey; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return Status; -} - NTSTATUS NTAPI NtQueryKey(IN HANDLE KeyHandle, @@ -1050,65 +1128,6 @@ ObDereferenceObject(KeyObject); CmiSyncHives(); return Status; -} - -/* - * NOTE: - * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and - * KeyObjectAttributes->Name specifies the name of the key to load. - * Flags can be 0 or REG_NO_LAZY_FLUSH. - */ -NTSTATUS STDCALL -NtLoadKey2 (IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes, - IN ULONG Flags) -{ - NTSTATUS Status; - PAGED_CODE(); - DPRINT ("NtLoadKey2() called\n"); - -#if 0 - if (!SeSinglePrivilegeCheck (SeRestorePrivilege, ExGetPreviousMode ())) - return STATUS_PRIVILEGE_NOT_HELD; -#endif - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - Status = CmiLoadHive (KeyObjectAttributes, - FileObjectAttributes->ObjectName, - Flags); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CmiLoadHive() failed (Status %lx)\n", Status); - } - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - return Status; -} - -NTSTATUS STDCALL -NtInitializeRegistry (IN BOOLEAN SetUpBoot) -{ - NTSTATUS Status; - - PAGED_CODE(); - - if (CmiRegistryInitialized == TRUE) - return STATUS_ACCESS_DENIED; - - /* Save boot log file */ - IopSaveBootLogToFile(); - - Status = CmiInitHives (SetUpBoot); - - CmiRegistryInitialized = TRUE; - - return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue May 15 00:24:12 2007 @@ -630,32 +630,16 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - DPRINT1("Key not found in parent list ???\n"); - } - RemoveEntryList(&KeyObject->ListEntry); RtlFreeUnicodeString(&KeyObject->Name); - if (KeyObject->Flags & KO_MARKED_FOR_DELETE) - { - DPRINT("delete really key\n"); - - CmiRemoveSubKey(KeyObject->RegistryHive, - ParentKeyObject, - KeyObject); - - KeQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); - HvMarkCellDirty (&ParentKeyObject->RegistryHive->Hive, - ParentKeyObject->KeyCellOffset); - - if (!IsNoFileHive (KeyObject->RegistryHive) || - !IsNoFileHive (ParentKeyObject->RegistryHive)) - { - CmiSyncHives (); - } - } + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + DPRINT1("Key not found in parent list ???\n"); + } + + + ASSERT((KeyObject->Flags & KO_MARKED_FOR_DELETE) == FALSE); ObDereferenceObject (ParentKeyObject);

17 years, 5 months

[hpoussin] 26783: Also define the DPRINT_ constants in release mode

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue May 15 00:07:16 2007 New Revision: 26783 URL: http://svn.reactos.org/svn/reactos?rev=26783&view=rev Log: Also define the DPRINT_ constants in release mode 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:07:16 2007 @@ -21,21 +21,21 @@ #ifndef __DEBUG_H #define __DEBUG_H +#define DPRINT_NONE 0x00000000 // No debug print +#define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff +#define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages +#define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages +#define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages +#define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages +#define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages +#define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages +#define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages +#define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages +#define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages +#define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages +#define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader + #ifdef DBG - - #define DPRINT_NONE 0x00000000 // No debug print - #define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff - #define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages - #define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages - #define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages - #define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages - #define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages - #define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages - #define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages - #define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages - #define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages - #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages - #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader VOID DebugInit(VOID); VOID DebugPrint(ULONG Mask, char *format, ...);

17 years, 5 months

[fireball] 26782: - Fix debug print macros (by hpoussin).

by fireball＠svn.reactos.org

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_)

17 years, 5 months

[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

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)

17 years, 5 months

[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

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; +}

17 years, 5 months

[arty] 26779: Load address bug: offset from the real target, not kernel start.

by arty＠svn.reactos.org

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;

17 years, 5 months

[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

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; +}

17 years, 5 months

[arty] 26777: Subtle bug.

by arty＠svn.reactos.org

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];

17 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007