Changeset 8816 for trunk/src/ddraw/fillfunc.cpp

Timestamp:

Jul 1, 2002, 6:02:05 PM (23 years ago)

Author:

sandervl

Message:

color fill fixes (heap corruption & missing lines)

File:

• trunk/src/ddraw/fillfunc.cpp (modified) (4 diffs)

trunk/src/ddraw/fillfunc.cpp

@@ -1 @@
-/* $Id: fillfunc.cpp,v 1.4 2001-04-04 09:02:15 sandervl Exp $ */
+/* $Id: fillfunc.cpp,v 1.5 2002-07-01 16:02:05 sandervl Exp $ */
 
 /*
@@ -40 +40 @@
   if(dwWidth % 4)
   {
+    if(i==0) i = 1;     //or else next line will corrupt heap
     pFillPos = (char*) (&pColor[i-1]);
     for(i=0;i<dwWidth % 4;i++)
@@ -81 +82 @@
   if(dwWidth % 2)
   {
+     if(i==0) i = 1;    //or else next line will corrupt heap
      pFillPos = (char*)(&pColor[i-1]);
     *((USHORT*)pFillPos) = (USHORT)dwColor;
@@ -222 +224 @@
                         )
 {
-  dprintf(("Fill16on16\n"));
+  dprintf(("Fill16on16 %x (%d,%d)(%d,%d) %d %x", pDB+(dwTop*dwPitchDB)+(dwLeft*2), dwLeft, dwTop, dwWidth, dwHeight, dwPitchDB, dwColor));
   dwColor = (dwColor&0xFFFF)+((dwColor&0xFFFF)<<16);