Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REG] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-25 12:50:15 +01:00
parent eae3333c2f
commit 80c45b1f06
30 changed files with 38 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

25
base/applications/cmdutils/reg/reg.c
View file

@ -16,15 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <winreg.h>
#include <wincon.h>
#include <shlwapi.h>
#include <windows.h>
#include <errno.h>
#include <stdlib.h>
#include <wine/unicode.h>
#include <wine/debug.h>
#include <wine/heap.h>
#include "reg.h"
WINE_DEFAULT_DEBUG_CHANNEL(reg);
@ -85,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0};
void *heap_xalloc(size_t size)
{
void *buf = HeapAlloc(GetProcessHeap(), 0, size);
void *buf = heap_alloc(size);
if (!buf)
{
ERR("Out of memory!\n");
@ -96,12 +93,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)
{
@ -112,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size)
return new_buf;
}
BOOL heap_free(void *buf)
{
return HeapFree(GetProcessHeap(), 0, buf);
}
void output_writeconsole(const WCHAR *str, DWORD wlen)
{
DWORD count, ret;