fix a mem leak in win32k bitmap code

svn path=/trunk/; revision=32247

diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c
index c0b6a7b..72fea7e 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/bitmaps.c
+++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c
@@ -70,23 +70,22 @@ IntGdiCreateBitmap(
       return 0;
    }
 
       return 0;
    }
 

-   if (NULL != pBits)
+   PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hBitmap );
+   if (bmp == NULL)

    {
    {

-       PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hBitmap );
-       if (bmp == NULL)
-       {
-          NtGdiDeleteObject(hBitmap);
-          return NULL;
-       }
+      NtGdiDeleteObject(hBitmap);
+      return NULL;
+   }

 
 

-       bmp->flFlags = BITMAPOBJ_IS_APIBITMAP;
+   bmp->flFlags = BITMAPOBJ_IS_APIBITMAP;

 
 

+   if (NULL != pBits)
+   {

        IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pBits);
        IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pBits);

-
-
-       BITMAPOBJ_UnlockBitmap( bmp );

    }
 
    }
 

+   BITMAPOBJ_UnlockBitmap( bmp );
+

    DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n",
           Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap);
 
    DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n",
           Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap);
 

diff --git a/reactos/subsystems/win32/win32k/objects/dibobj.c b/reactos/subsystems/win32/win32k/objects/dibobj.c
index 7019832..fd41a12 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/dibobj.c
+++ b/reactos/subsystems/win32/win32k/objects/dibobj.c
@@ -809,12 +809,9 @@ IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
   LONG compr;
   LONG dibsize;
   BOOL fColor;
   LONG compr;
   LONG dibsize;
   BOOL fColor;

-  SIZEL size;
-

 
   if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &dibsize ) == -1) return 0;
 
 
   if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &dibsize ) == -1) return 0;
 

-

   // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2
   // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap.
 
   // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2
   // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap.
 


@@ -866,12 +863,11 @@ IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
   }
   else
   {
   }
   else
   {

-    size.cx = width;
-    size.cy = abs(height);
-
-    handle = IntCreateBitmap(size, DIB_GetDIBWidthBytes(width, 1), BMF_1BPP,
-                             (height < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT,
-                             NULL);
+    handle = IntGdiCreateBitmap(width,
+                                height,
+                                1,
+                                1,
+                                NULL);

   }
 
   if (height < 0)
   }
 
   if (height < 0)