From: Nikolay Sivov nsivov@codeweavers.com
--- dlls/ole32/antimoniker.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 2a7be8e75cc..e4ee4a729d4 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <assert.h> #include <stdarg.h> #include <string.h>
@@ -27,10 +26,8 @@
#include "windef.h" #include "winbase.h" -#include "winerror.h" #include "objbase.h" #include "wine/debug.h" -#include "wine/heap.h" #include "moniker.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -140,7 +137,7 @@ static ULONG WINAPI AntiMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker); + free(moniker); }
return refcount; @@ -616,8 +613,7 @@ HRESULT create_anti_moniker(DWORD order, IMoniker **ret) { AntiMonikerImpl *moniker;
- moniker = heap_alloc_zero(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) return E_OUTOFMEMORY;
moniker->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl;