Changeset 8816 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

color fill fixes (heap corruption & missing lines)

Location:

trunk/src/ddraw

Files:

• OS2SURFACE.CPP (modified) (8 diffs)
• fillfunc.cpp (modified) (4 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.42 2002-06-08 14:20:06 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.43 2002-07-01 16:02:04 sandervl Exp $ */
 
 /*
@@ -1502 +1502 @@
   if(NULL!=lpDestRect)
   {
-    dprintf(("DDRAW: Fill only Rect(%d,%d)(%d,%d)\n", lpDestRect->left, lpDestRect->top,
-             lpDestRect->right, lpDestRect->bottom));
-    FillWidth  = lpDestRect->right - lpDestRect->left;
-    FillHeight = lpDestRect->bottom - lpDestRect->top -1;
-    Top = lpDestRect->top;
-    Left = lpDestRect->left;
+    dprintf(("DDRAW: Fill only Rect(%d,%d)(%d,%d) (%d,%d)", lpDestRect->left, lpDestRect->top,
+             lpDestRect->right, lpDestRect->bottom, width, height));
+    FillWidth  = RECT_WIDTH(lpDestRect);
+    FillHeight = RECT_HEIGHT(lpDestRect);
+    Top        = lpDestRect->top;
+    Left       = lpDestRect->left;
+    if(Top + FillHeight > height) {
+        FillHeight = height - Top;
+        dprintf(("correcting FillHeight to %d", FillHeight));
+    }
+    if(Left + FillWidth > width) {
+        FillWidth = width - Left;
+        dprintf(("correcting FillWidth to %d", FillWidth));
+    }
   }
   else
@@ -1515 +1523 @@
     Left = 0;
     FillWidth  = width;
-    FillHeight = height -1;
+    FillHeight = height;
     //pLine = pDiveBuffer;
   }
@@ -2711 +2719 @@
     dprintf(("DDRAW: Blitting with scaling\n Not supported.\n"));
 
-//    return DDERR_NOSTRETCHHW;
+    return DDERR_NOSTRETCHHW;
   }
 
@@ -4440 +4448 @@
               LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount
             ));
-    #if 1
     memset(&BitmapInfo, 0, sizeof(BitmapInfo));
     BitmapInfo.bmiHead.biSize     = sizeof(BITMAPINFOHEADER);
@@ -4453 +4460 @@
     bmihHdr.biPlanes   = 1;
     bmihHdr.biBitCount = (WORD)LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
-    #else
-    bmpSurface.bmType       = 0;
-    bmpSurface.bmWidth      = LockedSurfaceDesc.dwWidth;
-    bmpSurface.bmHeight     = LockedSurfaceDesc.dwHeight;
-    bmpSurface.bmWidthBytes = LockedSurfaceDesc.lPitch;
-    bmpSurface.bmPlanes     = 1;
-    bmpSurface.bmBits       = LockedSurfaceDesc.lpSurface;
-    #endif
+
     switch(LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
     {
@@ -4468 +4468 @@
         break;
       case 8:
-        #if 1
         BitmapInfo.bmiHead.biCompression = BI_RGB;
         if (me->lpPalette != NULL)
@@ -4493 +4492 @@
                                        (PBITMAPINFO)&BitmapInfo,
                                        DIB_RGB_COLORS);
-        #else
-        bmpSurface.bmBitsPixel  = 8;
-        me->hbmImage = CreateBitmapIndirect( &bmpSurface);
-        #endif
         break;
+
       case 16:
+      case 24:
       case 32:
-        dprintf(("DDRAW: 16/32 Bit not supported by OS/2"));
-        break;
-      case 24:
-        #if 0
-        BitmapInfo.bmiHead.biCompression = BI_RGB;
+        BitmapInfo.bmiHead.biCompression = BI_BITFIELDS;
+        BitmapInfo.bmiHead.biClrUsed     = 3;
+        *((DWORD *) &(BitmapInfo.bmiCols[0])) = me->DDSurfaceDesc.ddpfPixelFormat.dwRBitMask;
+        *((DWORD *) &(BitmapInfo.bmiCols[1])) = me->DDSurfaceDesc.ddpfPixelFormat.dwGBitMask;
+        *((DWORD *) &(BitmapInfo.bmiCols[2])) = me->DDSurfaceDesc.ddpfPixelFormat.dwBBitMask;
         me->hbmImage = CreateDIBitmap( me->hdcImage,
-                                       NULL,
-                                       CBM_CREATEDIB,
+                                       &bmihHdr,
+                                       CBM_INIT,
                                        LockedSurfaceDesc.lpSurface,
                                        (PBITMAPINFO)&BitmapInfo,
                                        DIB_RGB_COLORS );
-        #else
-        bmpSurface.bmBitsPixel  = 24;
-        me->hbmImage = CreateBitmapIndirect( &bmpSurface);
-        #endif
         break;
+
       default:
         dprintf( ("Unexpected BitCount %d \n",

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);