Aaryaman Vasishta : d3drm: Move AddRef from device2->device3.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 13 09:30:03 CDT 2015
Module: wine
Branch: master
Commit: ee6004ce0ce7cc92395a2bdf1607e1e42b1cd4c1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6004ce0ce7cc92395a2bdf1607e1e42b1cd4c1
Author: Aaryaman Vasishta <jem456.vasishta at gmail.com>
Date: Sat Jul 11 18:28:42 2015 +0530
d3drm: Move AddRef from device2->device3.
---
dlls/d3drm/device.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index c53abfc..f3f68fa 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -93,11 +93,8 @@ static HRESULT WINAPI d3drm_device2_QueryInterface(IDirect3DRMDevice2 *iface, RE
static ULONG WINAPI d3drm_device2_AddRef(IDirect3DRMDevice2 *iface)
{
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
- ULONG refcount = InterlockedIncrement(&device->ref);
-
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
- return refcount;
+ return IDirect3DRMDevice3_AddRef(&device->IDirect3DRMDevice3_iface);
}
static ULONG WINAPI d3drm_device2_Release(IDirect3DRMDevice2 *iface)
@@ -452,8 +449,11 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE
static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface)
{
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
+ ULONG refcount = InterlockedIncrement(&device->ref);
+
+ TRACE("%p increasing refcount to %u.\n", iface, refcount);
- return d3drm_device2_AddRef(&device->IDirect3DRMDevice2_iface);
+ return refcount;
}
static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface)
@@ -865,7 +865,7 @@ static ULONG WINAPI d3drm_device_win_AddRef(IDirect3DRMWinDevice *iface)
{
struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface);
- return d3drm_device2_AddRef(&device->IDirect3DRMDevice2_iface);
+ return d3drm_device3_AddRef(&device->IDirect3DRMDevice3_iface);
}
static ULONG WINAPI d3drm_device_win_Release(IDirect3DRMWinDevice *iface)
More information about the wine-cvs
mailing list