From 472a8f7a678e85de57e42de20d0563fb2006a221 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ri=C4=8Dardas=20Barkauskas?= Date: Mon, 17 Oct 2011 16:58:51 +0300 Subject: [PATCH] ddraw: COM cleanup for IDirect3DDevice7 interface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 100 ++++++++++++++++++++++----------------------- dlls/ddraw/executebuffer.c | 6 +-- dlls/ddraw/light.c | 6 +-- dlls/ddraw/main.c | 2 +- dlls/ddraw/material.c | 2 +- dlls/ddraw/vertexbuffer.c | 6 +-- dlls/ddraw/viewport.c | 6 +-- 9 files changed, 67 insertions(+), 67 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 41ac0a62c1f..17f1900eb44 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4328,7 +4328,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, } TRACE("Created device %p.\n", object); - *device = (IDirect3DDevice7 *)object; + *device = &object->IDirect3DDevice7_iface; LeaveCriticalSection(&ddraw_cs); return D3D_OK; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cb9ec526c1c..7b0d608425d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -277,7 +277,7 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha struct IDirect3DDeviceImpl { /* IUnknown */ - const IDirect3DDevice7Vtbl *lpVtbl; + IDirect3DDevice7 IDirect3DDevice7_iface; IDirect3DDevice3 IDirect3DDevice3_iface; IDirect3DDevice2 IDirect3DDevice2_iface; IDirect3DDevice IDirect3DDevice_iface; @@ -342,7 +342,7 @@ static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice3(IDirect3DDevice3 * static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) { - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice7_iface); } IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f8630817a4f..0b99e59b73f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -197,7 +197,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_QueryInterface(IDirect3DDevice3 *ifa IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); - return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)This, riid, obj); + return IDirect3DDevice7_QueryInterface(&This->IDirect3DDevice7_iface, riid, obj); } static HRESULT WINAPI IDirect3DDeviceImpl_2_QueryInterface(IDirect3DDevice2 *iface, REFIID riid, @@ -206,7 +206,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_QueryInterface(IDirect3DDevice2 *ifa IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); - return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)This, riid, obj); + return IDirect3DDevice7_QueryInterface(&This->IDirect3DDevice7_iface, riid, obj); } static HRESULT WINAPI IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *iface, REFIID riid, @@ -215,7 +215,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *ifac IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp); - return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)This, riid, obp); + return IDirect3DDevice7_QueryInterface(&This->IDirect3DDevice7_iface, riid, obp); } /***************************************************************************** @@ -246,7 +246,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_3_AddRef(IDirect3DDevice3 *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)This); + return IDirect3DDevice7_AddRef(&This->IDirect3DDevice7_iface); } static ULONG WINAPI IDirect3DDeviceImpl_2_AddRef(IDirect3DDevice2 *iface) @@ -254,7 +254,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_2_AddRef(IDirect3DDevice2 *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)This); + return IDirect3DDevice7_AddRef(&This->IDirect3DDevice7_iface); } static ULONG WINAPI IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface) @@ -262,7 +262,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)This); + return IDirect3DDevice7_AddRef(&This->IDirect3DDevice7_iface); } /***************************************************************************** @@ -385,7 +385,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_3_Release(IDirect3DDevice3 *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_Release((IDirect3DDevice7 *)This); + return IDirect3DDevice7_Release(&This->IDirect3DDevice7_iface); } static ULONG WINAPI IDirect3DDeviceImpl_2_Release(IDirect3DDevice2 *iface) @@ -393,7 +393,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_2_Release(IDirect3DDevice2 *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_Release((IDirect3DDevice7 *)This); + return IDirect3DDevice7_Release(&This->IDirect3DDevice7_iface); } static ULONG WINAPI IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface) @@ -401,7 +401,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_Release((IDirect3DDevice7 *)This); + return IDirect3DDevice7_Release(&This->IDirect3DDevice7_iface); } /***************************************************************************** @@ -1183,7 +1183,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_EnumTextureFormats(IDirect3DDevice3 TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg); - return IDirect3DDevice7_EnumTextureFormats((IDirect3DDevice7 *)This, Callback, Arg); + return IDirect3DDevice7_EnumTextureFormats(&This->IDirect3DDevice7_iface, Callback, Arg); } /***************************************************************************** @@ -1530,7 +1530,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_BeginScene(IDirect3DDevice3 *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)This); + return IDirect3DDevice7_BeginScene(&This->IDirect3DDevice7_iface); } static HRESULT WINAPI IDirect3DDeviceImpl_2_BeginScene(IDirect3DDevice2 *iface) @@ -1538,7 +1538,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_BeginScene(IDirect3DDevice2 *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)This); + return IDirect3DDevice7_BeginScene(&This->IDirect3DDevice7_iface); } static HRESULT WINAPI IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface) @@ -1546,7 +1546,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface) IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)This); + return IDirect3DDevice7_BeginScene(&This->IDirect3DDevice7_iface); } /***************************************************************************** @@ -1602,7 +1602,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_3_EndScene(IDirect3D IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); + return IDirect3DDevice7_EndScene(&This->IDirect3DDevice7_iface); } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface) @@ -1610,7 +1610,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_2_EndScene(IDirect3D IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); + return IDirect3DDevice7_EndScene(&This->IDirect3DDevice7_iface); } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface) @@ -1618,7 +1618,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_1_EndScene(IDirect3D IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface); TRACE("iface %p.\n", iface); - return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); + return IDirect3DDevice7_EndScene(&This->IDirect3DDevice7_iface); } /***************************************************************************** @@ -1982,7 +1982,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *if if(!RenderTarget) return DDERR_INVALIDPARAMS; - hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, &RenderTarget7); + hr = IDirect3DDevice7_GetRenderTarget(&This->IDirect3DDevice7_iface, &RenderTarget7); if(hr != D3D_OK) return hr; RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7); *RenderTarget = &RenderTargetImpl->IDirectDrawSurface4_iface; @@ -2004,7 +2004,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if if(!RenderTarget) return DDERR_INVALIDPARAMS; - hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, &RenderTarget7); + hr = IDirect3DDevice7_GetRenderTarget(&This->IDirect3DDevice7_iface, &RenderTarget7); if(hr != D3D_OK) return hr; RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7); *RenderTarget = &RenderTargetImpl->IDirectDrawSurface_iface; @@ -2247,7 +2247,7 @@ IDirect3DDeviceImpl_3_End(IDirect3DDevice3 *iface, TRACE("iface %p, flags %#x.\n", iface, Flags); - return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)This, This->primitive_type, + return IDirect3DDevice7_DrawPrimitive(&This->IDirect3DDevice7_iface, This->primitive_type, This->vertex_type, This->vertex_buffer, This->nb_vertices, This->render_flags); } @@ -2547,7 +2547,7 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, } default: - return IDirect3DDevice7_GetRenderState((IDirect3DDevice7 *)This, dwRenderStateType, lpdwRenderState); + return IDirect3DDevice7_GetRenderState(&This->IDirect3DDevice7_iface, dwRenderStateType, lpdwRenderState); } } @@ -2915,7 +2915,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, } default: - hr = IDirect3DDevice7_SetRenderState((IDirect3DDevice7 *)This, RenderStateType, Value); + hr = IDirect3DDevice7_SetRenderState(&This->IDirect3DDevice7_iface, RenderStateType, Value); break; } @@ -3030,7 +3030,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface, return DDERR_INVALIDPARAMS; } - hr = IDirect3DDevice7_SetRenderState((IDirect3DDevice7 *)This, rs, Value); + hr = IDirect3DDevice7_SetRenderState(&This->IDirect3DDevice7_iface, rs, Value); LeaveCriticalSection(&ddraw_cs); return hr; } @@ -3124,7 +3124,7 @@ IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface, return DDERR_INVALIDPARAMS; } - hr = IDirect3DDevice7_GetRenderState((IDirect3DDevice7 *)This, rs, Value); + hr = IDirect3DDevice7_GetRenderState(&This->IDirect3DDevice7_iface, rs, Value); LeaveCriticalSection(&ddraw_cs); return hr; } @@ -3224,7 +3224,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTransform(IDirect3DDevice3 *iface TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix); - return IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix); + return IDirect3DDevice7_SetTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix); } static HRESULT WINAPI IDirect3DDeviceImpl_2_SetTransform(IDirect3DDevice2 *iface, @@ -3234,7 +3234,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetTransform(IDirect3DDevice2 *iface TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix); - return IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix); + return IDirect3DDevice7_SetTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix); } /***************************************************************************** @@ -3314,7 +3314,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTransform(IDirect3DDevice3 *iface TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix); - return IDirect3DDevice7_GetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix); + return IDirect3DDevice7_GetTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix); } static HRESULT WINAPI IDirect3DDeviceImpl_2_GetTransform(IDirect3DDevice2 *iface, @@ -3324,7 +3324,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetTransform(IDirect3DDevice2 *iface TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix); - return IDirect3DDevice7_GetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix); + return IDirect3DDevice7_GetTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix); } /***************************************************************************** @@ -3403,7 +3403,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_MultiplyTransform(IDirect3DDevice3 * TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix); - return IDirect3DDevice7_MultiplyTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix); + return IDirect3DDevice7_MultiplyTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix); } static HRESULT WINAPI IDirect3DDeviceImpl_2_MultiplyTransform(IDirect3DDevice2 *iface, @@ -3413,7 +3413,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_MultiplyTransform(IDirect3DDevice2 * TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix); - return IDirect3DDevice7_MultiplyTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix); + return IDirect3DDevice7_MultiplyTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix); } /***************************************************************************** @@ -3511,7 +3511,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitive(IDirect3DDevice3 *ifac TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags); - return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawPrimitive(&This->IDirect3DDevice7_iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags); } @@ -3535,7 +3535,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DrawPrimitive(IDirect3DDevice2 *ifac return DDERR_INVALIDPARAMS; /* Should never happen */ } - return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawPrimitive(&This->IDirect3DDevice7_iface, PrimitiveType, FVF, Vertices, VertexCount, Flags); } @@ -3637,7 +3637,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitive(IDirect3DDevice TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags); - return IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawIndexedPrimitive(&This->IDirect3DDevice7_iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags); } @@ -3661,7 +3661,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DrawIndexedPrimitive(IDirect3DDevice return DDERR_INVALIDPARAMS; /* Should never happen */ } - return IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawIndexedPrimitive(&This->IDirect3DDevice7_iface, PrimitiveType, FVF, Vertices, VertexCount, Indices, IndexCount, Flags); } @@ -3700,7 +3700,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetClipStatus(IDirect3DDevice3 *ifac IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p, clip_status %p.\n", iface, ClipStatus); - return IDirect3DDevice7_SetClipStatus((IDirect3DDevice7 *)This, ClipStatus); + return IDirect3DDevice7_SetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus); } static HRESULT WINAPI IDirect3DDeviceImpl_2_SetClipStatus(IDirect3DDevice2 *iface, @@ -3709,7 +3709,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetClipStatus(IDirect3DDevice2 *ifac IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p, clip_status %p.\n", iface, ClipStatus); - return IDirect3DDevice7_SetClipStatus((IDirect3DDevice7 *)This, ClipStatus); + return IDirect3DDevice7_SetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus); } /***************************************************************************** @@ -3741,7 +3741,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetClipStatus(IDirect3DDevice3 *ifac IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); TRACE("iface %p, clip_status %p.\n", iface, ClipStatus); - return IDirect3DDevice7_GetClipStatus((IDirect3DDevice7 *)This, ClipStatus); + return IDirect3DDevice7_GetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus); } static HRESULT WINAPI IDirect3DDeviceImpl_2_GetClipStatus(IDirect3DDevice2 *iface, @@ -3750,7 +3750,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetClipStatus(IDirect3DDevice2 *ifac IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface); TRACE("iface %p, clip_status %p.\n", iface, ClipStatus); - return IDirect3DDevice7_GetClipStatus((IDirect3DDevice7 *)This, ClipStatus); + return IDirect3DDevice7_GetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus); } /***************************************************************************** @@ -3892,7 +3892,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveStrided(IDirect3DDevice TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); - return IDirect3DDevice7_DrawPrimitiveStrided((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawPrimitiveStrided(&This->IDirect3DDevice7_iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); } @@ -4039,7 +4039,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitiveStrided(IDirect3 TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); - return IDirect3DDevice7_DrawIndexedPrimitiveStrided((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawIndexedPrimitiveStrided(&This->IDirect3DDevice7_iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); } @@ -4150,7 +4150,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveVB(IDirect3DDevice3 *if TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags); - return IDirect3DDevice7_DrawPrimitiveVB((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawPrimitiveVB(&This->IDirect3DDevice7_iface, PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, StartVertex, NumVertices, Flags); } @@ -4313,7 +4313,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevi TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags); - return IDirect3DDevice7_DrawIndexedPrimitiveVB((IDirect3DDevice7 *)This, + return IDirect3DDevice7_DrawIndexedPrimitiveVB(&This->IDirect3DDevice7_iface, PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount, Flags); } @@ -4437,7 +4437,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_ComputeSphereVisibility(IDirect3DDev TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", iface, Centers, Radii, NumSpheres, Flags, ReturnValues); - return IDirect3DDevice7_ComputeSphereVisibility((IDirect3DDevice7 *)This, + return IDirect3DDevice7_ComputeSphereVisibility(&This->IDirect3DDevice7_iface, Centers, Radii, NumSpheres, Flags, ReturnValues); } @@ -4526,7 +4526,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface, TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2); - ret = IDirect3DDevice7_GetTexture((IDirect3DDevice7 *)This, Stage, &ret_val); + ret = IDirect3DDevice7_GetTexture(&This->IDirect3DDevice7_iface, Stage, &ret_val); ret_val_impl = unsafe_impl_from_IDirectDrawSurface7(ret_val); *Texture2 = ret_val_impl ? &ret_val_impl->IDirect3DTexture2_iface : NULL; @@ -4611,7 +4611,7 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, if (This->legacyTextureBlending) IDirect3DDevice3_GetRenderState(iface, D3DRENDERSTATE_TEXTUREMAPBLEND, &texmapblend); - hr = IDirect3DDevice7_SetTexture((IDirect3DDevice7 *)This, Stage, &tex->IDirectDrawSurface7_iface); + hr = IDirect3DDevice7_SetTexture(&This->IDirect3DDevice7_iface, Stage, &tex->IDirectDrawSurface7_iface); if (This->legacyTextureBlending && texmapblend == D3DTBLEND_MODULATE) { @@ -4816,7 +4816,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTextureStageState(IDirect3DDevice TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, TexStageStateType, State); - return IDirect3DDevice7_GetTextureStageState((IDirect3DDevice7 *)This, + return IDirect3DDevice7_GetTextureStageState(&This->IDirect3DDevice7_iface, Stage, TexStageStateType, State); } @@ -4952,7 +4952,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTextureStageState(IDirect3DDevice TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, TexStageStateType, State); - return IDirect3DDevice7_SetTextureStageState((IDirect3DDevice7 *)This, + return IDirect3DDevice7_SetTextureStageState(&This->IDirect3DDevice7_iface, Stage, TexStageStateType, State); } @@ -5016,7 +5016,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_ValidateDevice(IDirect3DDevice3 *ifa TRACE("iface %p, pass_count %p.\n", iface, Passes); - return IDirect3DDevice7_ValidateDevice((IDirect3DDevice7 *)This, Passes); + return IDirect3DDevice7_ValidateDevice(&This->IDirect3DDevice7_iface, Passes); } /***************************************************************************** @@ -6774,7 +6774,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) { if (!iface) return NULL; assert((iface->lpVtbl == &d3d_device7_fpu_preserve_vtbl) || (iface->lpVtbl == &d3d_device7_fpu_setup_vtbl)); - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice7_iface); } IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) @@ -6836,9 +6836,9 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi HRESULT hr; if (ddraw->cooperative_level & DDSCL_FPUPRESERVE) - device->lpVtbl = &d3d_device7_fpu_preserve_vtbl; + device->IDirect3DDevice7_iface.lpVtbl = &d3d_device7_fpu_preserve_vtbl; else - device->lpVtbl = &d3d_device7_fpu_setup_vtbl; + device->IDirect3DDevice7_iface.lpVtbl = &d3d_device7_fpu_setup_vtbl; device->IDirect3DDevice3_iface.lpVtbl = &d3d_device3_vtbl; device->IDirect3DDevice2_iface.lpVtbl = &d3d_device2_vtbl; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 75687f662d2..98096ceb5ef 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -157,7 +157,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, * enable it before drawing. This overwrites any ALPHA* * render state. */ wined3d_device_set_render_state(lpDevice->wined3d_device, WINED3DRS_COLORKEYENABLE, 1); - IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)lpDevice, + IDirect3DDevice7_DrawIndexedPrimitive(&lpDevice->IDirect3DDevice7_iface, D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, 0, This->indices, count * 3, 0); } break; @@ -216,7 +216,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, lpDevice->view = ci->u2.dwArg[0]; if (ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_PROJECTION) lpDevice->proj = ci->u2.dwArg[0]; - IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)lpDevice, + IDirect3DDevice7_SetTransform(&lpDevice->IDirect3DDevice7_iface, ci->u1.dtstTransformStateType, m); } @@ -283,7 +283,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, break; } - IDirect3DDevice7_SetRenderState((IDirect3DDevice7 *)lpDevice, rs, ci->u2.dwArg[0]); + IDirect3DDevice7_SetRenderState(&lpDevice->IDirect3DDevice7_iface, rs, ci->u2.dwArg[0]); } instr += size; diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 0325cd4ee81..a2b22b590ac 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -41,7 +41,7 @@ static void light_update(IDirect3DLightImpl *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - IDirect3DDevice7_SetLight((IDirect3DDevice7 *)device, light->dwLightIndex, &light->light7); + IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->dwLightIndex, &light->light7); } /***************************************************************************** @@ -62,7 +62,7 @@ void light_activate(IDirect3DLightImpl *light) light_update(light); if (!(light->light.dwFlags & D3DLIGHT_ACTIVE)) { - IDirect3DDevice7_LightEnable((IDirect3DDevice7 *)device, light->dwLightIndex, TRUE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, TRUE); light->light.dwFlags |= D3DLIGHT_ACTIVE; } } @@ -86,7 +86,7 @@ void light_deactivate(IDirect3DLightImpl *light) /* If was not active, activate it */ if (light->light.dwFlags & D3DLIGHT_ACTIVE) { - IDirect3DDevice7_LightEnable((IDirect3DDevice7 *)device, light->dwLightIndex, FALSE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); light->light.dwFlags &= ~D3DLIGHT_ACTIVE; } } diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2ab9eac967d..4bead03dfd4 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -960,7 +960,7 @@ DllMain(HINSTANCE hInstDLL, if(ddraw->d3ddevice) { WARN("DDraw %p has d3ddevice %p attached\n", ddraw, ddraw->d3ddevice); - while(IDirect3DDevice7_Release((IDirect3DDevice7 *)ddraw->d3ddevice)); + while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface)); } /* Try to release the objects diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 374daac9cd5..8f8ab403e2d 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -464,7 +464,7 @@ void material_activate(IDirect3DMaterialImpl* This) d3d7mat.u3.emissive = This->mat.u3.emissive; d3d7mat.u4.power = This->mat.u4.power; - IDirect3DDevice7_SetMaterial((IDirect3DDevice7 *)This->active_device, &d3d7mat); + IDirect3DDevice7_SetMaterial(&This->active_device->IDirect3DDevice7_iface, &d3d7mat); } static const struct IDirect3DMaterial3Vtbl d3d_material3_vtbl = diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 8c4d2015914..817ec1e4c45 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -361,8 +361,8 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVerte iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, device, Flags); return IDirect3DVertexBuffer7_ProcessVertices(&This->IDirect3DVertexBuffer7_iface, VertexOp, - DestIndex, Count, &Src->IDirect3DVertexBuffer7_iface, SrcIndex, (IDirect3DDevice7 *)device_impl, - Flags); + DestIndex, Count, &Src->IDirect3DVertexBuffer7_iface, SrcIndex, + device_impl ? &device_impl->IDirect3DDevice7_iface : NULL, Flags); } /***************************************************************************** @@ -459,7 +459,7 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer TRACE("iface %p, device %p, flags %#x.\n", iface, device, Flags); return IDirect3DVertexBuffer7_Optimize(&This->IDirect3DVertexBuffer7_iface, - (IDirect3DDevice7 *)device_impl, Flags); + device_impl ? &device_impl->IDirect3DDevice7_iface : NULL, Flags); } /***************************************************************************** diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index d6a722f7eeb..7dd1b5e0c13 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -72,7 +72,7 @@ void viewport_activate(IDirect3DViewportImpl *This, BOOL ignore_lights) } /* And also set the viewport */ - IDirect3DDevice7_SetViewport((IDirect3DDevice7 *)This->active_device, &vp); + IDirect3DDevice7_SetViewport(&This->active_device->IDirect3DDevice7_iface, &vp); } /***************************************************************************** @@ -692,7 +692,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, afterwards. */ viewport_activate(This, TRUE); - hr = IDirect3DDevice7_Clear((IDirect3DDevice7 *)This->active_device, dwCount, lpRects, + hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, dwCount, lpRects, dwFlags & (D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET), color, 1.0, 0x00000000); IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport); @@ -1075,7 +1075,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, * one will be restored afterwards. */ viewport_activate(This, TRUE); - hr = IDirect3DDevice7_Clear((IDirect3DDevice7 *)This->active_device, + hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil); IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport); if(current_viewport) { -- 2.11.4.GIT