Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

casting bug-fix in mm/npool.c - submitted by Mike Nordell aka tamlin - builds & boots to winhello for him & I both.

Browse source 
svn path=/trunk/; revision=5318
This commit is contained in:
Royce Mitchell III 2003-07-29 19:00:34 +00:00
parent a1edd5239a
commit 6992ecb9fa
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/ntoskrnl/mm/npool.c
View file

@ -1,4 +1,4 @@
/* $Id: npool.c,v 1.71 2003/07/21 21:53:53 royce Exp $ /* $Id: npool.c,v 1.72 2003/07/29 19:00:34 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1014,8 +1014,8 @@ static void check_duplicates(BLOCK_HDR* blk)
* NOTE: Bug checks if duplicates are found * NOTE: Bug checks if duplicates are found
*/ */
{ {
unsigned int base = (int)blk; unsigned int base = (unsigned int)blk;
unsigned int last = ((int)blk) + +sizeof(BLOCK_HDR) + blk->Size; unsigned int last = ((unsigned int)blk) + +sizeof(BLOCK_HDR) + blk->Size;
BLOCK_HDR* current; BLOCK_HDR* current;
PLIST_ENTRY current_entry; PLIST_ENTRY current_entry;
@ -1031,13 +1031,13 @@ static void check_duplicates(BLOCK_HDR* blk)
KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0); KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
} }
if ( (int)current > base && (int)current < last ) if ( (unsigned int)current > base && (unsigned int)current < last )
{ {
DbgPrint("intersecting blocks on list\n"); DbgPrint("intersecting blocks on list\n");
for(;;); for(;;);
} }
if ( (int)current < base && if ( (unsigned int)current < base &&
((int)current + current->Size + sizeof(BLOCK_HDR)) ((unsigned int)current + current->Size + sizeof(BLOCK_HDR))
> base ) > base )
{ {
DbgPrint("intersecting blocks on list\n"); DbgPrint("intersecting blocks on list\n");
@ -1052,13 +1052,13 @@ static void check_duplicates(BLOCK_HDR* blk)
{ {
current = CONTAINING_RECORD(current_entry, BLOCK_HDR, ListEntry); current = CONTAINING_RECORD(current_entry, BLOCK_HDR, ListEntry);
if ( (int)current > base && (int)current < last ) if ( (unsigned int)current > base && (unsigned int)current < last )
{ {
DbgPrint("intersecting blocks on list\n"); DbgPrint("intersecting blocks on list\n");
for(;;); for(;;);
} }
if ( (int)current < base && if ( (unsigned int)current < base &&
((int)current + current->Size + sizeof(BLOCK_HDR)) ((unsigned int)current + current->Size + sizeof(BLOCK_HDR))
> base ) > base )
{ {
DbgPrint("intersecting blocks on list\n"); DbgPrint("intersecting blocks on list\n");
@ -1209,13 +1209,13 @@ inline static void* block_to_address(BLOCK_HDR* blk)
* address (internal) * address (internal)
*/ */
{ {
return ( (void *) ((int)blk + sizeof(BLOCK_HDR)) ); return ( (void *) ((unsigned int)blk + sizeof(BLOCK_HDR)) );
} }
inline static BLOCK_HDR* address_to_block(void* addr) inline static BLOCK_HDR* address_to_block(void* addr)
{ {
return (BLOCK_HDR *) return (BLOCK_HDR *)
( ((int)addr) - sizeof(BLOCK_HDR) ); ( ((unsigned int)addr) - sizeof(BLOCK_HDR) );
} }
static BLOCK_HDR* lookup_block(unsigned int size) static BLOCK_HDR* lookup_block(unsigned int size)
@ -1324,7 +1324,7 @@ static void* take_block(BLOCK_HDR* current, unsigned int size,
* Replace the bigger block with a smaller block in the * Replace the bigger block with a smaller block in the
* same position in the list * same position in the list
*/ */
free_blk = (BLOCK_HDR *)(((int)current) free_blk = (BLOCK_HDR *)(((unsigned int)current)
+ sizeof(BLOCK_HDR) + size); + sizeof(BLOCK_HDR) + size);
free_blk->Size = current->Size - (sizeof(BLOCK_HDR) + size); free_blk->Size = current->Size - (sizeof(BLOCK_HDR) + size);