d3d8: Get rid of IDirect3D8Impl.

dlls/d3d8/d3d8_main.c

@@ -37,7 +37,7 @@ void WINAPI DebugSetMute(void) {
 
 IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version)
 {
-    IDirect3D8Impl *object;
+    struct d3d8 *object;
 
     TRACE("sdk_version %#x.\n", sdk_version);
 

dlls/d3d8/d3d8_private.h

@@ -100,9 +100,6 @@
 
 void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN;
 
-/* Direct3D8 Interfaces: */
-typedef struct IDirect3DBaseTexture8Impl IDirect3DBaseTexture8Impl;
-typedef struct IDirect3D8Impl IDirect3D8Impl;
 typedef struct IDirect3DDevice8Impl IDirect3DDevice8Impl;
 typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl;
 typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl;
@@ -110,17 +107,14 @@ typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl;
 typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl;
 typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl;
 
-/*****************************************************************************
- * IDirect3D implementation structure
- */
-struct IDirect3D8Impl
+struct d3d8
 {
     IDirect3D8 IDirect3D8_iface;
-    LONG       ref;
-    struct wined3d *WineD3D;
+    LONG refcount;
+    struct wined3d *wined3d;
 };
 
-BOOL d3d8_init(IDirect3D8Impl *d3d8) DECLSPEC_HIDDEN;
+BOOL d3d8_init(struct d3d8 *d3d8) DECLSPEC_HIDDEN;
 
 /*****************************************************************************
  * IDirect3DDevice8 implementation structure
@@ -176,7 +170,7 @@ struct IDirect3DDevice8Impl
     BOOL lost;
 };
 
-HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct wined3d *wined3d, UINT adapter,
+HRESULT device_init(IDirect3DDevice8Impl *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter,
         D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN;
 
 /* ---------------- */

dlls/d3d8/device.c

@@ -3065,7 +3065,7 @@ static void setup_fpu(void)
 #endif
 }
 
-HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct wined3d *wined3d, UINT adapter,
+HRESULT device_init(IDirect3DDevice8Impl *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter,
         D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters)
 {
     struct wined3d_swapchain_desc swapchain_desc;