Changeset 10373 for trunk/src/gdi32/blit.cpp

Timestamp:

Jan 11, 2004, 12:42:14 PM (22 years ago)

Author:

sandervl

Message:

Update

File:

• trunk/src/gdi32/blit.cpp (modified) (16 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.45 2003-07-16 10:46:16 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.46 2004-01-11 11:42:08 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include <winuser32.h>
 #include <dbglog.h>
+#include "oslibgpi.h"
+#include <dcdata.h>
 #include "dibsect.h"
 #include "rgbcvt.h"
@@ -48 +50 @@
             rc  = dsect->BitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest,
                                 nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop);
-            return rc;
+            goto blitdone;
         }
     }
     rc = O32_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop);
-    if(DIBSection::getSection() != NULL) {
-        DIBSection *destdib = DIBSection::findHDC(hdcDest);
-        if(destdib) {
-            destdib->sync(hdcDest, nYOriginDest, nHeightDest);
-        }
-    }
+
+blitdone:
+    DIBSECTION_MARK_INVALID(hdcDest);
+
     if(rc == FALSE) {
         dprintf(("!WARNING!: GDI32: StretchBlt returned FALSE; last error %x", rc, GetLastError()));
@@ -78 +78 @@
 
 #ifdef DEBUG
-      POINT point1, point2;
+    POINT point1, point2;
     GetViewportOrgEx(hdcDest, &point1);
     GetViewportOrgEx(hdcSrc, &point2);
@@ -90 +90 @@
         if(dsect) 
         {
-            return dsect->BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, nXSrc, nYSrc, nWidth, nHeight, dwRop);
+            rc = dsect->BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, nXSrc, nYSrc, nWidth, nHeight, dwRop);
+            goto blitdone;
         }
     }
@@ -98 +99 @@
     rc = O32_BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, dwRop);
 
-    if(DIBSection::getSection() != NULL) {
-        DIBSection *destdib = DIBSection::findHDC(hdcDest);
-        if(destdib) {
-            destdib->sync(hdcDest, nYDest, nHeight);
-        }
-    }
+blitdone:
+    DIBSECTION_MARK_INVALID(hdcDest);
     return rc;
 }
@@ -193 +190 @@
     }
     if(startscan != 0 || lines != info->bmiHeader.biHeight) {
-            dprintf(("WARNING: SetDIBitsToDevice startscan != 0 || lines != info->bmiHeader.biHeight"));
+        dprintf(("WARNING: SetDIBitsToDevice startscan != 0 || lines != info->bmiHeader.biHeight"));
         dprintf(("info bmp (%d,%d)", info->bmiHeader.biWidth, info->bmiHeader.biHeight));
     }
@@ -209 +206 @@
         result = info->bmiHeader.biHeight;
 
-        DIBSection *destdib = DIBSection::findHDC(hdc);
-        if(destdib) {
-                if(cx == info->bmiHeader.biWidth && cy == info->bmiHeader.biHeight &&
-                   destdib->GetBitCount() == info->bmiHeader.biBitCount &&
-                   destdib->GetBitCount() == 8) 
-                {
-                        destdib->sync(xDest, yDest, cx, cy, (PVOID)bits);
-                }
-                else    destdib->sync(hdc, yDest, cy);
-        }
+        DIBSECTION_MARK_INVALID(hdc);
     }
     dprintf(("GDI32: SetDIBitsToDevice hdc:%X xDest:%d yDest:%d, cx:%d, cy:%d, xSrc:%d, ySrc:%d, startscan:%d, lines:%d \nGDI32: bits 0x%X, info 0x%X, coloruse %d returned %d",
-                 hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (LPVOID) bits, (PBITMAPINFO)info, coloruse, result));
+              hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (LPVOID) bits, (PBITMAPINFO)info, coloruse, result));
     dprintf(("GDI32: SetDIBitsToDevice %d %d %d %d %x %d", info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biPlanes, info->bmiHeader.biBitCount, info->bmiHeader.biCompression, info->bmiHeader.biSizeImage));
 
@@ -358 +346 @@
     rc = O32_PatBlt(hdc,nXLeft,nYLeft,nWidth,nHeight,dwRop);
     if(rc) {
-        DIBSection *destdib = DIBSection::findHDC(hdc);
-        if(destdib) {
-                    destdib->sync(hdc, nYLeft, nHeight);
-            }
+        DIBSECTION_MARK_INVALID(hdc);
     }
     return(rc);
@@ -367 +352 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API MaskBlt( HDC arg1, int arg2, int arg3, int arg4, int arg5, HDC   arg6, int arg7, int arg8, HBITMAP arg9, int arg10, int arg11, DWORD  arg12)
-{
-    return O32_MaskBlt(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+BOOL WIN32API MaskBlt( HDC hdcDest, int arg2, int arg3, int arg4, int arg5, HDC hdcSrc, int arg7, int arg8, HBITMAP arg9, int arg10, int arg11, DWORD  arg12)
+{
+    BOOL ret;
+
+    DIBSECTION_CHECK_IF_DIRTY(hdcSrc);
+
+    ret = O32_MaskBlt(hdcDest, arg2, arg3, arg4, arg5, hdcSrc, arg7, arg8, arg9, arg10, arg11, arg12);
+    if(ret) {
+        DIBSECTION_MARK_INVALID(hdcDest);
+    }
+    return ret;
 }
 //******************************************************************************
@@ -426 +419 @@
         //Open32 always returns height of bitmap (regardless of how many scanlines were copied)
         if(rc != heightSrc && rc != infoLoc->bmiHeader.biHeight) {
-                    dprintf(("StretchDIBits failed with rc %x", rc));
+            dprintf(("StretchDIBits failed with rc %x", rc));
         }
-            else {
-                    rc = heightSrc;
-
-                    DIBSection *destdib = DIBSection::findHDC(hdc);
-                    if(destdib) {
-                        if(widthDst == widthSrc && heightDst == heightSrc &&
-                            destdib->GetBitCount() == infoLoc->bmiHeader.biBitCount &&
-                            destdib->GetBitCount() == 8) 
-                {
-                                    destdib->sync(xDst, yDst, widthDst, heightDst, (PVOID)bits);
-                            }
-                            else        destdib->sync(hdc, yDst, heightDst);
-                    }
-            }
+        else {
+            rc = heightSrc;
+
+            DIBSECTION_MARK_INVALID(hdc);
+        }
     
         return rc;
@@ -489 +473 @@
 
     rc = O32_StretchDIBits(hdc, xDst, yDst, widthDst, heightDst, xSrc, ySrc,
-                             widthSrc, heightSrc, (void *)bits,
-                             (PBITMAPINFO)info, wUsage, dwRop);
+                           widthSrc, heightSrc, (void *)bits,
+                           (PBITMAPINFO)info, wUsage, dwRop);
 
     if(compression == BI_BITFIELDS) {
@@ -505 +489 @@
             rc = heightSrc;
 
-            DIBSection *destdib = DIBSection::findHDC(hdc);
-            if(destdib) {
-                if(widthDst == widthSrc && heightDst == heightSrc &&
-                    destdib->GetBitCount() == info->bmiHeader.biBitCount &&
-                    destdib->GetBitCount() == 8) 
-            {
-                             destdib->sync(xDst, yDst, widthDst, heightDst, (PVOID)bits);
-                    }
-                    else destdib->sync(hdc, yDst, heightDst);
-            }
+            DIBSECTION_MARK_INVALID(hdc);
     }
 
@@ -526 +501 @@
                            const BITMAPINFO *info, UINT wUsage, DWORD dwRop )
 {
-
     if(info->bmiHeader.biHeight < 0) {
         // upside down
@@ -563 +537 @@
 int WIN32API SetStretchBltMode( HDC arg1, int  arg2)
 {
+#ifdef DEBUG
     if(DIBSection::getSection() != NULL)
     {
@@ -571 +546 @@
         }
     }
+#endif
     return O32_SetStretchBltMode(arg1, arg2);
 }