Aaryaman Vasishta : d3drm: Move Release from device2->device3.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 13 09:30:03 CDT 2015
Module: wine
Branch: master
Commit: 0339e57f321240d98e6d30390fe319901de362ef
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0339e57f321240d98e6d30390fe319901de362ef
Author: Aaryaman Vasishta <jem456.vasishta at gmail.com>
Date: Sat Jul 11 18:28:43 2015 +0530
d3drm: Move Release from device2->device3.
---
dlls/d3drm/device.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index f3f68fa..0e41855 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -100,14 +100,8 @@ static ULONG WINAPI d3drm_device2_AddRef(IDirect3DRMDevice2 *iface)
static ULONG WINAPI d3drm_device2_Release(IDirect3DRMDevice2 *iface)
{
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
- ULONG refcount = InterlockedDecrement(&device->ref);
-
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
- if (!refcount)
- HeapFree(GetProcessHeap(), 0, device);
-
- return refcount;
+ return IDirect3DRMDevice3_Release(&device->IDirect3DRMDevice3_iface);
}
static HRESULT WINAPI d3drm_device2_Clone(IDirect3DRMDevice2 *iface,
@@ -459,8 +453,14 @@ static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface)
static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface)
{
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
+ ULONG refcount = InterlockedDecrement(&device->ref);
+
+ TRACE("%p decreasing refcount to %u.\n", iface, refcount);
- return d3drm_device2_Release(&device->IDirect3DRMDevice2_iface);
+ if (!refcount)
+ HeapFree(GetProcessHeap(), 0, device);
+
+ return refcount;
}
static HRESULT WINAPI d3drm_device3_Clone(IDirect3DRMDevice3 *iface,
@@ -872,7 +872,7 @@ static ULONG WINAPI d3drm_device_win_Release(IDirect3DRMWinDevice *iface)
{
struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface);
- return d3drm_device2_Release(&device->IDirect3DRMDevice2_iface);
+ return d3drm_device3_Release(&device->IDirect3DRMDevice3_iface);
}
static HRESULT WINAPI d3drm_device_win_Clone(IDirect3DRMWinDevice *iface,
More information about the wine-cvs
mailing list