mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:54:13 +00:00
regedit: 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:
parent
06a3a32294
commit
505a9e0283
9 changed files with 11 additions and 14 deletions
|
@ -27,8 +27,9 @@
|
|||
#include "regproc.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "wine/heap.h"
|
||||
#include "wine/unicode.h"
|
||||
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(regedit);
|
||||
|
||||
ChildWnd* g_pChildWnd;
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <shellapi.h>
|
||||
#include <shlwapi.h>
|
||||
|
||||
#include "wine/heap.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "main.h"
|
||||
#include "regproc.h"
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "main.h"
|
||||
#include "regproc.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/heap.h"
|
||||
#include "wine/unicode.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(regedit);
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "winnls.h"
|
||||
#include "commctrl.h"
|
||||
|
||||
#include "wine/heap.h"
|
||||
#include "main.h"
|
||||
#include "regproc.h"
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
#include "main.h"
|
||||
#include "regproc.h"
|
||||
#include "wine/heap.h"
|
||||
#include "wine/unicode.h"
|
||||
|
||||
static INT Image_String;
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <shellapi.h>
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/heap.h"
|
||||
#include "regproc.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(regedit);
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <windows.h>
|
||||
#include <wine/unicode.h>
|
||||
#include <wine/debug.h>
|
||||
#include <wine/heap.h>
|
||||
#include "regproc.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(regedit);
|
||||
|
@ -46,7 +47,7 @@ static HKEY reg_class_keys[] = {
|
|||
|
||||
void *heap_xalloc(size_t size)
|
||||
{
|
||||
void *buf = HeapAlloc(GetProcessHeap(), 0, size);
|
||||
void *buf = heap_alloc(size);
|
||||
if (!buf)
|
||||
{
|
||||
ERR("Out of memory!\n");
|
||||
|
@ -57,12 +58,7 @@ void *heap_xalloc(size_t size)
|
|||
|
||||
void *heap_xrealloc(void *buf, size_t size)
|
||||
{
|
||||
void *new_buf;
|
||||
|
||||
if (buf)
|
||||
new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size);
|
||||
else
|
||||
new_buf = HeapAlloc(GetProcessHeap(), 0, size);
|
||||
void *new_buf = heap_realloc(buf, size);
|
||||
|
||||
if (!new_buf)
|
||||
{
|
||||
|
@ -73,11 +69,6 @@ void *heap_xrealloc(void *buf, size_t size)
|
|||
return new_buf;
|
||||
}
|
||||
|
||||
BOOL heap_free(void *buf)
|
||||
{
|
||||
return HeapFree(GetProcessHeap(), 0, buf);
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* Allocates memory and converts input from multibyte to wide chars
|
||||
* Returned string must be freed by the caller
|
||||
|
|
|
@ -30,7 +30,6 @@ void WINAPIV error_exit(unsigned int id, ...);
|
|||
char *GetMultiByteString(const WCHAR *strW);
|
||||
void *heap_xalloc(size_t size);
|
||||
void *heap_xrealloc(void *buf, size_t size);
|
||||
BOOL heap_free(void *buf);
|
||||
BOOL import_registry_file(FILE *reg_file);
|
||||
void delete_registry_key(WCHAR *reg_key_name);
|
||||
BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format);
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <wine/debug.h>
|
||||
#include <shlwapi.h>
|
||||
|
||||
#include "wine/heap.h"
|
||||
#include "main.h"
|
||||
#include "regproc.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue