d3d10core: COM cleanup for the ID3D10Device iface.

eeacb8f2 · Michael Stefaniuc · Alexandre Julliard · 076e1cf0 · eeacb8f2 · eeacb8f2
Commit eeacb8f2 authored Jul 11, 2011 by Michael Stefaniuc Committed by Alexandre Julliard Jul 11, 2011
Expand all Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

d3d10core_private.h dlls/d3d10core/d3d10core_private.h +1 -1

device.c dlls/d3d10core/device.c +0 -0

texture.c dlls/d3d10core/texture.c +2 -1

No files found.
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -69,7 +69,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
 /* IDirect3D10Device */
 struct d3d10_device
 {
-    const struct ID3D10DeviceVtbl *vtbl;
+    ID3D10Device ID3D10Device_iface;
    const struct IUnknownVtbl *inner_unknown_vtbl;
    IWineDXGIDeviceParent IWineDXGIDeviceParent_iface;
    IUnknown *outer_unknown;

--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
--- a/dlls/d3d10core/texture.c
+++ b/dlls/d3d10core/texture.c
@@ -217,7 +217,8 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
    {
        IWineDXGIDevice *wine_device;
-        hr = ID3D10Device_QueryInterface((ID3D10Device *)device, &IID_IWineDXGIDevice, (void **)&wine_device);
+        hr = ID3D10Device_QueryInterface(&device->ID3D10Device_iface, &IID_IWineDXGIDevice,
+                (void **)&wine_device);
        if (FAILED(hr))
        {
            ERR("Device should implement IWineDXGIDevice\n");