Truncate dest blit rectangle down to surface size.

e38b4191 · Marcus Meissner · Alexandre Julliard · c7dd2542 · e38b4191
Commit e38b4191 authored Nov 27, 2000 by Marcus Meissner Committed by Alexandre Julliard Nov 27, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

main.c dlls/ddraw/dsurface/main.c +6 -1

No files found.
--- a/dlls/ddraw/dsurface/main.c
+++ b/dlls/ddraw/dsurface/main.c
@@ -232,7 +232,12 @@ HRESULT WINAPI IDirectDrawSurface4Impl_Blt(
 	}
    }
    if (src) assert((xsrc.bottom-xsrc.top) <= sdesc.dwHeight);
-    assert((xdst.bottom-xdst.top) <= ddesc.dwHeight);
+
+    /* truncate dst rect to dest surface. */
+    if ((xdst.bottom-xdst.top) > ddesc.dwHeight)
+	xdst.bottom = xdst.top+ddesc.dwHeight;
+    if ((xdst.right-xdst.left) > ddesc.dwWidth)
+	xdst.right = xdst.left+ddesc.dwWidth;

    bpp = GET_BPP(ddesc);
    srcheight = xsrc.bottom - xsrc.top;