From: Aaryaman Vasishta Subject: [PATCH 1/4] d3drm: Introduce d3drm_texture_destroy helper. Message-Id: <1461871028-61881-1-git-send-email-jem456.vasishta@gmail.com> Date: Fri, 29 Apr 2016 00:47:05 +0530 Signed-off-by: Aaryaman Vasishta --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/texture.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 2eb8e4d..f7a59da 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -63,6 +63,8 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HID HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; +void d3drm_texture_destroy(struct d3drm_texture *texture) DECLSPEC_HIDDEN; + void d3drm_device_destroy(struct d3drm_device *device) DECLSPEC_HIDDEN; HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, IDirectDraw *ddraw, IDirectDrawClipper *clipper, int width, int height, diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 886bb0b..6537be6 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -44,6 +44,11 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); } +void d3drm_texture_destroy(struct d3drm_texture *texture) +{ + HeapFree(GetProcessHeap(), 0, texture); +} + static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -724,7 +729,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) if (!refcount) { d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); - HeapFree(GetProcessHeap(), 0, texture); + d3drm_texture_destroy(texture); } return refcount; -- 2.3.2 (Apple Git-55)