ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winetest: Replace malloc() & co with HeapAlloc().

This commit is contained in:
Francois Gouget 2009-05-17 13:28:46 +02:00 committed by Alexandre Julliard
parent bf6b95e95c
commit 4a558538c8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/winetest/util.c
View File

@ -29,7 +29,7 @@ HANDLE logfile = 0;
void *heap_alloc (size_t len) void *heap_alloc (size_t len)
{ {
void *p = malloc (len); void *p = HeapAlloc(GetProcessHeap(), 0, len);
if (!p) report (R_FATAL, "Out of memory."); if (!p) report (R_FATAL, "Out of memory.");
return p; return p;
@ -37,7 +37,7 @@ void *heap_alloc (size_t len)
void *heap_realloc (void *op, size_t len) void *heap_realloc (void *op, size_t len)
{ {
void *p = realloc (op, len); void *p = HeapReAlloc(GetProcessHeap(), 0, op, len);
if (len && !p) report (R_FATAL, "Out of memory."); if (len && !p) report (R_FATAL, "Out of memory.");
return p; return p;
@ -45,14 +45,16 @@ void *heap_realloc (void *op, size_t len)
char *heap_strdup( const char *str ) char *heap_strdup( const char *str )
{ {
char *res = strdup( str ); int len = lstrlen(str) + 1;
char* res = HeapAlloc(GetProcessHeap(), 0, len);
if (!res) report (R_FATAL, "Out of memory."); if (!res) report (R_FATAL, "Out of memory.");
memcpy(res, str, len);
return res; return res;
} }
void heap_free (void *op) void heap_free (void *op)
{ {
free (op); HeapFree(GetProcessHeap(), 0, op);
} }
static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap)
@ -61,14 +63,14 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap)
char *p, *q; char *p, *q;
int n; int n;
p = malloc (size); p = HeapAlloc(GetProcessHeap(), 0, size);
if (!p) return NULL; if (!p) return NULL;
while (1) { while (1) {
n = vsnprintf (p, size, fmt, ap); n = vsnprintf (p, size, fmt, ap);
if (n < 0) size *= 2; /* Windows */ if (n < 0) size *= 2; /* Windows */
else if ((unsigned)n >= size) size = n+1; /* glibc */ else if ((unsigned)n >= size) size = n+1; /* glibc */
else break; else break;
q = realloc (p, size); q = HeapReAlloc(GetProcessHeap(), 0, p, size);
if (!q) { if (!q) {
heap_free (p); heap_free (p);
return NULL; return NULL;