Module: wine Branch: master Commit: 07c038c2b4c250f5aef042a7955f32cf9293e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c038c2b4c250f5aef042a795...
Author: Aaryaman Vasishta jem456.vasishta@gmail.com Date: Sat May 21 02:55:39 2016 +0530
d3drm: Introduce d3drm_texture_destroy helper.
Signed-off-by: Aaryaman Vasishta jem456.vasishta@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3drm/texture.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 5596bf5..eb8dfe0 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -44,6 +44,14 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); }
+static void d3drm_texture_destroy(struct d3drm_texture *texture) +{ + TRACE("texture %p is being destroyed.\n", texture); + + d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); + HeapFree(GetProcessHeap(), 0, texture); +} + static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -722,10 +730,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount);
if (!refcount) - { - d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); - HeapFree(GetProcessHeap(), 0, texture); - } + d3drm_texture_destroy(texture);
return refcount; }