From 36a554e323b0da6f291764e085c584c0b0c2aee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ri=C4=8Dardas=20Barkauskas?= Date: Sat, 4 Jun 2011 19:13:40 +0300 Subject: ddraw: Separate other conversion to IDirectDrawSurfaceImpl from conversions to ifaces. --- dlls/ddraw/surface.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8b4cfa7..895f07b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -146,23 +146,26 @@ static HRESULT WINAPI ddraw_surface3_QueryInterface(IDirectDrawSurface3 *iface, static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_gamma_control(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } static HRESULT WINAPI d3d_texture2_QueryInterface(IDirect3DTexture2 *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_texture2(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_texture1(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } /***************************************************************************** @@ -204,23 +207,26 @@ static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_gamma_control(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_texture2(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_texture1(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } /***************************************************************************** @@ -411,23 +417,26 @@ static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_gamma_control(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_texture2(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_texture1(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } /***************************************************************************** -- 1.7.5.1