ddraw: COM cleanup for the IDirect3DMaterial3 iface.

d9fb7b9b · Michael Stefaniuc · Alexandre Julliard · 8d91f8b6 · d9fb7b9b · d9fb7b9b
Commit d9fb7b9b authored Jun 08, 2011 by Michael Stefaniuc Committed by Alexandre Julliard Jun 08, 2011
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 37 additions and 40 deletions

ddraw.c dlls/ddraw/ddraw.c +1 -1

ddraw_private.h dlls/ddraw/ddraw_private.h +1 -1

material.c dlls/ddraw/material.c +35 -38

No files found.
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4611,7 +4611,7 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 
    }

    TRACE("Created material %p.\n", object);
-    *material = (IDirect3DMaterial3 *)object;
+    *material = &object->IDirect3DMaterial3_iface;

    return D3D_OK;
 }

--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -414,7 +414,7 @@ void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_
 ******************************************************************************/
 struct IDirect3DMaterialImpl
 {
-    const IDirect3DMaterial3Vtbl *lpVtbl;
+    IDirect3DMaterial3 IDirect3DMaterial3_iface;
    IDirect3DMaterial2 IDirect3DMaterial2_iface;
    IDirect3DMaterial IDirect3DMaterial_iface;
    LONG  ref;

--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c