Module: wine Branch: master Commit: 894f1cde4acb862dbaa000e7fb9cb09b3d216f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/894f1cde4acb862dbaa000e7fb9cb09...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sat May 27 10:45:37 2023 +0200
ole32/pointermoniker: Use CRT allocation functions.
---
dlls/ole32/pointermoniker.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 0beab94c649..9b5ea8caf76 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "oleidl.h" #include "wine/debug.h" -#include "wine/heap.h" #include "moniker.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -110,7 +109,7 @@ static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pObject) IUnknown_Release(moniker->pObject); - heap_free(moniker); + free(moniker); }
return refcount; @@ -600,8 +599,7 @@ HRESULT WINAPI CreatePointerMoniker(IUnknown *object, IMoniker **ret) if (!ret) return E_INVALIDARG;
- moniker = heap_alloc(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) { *ret = NULL; return E_OUTOFMEMORY; @@ -714,7 +712,7 @@ static ULONG WINAPI ObjrefMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pObject) IUnknown_Release(moniker->pObject); - heap_free(moniker); + free(moniker); }
return refcount; @@ -1017,8 +1015,7 @@ HRESULT WINAPI CreateObjrefMoniker(IUnknown *obj, IMoniker **ret) if (!ret) return E_INVALIDARG;
- moniker = heap_alloc(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) { *ret = NULL; return E_OUTOFMEMORY;