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

explorerframe: Use CRT memory allocation functions. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-03-31 15:00:23 +03:00 committed by Alexandre Julliard
parent 686843655c
commit 8498a9d1ef
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/explorerframe/nstc.c
View File

@ -33,7 +33,6 @@
#include "wine/list.h"
#include "wine/debug.h"
#include "wine/heap.h"
#include "explorerframe_main.h"
@ -852,7 +851,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface)
if(!ref)
{
TRACE("Freeing.\n");
heap_free(This);
free(This);
EFRAME_UnlockModule();
}
@ -989,7 +988,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface,
TRACE("%p, %d, %p, %lx, %lx, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif);
new_root = heap_alloc(sizeof(*new_root));
new_root = malloc(sizeof(*new_root));
if(!new_root)
return E_OUTOFMEMORY;
@ -1013,7 +1012,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface,
if(!new_root->htreeitem)
{
WARN("Failed to add the root.\n");
heap_free(new_root);
free(new_root);
return E_FAIL;
}
@ -1081,7 +1080,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface,
events_OnItemDeleted(This, root->psi, TRUE);
SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem);
list_remove(&root->entry);
heap_free(root);
free(root);
return S_OK;
}
else
@ -1123,7 +1122,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface,
if(!count)
return E_INVALIDARG;
array = heap_alloc(sizeof(LPITEMIDLIST)*count);
array = malloc(sizeof(LPITEMIDLIST)*count);
i = 0;
LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry)
@ -1137,7 +1136,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface,
for(i = 0; i < count; i++)
ILFree(array[i]);
heap_free(array);
free(array);
return hr;
}
@ -1598,7 +1597,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void
EFRAME_LockModule();
nstc = heap_alloc_zero(sizeof(*nstc));
nstc = calloc(1, sizeof(*nstc));
if (!nstc)
return E_OUTOFMEMORY;

5
dlls/explorerframe/taskbarlist.c
View File

@ -21,7 +21,6 @@
#include "explorerframe_main.h"
#include "wine/debug.h"
#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(explorerframe);
@ -81,7 +80,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface)
if (!refcount)
{
heap_free(This);
free(This);
EFRAME_UnlockModule();
}
@ -309,7 +308,7 @@ HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_lis
return CLASS_E_NOAGGREGATION;
}
object = heap_alloc(sizeof(*object));
object = malloc(sizeof(*object));
if (!object)
{
ERR("Failed to allocate taskbar list object memory\n");