d3d8: COM cleanup for the IDirect3DCubeTexture8 iface.

8a13f059 · Michael Stefaniuc · Alexandre Julliard · 75cc8985 · 8a13f059 · 8a13f059
Commit 8a13f059 authored Jan 31, 2011 by Michael Stefaniuc Committed by Alexandre Julliard Jan 31, 2011
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 71 additions and 44 deletions

cubetexture.c dlls/d3d8/cubetexture.c +66 -38

d3d8_private.h dlls/d3d8/d3d8_private.h +4 -5

device.c dlls/d3d8/device.c +1 -1

No files found.
--- a/dlls/d3d8/cubetexture.c
+++ b/dlls/d3d8/cubetexture.c
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -348,15 +348,14 @@ struct IDirect3DBaseTexture8Impl
 */
 struct IDirect3DCubeTexture8Impl
 {
-    /* IUnknown fields */
-    const IDirect3DCubeTexture8Vtbl *lpVtbl;
-    LONG                   ref;
+    IDirect3DCubeTexture8   IDirect3DCubeTexture8_iface;
+    LONG                    ref;

    /* IDirect3DResource8 fields */
-    IWineD3DCubeTexture             *wineD3DCubeTexture;
+    IWineD3DCubeTexture    *wineD3DCubeTexture;

    /* Parent reference */
-    LPDIRECT3DDEVICE8                parentDevice;
+    IDirect3DDevice8       *parentDevice;
 };

 HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl *device,

--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -770,7 +770,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(IDirect3DDevice8 *i
    }

    TRACE("Created cube texture %p.\n", object);
-    *texture = (IDirect3DCubeTexture8 *)object;
+    *texture = &object->IDirect3DCubeTexture8_iface;

    return hr;
 }