Changeset 3755 for trunk/src

Timestamp:

Jun 26, 2000, 12:27:45 PM (25 years ago)

Author:

sandervl

Message:

reverse video fix for sdd & rp7

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.35 2000-06-17 11:58:07 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.36 2000-06-26 10:27:45 sandervl Exp $ */
 
 /*
@@ -397 +397 @@
  pDCData pHps;
 
-  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdcDest);
   if(!pHps)
   {
@@ -428 +428 @@
   }
 
-  //win32 coordinates are of the left top, OS/2 expects left bottom
+  //win32 coordinates are relative to left top, OS/2 expects left bottom
   //source rectangle is non-inclusive (top, right not included)
+  //destination rectangle is incl.-inclusive (everything included)
   if(nXdest + nDestWidth > hdcWidth) {
         nDestWidth  = hdcWidth - nXdest;
@@ -438 +439 @@
   point[0].x = nXdest;
   point[0].y = hdcHeight - nYdest - nDestHeight;
-  point[1].x = nXdest + nDestWidth;
-  point[1].y = hdcHeight - nYdest;
+  point[1].x = nXdest + nDestWidth - 1;
+  point[1].y = hdcHeight - nYdest - 1;
 
   //target rectangle is inclusive-inclusive
@@ -453 +454 @@
   point[3].y = pOS2bmp->cy - nYsrc;
 
+  dprintf(("DIBSection::BitBlt (%d,%d)(%d,%d) from (%d,%d)(%d,%d) dim (%d,%d)(%d,%d)", point[0].x, point[0].y,
+           point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y,
+           nDestWidth, nDestHeight, nSrcWidth, nSrcHeight));
+
+/*
+  hwndDest = Win32ToOS2Handle(hwndDest);
+  if(hwndDest != 0)
+  {
+        hps = WinGetPS(hwndDest);
+  }
+*/
   oldyinversion = GpiQueryYInversion(hps);
   if(oldyinversion != 0) {
@@ -511 +523 @@
   else  rc = GpiDrawBits(hps, bitmapBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
 
+/*
+  if(hwndDest != 0)
+  {
+    WinReleasePS(hps);
+  }
+*/
   if(rc == GPI_OK) {
         DIBSection *destdib = DIBSection::findHDC(hdcDest);
@@ -519 +537 @@
         if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
         SetLastError(ERROR_SUCCESS_W);
+
         return(TRUE);
   }