Get rid of HEAP_xrealloc.
This commit is contained in:
parent
2941a2126c
commit
7827254cf2
|
@ -451,8 +451,8 @@ extern char* DEBUG_XStrDup(const char *str);
|
|||
work, etc... if someone could make optimized routines so it wouldn't
|
||||
take so long to load, it could be made default) */
|
||||
#include "heap.h"
|
||||
#define DBG_alloc(x) HEAP_xalloc(dbg_heap,0,x)
|
||||
#define DBG_realloc(x,y) HEAP_xrealloc(dbg_heap,0,x,y)
|
||||
#define DBG_alloc(x) HeapAlloc(dbg_heap,0,x)
|
||||
#define DBG_realloc(x,y) HeapRealloc(dbg_heap,0,x,y)
|
||||
#define DBG_free(x) HeapFree(dbg_heap,0,x)
|
||||
#define DBG_strdup(x) HEAP_strdupA(dbg_heap,0,x)
|
||||
#define DBG_need_heap
|
||||
|
|
|
@ -17,7 +17,6 @@ extern HANDLE SegptrHeap;
|
|||
extern int HEAP_IsInsideHeap( HANDLE heap, DWORD flags, LPCVOID ptr );
|
||||
extern SEGPTR HEAP_GetSegptr( HANDLE heap, DWORD flags, LPCVOID ptr );
|
||||
extern LPVOID HEAP_xalloc( HANDLE heap, DWORD flags, DWORD size );
|
||||
extern LPVOID HEAP_xrealloc( HANDLE heap, DWORD flags, LPVOID lpMem, DWORD size );
|
||||
extern LPSTR HEAP_strdupA( HANDLE heap, DWORD flags, LPCSTR str );
|
||||
extern LPWSTR HEAP_strdupW( HANDLE heap, DWORD flags, LPCWSTR str );
|
||||
extern LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
|
||||
|
|
|
@ -1651,24 +1651,6 @@ LPVOID HEAP_xalloc( HANDLE heap, DWORD flags, DWORD size )
|
|||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* HEAP_xrealloc
|
||||
*
|
||||
* Same as HeapReAlloc(), but die on failure.
|
||||
*/
|
||||
LPVOID HEAP_xrealloc( HANDLE heap, DWORD flags, LPVOID lpMem, DWORD size )
|
||||
{
|
||||
LPVOID p = HeapReAlloc( heap, flags, lpMem, size );
|
||||
if (!p)
|
||||
{
|
||||
MESSAGE("Virtual memory exhausted.\n" );
|
||||
exit(1);
|
||||
}
|
||||
SET_EIP(p);
|
||||
return p;
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* HEAP_strdupA
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue