niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

ddrawex: Use CRT allocation functions.

Browse source
This commit is contained in:
Alex Henrie 2023-11-04 21:11:55 -06:00 • committed by Alexandre Julliard
parent 38d6ffdbe9
commit 9365e6f682
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/ddrawex/ddraw.c
View file

@ -165,7 +165,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface)
if (!refcount)
{
IDirectDraw4_Release(ddrawex->parent);
heap_free(ddrawex);
free(ddrawex);
}
return refcount;
@ -1425,7 +1425,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
if (outer_unknown)
FIXME("Implement aggregation in ddrawex's IDirectDraw interface.\n");
if (!(object = heap_alloc_zero(sizeof(*object))))
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
object->ref = 1;
@ -1450,7 +1450,7 @@ err:
IDirectDraw4_Release(object->parent);
if (parent)
IDirectDraw_Release(parent);
heap_free(object);
free(object);
*ddraw = NULL;
return hr;
}

2
dlls/ddrawex/ddrawex_private.h
View file

@ -19,8 +19,6 @@
#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);

10
dlls/ddrawex/main.c
View file

@ -82,7 +82,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface)
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
heap_free(factory);
free(factory);
return refcount;
}
@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface)
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
heap_free(factory);
free(factory);
return refcount;
}
@ -193,13 +193,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void
if (outer_unknown)
return CLASS_E_NOAGGREGATION;
if (!(factory = heap_alloc_zero(sizeof(*factory))))
if (!(factory = calloc(1, sizeof(*factory))))
return E_OUTOFMEMORY;
factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl;
if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out)))
heap_free(factory);
free(factory);
return hr;
}
@ -223,7 +223,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)
return CLASS_E_CLASSNOTAVAILABLE;
}
if (!(factory = heap_alloc_zero(sizeof(*factory))))
if (!(factory = calloc(1, sizeof(*factory))))
return E_OUTOFMEMORY;
factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl;

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);
heap_free(surface);
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 = heap_alloc_zero(sizeof(*impl));
impl = calloc(1, sizeof(*impl));
impl->ref = 1;
impl->IDirectDrawSurface3_iface.lpVtbl = &ddrawex_surface3_vtbl;
impl->IDirectDrawSurface4_iface.lpVtbl = &ddrawex_surface4_vtbl;