summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
034e605)
svn path=/trunk/; revision=10725
*/
void* realloc(void* _ptr, size_t _size)
{
*/
void* realloc(void* _ptr, size_t _size)
{
+ if (!_ptr)
+ return(HeapAlloc(GetProcessHeap(),0,_size));
return(HeapReAlloc(GetProcessHeap(),0,_ptr,_size));
}
return(HeapReAlloc(GetProcessHeap(),0,_ptr,_size));
}
-/* $Id: console.c,v 1.78 2004/08/24 17:21:11 navaraf Exp $
+/* $Id: console.c,v 1.79 2004/08/28 22:14:08 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
- CtrlHandlers =
- RtlReAllocateHeap(RtlGetProcessHeap(),
- HEAP_ZERO_MEMORY,
- (PVOID)CtrlHandlers,
- NrCtrlHandlers * sizeof(PHANDLER_ROUTINE));
+ if (CtrlHandlers == NULL)
+ {
+ CtrlHandlers = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,
+ NrCtrlHandlers * sizeof(PHANDLER_ROUTINE));
+ }
+ else
+ {
+ CtrlHandlers = RtlReAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,
+ (PVOID)CtrlHandlers,
+ NrCtrlHandlers * sizeof(PHANDLER_ROUTINE));
+ }
if (CtrlHandlers == NULL)
{
NrCtrlHandlers = 0;
if (CtrlHandlers == NULL)
{
NrCtrlHandlers = 0;
SUBHEAP *subheap;
if (!ptr)
SUBHEAP *subheap;
if (!ptr)
- return RtlAllocateHeap( heap, flags, size ); /* FIXME: correct? */
if (!(heapPtr = HEAP_GetPtr( heap )))
return FALSE;
if (!(heapPtr = HEAP_GetPtr( heap )))
return FALSE;