ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Use unsafe_impl_from_IDirect3DIndexBuffer8 for an app provided iface.

This commit is contained in:
Michael Stefaniuc 2011-07-05 00:43:50 +02:00 committed by Alexandre Julliard
parent d615be8eea
commit c1eeeec2d2
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3d8/buffer.c
View File

@ -17,6 +17,7 @@
*/ */
#include "config.h" #include "config.h"
#include <assert.h>
#include "d3d8_private.h" #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8); WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
@ -571,3 +572,12 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl
return D3D_OK; return D3D_OK;
} }
IDirect3DIndexBuffer8Impl *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface)
{
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d8_indexbuffer_vtbl);
return impl_from_IDirect3DIndexBuffer8(iface);
}

1
dlls/d3d8/d3d8_private.h
View File

@ -298,6 +298,7 @@ struct IDirect3DIndexBuffer8Impl
HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl *device, HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl *device,
UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
IDirect3DIndexBuffer8Impl *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface) DECLSPEC_HIDDEN;
/* --------------------- */ /* --------------------- */
/* IDirect3DBaseTexture8 */ /* IDirect3DBaseTexture8 */

2
dlls/d3d8/device.c
View File

@ -2367,8 +2367,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(IDirect3DDevice8 *iface,
IDirect3DIndexBuffer8 *pIndexData, UINT baseVertexIndex) IDirect3DIndexBuffer8 *pIndexData, UINT baseVertexIndex)
{ {
IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface);
IDirect3DIndexBuffer8Impl *ib = unsafe_impl_from_IDirect3DIndexBuffer8(pIndexData);
HRESULT hr; HRESULT hr;
IDirect3DIndexBuffer8Impl *ib = (IDirect3DIndexBuffer8Impl *)pIndexData;
TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, pIndexData, baseVertexIndex); TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, pIndexData, baseVertexIndex);