From da51ac07a6b3ec4801f880f04dfaea64a9a41fa1 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Mon, 14 Aug 2006 12:01:20 +0000 Subject: [PATCH] - VALUE_CELL => CM_KEY_VALUE svn path=/trunk/; revision=23574 --- .../boot/freeldr/freeldr/reactos/binhive.c | 16 ++++----- reactos/lib/cmlib/cmdata.h | 8 ++--- reactos/ntoskrnl/cm/cm.h | 10 +++--- reactos/ntoskrnl/cm/ntfunc.c | 8 ++--- reactos/ntoskrnl/cm/regfile.c | 34 +++++++++---------- reactos/ntoskrnl/cm/regobj.c | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/reactos/binhive.c b/reactos/boot/freeldr/freeldr/reactos/binhive.c index 1228a64d406..ac244eb1b62 100644 --- a/reactos/boot/freeldr/freeldr/reactos/binhive.c +++ b/reactos/boot/freeldr/freeldr/reactos/binhive.c @@ -117,11 +117,11 @@ CmiAllocateValueListCell (PHHIVE Hive, static BOOLEAN CmiAllocateValueCell(PHHIVE Hive, - PVALUE_CELL *ValueCell, + PCM_KEY_VALUE *ValueCell, HCELL_INDEX *ValueCellOffset, PWCHAR ValueName) { - PVALUE_CELL NewValueCell; + PCM_KEY_VALUE NewValueCell; ULONG NameSize; BOOLEAN Packable = TRUE; ULONG i; @@ -136,14 +136,14 @@ CmiAllocateValueCell(PHHIVE Hive, break; } } - *ValueCellOffset = HvAllocateCell (Hive, sizeof(VALUE_CELL) + NameSize, HvStable); + *ValueCellOffset = HvAllocateCell (Hive, sizeof(CM_KEY_VALUE) + NameSize, HvStable); if (*ValueCellOffset == HCELL_NULL) { DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); return FALSE; } - NewValueCell = (PVALUE_CELL) HvGetCell (Hive, *ValueCellOffset); + NewValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, *ValueCellOffset); NewValueCell->Id = REG_VALUE_CELL_ID; NewValueCell->NameSize = NameSize; NewValueCell->Flags = 0; @@ -210,7 +210,7 @@ CmiExportValue (PHHIVE Hive, { HCELL_INDEX ValueCellOffset; HCELL_INDEX DataCellOffset; - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; PVOID DataCell; ULONG DataSize; ULONG DataType; @@ -521,7 +521,7 @@ CmiExportHive (PHHIVE Hive, static BOOLEAN RegImportValue (PHHIVE Hive, - PVALUE_CELL ValueCell, + PCM_KEY_VALUE ValueCell, FRLDRHKEY Key) { PVOID DataCell; @@ -606,7 +606,7 @@ RegImportSubKey(PHHIVE Hive, PHASH_TABLE_CELL HashCell; PCM_KEY_NODE SubKeyCell; PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL ValueCell = NULL; + PCM_KEY_VALUE ValueCell = NULL; PWCHAR wName; FRLDRHKEY SubKey; LONG Error; @@ -664,7 +664,7 @@ RegImportSubKey(PHHIVE Hive, { DbgPrint((DPRINT_REGISTRY, "ValueOffset[%d]: %x\n", i, ValueListCell->ValueOffset[i])); - ValueCell = (PVALUE_CELL) HvGetCell (Hive, ValueListCell->ValueOffset[i]); + ValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, ValueListCell->ValueOffset[i]); DbgPrint((DPRINT_REGISTRY, "ValueCell[%d]: %x\n", i, ValueCell)); diff --git a/reactos/lib/cmlib/cmdata.h b/reactos/lib/cmlib/cmdata.h index 7e1651da13e..ea7a96896f0 100644 --- a/reactos/lib/cmlib/cmdata.h +++ b/reactos/lib/cmlib/cmdata.h @@ -114,7 +114,7 @@ typedef struct _VALUE_LIST_CELL HCELL_INDEX ValueOffset[0]; } VALUE_LIST_CELL, *PVALUE_LIST_CELL; -typedef struct _VALUE_CELL +typedef struct _CM_KEY_VALUE { USHORT Id; // "kv" USHORT NameSize; // length of Name @@ -124,12 +124,12 @@ typedef struct _VALUE_CELL USHORT Flags; USHORT Unused1; UCHAR Name[0]; /* warning : not zero terminated */ -} VALUE_CELL, *PVALUE_CELL; +} CM_KEY_VALUE, *PCM_KEY_VALUE; -/* VALUE_CELL.Flags constants */ +/* CM_KEY_VALUE.Flags constants */ #define REG_VALUE_NAME_PACKED 0x0001 -/* VALUE_CELL.DataSize mask constants */ +/* CM_KEY_VALUE.DataSize mask constants */ #define REG_DATA_SIZE_MASK 0x7FFFFFFF #define REG_DATA_IN_OFFSET 0x80000000 diff --git a/reactos/ntoskrnl/cm/cm.h b/reactos/ntoskrnl/cm/cm.h index f96a7e3bb5c..e52b652faf8 100644 --- a/reactos/ntoskrnl/cm/cm.h +++ b/reactos/ntoskrnl/cm/cm.h @@ -269,21 +269,21 @@ NTSTATUS CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN PUNICODE_STRING ValueName, - OUT PVALUE_CELL *ValueCell, + OUT PCM_KEY_VALUE *ValueCell, OUT HCELL_INDEX *VBOffset); NTSTATUS CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN ULONG Index, - OUT PVALUE_CELL *ValueCell); + OUT PCM_KEY_VALUE *ValueCell); NTSTATUS CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, IN PUNICODE_STRING ValueName, - OUT PVALUE_CELL *pValueCell, + OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset); NTSTATUS @@ -319,14 +319,14 @@ CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, NTSTATUS CmiAllocateValueCell(IN PEREGISTRY_HIVE RegistryHive, - OUT PVALUE_CELL *ValueCell, + OUT PCM_KEY_VALUE *ValueCell, OUT HCELL_INDEX *VBOffset, IN PUNICODE_STRING ValueName, IN HV_STORAGE_TYPE Storage); NTSTATUS CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, - PVALUE_CELL ValueCell, + PCM_KEY_VALUE ValueCell, HCELL_INDEX VBOffset); NTSTATUS diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c index 093ad4387b2..6e30b4bbcc1 100644 --- a/reactos/ntoskrnl/cm/ntfunc.c +++ b/reactos/ntoskrnl/cm/ntfunc.c @@ -987,7 +987,7 @@ NtEnumerateValueKey(IN HANDLE KeyHandle, PKEY_OBJECT KeyObject; PEREGISTRY_HIVE RegistryHive; PCM_KEY_NODE KeyCell; - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; PVOID DataCell; ULONG NameSize, DataSize; PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; @@ -1667,7 +1667,7 @@ NtQueryValueKey(IN HANDLE KeyHandle, PKEY_OBJECT KeyObject; PEREGISTRY_HIVE RegistryHive; PCM_KEY_NODE KeyCell; - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; PVOID DataCell; PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; @@ -1927,7 +1927,7 @@ NtSetValueKey(IN HANDLE KeyHandle, PKEY_OBJECT KeyObject; PEREGISTRY_HIVE RegistryHive; PCM_KEY_NODE KeyCell; - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; HCELL_INDEX ValueCellOffset; PVOID DataCell; ULONG DesiredAccess; @@ -2374,7 +2374,7 @@ NtQueryMultipleValueKey (IN HANDLE KeyHandle, OUT PULONG ReturnLength) { PEREGISTRY_HIVE RegistryHive; - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; PKEY_OBJECT KeyObject; PVOID DataCell; ULONG BufferLength = 0; diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c index 881e827c785..7548f58103c 100644 --- a/reactos/ntoskrnl/cm/regfile.c +++ b/reactos/ntoskrnl/cm/regfile.c @@ -937,7 +937,7 @@ CmiGetMaxValueNameLength(PEREGISTRY_HIVE RegistryHive, PCM_KEY_NODE KeyCell) { PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL CurValueCell; + PCM_KEY_VALUE CurValueCell; ULONG MaxValueName; ULONG Size; ULONG i; @@ -985,7 +985,7 @@ CmiGetMaxValueDataLength(PEREGISTRY_HIVE RegistryHive, PCM_KEY_NODE KeyCell) { PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL CurValueCell; + PCM_KEY_VALUE CurValueCell; LONG MaxValueData; ULONG i; @@ -1289,7 +1289,7 @@ CmiRemoveSubKey(PEREGISTRY_HIVE RegistryHive, { PHASH_TABLE_CELL HashBlock; PVALUE_LIST_CELL ValueList; - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; HV_STORAGE_TYPE Storage; ULONG i; @@ -1390,11 +1390,11 @@ NTSTATUS CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN PUNICODE_STRING ValueName, - OUT PVALUE_CELL *ValueCell, + OUT PCM_KEY_VALUE *ValueCell, OUT HCELL_INDEX *ValueCellOffset) { PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL CurValueCell; + PCM_KEY_VALUE CurValueCell; ULONG i; *ValueCell = NULL; @@ -1437,10 +1437,10 @@ NTSTATUS CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN ULONG Index, - OUT PVALUE_CELL *ValueCell) + OUT PCM_KEY_VALUE *ValueCell) { PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL CurValueCell; + PCM_KEY_VALUE CurValueCell; *ValueCell = NULL; @@ -1472,11 +1472,11 @@ CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, IN PUNICODE_STRING ValueName, - OUT PVALUE_CELL *pValueCell, + OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset) { PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL NewValueCell; + PCM_KEY_VALUE NewValueCell; HCELL_INDEX ValueListCellOffset; HCELL_INDEX NewValueCellOffset; ULONG CellSize; @@ -1560,7 +1560,7 @@ CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, IN PUNICODE_STRING ValueName) { PVALUE_LIST_CELL ValueListCell; - PVALUE_CELL CurValueCell; + PCM_KEY_VALUE CurValueCell; ULONG i; NTSTATUS Status; @@ -1723,12 +1723,12 @@ CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, NTSTATUS CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive, - PVALUE_CELL *ValueCell, + PCM_KEY_VALUE *ValueCell, HCELL_INDEX *VBOffset, IN PUNICODE_STRING ValueName, IN HV_STORAGE_TYPE Storage) { - PVALUE_CELL NewValueCell; + PCM_KEY_VALUE NewValueCell; NTSTATUS Status; BOOLEAN Packable; ULONG NameSize; @@ -1741,7 +1741,7 @@ CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive, DPRINT("ValueName->Length %lu NameSize %lu\n", ValueName->Length, NameSize); - *VBOffset = HvAllocateCell (RegistryHive->Hive, sizeof(VALUE_CELL) + NameSize, Storage); + *VBOffset = HvAllocateCell (RegistryHive->Hive, sizeof(CM_KEY_VALUE) + NameSize, Storage); if (*VBOffset == HCELL_NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1779,7 +1779,7 @@ CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive, NTSTATUS CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, - PVALUE_CELL ValueCell, + PCM_KEY_VALUE ValueCell, HCELL_INDEX ValueCellOffset) { DPRINT("CmiDestroyValueCell(Cell %p Offset %lx)\n", @@ -2071,8 +2071,8 @@ CmiCopyKey (PEREGISTRY_HIVE DstHive, { PVALUE_LIST_CELL NewValueListCell; PVALUE_LIST_CELL SrcValueListCell; - PVALUE_CELL NewValueCell; - PVALUE_CELL SrcValueCell; + PCM_KEY_VALUE NewValueCell; + PCM_KEY_VALUE SrcValueCell; PVOID SrcValueDataCell; PVOID NewValueDataCell; HCELL_INDEX ValueCellOffset; @@ -2104,7 +2104,7 @@ CmiCopyKey (PEREGISTRY_HIVE DstHive, /* Copy value cell */ SrcValueCell = HvGetCell (SrcHive->Hive, SrcValueListCell->ValueOffset[i]); - NewValueCellSize = sizeof(VALUE_CELL) + SrcValueCell->NameSize; + NewValueCellSize = sizeof(CM_KEY_VALUE) + SrcValueCell->NameSize; ValueCellOffset = HvAllocateCell (DstHive->Hive, NewValueCellSize, HvStable); if (ValueCellOffset == HCELL_NULL) { diff --git a/reactos/ntoskrnl/cm/regobj.c b/reactos/ntoskrnl/cm/regobj.c index 6059e35981a..047ae387582 100644 --- a/reactos/ntoskrnl/cm/regobj.c +++ b/reactos/ntoskrnl/cm/regobj.c @@ -888,7 +888,7 @@ CmiGetLinkTarget(PEREGISTRY_HIVE RegistryHive, PUNICODE_STRING TargetPath) { UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); - PVALUE_CELL ValueCell; + PCM_KEY_VALUE ValueCell; PVOID DataCell; NTSTATUS Status;