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

Timestamp:

Nov 12, 1999, 12:38:45 PM (26 years ago)

Author:

sandervl

Message:

DIBSection changes, EB's file io additions, Jens Weissner's changes to several dlls

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.7 1999-11-10 14:15:23 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.8 1999-11-12 11:38:38 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include "dibsect.h"
 
+HWND WIN32API WindowFromDC(HDC hdc);
+HWND Win32ToOS2Handle(HWND hwnd);
+
+BOOL    APIENTRY _GpiEnableYInversion (HPS hps, LONG lHeight);
+
+inline BOOL APIENTRY GpiEnableYInversion (HPS hps, LONG lHeight)
+{
+ BOOL yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = _GpiEnableYInversion(hps, lHeight);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+
 //NOTE:
 //This is not a complete solution for CreateDIBSection, but enough for Quake 2!
@@ -147 +164 @@
 //******************************************************************************
 //******************************************************************************
-#if 1
 BOOL DIBSection::BitBlt(HDC hdcDest, int nXdest, int nYdest, int nWidth,
                         int nHeight, int nXsrc, int nYsrc, DWORD Rop)
 {
- HWND   hwndDest = WinWindowFromDC(hdcDest);
  HPS    hps = (HPS)hdcDest;
  POINTL point[4];
  LONG   rc;
 
-  dprintf(("DIBSection::BitBlt %X %x (%d,%d) to (%d,%d) (%d,%d) rop %x\n", hdcDest, hwndDest, nXdest, nYdest, nWidth, nHeight, nXsrc, nYsrc, Rop));
-
+  HWND hwndDest = WindowFromDC(hdcDest);
+  hwndDest = Win32ToOS2Handle(hwndDest);
   if(hwndDest != 0) {
          hps = WinGetPS(hwndDest);
@@ -165 +180 @@
         return(FALSE);
   }
+
+  dprintf(("DIBSection::BitBlt %X %x (%d,%d) to (%d,%d) (%d,%d) rop %x\n", hdcDest, hwndDest, nXdest, nYdest, nWidth, nHeight, nXsrc, nYsrc, Rop));
 
   point[0].x = nXdest;
@@ -182 +199 @@
   else  point[3].y = nYsrc + nHeight;
 
-#if 0
+#if 1
   if(fFlip & FLIP_VERT) {
-    ULONG y;
-        y = point[0].y;
-        point[0].y = point[1].y;
-        point[1].y = y;
+        GpiEnableYInversion(hps, nHeight);
   }
 
@@ -209 +223 @@
   return(FALSE);
 }
-#else
-BOOL DIBSection::BitBlt(HDC hdcDest, int nXdest, int nYdest, int nWidth,
-                        int nHeight, int nXsrc, int nYsrc, DWORD Rop)
-{
- HPS    hps = (HPS)hdcDest;
- POINTL point[4];
- LONG   rc;
-
-  if(hps == 0) {
-        eprintf(("DIBSection::BitBlt, hps == 0"));
-        return(FALSE);
-  }
-
-//  dprintf(("DIBSection::BitBlt (%d,%d) to (%d,%d) (%d,%d)\n", nXsrc, nYsrc, nXdest, nYdest, nXdest+ nWidth, nYdest + nHeight));
-  point[0].x = nXdest;
-  point[0].y = nYdest;
-  point[1].x = nXdest + nWidth - 1;
-  point[1].y = nYdest + nHeight - 1;
-  point[2].x = nXsrc;
-  point[2].y = nYsrc;
-  if(nXsrc + nWidth > pOS2bmp->cx) {
-        point[3].x = pOS2bmp->cx;
-  }
-  else  point[3].x = nXsrc + nWidth;
-
-  if(nYsrc + nHeight > pOS2bmp->cy) {
-        point[3].y = pOS2bmp->cy;
-  }
-  else  point[3].y = nYsrc + nHeight;
-
-  rc = GpiDrawBits(hps, bmpBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, BBO_OR);
-//  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));
-
-  if(rc == GPI_OK)
-        return(TRUE);
-  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));
-  dprintf(("WinGetLastError returned %X\n", WinGetLastError(WinQueryAnchorBlock(hwndParent)) & 0xFFFF));
-  return(FALSE);
-}
-#endif
 //******************************************************************************
 //******************************************************************************