[PATCH 2/7] d3drm: Introduce d3drm_texture_destroy helper (v4).
Aaryaman Vasishta
jem456.vasishta at gmail.com
Fri May 13 16:21:32 CDT 2016
v4: Function should be static. Also added a trace.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
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 886bb0b..190a2dd 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;
}
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list