[ros-diffs] [ion] 23574: - VALUE_CELL => CM_KEY_VALUE

Author: ion
Date: Mon Aug 14 16:01:20 2006
New Revision: 23574

URL: http://svn.reactos.org/svn/reactos?rev=23574&view=rev
Log:
- VALUE_CELL => CM_KEY_VALUE

Modified:
    trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
    trunk/reactos/lib/cmlib/cmdata.h
    trunk/reactos/ntoskrnl/cm/cm.h
    trunk/reactos/ntoskrnl/cm/ntfunc.c
    trunk/reactos/ntoskrnl/cm/regfile.c
    trunk/reactos/ntoskrnl/cm/regobj.c

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Mon Aug 14 16:01:20 2006
@@ -117,11 +117,11 @@
 
 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 @@
           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 @@
 {
   HCELL_INDEX ValueCellOffset;
   HCELL_INDEX DataCellOffset;
-  PVALUE_CELL ValueCell;
+  PCM_KEY_VALUE ValueCell;
   PVOID DataCell;
   ULONG DataSize;
   ULONG DataType;
@@ -521,7 +521,7 @@
 
 static BOOLEAN
 RegImportValue (PHHIVE Hive,
-		PVALUE_CELL ValueCell,
+		PCM_KEY_VALUE ValueCell,
 		FRLDRHKEY Key)
 {
   PVOID DataCell;
@@ -606,7 +606,7 @@
   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 @@
 	{
 	  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));
 

Modified: trunk/reactos/lib/cmlib/cmdata.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=235…
==============================================================================
--- trunk/reactos/lib/cmlib/cmdata.h (original)
+++ trunk/reactos/lib/cmlib/cmdata.h Mon Aug 14 16:01:20 2006
@@ -114,7 +114,7 @@
   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 @@
   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
 

Modified: trunk/reactos/ntoskrnl/cm/cm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=23574…
==============================================================================
--- trunk/reactos/ntoskrnl/cm/cm.h (original)
+++ trunk/reactos/ntoskrnl/cm/cm.h Mon Aug 14 16:01:20 2006
@@ -269,21 +269,21 @@
 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 @@
 
 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

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 Aug 14 16:01:20 2006
@@ -987,7 +987,7 @@
   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 @@
   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 @@
   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 @@
 			 OUT PULONG ReturnLength)
 {
   PEREGISTRY_HIVE RegistryHive;
-  PVALUE_CELL ValueCell;
+  PCM_KEY_VALUE ValueCell;
   PKEY_OBJECT KeyObject;
   PVOID DataCell;
   ULONG BufferLength = 0;

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 Aug 14 16:01:20 2006
@@ -937,7 +937,7 @@
 			 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 @@
 			 PCM_KEY_NODE KeyCell)
 {
   PVALUE_LIST_CELL ValueListCell;
-  PVALUE_CELL CurValueCell;
+  PCM_KEY_VALUE CurValueCell;
   LONG MaxValueData;
   ULONG i;
 
@@ -1289,7 +1289,7 @@
 {
   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 @@
 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 @@
 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 @@
 		 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 @@
 		      IN PUNICODE_STRING ValueName)
 {
   PVALUE_LIST_CELL ValueListCell;
-  PVALUE_CELL CurValueCell;
+  PCM_KEY_VALUE CurValueCell;
   ULONG i;
   NTSTATUS Status;
 
@@ -1723,12 +1723,12 @@
 
 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 @@
 
   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 @@
 
 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 @@
     {
       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 @@
 	  /* 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)
 	    {

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 Mon Aug 14 16:01:20 2006
@@ -888,7 +888,7 @@
 		 PUNICODE_STRING TargetPath)
 {
   UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"SymbolicLinkValue");
-  PVALUE_CELL ValueCell;
+  PCM_KEY_VALUE ValueCell;
   PVOID DataCell;
   NTSTATUS Status;