system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 21:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ddraw: Remove rectangle validation from ddraw_surface7_Blt().

Browse source 
This is already done by wined3d_surface_blt().
This commit is contained in:
Henri Verbeet 2011-08-03 21:34:47 +02:00 committed by Alexandre Julliard
parent 7e3ecd683c
commit 92e616f355
1 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/ddraw/surface.c
View file

@ -1211,30 +1211,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR
return DDERR_INVALIDPARAMS;
}
/* Sizes can change, therefore hold the lock when testing the rectangles */
EnterCriticalSection(&ddraw_cs);
if(DestRect)
{
if(DestRect->top >= DestRect->bottom || DestRect->left >= DestRect->right ||
DestRect->right > This->surface_desc.dwWidth ||
DestRect->bottom > This->surface_desc.dwHeight)
{
WARN("Destination rectangle is invalid, returning DDERR_INVALIDRECT\n");
LeaveCriticalSection(&ddraw_cs);
return DDERR_INVALIDRECT;
}
}
if(Src && SrcRect)
{
if(SrcRect->top >= SrcRect->bottom || SrcRect->left >=SrcRect->right ||
SrcRect->right > Src->surface_desc.dwWidth ||
SrcRect->bottom > Src->surface_desc.dwHeight)
{
WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n");
LeaveCriticalSection(&ddraw_cs);
return DDERR_INVALIDRECT;
}
}
if(Flags & DDBLT_KEYSRC && (!Src || !(Src->surface_desc.dwFlags & DDSD_CKSRCBLT))) {
WARN("DDBLT_KEYDEST blit without color key in surface, returning DDERR_INVALIDPARAMS\n");