ddraw: COM cleanup for the IDirectDraw4 iface.

dlls/ddraw/ddraw_private.h

@@ -97,7 +97,7 @@ struct IDirectDrawImpl
 {
     /* IUnknown fields */
     const IDirectDraw7Vtbl *lpVtbl;
-    const IDirectDraw4Vtbl *IDirectDraw4_vtbl;
+    IDirectDraw4 IDirectDraw4_iface;
     IDirectDraw3 IDirectDraw3_iface;
     IDirectDraw2 IDirectDraw2_iface;
     IDirectDraw IDirectDraw_iface;

dlls/ddraw/device.c

@@ -124,7 +124,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface,
     }
     else if ( IsEqualGUID( &IID_IDirectDraw4, refiid ) )
     {
-        *obj = &This->ddraw->IDirectDraw4_vtbl;
+        *obj = &This->ddraw->IDirectDraw4_iface;
         TRACE("(%p) Returning IDirectDraw4 interface at %p\n", This, *obj);
     }
     else if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) )

dlls/ddraw/main.c

@@ -940,7 +940,7 @@ DllMain(HINSTANCE hInstDLL,
                 IDirectDraw_AddRef(&ddraw->IDirectDraw_iface);
                 IDirectDraw2_AddRef(&ddraw->IDirectDraw2_iface);
                 IDirectDraw3_AddRef(&ddraw->IDirectDraw3_iface);
-                IDirectDraw4_AddRef((IDirectDraw4 *)&ddraw->IDirectDraw4_vtbl);
+                IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface);
                 IDirectDraw7_AddRef((IDirectDraw7 *)ddraw);
 
                 /* Does a D3D device exist? Destroy it
@@ -976,7 +976,7 @@ DllMain(HINSTANCE hInstDLL,
                 while(IDirectDraw_Release(&ddraw->IDirectDraw_iface));
                 while(IDirectDraw2_Release(&ddraw->IDirectDraw2_iface));
                 while(IDirectDraw3_Release(&ddraw->IDirectDraw3_iface));
-                while(IDirectDraw4_Release((IDirectDraw4 *)&ddraw->IDirectDraw4_vtbl));
+                while(IDirectDraw4_Release(&ddraw->IDirectDraw4_iface));
                 while(IDirectDraw7_Release((IDirectDraw7 *)ddraw));
             }
         }

dlls/ddraw/surface.c

@@ -2258,7 +2258,7 @@ static HRESULT WINAPI ddraw_surface7_GetDDInterface(IDirectDrawSurface7 *iface,
             break;
 
         case 4:
-            *DD = &This->ddraw->IDirectDraw4_vtbl;
+            *DD = &This->ddraw->IDirectDraw4_iface;
             break;
 
         case 2: