From 2ca81c55739bcca3f3c081046e835ad5686d2a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Sun, 10 Sep 2006 15:26:48 +0000
Subject: [PATCH] Fix some warnings

svn path=/trunk/; revision=24025
---
 reactos/lib/cmlib/cmlib.mak  |  2 +-
 reactos/lib/cmlib/hivebin.c  |  8 ++++----
 reactos/lib/cmlib/hivecell.c | 14 +++++++-------
 reactos/lib/rtl/bitmap.c     |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/reactos/lib/cmlib/cmlib.mak b/reactos/lib/cmlib/cmlib.mak
index 076a7925853..0b83185cb60 100644
--- a/reactos/lib/cmlib/cmlib.mak
+++ b/reactos/lib/cmlib/cmlib.mak
@@ -31,7 +31,7 @@ CMLIB_HOST_OBJECTS = \
 	$(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o))
 
 CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-  -D_X86_ -D__i386__ -D_REACTOS_ \
+  -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_\
   -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk \
   -D__NO_CTYPE_INLINES
 
diff --git a/reactos/lib/cmlib/hivebin.c b/reactos/lib/cmlib/hivebin.c
index 29e74b925ae..5a70b8d4aa1 100644
--- a/reactos/lib/cmlib/hivebin.c
+++ b/reactos/lib/cmlib/hivebin.c
@@ -24,17 +24,17 @@ HvpAddBin(
    PHCELL Block;
 
    BinSize = ROUND_UP(Size + sizeof(HBIN), HV_BLOCK_SIZE);
-   BlockCount = BinSize / HV_BLOCK_SIZE;
+   BlockCount = (ULONG)(BinSize / HV_BLOCK_SIZE);
 
    Bin = RegistryHive->Allocate(BinSize, TRUE);
    if (Bin == NULL)
       return NULL;
-   RtlZeroMemory(Bin, sizeof(HBIN));
+   RtlZeroMemory(Bin, BinSize);
 
    Bin->Signature = HV_BIN_SIGNATURE;
    Bin->FileOffset = RegistryHive->Storage[Storage].Length *
                     HV_BLOCK_SIZE;
-   Bin->Size = BinSize;
+   Bin->Size = (ULONG)BinSize;
 
    /* Allocate new block list */
    OldBlockListSize = RegistryHive->Storage[Storage].Length;
@@ -65,7 +65,7 @@ HvpAddBin(
 
    /* Initialize a free block in this heap. */
    Block = (PHCELL)(Bin + 1);
-   Block->Size = BinSize - sizeof(HBIN);
+   Block->Size = (LONG)(BinSize - sizeof(HBIN));
 
    if (Storage == HvStable)
    {
diff --git a/reactos/lib/cmlib/hivecell.c b/reactos/lib/cmlib/hivecell.c
index ce341276d39..d829bc895f3 100644
--- a/reactos/lib/cmlib/hivecell.c
+++ b/reactos/lib/cmlib/hivecell.c
@@ -202,7 +202,7 @@ HvpFindFree(
       while (*pFreeCellOffset != HCELL_NULL)
       {
          FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset);
-         if (HvpGetCellFullSize(RegistryHive, FreeCellData) >= Size)
+         if ((ULONG)HvpGetCellFullSize(RegistryHive, FreeCellData) >= Size)
          {
             FreeCellOffset = *pFreeCellOffset;
             *pFreeCellOffset = *FreeCellData;
@@ -299,7 +299,7 @@ HvAllocateCell(
 
    /* Split the block in two parts */
    /* FIXME: There is some minimal cell size that we must respect. */
-   if (FreeCell->Size > Size + sizeof(HCELL_INDEX))
+   if ((ULONG)FreeCell->Size > Size + sizeof(HCELL_INDEX))
    {
       NewCell = (PHCELL)((ULONG_PTR)FreeCell + Size);
       NewCell->Size = FreeCell->Size - Size;
@@ -344,7 +344,7 @@ HvReallocateCell(
     * FIXME: Merge with adjacent free cell if possible.
     * FIXME: Implement shrinking.
     */
-   if (Size > -OldCellSize)
+   if (Size > (ULONG)-OldCellSize)
    {
       NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage);
       if (NewCellIndex == HCELL_NULL)
@@ -393,8 +393,8 @@ HvFreeCell(
       if (Neighbor->Size > 0)
       {
          HvpRemoveFree(RegistryHive, Neighbor,
-                       ((HCELL_INDEX)Neighbor - (HCELL_INDEX)Bin +
-                       Bin->FileOffset) | (CellIndex & HCELL_TYPE_MASK));
+                       ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin +
+                       Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK));
          Free->Size += Neighbor->Size;
       }
    }
@@ -409,8 +409,8 @@ HvFreeCell(
             Neighbor->Size += Free->Size;
             if (CellType == HvStable)
                HvMarkCellDirty(RegistryHive,
-                               (HCELL_INDEX)Neighbor - (HCELL_INDEX)Bin +
-                               Bin->FileOffset);
+                               (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin +
+                               Bin->FileOffset));
             return;
          }
          Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size);
diff --git a/reactos/lib/rtl/bitmap.c b/reactos/lib/rtl/bitmap.c
index 98514ae85fd..feb742e0054 100644
--- a/reactos/lib/rtl/bitmap.c
+++ b/reactos/lib/rtl/bitmap.c
@@ -874,7 +874,7 @@ RtlTestBit(PRTL_BITMAP BitMapHeader,
 
   Ptr = (PULONG)BitMapHeader->Buffer + (BitNumber / 32);
 
-  return (*Ptr & (1 << (BitNumber % 32)));
+  return (BOOLEAN)(*Ptr & (1 << (BitNumber % 32)));
 }
 
 /*
@@ -923,7 +923,7 @@ CCHAR WINAPI RtlFindMostSignificantBit(ULONGLONG ulLong)
     signed char ret = 32;
     DWORD dw;
 
-    if (!(dw = (ulLong >> 32)))
+    if (!(dw = (DWORD)(ulLong >> 32)))
     {
         ret = 0;
         dw = (DWORD)ulLong;
@@ -957,7 +957,7 @@ CCHAR WINAPI RtlFindLeastSignificantBit(ULONGLONG ulLong)
     if (!(dw = (DWORD)ulLong))
     {
         ret = 32;
-        if (!(dw = ulLong >> 32)) return -1;
+        if (!(dw = (DWORD)(ulLong >> 32))) return -1;
     }
     if (!(dw & 0xffff))
     {