Changeset 3711 for trunk/src

Timestamp:

Jun 14, 2000, 8:30:18 PM (25 years ago)

Author:

sandervl

Message:

dib blit fixes

Location:

trunk/src/gdi32

Files:

• dibsect.cpp (modified) (11 diffs)
• dibsect.h (modified) (2 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.33 2000-05-28 17:03:18 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.34 2000-06-14 18:30:15 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include <win32wnd.h>
 #include <cpuhlp.h>
+#include <dcdata.h>
 #include "oslibgpi.h"
 #include "rgbcvt.h"
@@ -38 +39 @@
 //******************************************************************************
 DIBSection::DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD hSection, DWORD dwOffset, DWORD handle, int fFlip)
-                : bmpBits(NULL), pOS2bmp(NULL), next(NULL), bmpBitsBuffer(NULL)
+                : bmpBits(NULL), pOS2bmp(NULL), next(NULL), bmpBitsDblBuffer(NULL)
 {
   bmpsize = pbmi->biWidth;
@@ -164 +165 @@
    //double buffer for rgb 555 dib sections (for conversion) or flipped sections
    if(dibinfo.dsBitfields[1] == 0x03e0 || (fFlip & FLIP_VERT)) {
-        DosAllocMem((PPVOID)&bmpBitsBuffer, bmpsize*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
+        DosAllocMem((PPVOID)&bmpBitsDblBuffer, bmpsize*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
    }
 
@@ -205 +206 @@
         DosFreeMem(bmpBits);
 
-   if(bmpBitsBuffer)
-        DosFreeMem(bmpBitsBuffer);
+   if(bmpBitsDblBuffer)
+        DosFreeMem(bmpBitsDblBuffer);
 
    if(pOS2bmp)
@@ -341 +342 @@
    //double buffer for rgb 555 dib sections (for conversion) or flipped sections
    if(dibinfo.dsBitfields[1] == 0x03e0 || (fFlip & FLIP_VERT)) {
-        if(bmpBitsBuffer) {
-                DosFreeMem(bmpBitsBuffer);
+        if(bmpBitsDblBuffer) {
+                DosFreeMem(bmpBitsDblBuffer);
         }
-        DosAllocMem((PPVOID)&bmpBitsBuffer, dibinfo.dsBm.bmWidthBytes*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
+        DosAllocMem((PPVOID)&bmpBitsDblBuffer, dibinfo.dsBm.bmWidthBytes*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
    }
 
@@ -394 +395 @@
  BOOL   fRestoryYInversion = FALSE, fFrameWindowDC = FALSE;
  HWND   hwndDest;
-
-  hwndDest = WindowFromDC(hdcDest);
-  //TODO: Test whether dc is for the client or frame window
-//  if(hwndDest && IsOS2FrameWindowHandle(hwndDest)) {
-//      fFrameWindowDC = TRUE;
-//  }
+ pDCData pHps;
+
+  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+  if(!pHps)
+  {
+      SetLastError(ERROR_INVALID_HANDLE_W);
+      return FALSE;
+  }
+
+  hwndDest = WindowFromDC(hdcDest); //could return desktop window, so check that
+  if(hwndDest && pHps->hwnd && !pHps->isClient) {
+        fFrameWindowDC = TRUE;
+  }
 
   dprintf(("DIBSection::BitBlt %x %X (hps %x) %x to(%d,%d)(%d,%d) from (%d,%d)(%d,%d) rop %x flip %x",
@@ -478 +486 @@
         //manually reverse bitmap data
         char *src = bmpBits + (pOS2bmp->cy-1)*dibinfo.dsBm.bmWidthBytes;
-        char *dst = bmpBitsBuffer;
+        char *dst = bmpBitsDblBuffer;
         for(int i=0;i<pOS2bmp->cy;i++) {
                 memcpy(dst, src, dibinfo.dsBm.bmWidthBytes);
@@ -484 +492 @@
                 src -= dibinfo.dsBm.bmWidthBytes;
         }
-        bmpBits = bmpBitsBuffer;
-  }
+        bitmapBits = bmpBitsDblBuffer;
+  }
+  else  bitmapBits = bmpBits;
 
   //SvL: Optimize this.. (don't convert entire bitmap if only a part will be blitted to the dc)
@@ -491 +500 @@
         dprintf(("DIBSection::BitBlt; convert rgb 555 to 565 (old y inv. = %d)", oldyinversion));
 
-        if(bmpBitsBuffer == NULL)
+        if(bmpBitsDblBuffer == NULL)
                 DebugInt3();
 
         if(CPUFeatures & CPUID_MMX) {
-                RGB555to565MMX((WORD *)bmpBitsBuffer, (WORD *)bmpBits, pOS2bmp->cbImage/sizeof(WORD));
+                RGB555to565MMX((WORD *)bmpBitsDblBuffer, (WORD *)bitmapBits, pOS2bmp->cbImage/sizeof(WORD));
         }
-        else    RGB555to565((WORD *)bmpBitsBuffer, (WORD *)bmpBits, pOS2bmp->cbImage/sizeof(WORD));
-        rc = GpiDrawBits(hps, bmpBitsBuffer, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
-  }
-  else  rc = GpiDrawBits(hps, bmpBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
+        else    RGB555to565((WORD *)bmpBitsDblBuffer, (WORD *)bitmapBits, pOS2bmp->cbImage/sizeof(WORD));
+        rc = GpiDrawBits(hps, bmpBitsDblBuffer, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
+  }
+  else  rc = GpiDrawBits(hps, bitmapBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
 
   if(rc == GPI_OK) {
@@ -533 +542 @@
   BITMAPINFO2 *tmphdr = (BITMAPINFO2 *)malloc(os2bmphdrsize);
   memcpy(tmphdr, pOS2bmp, os2bmphdrsize);
-  destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
-  rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
+
+  if(fFlip & FLIP_VERT) {
+        destBuf = bmpBitsDblBuffer + nYdest*dibinfo.dsBm.bmWidthBytes;
+
+        rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
+                                tmphdr);
+        //manually reverse bitmap data
+        char *src = destBuf;
+        char *dst = GetDIBObject() + (nYdest+nDestHeight-1)*dibinfo.dsBm.bmWidthBytes;
+        for(int i=0;i<nDestHeight;i++) {
+                memcpy(dst, src, dibinfo.dsBm.bmWidthBytes);
+                dst -= dibinfo.dsBm.bmWidthBytes;
+                src += dibinfo.dsBm.bmWidthBytes;
+        }
+  }
+  else {
+        destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
+        rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
                           tmphdr);
+  }
   free(tmphdr);
   if(rc != nDestHeight) {

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.18 2000-05-23 18:46:20 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.19 2000-06-14 18:30:18 sandervl Exp $ */
 
 /*
@@ -103 +103 @@
           HWND  hwndParent;
           HDC   hdc;
-          char *bmpBits, *bmpBitsBuffer;
+          char *bmpBits, *bmpBitsDblBuffer;
           BOOL  fFlip;
           int   bmpsize, os2bmphdrsize;