=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw: Add DDBLT_DEPTHFILL validation.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 17 11:01:59 CDT 2015
Module: wine
Branch: master
Commit: a84980168ce948069565a65cf5d98b778c471fe1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84980168ce948069565a65cf5d98b778c471fe1
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Mar 16 14:48:54 2015 +0100
ddraw: Add DDBLT_DEPTHFILL validation.
---
dlls/ddraw/surface.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 8b25cb9..034e3aa 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1537,26 +1537,36 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR
wined3d_mutex_lock();
- if (Flags & DDBLT_COLORFILL)
+ if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL))
{
if (src_surface)
{
wined3d_mutex_unlock();
- WARN("DDBLT_COLORFILL is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n");
+ WARN("Depth or colorfill is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n");
return DDERR_INVALIDPARAMS;
}
if (!DDBltFx)
{
wined3d_mutex_unlock();
- WARN("DDBLT_COLORFILL used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n");
+ WARN("Depth or colorfill used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n");
return DDERR_INVALIDPARAMS;
}
- if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
+
+ if ((Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) == (DDBLT_COLORFILL | DDBLT_DEPTHFILL))
+ Flags &= ~DDBLT_DEPTHFILL;
+
+ if ((dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_COLORFILL))
{
wined3d_mutex_unlock();
WARN("DDBLT_COLORFILL used on a depth buffer, returning DDERR_INVALIDPARAMS.\n");
return DDERR_INVALIDPARAMS;
}
+ if (!(dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_DEPTHFILL))
+ {
+ wined3d_mutex_unlock();
+ WARN("DDBLT_DEPTHFILL used on a color buffer, returning DDERR_INVALIDPARAMS.\n");
+ return DDERR_INVALIDPARAMS;
+ }
}
if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT)))
More information about the wine-cvs
mailing list