ddraw: COM cleanup for the IDirectDraw2 iface.

dlls/ddraw/ddraw_private.h

@@ -99,7 +99,7 @@ struct IDirectDrawImpl
     const IDirectDraw7Vtbl *lpVtbl;
     const IDirectDraw4Vtbl *IDirectDraw4_vtbl;
     const IDirectDraw3Vtbl *IDirectDraw3_vtbl;
-    const IDirectDraw2Vtbl *IDirectDraw2_vtbl;
+    IDirectDraw2 IDirectDraw2_iface;
     IDirectDraw IDirectDraw_iface;
     IDirect3D7 IDirect3D7_iface;
     IDirect3D3 IDirect3D3_iface;

dlls/ddraw/device.c

@@ -129,7 +129,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface,
     }
     else if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) )
     {
-        *obj = &This->ddraw->IDirectDraw2_vtbl;
+        *obj = &This->ddraw->IDirectDraw2_iface;
         TRACE("(%p) Returning IDirectDraw2 interface at %p\n", This, *obj);
     }
     else if( IsEqualGUID( &IID_IDirectDraw, refiid ) )

dlls/ddraw/main.c

@@ -938,7 +938,7 @@ DllMain(HINSTANCE hInstDLL,
 
                 /* Add references to each interface to avoid freeing them unexpectedly */
                 IDirectDraw_AddRef(&ddraw->IDirectDraw_iface);
-                IDirectDraw2_AddRef((IDirectDraw2 *)&ddraw->IDirectDraw2_vtbl);
+                IDirectDraw2_AddRef(&ddraw->IDirectDraw2_iface);
                 IDirectDraw3_AddRef((IDirectDraw3 *)&ddraw->IDirectDraw3_vtbl);
                 IDirectDraw4_AddRef((IDirectDraw4 *)&ddraw->IDirectDraw4_vtbl);
                 IDirectDraw7_AddRef((IDirectDraw7 *)ddraw);
@@ -974,7 +974,7 @@ DllMain(HINSTANCE hInstDLL,
                     * restores the screen mode too
                     */
                 while(IDirectDraw_Release(&ddraw->IDirectDraw_iface));
-                while(IDirectDraw2_Release((IDirectDraw2 *)&ddraw->IDirectDraw2_vtbl));
+                while(IDirectDraw2_Release(&ddraw->IDirectDraw2_iface));
                 while(IDirectDraw3_Release((IDirectDraw3 *)&ddraw->IDirectDraw3_vtbl));
                 while(IDirectDraw4_Release((IDirectDraw4 *)&ddraw->IDirectDraw4_vtbl));
                 while(IDirectDraw7_Release((IDirectDraw7 *)ddraw));

dlls/ddraw/surface.c

@@ -2262,7 +2262,7 @@ static HRESULT WINAPI ddraw_surface7_GetDDInterface(IDirectDrawSurface7 *iface,
             break;
 
         case 2:
-            *DD = &This->ddraw->IDirectDraw2_vtbl;
+            *DD = &This->ddraw->IDirectDraw2_iface;
             break;
 
         case 1: