d3d8: Get rid of IDirect3DVolume8Impl.

dlls/d3d8/d3d8_private.h

@@ -100,8 +100,6 @@
 
 void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN;
 
-typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl;
-
 struct d3d8
 {
     IDirect3D8 IDirect3D8_iface;
@@ -168,23 +166,16 @@ struct d3d8_device
 HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter,
         D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN;
 
-/* ---------------- */
-/* IDirect3DVolume8 */
-/* ---------------- */
-
-/*****************************************************************************
- * IDirect3DVolume8 implementation structure
- */
-struct IDirect3DVolume8Impl
+struct d3d8_volume
 {
-    IDirect3DVolume8    IDirect3DVolume8_iface;
-    LONG                ref;
+    IDirect3DVolume8 IDirect3DVolume8_iface;
+    LONG refcount;
     struct wined3d_volume *wined3d_volume;
     IUnknown *container;
     IUnknown *forwardReference;
 };
 
-HRESULT volume_init(IDirect3DVolume8Impl *volume, struct d3d8_device *device, UINT width, UINT height,
+HRESULT volume_init(struct d3d8_volume *volume, struct d3d8_device *device, UINT width, UINT height,
         UINT depth, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool) DECLSPEC_HIDDEN;
 
 struct d3d8_swapchain

dlls/d3d8/device.c

@@ -2902,7 +2902,7 @@ static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *d
         enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume)
 {
     struct d3d8_device *device = device_from_device_parent(device_parent);
-    IDirect3DVolume8Impl *object;
+    struct d3d8_volume *object;
     HRESULT hr;
 
     TRACE("device_parent %p, container_parent %p, width %u, height %u, depth %u, "

dlls/d3d8/texture.c

@@ -1031,7 +1031,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if
 {
     struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface);
     struct wined3d_resource *sub_resource;
-    IDirect3DVolume8Impl *volume_impl;
+    struct d3d8_volume *volume_impl;
 
     TRACE("iface %p, level %u, volume %p.\n", iface, level, volume);
 
@@ -1055,7 +1055,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface,
 {
     struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface);
     struct wined3d_resource *sub_resource;
-    IDirect3DVolume8Impl *volume_impl;
+    struct d3d8_volume *volume_impl;
     HRESULT hr;
 
     TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n",
@@ -1078,7 +1078,7 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface,
 {
     struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface);
     struct wined3d_resource *sub_resource;
-    IDirect3DVolume8Impl *volume_impl;
+    struct d3d8_volume *volume_impl;
     HRESULT hr;
 
     TRACE("iface %p, level %u.\n", iface, level);