[ros-diffs] [tfaber] 55150: [FREELDR] - Do not declare functions without prototypes - DPRINT fix - Powered by VS11

Author: tfaber
Date: Tue Jan 24 20:57:03 2012
New Revision: 55150

URL: http://svn.reactos.org/svn/reactos?rev=55150&view=rev
Log:
[FREELDR]
- Do not declare functions without prototypes
- DPRINT fix
- Powered by VS11

Modified:
    trunk/reactos/boot/freeldr/freeldr/debug.c
    trunk/reactos/boot/freeldr/freeldr/include/bget.h
    trunk/reactos/boot/freeldr/freeldr/mm/heap.c

Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Tue Jan 24 20:57:03 2012
@@ -188,7 +188,7 @@
 	}
 
 	DebugStartOfLine = FALSE; // We don't want line headers
-	DbgPrint("Dumping buffer at 0x%x with length of %d bytes:\n", Buffer,
Length);
+	DbgPrint("Dumping buffer at %p with length of %lu bytes:\n", Buffer, Length);
 
 	for (Idx=0; Idx<Length; )
 	{

Modified: trunk/reactos/boot/freeldr/freeldr/include/bget.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/bget.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/bget.h [iso-8859-1] Tue Jan 24 20:57:03
2012
@@ -4,27 +4,19 @@
 
 */
 
-#ifndef _
-#ifdef PROTOTYPES
-#define  _(x)  x		      /* If compiler knows prototypes */
-#else
-#define  _(x)  ()                     /* It it doesn't */
-#endif /* PROTOTYPES */
-#endif
-
 typedef long bufsize;
-void	bpool	    _((void *buffer, bufsize len));
-void   *bget	    _((bufsize size));
-void   *bgetz	    _((bufsize size));
-void   *bgetr	    _((void *buffer, bufsize newsize));
-void	brel	    _((void *buf));
-void	bectl	    _((int (*compact)(bufsize sizereq, int sequence),
-		       void *(*acquire)(bufsize size),
-		       void (*release)(void *buf), bufsize pool_incr));
-void	bstats	    _((bufsize *curalloc, bufsize *totfree, bufsize *maxfree,
-		       long *nget, long *nrel));
-void	bstatse     _((bufsize *pool_incr, long *npool, long *npget,
-		       long *nprel, long *ndget, long *ndrel));
-void	bufdump     _((void *buf));
-void	bpoold	    _((void *pool, int dumpalloc, int dumpfree));
-int	bpoolv	    _((void *pool));
+void	bpool	    (void *buffer, bufsize len);
+void   *bget	    (bufsize size);
+void   *bgetz	    (bufsize size);
+void   *bgetr	    (void *buffer, bufsize newsize);
+void	brel	    (void *buf);
+void	bectl	    (int (*compact)(bufsize sizereq, int sequence),
+		     void *(*acquire)(bufsize size),
+		     void (*release)(void *buf), bufsize pool_incr);
+void	bstats	    (bufsize *curalloc, bufsize *totfree, bufsize *maxfree,
+		     long *nget, long *nrel);
+void	bstatse     (bufsize *pool_incr, long *npool, long *npget,
+		     long *nprel, long *ndget, long *ndrel);
+void	bufdump     (void *buf);
+void	bpoold	    (void *pool, int dumpalloc, int dumpfree);
+int	bpoolv	    (void *pool);

Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Tue Jan 24 20:57:03 2012
@@ -42,7 +42,7 @@
 	}
 
 	// Initialize BGET
-	bpool(HeapStart << MM_PAGE_SHIFT, PagesNeeded << MM_PAGE_SHIFT);
+	bpool((PVOID)(HeapStart << MM_PAGE_SHIFT), PagesNeeded << MM_PAGE_SHIFT);
 
 	// Mark those pages as used
 	MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded,
LoaderOsloaderHeap);