Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- VALUE_CELL => CM_KEY_VALUE

Browse source 
svn path=/trunk/; revision=23574
This commit is contained in:
Alex Ionescu 2006-08-14 12:01:20 +00:00
parent aa9cca267c
commit da51ac07a6
6 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/boot/freeldr/freeldr/reactos/binhive.c
View file

@ -117,11 +117,11 @@ CmiAllocateValueListCell (PHHIVE Hive,
static BOOLEAN static BOOLEAN
CmiAllocateValueCell(PHHIVE Hive, CmiAllocateValueCell(PHHIVE Hive,
PVALUE_CELL *ValueCell, PCM_KEY_VALUE *ValueCell,
HCELL_INDEX *ValueCellOffset, HCELL_INDEX *ValueCellOffset,
PWCHAR ValueName) PWCHAR ValueName)
{ {
PVALUE_CELL NewValueCell; PCM_KEY_VALUE NewValueCell;
ULONG NameSize; ULONG NameSize;
BOOLEAN Packable = TRUE; BOOLEAN Packable = TRUE;
ULONG i; ULONG i;
@ -136,14 +136,14 @@ CmiAllocateValueCell(PHHIVE Hive,
break; break;
} }
} }
*ValueCellOffset = HvAllocateCell (Hive, sizeof(VALUE_CELL) + NameSize, HvStable); *ValueCellOffset = HvAllocateCell (Hive, sizeof(CM_KEY_VALUE) + NameSize, HvStable);
if (*ValueCellOffset == HCELL_NULL) if (*ValueCellOffset == HCELL_NULL)
{ {
DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n"));
return FALSE; return FALSE;
} }
NewValueCell = (PVALUE_CELL) HvGetCell (Hive, *ValueCellOffset); NewValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, *ValueCellOffset);
NewValueCell->Id = REG_VALUE_CELL_ID; NewValueCell->Id = REG_VALUE_CELL_ID;
NewValueCell->NameSize = NameSize; NewValueCell->NameSize = NameSize;
NewValueCell->Flags = 0; NewValueCell->Flags = 0;
@ -210,7 +210,7 @@ CmiExportValue (PHHIVE Hive,
{ {
HCELL_INDEX ValueCellOffset; HCELL_INDEX ValueCellOffset;
HCELL_INDEX DataCellOffset; HCELL_INDEX DataCellOffset;
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
PVOID DataCell; PVOID DataCell;
ULONG DataSize; ULONG DataSize;
ULONG DataType; ULONG DataType;
@ -521,7 +521,7 @@ CmiExportHive (PHHIVE Hive,
static BOOLEAN static BOOLEAN
RegImportValue (PHHIVE Hive, RegImportValue (PHHIVE Hive,
PVALUE_CELL ValueCell, PCM_KEY_VALUE ValueCell,
FRLDRHKEY Key) FRLDRHKEY Key)
{ {
PVOID DataCell; PVOID DataCell;
@ -606,7 +606,7 @@ RegImportSubKey(PHHIVE Hive,
PHASH_TABLE_CELL HashCell; PHASH_TABLE_CELL HashCell;
PCM_KEY_NODE SubKeyCell; PCM_KEY_NODE SubKeyCell;
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL ValueCell = NULL; PCM_KEY_VALUE ValueCell = NULL;
PWCHAR wName; PWCHAR wName;
FRLDRHKEY SubKey; FRLDRHKEY SubKey;
LONG Error; LONG Error;
@ -664,7 +664,7 @@ RegImportSubKey(PHHIVE Hive,
{ {
DbgPrint((DPRINT_REGISTRY, "ValueOffset[%d]: %x\n", i, ValueListCell->ValueOffset[i])); 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)); DbgPrint((DPRINT_REGISTRY, "ValueCell[%d]: %x\n", i, ValueCell));

8
reactos/lib/cmlib/cmdata.h
View file

@ -114,7 +114,7 @@ typedef struct _VALUE_LIST_CELL
HCELL_INDEX ValueOffset[0]; HCELL_INDEX ValueOffset[0];
} VALUE_LIST_CELL, *PVALUE_LIST_CELL; } VALUE_LIST_CELL, *PVALUE_LIST_CELL;
typedef struct _VALUE_CELL typedef struct _CM_KEY_VALUE
{ {
USHORT Id; // "kv" USHORT Id; // "kv"
USHORT NameSize; // length of Name USHORT NameSize; // length of Name
@ -124,12 +124,12 @@ typedef struct _VALUE_CELL
USHORT Flags; USHORT Flags;
USHORT Unused1; USHORT Unused1;
UCHAR Name[0]; /* warning : not zero terminated */ 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 #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_SIZE_MASK 0x7FFFFFFF
#define REG_DATA_IN_OFFSET 0x80000000 #define REG_DATA_IN_OFFSET 0x80000000

10
reactos/ntoskrnl/cm/cm.h
View file

@ -269,21 +269,21 @@ NTSTATUS
CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive,
IN PCM_KEY_NODE KeyCell, IN PCM_KEY_NODE KeyCell,
IN PUNICODE_STRING ValueName, IN PUNICODE_STRING ValueName,
OUT PVALUE_CELL *ValueCell, OUT PCM_KEY_VALUE *ValueCell,
OUT HCELL_INDEX *VBOffset); OUT HCELL_INDEX *VBOffset);
NTSTATUS NTSTATUS
CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive,
IN PCM_KEY_NODE KeyCell, IN PCM_KEY_NODE KeyCell,
IN ULONG Index, IN ULONG Index,
OUT PVALUE_CELL *ValueCell); OUT PCM_KEY_VALUE *ValueCell);
NTSTATUS NTSTATUS
CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive, CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive,
IN PCM_KEY_NODE KeyCell, IN PCM_KEY_NODE KeyCell,
IN HCELL_INDEX KeyCellOffset, IN HCELL_INDEX KeyCellOffset,
IN PUNICODE_STRING ValueName, IN PUNICODE_STRING ValueName,
OUT PVALUE_CELL *pValueCell, OUT PCM_KEY_VALUE *pValueCell,
OUT HCELL_INDEX *pValueCellOffset); OUT HCELL_INDEX *pValueCellOffset);
NTSTATUS NTSTATUS
@ -319,14 +319,14 @@ CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive,
NTSTATUS NTSTATUS
CmiAllocateValueCell(IN PEREGISTRY_HIVE RegistryHive, CmiAllocateValueCell(IN PEREGISTRY_HIVE RegistryHive,
OUT PVALUE_CELL *ValueCell, OUT PCM_KEY_VALUE *ValueCell,
OUT HCELL_INDEX *VBOffset, OUT HCELL_INDEX *VBOffset,
IN PUNICODE_STRING ValueName, IN PUNICODE_STRING ValueName,
IN HV_STORAGE_TYPE Storage); IN HV_STORAGE_TYPE Storage);
NTSTATUS NTSTATUS
CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive,
PVALUE_CELL ValueCell, PCM_KEY_VALUE ValueCell,
HCELL_INDEX VBOffset); HCELL_INDEX VBOffset);
NTSTATUS NTSTATUS

8
reactos/ntoskrnl/cm/ntfunc.c
View file

@ -987,7 +987,7 @@ NtEnumerateValueKey(IN HANDLE KeyHandle,
PKEY_OBJECT KeyObject; PKEY_OBJECT KeyObject;
PEREGISTRY_HIVE RegistryHive; PEREGISTRY_HIVE RegistryHive;
PCM_KEY_NODE KeyCell; PCM_KEY_NODE KeyCell;
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
PVOID DataCell; PVOID DataCell;
ULONG NameSize, DataSize; ULONG NameSize, DataSize;
PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation;
@ -1667,7 +1667,7 @@ NtQueryValueKey(IN HANDLE KeyHandle,
PKEY_OBJECT KeyObject; PKEY_OBJECT KeyObject;
PEREGISTRY_HIVE RegistryHive; PEREGISTRY_HIVE RegistryHive;
PCM_KEY_NODE KeyCell; PCM_KEY_NODE KeyCell;
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
PVOID DataCell; PVOID DataCell;
PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation;
PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation;
@ -1927,7 +1927,7 @@ NtSetValueKey(IN HANDLE KeyHandle,
PKEY_OBJECT KeyObject; PKEY_OBJECT KeyObject;
PEREGISTRY_HIVE RegistryHive; PEREGISTRY_HIVE RegistryHive;
PCM_KEY_NODE KeyCell; PCM_KEY_NODE KeyCell;
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
HCELL_INDEX ValueCellOffset; HCELL_INDEX ValueCellOffset;
PVOID DataCell; PVOID DataCell;
ULONG DesiredAccess; ULONG DesiredAccess;
@ -2374,7 +2374,7 @@ NtQueryMultipleValueKey (IN HANDLE KeyHandle,
OUT PULONG ReturnLength) OUT PULONG ReturnLength)
{ {
PEREGISTRY_HIVE RegistryHive; PEREGISTRY_HIVE RegistryHive;
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
PKEY_OBJECT KeyObject; PKEY_OBJECT KeyObject;
PVOID DataCell; PVOID DataCell;
ULONG BufferLength = 0; ULONG BufferLength = 0;

34
reactos/ntoskrnl/cm/regfile.c
View file

@ -937,7 +937,7 @@ CmiGetMaxValueNameLength(PEREGISTRY_HIVE RegistryHive,
PCM_KEY_NODE KeyCell) PCM_KEY_NODE KeyCell)
{ {
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL CurValueCell; PCM_KEY_VALUE CurValueCell;
ULONG MaxValueName; ULONG MaxValueName;
ULONG Size; ULONG Size;
ULONG i; ULONG i;
@ -985,7 +985,7 @@ CmiGetMaxValueDataLength(PEREGISTRY_HIVE RegistryHive,
PCM_KEY_NODE KeyCell) PCM_KEY_NODE KeyCell)
{ {
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL CurValueCell; PCM_KEY_VALUE CurValueCell;
LONG MaxValueData; LONG MaxValueData;
ULONG i; ULONG i;
@ -1289,7 +1289,7 @@ CmiRemoveSubKey(PEREGISTRY_HIVE RegistryHive,
{ {
PHASH_TABLE_CELL HashBlock; PHASH_TABLE_CELL HashBlock;
PVALUE_LIST_CELL ValueList; PVALUE_LIST_CELL ValueList;
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
HV_STORAGE_TYPE Storage; HV_STORAGE_TYPE Storage;
ULONG i; ULONG i;
@ -1390,11 +1390,11 @@ NTSTATUS
CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive,
IN PCM_KEY_NODE KeyCell, IN PCM_KEY_NODE KeyCell,
IN PUNICODE_STRING ValueName, IN PUNICODE_STRING ValueName,
OUT PVALUE_CELL *ValueCell, OUT PCM_KEY_VALUE *ValueCell,
OUT HCELL_INDEX *ValueCellOffset) OUT HCELL_INDEX *ValueCellOffset)
{ {
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL CurValueCell; PCM_KEY_VALUE CurValueCell;
ULONG i; ULONG i;
*ValueCell = NULL; *ValueCell = NULL;
@ -1437,10 +1437,10 @@ NTSTATUS
CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive, CmiGetValueFromKeyByIndex(IN PEREGISTRY_HIVE RegistryHive,
IN PCM_KEY_NODE KeyCell, IN PCM_KEY_NODE KeyCell,
IN ULONG Index, IN ULONG Index,
OUT PVALUE_CELL *ValueCell) OUT PCM_KEY_VALUE *ValueCell)
{ {
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL CurValueCell; PCM_KEY_VALUE CurValueCell;
*ValueCell = NULL; *ValueCell = NULL;
@ -1472,11 +1472,11 @@ CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive,
IN PCM_KEY_NODE KeyCell, IN PCM_KEY_NODE KeyCell,
IN HCELL_INDEX KeyCellOffset, IN HCELL_INDEX KeyCellOffset,
IN PUNICODE_STRING ValueName, IN PUNICODE_STRING ValueName,
OUT PVALUE_CELL *pValueCell, OUT PCM_KEY_VALUE *pValueCell,
OUT HCELL_INDEX *pValueCellOffset) OUT HCELL_INDEX *pValueCellOffset)
{ {
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL NewValueCell; PCM_KEY_VALUE NewValueCell;
HCELL_INDEX ValueListCellOffset; HCELL_INDEX ValueListCellOffset;
HCELL_INDEX NewValueCellOffset; HCELL_INDEX NewValueCellOffset;
ULONG CellSize; ULONG CellSize;
@ -1560,7 +1560,7 @@ CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive,
IN PUNICODE_STRING ValueName) IN PUNICODE_STRING ValueName)
{ {
PVALUE_LIST_CELL ValueListCell; PVALUE_LIST_CELL ValueListCell;
PVALUE_CELL CurValueCell; PCM_KEY_VALUE CurValueCell;
ULONG i; ULONG i;
NTSTATUS Status; NTSTATUS Status;
@ -1723,12 +1723,12 @@ CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive,
NTSTATUS NTSTATUS
CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive, CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive,
PVALUE_CELL *ValueCell, PCM_KEY_VALUE *ValueCell,
HCELL_INDEX *VBOffset, HCELL_INDEX *VBOffset,
IN PUNICODE_STRING ValueName, IN PUNICODE_STRING ValueName,
IN HV_STORAGE_TYPE Storage) IN HV_STORAGE_TYPE Storage)
{ {
PVALUE_CELL NewValueCell; PCM_KEY_VALUE NewValueCell;
NTSTATUS Status; NTSTATUS Status;
BOOLEAN Packable; BOOLEAN Packable;
ULONG NameSize; ULONG NameSize;
@ -1741,7 +1741,7 @@ CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive,
DPRINT("ValueName->Length %lu NameSize %lu\n", ValueName->Length, NameSize); 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) if (*VBOffset == HCELL_NULL)
{ {
Status = STATUS_INSUFFICIENT_RESOURCES; Status = STATUS_INSUFFICIENT_RESOURCES;
@ -1779,7 +1779,7 @@ CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive,
NTSTATUS NTSTATUS
CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive,
PVALUE_CELL ValueCell, PCM_KEY_VALUE ValueCell,
HCELL_INDEX ValueCellOffset) HCELL_INDEX ValueCellOffset)
{ {
DPRINT("CmiDestroyValueCell(Cell %p Offset %lx)\n", DPRINT("CmiDestroyValueCell(Cell %p Offset %lx)\n",
@ -2071,8 +2071,8 @@ CmiCopyKey (PEREGISTRY_HIVE DstHive,
{ {
PVALUE_LIST_CELL NewValueListCell; PVALUE_LIST_CELL NewValueListCell;
PVALUE_LIST_CELL SrcValueListCell; PVALUE_LIST_CELL SrcValueListCell;
PVALUE_CELL NewValueCell; PCM_KEY_VALUE NewValueCell;
PVALUE_CELL SrcValueCell; PCM_KEY_VALUE SrcValueCell;
PVOID SrcValueDataCell; PVOID SrcValueDataCell;
PVOID NewValueDataCell; PVOID NewValueDataCell;
HCELL_INDEX ValueCellOffset; HCELL_INDEX ValueCellOffset;
@ -2104,7 +2104,7 @@ CmiCopyKey (PEREGISTRY_HIVE DstHive,
/* Copy value cell */ /* Copy value cell */
SrcValueCell = HvGetCell (SrcHive->Hive, SrcValueListCell->ValueOffset[i]); 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); ValueCellOffset = HvAllocateCell (DstHive->Hive, NewValueCellSize, HvStable);
if (ValueCellOffset == HCELL_NULL) if (ValueCellOffset == HCELL_NULL)
{ {

2
reactos/ntoskrnl/cm/regobj.c
View file

@ -888,7 +888,7 @@ CmiGetLinkTarget(PEREGISTRY_HIVE RegistryHive,
PUNICODE_STRING TargetPath) PUNICODE_STRING TargetPath)
{ {
UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"SymbolicLinkValue");
PVALUE_CELL ValueCell; PCM_KEY_VALUE ValueCell;
PVOID DataCell; PVOID DataCell;
NTSTATUS Status; NTSTATUS Status;