Fix IDirect3DVertexBuffer interface.
Implements GetVertexBufferDesc. Remove some useless FIXME.
This commit is contained in:
parent
d70a2c0322
commit
f78cf542dc
|
@ -109,7 +109,8 @@ HRESULT WINAPI
|
||||||
Main_IDirect3DVertexBufferImpl_7_1T_Unlock(LPDIRECT3DVERTEXBUFFER7 iface)
|
Main_IDirect3DVertexBufferImpl_7_1T_Unlock(LPDIRECT3DVERTEXBUFFER7 iface)
|
||||||
{
|
{
|
||||||
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
|
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
|
||||||
FIXME("(%p/%p)->(): stub!\n", This, iface);
|
TRACE("(%p/%p)->()\n", This, iface);
|
||||||
|
/* Nothing to do */
|
||||||
return DD_OK;
|
return DD_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,8 +133,11 @@ HRESULT WINAPI
|
||||||
Main_IDirect3DVertexBufferImpl_7_1T_GetVertexBufferDesc(LPDIRECT3DVERTEXBUFFER7 iface,
|
Main_IDirect3DVertexBufferImpl_7_1T_GetVertexBufferDesc(LPDIRECT3DVERTEXBUFFER7 iface,
|
||||||
LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc)
|
LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc)
|
||||||
{
|
{
|
||||||
|
DWORD size;
|
||||||
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
|
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
|
||||||
FIXME("(%p/%p)->(%p): stub!\n", This, iface, lpD3DVertexBufferDesc);
|
TRACE("(%p/%p)->(%p)\n", This, iface, lpD3DVertexBufferDesc);
|
||||||
|
size = (lpD3DVertexBufferDesc->dwSize < This->desc.dwSize) ? lpD3DVertexBufferDesc->dwSize : This->desc.dwSize;
|
||||||
|
memcpy(lpD3DVertexBufferDesc,&This->desc,size);
|
||||||
return DD_OK;
|
return DD_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,7 +262,7 @@ ICOM_VTABLE(IDirect3DVertexBuffer7) VTABLE_IDirect3DVertexBuffer7 =
|
||||||
XCAST(ProcessVertices) Main_IDirect3DVertexBufferImpl_7_ProcessVertices,
|
XCAST(ProcessVertices) Main_IDirect3DVertexBufferImpl_7_ProcessVertices,
|
||||||
XCAST(GetVertexBufferDesc) Main_IDirect3DVertexBufferImpl_7_1T_GetVertexBufferDesc,
|
XCAST(GetVertexBufferDesc) Main_IDirect3DVertexBufferImpl_7_1T_GetVertexBufferDesc,
|
||||||
XCAST(Optimize) Main_IDirect3DVertexBufferImpl_7_Optimize,
|
XCAST(Optimize) Main_IDirect3DVertexBufferImpl_7_Optimize,
|
||||||
XCAST(ProcessVerticesStrided) Main_IDirect3DVertexBufferImpl_7_ProcessVerticesStrided,
|
XCAST(ProcessVerticesStrided) Main_IDirect3DVertexBufferImpl_7_ProcessVerticesStrided
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
|
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
|
||||||
|
@ -275,14 +279,14 @@ ICOM_VTABLE(IDirect3DVertexBuffer7) VTABLE_IDirect3DVertexBuffer7 =
|
||||||
ICOM_VTABLE(IDirect3DVertexBuffer) VTABLE_IDirect3DVertexBuffer =
|
ICOM_VTABLE(IDirect3DVertexBuffer) VTABLE_IDirect3DVertexBuffer =
|
||||||
{
|
{
|
||||||
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
|
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
|
||||||
XCAST(QueryInterface) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
XCAST(QueryInterface) Thunk_IDirect3DVertexBufferImpl_1_QueryInterface,
|
||||||
XCAST(AddRef) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
XCAST(AddRef) Thunk_IDirect3DVertexBufferImpl_1_AddRef,
|
||||||
XCAST(Release) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
XCAST(Release) Thunk_IDirect3DVertexBufferImpl_1_Release,
|
||||||
XCAST(Lock) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
XCAST(Lock) Thunk_IDirect3DVertexBufferImpl_1_Lock,
|
||||||
XCAST(Unlock) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
XCAST(Unlock) Thunk_IDirect3DVertexBufferImpl_1_Unlock,
|
||||||
XCAST(ProcessVertices) Main_IDirect3DVertexBufferImpl_1_ProcessVertices,
|
XCAST(ProcessVertices) Main_IDirect3DVertexBufferImpl_1_ProcessVertices,
|
||||||
XCAST(GetVertexBufferDesc) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
XCAST(GetVertexBufferDesc) Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
|
||||||
XCAST(Optimize) Main_IDirect3DVertexBufferImpl_1_Optimize,
|
XCAST(Optimize) Main_IDirect3DVertexBufferImpl_1_Optimize
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
|
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
|
||||||
|
|
|
@ -98,7 +98,7 @@ ULONG WINAPI
|
||||||
Main_IDirect3DViewportImpl_3_2_1_AddRef(LPDIRECT3DVIEWPORT3 iface)
|
Main_IDirect3DViewportImpl_3_2_1_AddRef(LPDIRECT3DVIEWPORT3 iface)
|
||||||
{
|
{
|
||||||
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
|
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
|
||||||
FIXME("(%p/%p)->() incrementing from %lu.\n", This, iface, This->ref);
|
TRACE("(%p/%p)->() incrementing from %lu.\n", This, iface, This->ref);
|
||||||
return ++(This->ref);
|
return ++(This->ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ ULONG WINAPI
|
||||||
Main_IDirect3DViewportImpl_3_2_1_Release(LPDIRECT3DVIEWPORT3 iface)
|
Main_IDirect3DViewportImpl_3_2_1_Release(LPDIRECT3DVIEWPORT3 iface)
|
||||||
{
|
{
|
||||||
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
|
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
|
||||||
FIXME("(%p/%p)->() decrementing from %lu.\n", This, iface, This->ref);
|
TRACE("(%p/%p)->() decrementing from %lu.\n", This, iface, This->ref);
|
||||||
if (!--(This->ref)) {
|
if (!--(This->ref)) {
|
||||||
HeapFree(GetProcessHeap(), 0, This);
|
HeapFree(GetProcessHeap(), 0, This);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue