ddrawex: Get rid of the IDirectDrawSurfaceImpl typedef.

dlls/ddrawex/ddraw.c

@@ -478,7 +478,7 @@ static HRESULT WINAPI ddrawex4_DuplicateSurface(IDirectDraw4 *iface,
         IDirectDrawSurface4 *src, IDirectDrawSurface4 **dst)
 {
     struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
-    IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface4(src);
+    struct ddrawex_surface *src_impl = unsafe_impl_from_IDirectDrawSurface4(src);
 
     TRACE("iface %p, src %p, dst %p.\n", iface, src, dst);
     FIXME("Create a wrapper surface.\n");

dlls/ddrawex/ddrawex_private.h

@@ -66,10 +66,7 @@ struct ddrawex
 IDirectDraw4 *dd_get_outer(IDirectDraw4 *inner) DECLSPEC_HIDDEN;
 IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer) DECLSPEC_HIDDEN;
 
-/******************************************************************************
- * IDirectDrawSurface implementation
- ******************************************************************************/
-typedef struct
+struct ddrawex_surface
 {
     IDirectDrawSurface3 IDirectDrawSurface3_iface;
     IDirectDrawSurface4 IDirectDrawSurface4_iface;
@@ -83,10 +80,9 @@ typedef struct
 
     /* An UUID we use to store the outer surface as private data in the inner surface */
 #define IID_DDrawexPriv IID_IDirectDrawSurface4
+};
 
-} IDirectDrawSurfaceImpl;
-
-IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN;
+struct ddrawex_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN;
 IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) DECLSPEC_HIDDEN;
 HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN;