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

Timestamp:

Apr 1, 2003, 5:57:05 PM (22 years ago)

Author:

sandervl

Message:

Fix for partial dibsection resyncs

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.64 2003-02-06 19:20:03 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.65 2003-04-01 15:57:05 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #define DBG_LOCALLOG  DBG_dibsect
 #include "dbglocal.h"
+
 
 //******************************************************************************
@@ -83 +84 @@
    this->dwOffset = dwOffset;
    if(hSection) {
-        bmpBits = (char *)MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS_W, 0, dwOffset, bmpsize*pbmi->biHeight);
+        bmpBits = (char *)MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS_W, 0, dwOffset, bmpsize*pbmi->biHeight - dwOffset);
         if(!bmpBits) {
             dprintf(("Dibsection: mapViewOfFile %x failed!", hSection));
@@ -522 +523 @@
 #else
   point[2].y = nYsrc;
-  point[3].y = nYsrc + nSrcHeight - 1;
+  point[3].y = nYsrc + nSrcHeight;
 #endif
 
@@ -555 +556 @@
         fRestoryYInversion = TRUE;
   }
+#else
+  dprintf(("Sync destination dibsection: hdc y inversion = %d", GpiQueryYInversion(hdc)));
 #endif
 
@@ -591 +594 @@
         break;
   }
+#ifndef INVERT
+  if(!(fFlip & FLIP_VERT)) {
+#else
   if(fFlip & FLIP_VERT) {
+#endif
         //manually reverse bitmap data
         char *src = bmpBits + (pOS2bmp->cy-1)*dibinfo.dsBm.bmWidthBytes;
@@ -683 +690 @@
       }
   }
-#endif
-
+#else
+  dprintf(("Sync destination dibsection: hdc y inversion = %d", GpiQueryYInversion(hdc)));
+#endif
+
+#ifndef INVERT
+  if(!(fFlip & FLIP_VERT)) {
+#else
   if(fFlip & FLIP_VERT) {
+#endif
         destBuf = bmpBitsDblBuffer + nYdest*dibinfo.dsBm.bmWidthBytes;
 
@@ -695 +708 @@
         tmphdr->cbImage = dibinfo.dsBm.bmHeight*dibinfo.dsBm.bmWidthBytes;
 
-        rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
+#ifdef INVERT
+        int dest = dibinfo.dsBm.bmHeight - nYdest - nDestHeight;
+#else
+        int dest = nYdest;
+#endif
+        rc = GpiQueryBitmapBits(hdc, dest, nDestHeight, destBuf,
                                 tmphdr);
         if(rc == GPI_ALTERROR) {
@@ -719 +737 @@
 
         destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
+
+#ifdef INVERT
+        int dest = dibinfo.dsBm.bmHeight - nYdest - nDestHeight;
+#else
+        int dest = nYdest;
+#endif
         rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
                                 tmphdr);
@@ -736 +760 @@
 
   if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
-    dprintf(("DIBSection::sync: convert RGB 565 to RGB 555"));
-
-    destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
-
-    if(CPUFeatures & CPUID_MMX) {
+      dprintf(("DIBSection::sync: convert RGB 565 to RGB 555"));
+
+      destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
+
+      if(CPUFeatures & CPUID_MMX) {
             RGB565to555MMX((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
-    }
-    else    RGB565to555((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
+      }
+      else  RGB565to555((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
   }
 
   free(tmphdr);
   if(rc != nDestHeight) {
-    dprintf(("!WARNING!: GpiQueryBitmapBits returned %d instead of %d scanlines", rc, nDestHeight));
+      dprintf(("!WARNING!: GpiQueryBitmapBits returned %d instead of %d scanlines", rc, nDestHeight));
   }