[ros-diffs] [amunger] 28344: Fixup the R_MAGIC code.

[amunger at svn.reactos.org]

Author: amunger
Date: Wed Aug 15 11:45:55 2007
New Revision: 28344

URL: http://svn.reactos.org/svn/reactos?rev=28344&view=rev
Log:
Fixup the R_MAGIC code.

Modified:
    trunk/reactos/ntoskrnl/mm/rpoolmgr.h

Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rpoolmgr.h?rev=28344&r1=28343&r2=28344&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/rpoolmgr.h (original)
+++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h Wed Aug 15 11:45:55 2007
@@ -427,12 +427,12 @@
 
 	ASSERT ( Addr >= (char*)pool->UserBase && Addr < ((char*)pool->UserBase + pool->UserSize - 16) );
 #ifdef R_MAGIC
-	if ( pUsed->UsedMagic == MM_PPOOL_FREEMAGIC )
+	if ( pUsed->UsedMagic == R_FREE_MAGIC )
 	{
 		pUsed->UserSize = 0; // just to keep from confusion, MmpBadBlock() doesn't return...
 		RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 );
 	}
-	if ( pUsed->UsedMagic != MM_PPOOL_USEDMAGIC )
+	if ( pUsed->UsedMagic != R_USED_MAGIC )
 	{
 		RiBadBlock ( pUsed, Addr, "bad magic", file, line, 0 );
 	}
@@ -650,7 +650,7 @@
 {
 	Block->Status = 1;
 	RUsedFillStack ( Block );
-#if R_MAGIC
+#ifdef R_MAGIC
 	Block->UsedMagic = R_USED_MAGIC;
 #endif//R_MAGIC
 	//ASSERT_SIZE ( Block->Size );
@@ -978,7 +978,7 @@
 {
 	PR_USED Block = RBodyToHdr(Addr);
 	// TODO FIXME - should we validate params?
-#if R_MAGIC
+#ifdef R_MAGIC
 	if ( Block->UsedMagic != R_USED_MAGIC )
 		return 0xDEADBEEF;
 #endif//R_MAGIC