Changeset 3302 for trunk/src/gdi32/dibsect.cpp

Timestamp:

Apr 2, 2000, 2:24:40 PM (25 years ago)

Author:

sandervl

Message:

dib sync bugfixes

File:

• trunk/src/gdi32/dibsect.cpp (modified) (10 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.24 2000-04-01 15:05:30 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.25 2000-04-02 12:24:40 sandervl Exp $ */
 
 /*
@@ -40 +40 @@
                 : bmpBits(NULL), pOS2bmp(NULL), next(NULL), bmpBitsRGB565(NULL)
 {
-  int  os2bmpsize;
-
   bmpsize = pbmi->biWidth;
   /* @@@PH 98/06/07 -- high-color bitmaps don't have palette */
 
   this->fFlip = fFlip;
-  os2bmpsize = sizeof(BITMAPINFO2);
+  os2bmphdrsize = sizeof(BITMAPINFO2);
 
   switch(pbmi->biBitCount)
@@ -52 +50 @@
         case 1:
                 bmpsize = ((bmpsize + 31) & ~31) / 8;
-                os2bmpsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
+                os2bmphdrsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
                 break;
         case 4:
                 bmpsize = ((bmpsize + 7) & ~7) / 2;
-                os2bmpsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
+                os2bmphdrsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
                 break;
         case 8:
-                os2bmpsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
+                os2bmphdrsize += ((1 << pbmi->biBitCount)-1)*sizeof(RGB2);
                 bmpsize = (bmpsize + 3) & ~3;
                 break;
@@ -92 +90 @@
    memset(bmpBits, 0, bmpsize*pbmi->biHeight);
 
-   pOS2bmp = (BITMAPINFO2 *)malloc(os2bmpsize);
+   pOS2bmp = (BITMAPINFO2 *)malloc(os2bmphdrsize);
 
    memset(pOS2bmp, /* set header + palette entries to zero */
           0,
-          os2bmpsize);
+          os2bmphdrsize);
 
    pOS2bmp->cbFix         = sizeof(BITMAPINFO2) - sizeof(RGB2);
@@ -238 +236 @@
 {
   lines = (int)lines >= 0 ? (int)lines : (int)-lines;
-  int  os2bmpsize;
   int  palsize=0;
 
   bmpsize = pbmi->biWidth;
-  os2bmpsize = sizeof(BITMAPINFO2);
+  os2bmphdrsize = sizeof(BITMAPINFO2);
 
   switch(pbmi->biBitCount)
@@ -249 +246 @@
       bmpsize = ((bmpsize + 31) & ~31) / 8;
       palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
-      os2bmpsize += palsize;
+      os2bmphdrsize += palsize;
       break;
     case 4:
       bmpsize = ((bmpsize + 7) & ~7) / 2;
       palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
-      os2bmpsize += palsize;
+      os2bmphdrsize += palsize;
       break;
     case 8:
       palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
-      os2bmpsize += palsize;
+      os2bmphdrsize += palsize;
       bmpsize = (bmpsize + 3) & ~3;
       break;
@@ -285 +282 @@
         DosFreeMem(oldbits);
    }
-   pOS2bmp    = (BITMAPINFO2 *)realloc(pOS2bmp, os2bmpsize);
+   pOS2bmp    = (BITMAPINFO2 *)realloc(pOS2bmp, os2bmphdrsize);
    pOS2bmp->cbFix         = sizeof(BITMAPINFO2) - sizeof(RGB2);
    pOS2bmp->cx            = pbmi->biWidth;
@@ -386 +383 @@
  LONG   rc;
  PVOID  bitmapBits = NULL;
+ int    oldyinversion = 0;
 
   HWND hwndDest = WindowFromDC(hdcDest);
@@ -412 +410 @@
   if(nXsrc + nSrcWidth > pOS2bmp->cx)
   {
-    point[3].x = pOS2bmp->cx;
-  }
-  else
-    point[3].x = nXsrc + nSrcWidth;
+        point[3].x = pOS2bmp->cx;
+        nSrcWidth  = pOS2bmp->cx - nXsrc;
+  }
+  else  point[3].x = nXsrc + nSrcWidth;
 
   if(nYsrc + nSrcHeight > pOS2bmp->cy)
   {
-    point[3].y = pOS2bmp->cy;
-  }
-  else
-    point[3].y = pOS2bmp->cy - nYsrc;
-
-
-#if 1
+        point[3].y = pOS2bmp->cy;
+        nSrcHeight = pOS2bmp->cy - nYsrc;
+  }
+  else  point[3].y = pOS2bmp->cy - nYsrc;
+
+  oldyinversion = GpiQueryYInversion(hps);
   if(fFlip & FLIP_VERT)
   {
-    GpiEnableYInversion(hps, nDestHeight);
-  }
+        GpiEnableYInversion(hps, nDestHeight-1);
+  }
+  else  GpiEnableYInversion(hps, 0);
 
   if(fFlip & FLIP_HOR)
   {
-    ULONG x;
-    x = point[0].x;
-    point[0].x = point[1].x;
-    point[1].x = x;
-  }
-#endif
+        ULONG x;
+        x = point[0].x;
+        point[0].x = point[1].x;
+        point[1].x = x;
+  }
 
   //SvL: Optimize this.. (don't convert entire bitmap if only a part will be blitted to the dc)
@@ -455 +452 @@
   else  rc = GpiDrawBits(hps, bmpBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, BBO_OR);
 
+  if(rc == GPI_OK) {
+        DIBSection *destdib = DIBSection::findHDC(hdcDest);
+        if(destdib) {
+                dprintf(("Sync destination dibsection %x (%x) (%d)", destdib->handle, hdcDest, oldyinversion));
+
+                //todo: rgb 565 to 555 conversion if bpp == 16
+                BITMAPINFO2 *tmphdr = (BITMAPINFO2 *)malloc(destdib->os2bmphdrsize);
+                memcpy(tmphdr, destdib->pOS2bmp, destdib->os2bmphdrsize);
+                rc = GpiQueryBitmapBits(hps, nYdest, nDestHeight, destdib->GetDIBObject(),
+                                        tmphdr);
+                free(tmphdr);
+                if(rc != nDestHeight) {
+                        DebugInt3();
+                }
+        }
+        //restore old y inversion height
+        GpiEnableYInversion(hps, oldyinversion);
+        if(hwndDest != 0)
+        {
+                WinReleasePS(hps);
+        }
+        return(TRUE);
+  }
+  GpiEnableYInversion(hps, oldyinversion);
   if(hwndDest != 0)
   {
-    WinReleasePS(hps);
-  }
-  if(rc == GPI_OK) {
-        return(TRUE);
+        WinReleasePS(hps);
   }
   dprintf(("DIBSection::BitBlt %X (%d,%d) (%d,%d) to (%d,%d) (%d,%d) returned %d\n", hps, point[0].x, point[0].y, point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y, rc));