=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Rename d3d10_device_inner to d3d_device_inner.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 1 10:57:00 CDT 2015
Module: wine
Branch: master
Commit: 9754cda53bdeb2354a75711fba27df15cfaf259c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9754cda53bdeb2354a75711fba27df15cfaf259c
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Sun Sep 27 18:50:00 2015 +0200
d3d11: Rename d3d10_device_inner to d3d_device_inner.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/device.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index efa52ee..f56d3a9 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -563,7 +563,7 @@ static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface)
return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner);
}
-static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out)
+static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out)
{
struct d3d_device *device = impl_from_IUnknown(iface);
@@ -598,17 +598,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa
return S_OK;
}
-static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface)
+static ULONG STDMETHODCALLTYPE d3d_device_inner_AddRef(IUnknown *iface)
{
- struct d3d_device *This = impl_from_IUnknown(iface);
- ULONG refcount = InterlockedIncrement(&This->refcount);
+ struct d3d_device *device = impl_from_IUnknown(iface);
+ ULONG refcount = InterlockedIncrement(&device->refcount);
- TRACE("%p increasing refcount to %u\n", This, refcount);
+ TRACE("%p increasing refcount to %u.\n", device, refcount);
return refcount;
}
-static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface)
+static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface)
{
struct d3d_device *device = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&device->refcount);
@@ -2786,12 +2786,12 @@ static const struct ID3D10Device1Vtbl d3d10_device1_vtbl =
d3d10_device_GetFeatureLevel,
};
-static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl =
+static const struct IUnknownVtbl d3d_device_inner_unknown_vtbl =
{
/* IUnknown methods */
- d3d10_device_inner_QueryInterface,
- d3d10_device_inner_AddRef,
- d3d10_device_inner_Release,
+ d3d_device_inner_QueryInterface,
+ d3d_device_inner_AddRef,
+ d3d_device_inner_Release,
};
/* ID3D10Multithread methods */
@@ -3125,7 +3125,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops =
HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown)
{
- device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl;
+ device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl;
device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl;
device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl;
device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;
More information about the wine-cvs
mailing list