[PATCH 1/5] d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetVertexDeclaration().
Henri Verbeet
hverbeet at codeweavers.com
Thu Apr 26 14:11:51 CDT 2012
---
dlls/d3d9/device.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index c5dc834..d4f1eea 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2129,6 +2129,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9
{
IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
struct wined3d_vertex_declaration *wined3d_declaration = NULL;
+ IDirect3DVertexDeclaration9Impl *declaration_impl;
HRESULT hr;
TRACE("iface %p, declaration %p.\n", iface, declaration);
@@ -2139,7 +2140,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9
hr = wined3d_device_get_vertex_declaration(This->wined3d_device, &wined3d_declaration);
if (SUCCEEDED(hr) && wined3d_declaration)
{
- *declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration);
+ declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration);
+ *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface;
IDirect3DVertexDeclaration9_AddRef(*declaration);
wined3d_vertex_declaration_decref(wined3d_declaration);
}
--
1.7.3.4
More information about the wine-patches
mailing list