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

ddrawex: Use the global memory allocation helpers. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-02-10 00:42:43 +03:30 committed by Alexandre Julliard
parent 405e25d5b4
commit 71c2c2dad2
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ddrawex/ddraw.c
View File

@ -166,7 +166,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface)
if (!refcount)
{
IDirectDraw4_Release(ddrawex->parent);
HeapFree(GetProcessHeap(), 0, ddrawex);
heap_free(ddrawex);
}
return refcount;
@ -1426,7 +1426,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
if (outer_unknown)
FIXME("Implement aggregation in ddrawex's IDirectDraw interface.\n");
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
if (!(object = heap_alloc_zero(sizeof(*object))))
return E_OUTOFMEMORY;
object->ref = 1;
@ -1447,9 +1447,11 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
return DD_OK;
err:
if(object && object->parent) IDirectDraw4_Release(object->parent);
if(parent) IDirectDraw_Release(parent);
HeapFree(GetProcessHeap(), 0, object);
if (object && object->parent)
IDirectDraw4_Release(object->parent);
if (parent)
IDirectDraw_Release(parent);
heap_free(object);
*ddraw = NULL;
return hr;
}

2
dlls/ddrawex/ddrawex_private.h
View File

@ -19,6 +19,8 @@
#ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
#define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
#include "wine/heap.h"
DEFINE_GUID(CLSID_DirectDrawFactory, 0x4fd2a832, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);
DEFINE_GUID(IID_IDirectDrawFactory, 0x4fd2a833, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);

12
dlls/ddrawex/main.c
View File

@ -84,7 +84,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface)
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
if (!refcount)
HeapFree(GetProcessHeap(), 0, factory);
heap_free(factory);
return refcount;
}
@ -163,7 +163,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface)
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
if (!refcount)
HeapFree(GetProcessHeap(), 0, factory);
heap_free(factory);
return refcount;
}
@ -195,13 +195,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void
if (outer_unknown)
return CLASS_E_NOAGGREGATION;
if (!(factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory))))
if (!(factory = heap_alloc_zero(sizeof(*factory))))
return E_OUTOFMEMORY;
factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl;
if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out)))
HeapFree(GetProcessHeap(), 0, factory);
heap_free(factory);
return hr;
}
@ -234,8 +234,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)
return CLASS_E_CLASSNOTAVAILABLE;
}
factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory));
if (factory == NULL) return E_OUTOFMEMORY;
if (!(factory = heap_alloc_zero(sizeof(*factory))))
return E_OUTOFMEMORY;
factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl;
factory->ref = 1;

4
dlls/ddrawex/surface.c
View File

@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface)
{
IDirectDrawSurface4_FreePrivateData(surface->parent, &IID_DDrawexPriv);
IDirectDrawSurface4_Release(surface->parent);
HeapFree(GetProcessHeap(), 0, surface);
heap_free(surface);
}
return refcount;
@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner)
struct ddrawex_surface *impl;
TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner);
impl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl));
impl = heap_alloc_zero(sizeof(*impl));
impl->ref = 1;
impl->IDirectDrawSurface3_iface.lpVtbl = &ddrawex_surface3_vtbl;
impl->IDirectDrawSurface4_iface.lpVtbl = &ddrawex_surface4_vtbl;