[PATCH 2/5] d3drm: Add helper for destroying device.

Aaryaman Vasishta jem456.vasishta at gmail.com
Tue Aug 18 13:47:52 CDT 2015


---
 dlls/d3drm/d3drm_private.h | 2 ++
 dlls/d3drm/device.c        | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index 9538de0..e1b37f8 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -42,6 +42,8 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HID
 HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data,
                        D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN;
 
+void d3drm_device_destroy(struct d3drm_device *device) DECLSPEC_HIDDEN;
+
 struct d3drm_file_header
 {
     WORD major;
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index ddb9873..b99872c 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -75,6 +75,11 @@ IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device)
     return &device->IDirect3DRMDevice3_iface;
 }
 
+void d3drm_device_destroy(struct d3drm_device *device)
+{
+    HeapFree(GetProcessHeap(), 0, device);
+}
+
 static inline struct d3drm_device *impl_from_IDirect3DRMWinDevice(IDirect3DRMWinDevice *iface)
 {
     return CONTAINING_RECORD(iface, struct d3drm_device, IDirect3DRMWinDevice_iface);
@@ -871,7 +876,7 @@ static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface)
     TRACE("%p decreasing refcount to %u.\n", iface, refcount);
 
     if (!refcount)
-        HeapFree(GetProcessHeap(), 0, device);
+        d3drm_device_destroy(device);
 
     return refcount;
 }
-- 
2.3.2 (Apple Git-55)




More information about the wine-patches mailing list