system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Perform sanity checks on the rectangle in LockRect.

Browse source
This commit is contained in:
Stefan Dösinger 2006-06-29 21:13:12 +02:00 committed by Alexandre Julliard
parent 2abfc391b4
commit 77448f588b
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dlls/wined3d/surface.c
View file

@ -348,6 +348,17 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED
} else {
TRACE("Lock Rect (%p) = l %ld, t %ld, r %ld, b %ld\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom);
if ((pRect->top < 0) ||
(pRect->left < 0) ||
(pRect->left >= pRect->right) ||
(pRect->top >= pRect->bottom) ||
(pRect->right > This->currentDesc.Width) ||
(pRect->bottom > This->currentDesc.Height))
{
WARN(" Invalid values in pRect !!!\n");
return D3DERR_INVALIDCALL;
}
if (This->resource.format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */
pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + ((pRect->left * This->bytesPerPixel / 2));
} else {

11
dlls/wined3d/surface_gdi.c
View file

@ -196,6 +196,17 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface,
TRACE("Lock Rect (%p) = l %ld, t %ld, r %ld, b %ld\n",
pRect, pRect->left, pRect->top, pRect->right, pRect->bottom);
if ((pRect->top < 0) ||
(pRect->left < 0) ||
(pRect->left >= pRect->right) ||
(pRect->top >= pRect->bottom) ||
(pRect->right > This->currentDesc.Width) ||
(pRect->bottom > This->currentDesc.Height))
{
WARN(" Invalid values in pRect !!!\n");
return D3DERR_INVALIDCALL;
}
if (This->resource.format == WINED3DFMT_DXT1)
{
/* DXT1 is half byte per pixel */