From 8000fc4e35697d3ae5bee5a3fc127a00d32f1327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ri=C4=8Dardas=20Barkauskas?= Date: Fri, 29 Jul 2011 18:52:33 +0300 Subject: [PATCH] ddraw: Rename surface_from_texture2 to impl_from_IDirect3DTexture2. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/surface.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b7ab1988114..7fcefc9be5e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -219,9 +219,9 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture(IDirect3DTextur return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture_iface); } -static inline IDirectDrawSurfaceImpl *surface_from_texture2(IDirect3DTexture2 *iface) +static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl); } static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a7722d74fcf..0b793ab8872 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -201,7 +201,7 @@ static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl static HRESULT WINAPI d3d_texture2_QueryInterface(IDirect3DTexture2 *iface, REFIID riid, void **object) { - IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture2(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); @@ -332,7 +332,7 @@ static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) { - IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture2(iface); TRACE("iface %p.\n", iface); return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface); @@ -615,7 +615,7 @@ static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { - IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture2(iface); TRACE("iface %p.\n", iface); return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); @@ -4491,7 +4491,7 @@ static HRESULT WINAPI d3d_texture1_Unload(IDirect3DTexture *iface) static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) { - IDirectDrawSurfaceImpl *surface = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirect3DTexture2(iface); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); @@ -4571,7 +4571,7 @@ static IDirectDrawSurfaceImpl *get_sub_mimaplevel(IDirectDrawSurfaceImpl *surfac *****************************************************************************/ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTexture2 *src_texture) { - IDirectDrawSurfaceImpl *dst_surface = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *dst_surface = impl_from_IDirect3DTexture2(iface); IDirectDrawSurfaceImpl *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture); HRESULT hr;