2003-02-18 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* ntoskrnl/cm/regfile.c (CmiRemoveSubKey): Kill warnings.
	(CmiMergeFree): Ditto.

svn path=/trunk/; revision=4175

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index ccae3af..aa9015b 100644 (file)
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-18  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+       * ntoskrnl/cm/regfile.c (CmiRemoveSubKey): Kill warnings.
+       (CmiMergeFree): Ditto.
+

 2003-02-10  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * include/structs.h (OSVERSIONINFOEXA): Expand definition of
 2003-02-10  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * include/structs.h (OSVERSIONINFOEXA): Expand definition of

diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index d0066e3..bd74e44 100644 (file)
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -1992,7 +1992,7 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
     }
 
   /* Remove the key from the parent key's hash block */
     }
 
   /* Remove the key from the parent key's hash block */

-  if (ParentKey->KeyCell->HashTableOffset != -1)
+  if (ParentKey->KeyCell->HashTableOffset != (BLOCK_OFFSET) -1)

     {
       DPRINT1("ParentKey HashTableOffset %lx\n", ParentKey->KeyCell->HashTableOffset)
       HashBlock = CmiGetBlock(RegistryHive,
     {
       DPRINT1("ParentKey HashTableOffset %lx\n", ParentKey->KeyCell->HashTableOffset)
       HashBlock = CmiGetBlock(RegistryHive,


@@ -2010,7 +2010,7 @@ CmiRemoveSubKey(PREGISTRY_HIVE RegistryHive,
     }
 
   /* Remove the key's hash block */
     }
 
   /* Remove the key's hash block */

-  if (SubKey->KeyCell->HashTableOffset != -1)
+  if (SubKey->KeyCell->HashTableOffset != (BLOCK_OFFSET) -1)

     {
       DPRINT1("SubKey HashTableOffset %lx\n", SubKey->KeyCell->HashTableOffset)
       HashBlock = CmiGetBlock(RegistryHive,
     {
       DPRINT1("SubKey HashTableOffset %lx\n", SubKey->KeyCell->HashTableOffset)
       HashBlock = CmiGetBlock(RegistryHive,


@@ -2757,7 +2757,7 @@ CmiMergeFree(PREGISTRY_HIVE RegistryHive,
   ULONG BlockSize;
   ULONG BinSize;
   PHBIN Bin;
   ULONG BlockSize;
   ULONG BinSize;
   PHBIN Bin;

-  LONG i;
+  ULONG i;

 
   DPRINT("CmiMergeFree(Block %lx  Offset %lx  Size %lx) called\n",
         FreeBlock, FreeOffset, FreeBlock->CellSize);
 
   DPRINT("CmiMergeFree(Block %lx  Offset %lx  Size %lx) called\n",
         FreeBlock, FreeOffset, FreeBlock->CellSize);