[ros-diffs] [fireball] 33882: - Revert 33881, PatBlt may be buggy, but what was introduced in 33881 was a non-working hack. Unregresses FF2.0 installer having a black rectangle in the bottom of its window.

[fireball at svn.reactos.org]

Author: fireball
Date: Sat Jun  7 04:20:05 2008
New Revision: 33882

URL: http://svn.reactos.org/svn/reactos?rev=33882&view=rev
Log:
- Revert 33881, PatBlt may be buggy, but what was introduced in 33881 was a non-working hack. Unregresses FF2.0 installer having a black rectangle in the bottom of its window.

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/bitblt.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/bitblt.c?rev=33882&r1=33881&r2=33882&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Jun  7 04:20:05 2008
@@ -1069,13 +1069,10 @@
    INT Height,
    DWORD ROP)
 {
-    /* FIXME PatBlt code is wrong, we using NtGdiBitBlt to workaround this bug for now, like random crash, and so on */
-#if 0
    PGDIBRUSHOBJ BrushObj;
    DC *dc;
    PDC_ATTR Dc_Attr;
    BOOL ret;
-#endif
 
    BOOL UsesSource = ROP3_USES_SOURCE(ROP);
    if (UsesSource)
@@ -1084,9 +1081,6 @@
        return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0);
    }
 
-   return NtGdiBitBlt( hDC, XLeft, YLeft, Width, Height,  0, 0, 0, ROP, 0, 0);
-    
-#if 0
    dc = DC_LockDc(hDC);
    if (dc == NULL)
    {
@@ -1123,7 +1117,6 @@
    DC_UnlockDc(dc);
 
    return ret;
-#endif
 }
 
 BOOL STDCALL