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

reg: Use the global HeapAlloc() wrappers. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-02-07 23:48:40 +01:00 committed by Alexandre Julliard
parent 4b08687757
commit 6542c3e860
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/reg/export.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#include <wine/heap.h>
#include "reg.h" #include "reg.h"

1
programs/reg/import.c
View File

@ -23,6 +23,7 @@
#include <wine/unicode.h> #include <wine/unicode.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/heap.h>
#include "reg.h" #include "reg.h"

15
programs/reg/reg.c
View File

@ -21,6 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/heap.h>
#include "reg.h" #include "reg.h"
WINE_DEFAULT_DEBUG_CHANNEL(reg); WINE_DEFAULT_DEBUG_CHANNEL(reg);
@ -81,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0};
void *heap_xalloc(size_t size) void *heap_xalloc(size_t size)
{ {
void *buf = HeapAlloc(GetProcessHeap(), 0, size); void *buf = heap_alloc(size);
if (!buf) if (!buf)
{ {
ERR("Out of memory!\n"); ERR("Out of memory!\n");
@ -92,12 +93,7 @@ void *heap_xalloc(size_t size)
void *heap_xrealloc(void *buf, size_t size) void *heap_xrealloc(void *buf, size_t size)
{ {
void *new_buf; void *new_buf = heap_realloc(buf, size);
if (buf)
new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size);
else
new_buf = HeapAlloc(GetProcessHeap(), 0, size);
if (!new_buf) if (!new_buf)
{ {
@ -108,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size)
return new_buf; return new_buf;
} }
BOOL heap_free(void *buf)
{
return HeapFree(GetProcessHeap(), 0, buf);
}
void output_writeconsole(const WCHAR *str, DWORD wlen) void output_writeconsole(const WCHAR *str, DWORD wlen)
{ {
DWORD count, ret; DWORD count, ret;

1
programs/reg/reg.h
View File

@ -27,7 +27,6 @@
/* reg.c */ /* reg.c */
void *heap_xalloc(size_t size); void *heap_xalloc(size_t size);
void *heap_xrealloc(void *buf, size_t size); void *heap_xrealloc(void *buf, size_t size);
BOOL heap_free(void *buf);
void output_writeconsole(const WCHAR *str, DWORD wlen); void output_writeconsole(const WCHAR *str, DWORD wlen);
void WINAPIV output_message(unsigned int id, ...); void WINAPIV output_message(unsigned int id, ...);
BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info);