system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-23 13:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ddrawex: Get rid of the IDirectDrawSurfaceImpl typedef.

Browse source
This commit is contained in:
Henri Verbeet 2013-11-12 11:00:29 +01:00 committed by Alexandre Julliard
parent 38b4364ce4
commit 8c97327da6
3 changed files with 756 additions and 659 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/ddrawex/ddraw.c
View file

@ -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");

10
dlls/ddrawex/ddrawex_private.h
View file

@ -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;

1403
dlls/ddrawex/surface.c
View file

File diff suppressed because it is too large Load diff