From 0b37bf74b93e0797bd6a2e9de2c293fc7064909f Mon Sep 17 00:00:00 2001
From: Jason Edmeades <us@the-edmeades.demon.co.uk>
Date: Thu, 30 Oct 2003 23:24:44 +0000
Subject: [PATCH] CopyRects (per rect) copied one too many lines, trashing the
 heap. Also tidies up scissor test from previous patch.

---
 dlls/d3d8/device.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 75f3b414668..262ebbf74dc 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1056,9 +1056,9 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface,
             TRACE("Locked src and dst\n");
 
             /* Find where to start */
-	    for (j = 0; j < (r->bottom - r->top); j++) {
+            for (j = 0; j < (r->bottom - r->top - 1); j++) {
                memcpy((char*) lrDst.pBits + (j * lrDst.Pitch), (char*) lrSrc.pBits + (j * lrSrc.Pitch), copyperline);
-	    }
+            }
 
             IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) src);
             rc = IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) dst);
@@ -1352,8 +1352,6 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count
     glEnable(GL_SCISSOR_TEST);
     checkGLcall("glEnable GL_SCISSOR_TEST");
     if (Count > 0 && pRects) {
-        glEnable(GL_SCISSOR_TEST);
-        checkGLcall("glEnable GL_SCISSOR_TEST");
         curRect = pRects;
     } else {
         curRect = NULL;
@@ -1430,10 +1428,8 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count
                      old_color_clear_value[3]);
     }
 
-    if (Count > 0 && pRects) {
-        glDisable(GL_SCISSOR_TEST);
-        checkGLcall("glDisable");
-    }
+    glDisable(GL_SCISSOR_TEST);
+    checkGLcall("glDisable");
     LEAVE_GL();
 
     return D3D_OK;