[tkreuzer] 56464: [WIN32K] - Fix RLE hack (thanks to Mephisto) - Remove obsolete flags

Author: tkreuzer
Date: Tue May  1 13:57:18 2012
New Revision: 56464

URL: http://svn.reactos.org/svn/reactos?rev=56464&view=rev
Log:
[WIN32K]
- Fix RLE hack (thanks to Mephisto)
- Remove obsolete flags

Modified:
    trunk/reactos/win32ss/gdi/eng/surface.c
    trunk/reactos/win32ss/gdi/eng/surface.h
    trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
    trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c
    trunk/reactos/win32ss/gdi/ntgdi/dibobj.c

Modified: trunk/reactos/win32ss/gdi/eng/surface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?r...
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Tue May  1 13:57:18 2012
@@ -143,8 +143,6 @@
     PVOID pvSection;

ASSERT(!pvBits || (iType == STYPE_BITMAP));
-    ASSERT(pvBits || !(fjBitmap & BMF_DONT_FREE));
-    ASSERT(!pvBits || !(fjBitmap & BMF_SINGLEALLOC));

/* Verify format */
     if ((iFormat < BMF_1BPP) || (iFormat > BMF_PNG))

Modified: trunk/reactos/win32ss/gdi/eng/surface.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?r...
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Tue May  1 13:57:18 2012
@@ -80,11 +80,7 @@
 #define ABORT_SURFACE             0x40000000
 #define PDEV_SURFACE              0x80000000

-
-#define BMF_DONT_FREE 0x100
-#define BMF_RLE_HACK  0x200
-#define BMF_SINGLEALLOC 0x400
-#define BMF_POOLALLOC 0x800
+#define BMF_POOLALLOC 0x100

/*  Internal interface  */

Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c?...
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Tue May  1 13:57:18 2012
@@ -1164,7 +1164,7 @@
                                      1,
                                      1,
                                      BMF_32BPP,
-                                     BMF_DONT_FREE,
+                                     0,
                                      0,
                                      &ulRGBColor);
     if (psurfDest)

Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c...
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue May  1 13:57:18 2012
@@ -84,7 +84,7 @@
     }

/* The infamous RLE hack */
-    if ((iFormat == BMF_4RLE) || (iFormat == BMF_8RLE))
+    if (pvCompressedBits)
     {
         SIZEL sizl;
         LONG lDelta;
@@ -95,7 +95,6 @@

pvBits = psurf->SurfObj.pvBits;
         DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat);
-        psurf->SurfObj.fjBitmap |= BMF_RLE_HACK;
     }

/* Get the handle for the bitmap */

Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c?...
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue May  1 13:57:18 2012
@@ -1595,7 +1595,6 @@
     bmp->dwOffset = offset;
     bmp->flags = API_BITMAP;
     bmp->biClrImportant = bi->biClrImportant;
-    bmp->SurfObj.fjBitmap &= ~BMF_DONT_FREE;

/* HACK */
     if(hpal != (HPALETTE)0xFFFFFFFF)