ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddrawex: Get rid of dds_get_inner().

This commit is contained in:
Michael Stefaniuc 2012-08-17 16:07:56 +02:00 committed by Alexandre Julliard
parent cb1248da33
commit f452057ef6
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ddrawex/ddraw.c
View File

@ -459,9 +459,11 @@ static HRESULT WINAPI IDirectDraw4Impl_DuplicateSurface(IDirectDraw4 *iface,
IDirectDrawSurface4 *src, IDirectDrawSurface4 **dst)
{
IDirectDrawImpl *This = impl_from_IDirectDraw4(iface);
IDirectDrawSurfaceImpl *surf = unsafe_impl_from_IDirectDrawSurface4(src);
FIXME("(%p)->(%p,%p). Create a wrapper surface\n", This, src, dst);
return IDirectDraw4_DuplicateSurface(This->parent, dds_get_inner(src), dst);
return IDirectDraw4_DuplicateSurface(This->parent, surf ? surf->parent : NULL, dst);
}
static HRESULT WINAPI IDirectDraw3Impl_DuplicateSurface(IDirectDraw3 *iface,

1
dlls/ddrawex/ddrawex_private.h
View File

@ -91,7 +91,6 @@ typedef struct
IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN;
IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) DECLSPEC_HIDDEN;
IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer) DECLSPEC_HIDDEN;
HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN;
#endif /* __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H */

7
dlls/ddrawex/surface.c
View File

@ -1220,13 +1220,6 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner)
return outer;
}
IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer)
{
IDirectDrawSurfaceImpl *This = impl_from_dds4(outer);
if(This == NULL) return NULL;
return This->parent;
}
HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface)
{
IDirectDrawSurfaceImpl *This = unsafe_impl_from_IDirectDrawSurface4(iface);