Changeset 1686 for trunk/src

Timestamp:

Nov 10, 1999, 3:15:23 PM (26 years ago)

Author:

sandervl

Message:

removed flipping in dibsection

Location:

trunk/src/gdi32

Files:

• dibsect.cpp (modified) (4 diffs)
• dibsect.h (modified) (2 diffs)
• gdi32.cpp (modified) (4 diffs)
• makefile (modified) (2 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.6 1999-10-31 21:38:15 achimha Exp $ */
+/* $Id: dibsect.cpp,v 1.7 1999-11-10 14:15:23 sandervl Exp $ */
 
 /*
@@ -148 +148 @@
 //******************************************************************************
 #if 1
-BOOL DIBSection::BitBlt(HDC hdcDest, HWND hwndDest, int nXdest, int nYdest, int nWidth,
+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));
 
   if(hwndDest != 0) {
@@ -179 +182 @@
   else  point[3].y = nYsrc + nHeight;
 
+#if 0
   if(fFlip & FLIP_VERT) {
     ULONG y;
@@ -192 +196 @@
         point[1].x = x;
   }
+#endif
 
   rc = GpiDrawBits(hps, bmpBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, BBO_OR);

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.4 1999-10-31 21:38:16 achimha Exp $ */
+/* $Id: dibsect.h,v 1.5 1999-11-10 14:15:23 sandervl Exp $ */
 
 /*
@@ -70 +70 @@
               void  UnSelectDIBObject()      { this->hdc = 0;   };
 
-              BOOL  BitBlt(HDC hdcDest, HWND hwndDest, int nXdest, int nYDest,
+              BOOL  BitBlt(HDC hdcDest, int nXdest, int nYDest,
                            int nWidth, int nHeight, int nXsrc, int nYSrc, DWORD Rop);
 

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.14 1999-11-09 17:06:14 cbratschi Exp $ */
+/* $Id: gdi32.cpp,v 1.15 1999-11-10 14:15:23 sandervl Exp $ */
 
 /*
@@ -295 +295 @@
 HDC WIN32API CreateCompatibleDC( HDC arg1)
 {
-    dprintf(("GDI32: CreateCompatibleDC %X\n", arg1));
-    return O32_CreateCompatibleDC(arg1);
+ HDC rc;
+
+    rc = O32_CreateCompatibleDC(arg1);
+    dprintf(("GDI32: CreateCompatibleDC %X returned %x", arg1, rc));
+    return rc;
 }
 //******************************************************************************
@@ -408 +411 @@
 HPALETTE WIN32API SelectPalette(HDC arg1, HPALETTE arg2, BOOL arg3)
 {
-    dprintf(("GDI32: SelectPalette\n"));
+    dprintf(("GDI32: SelectPalette %x", arg1));
     return O32_SelectPalette(arg1, arg2, arg3);
 }
@@ -526 +529 @@
         DIBSection *dsect = DIBSection::findHDC(hdcSrc);
         if(dsect) {
-                return(dsect->BitBlt(hdcDest, O32_WindowFromDC(hdcDest), arg2, arg3, arg4,
-                                     arg5, arg7, arg8, arg9));
+                return(dsect->BitBlt(hdcDest, arg2, arg3, arg4, arg5, arg7, arg8, arg9));
         }
     }

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 1999-10-20 22:36:54 sandervl Exp $
+# $Id: makefile,v 1.10 1999-11-10 14:15:23 sandervl Exp $
 
 #
@@ -69 +69 @@
 
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch
+        $(RM) *.obj *.lib *.dll *.map *.pch
         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
         $(RM) $(PDWIN32_LIB)\$(TARGET).lib