Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com):

- Remove NtGdiCreateDIBitmap, update all related files.
- Rewrite CreateDIBitmap.
- Tested with Qemu.


svn path=/trunk/; revision=32786

reactos/dll/win32/gdi32/misc/hacks.c

@@ -27,17 +27,6 @@ SetDIBits(HDC hdc,
     return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse);
 }
 
-HBITMAP
-STDCALL
-CreateDIBitmap(HDC hDc,
-               const BITMAPINFOHEADER *Header,
-               DWORD Init, LPCVOID Bits, const BITMAPINFO *Data,
-               UINT ColorUse)
-{
-    /* FIMXE we need do more thing in user mode */
-    return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data,  ColorUse);
-}
-
 /*
  * @implemented
  *

reactos/dll/win32/gdi32/objects/bitmap.c

@@ -1,7 +1,7 @@
 #include "precomp.h"
 
-//#define NDEBUG
+#define NDEBUG
-//#include <debug.h>
+#include <debug.h>
 
 /*
  * Return the full scan size for a bitmap.
@@ -30,6 +30,72 @@ DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines )
     return (MaxBits * ScanLines);  // ret the full Size.
 }
 
+/*
+ * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006
+ * from file dib.c from gdi32.dll or orginal version
+ * did not calc the info right for some headers.
+ */
+INT
+STDCALL
+DIB_GetBitmapInfo(const BITMAPINFOHEADER *header,
+				  PLONG width,
+				  PLONG height,
+				  PWORD planes,
+				  PWORD bpp,
+				  PLONG compr,
+				  PLONG size )
+{
+
+  if (header->biSize == sizeof(BITMAPCOREHEADER))
+  {
+     BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header;
+     *width  = core->bcWidth;
+     *height = core->bcHeight;
+     *planes = core->bcPlanes;
+     *bpp    = core->bcBitCount;
+     *compr  = 0;
+     *size   = 0;
+     return 0;
+  }
+
+  if (header->biSize == sizeof(BITMAPINFOHEADER))
+  {
+     *width  = header->biWidth;
+     *height = header->biHeight;
+     *planes = header->biPlanes;
+     *bpp    = header->biBitCount;
+     *compr  = header->biCompression;
+     *size   = header->biSizeImage;
+     return 1;
+  }
+
+  if (header->biSize == sizeof(BITMAPV4HEADER))
+  {
+      BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header;
+      *width  = v4hdr->bV4Width;
+      *height = v4hdr->bV4Height;
+      *planes = v4hdr->bV4Planes;
+      *bpp    = v4hdr->bV4BitCount;
+      *compr  = v4hdr->bV4V4Compression;
+      *size   = v4hdr->bV4SizeImage;
+      return 4;
+  }
+
+  if (header->biSize == sizeof(BITMAPV5HEADER))
+  {
+      BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header;
+      *width  = v5hdr->bV5Width;
+      *height = v5hdr->bV5Height;
+      *planes = v5hdr->bV5Planes;
+      *bpp    = v5hdr->bV5BitCount;
+      *compr  = v5hdr->bV5Compression;
+      *size   = v5hdr->bV5SizeImage;
+      return 5;
+  }
+  DPRINT("(%ld): wrong size for header\n", header->biSize );
+  return -1;
+}
+
 /*
  * @implemented
  */
@@ -194,3 +260,38 @@ GetDIBits(
 
     return ret;
 }
+
+/*
+ * @implemented
+ */
+HBITMAP
+STDCALL
+CreateDIBitmap( HDC hDC,
+                const BITMAPINFOHEADER *Header,
+                DWORD Init,
+                LPCVOID Bits,
+                const BITMAPINFO *Data,
+                UINT ColorUse)
+{
+ LONG width, height, compr, dibsize;
+ WORD planes, bpp;
+
+ if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1)
+ {
+    GdiSetLastError(ERROR_INVALID_PARAMETER);
+    return NULL;
+ }
+
+ return NtGdiCreateDIBitmapInternal(hDC,
+                                    width,
+                                    height,
+                                    Init,
+                                    (LPBYTE)Bits,
+                                    (PBITMAPINFO)Data,
+                                    ColorUse,
+                                    bpp,
+                                    dibsize,
+                                    0,
+                                    0);
+}
+

reactos/include/reactos/win32k/ntgdibad.h

@@ -59,18 +59,6 @@ NtGdiGetFontFamilyInfo(
     DWORD Size
 );
 
-/* Use NtGdiCreateDIBitmapInternal */
-HBITMAP
-STDCALL
-NtGdiCreateDIBitmap (
-	HDC			hDC,
-	CONST BITMAPINFOHEADER	* bmih,
-	DWORD			Init,
-	CONST VOID		* bInit,
-	CONST BITMAPINFO	* bmi,
-	UINT			Usage
-	);
-
 /* Use NtGdiGetDCPoint with GdiGetViewPortExt */
 BOOL STDCALL  NtGdiGetViewportExtEx(HDC  hDC, LPSIZE viewportExt);
 

reactos/subsystems/win32/win32k/ntuser/clipboard.c

@@ -273,8 +273,17 @@ renderBITMAPfromDIB(LPBYTE hDIB)
 
     offset = sizeof(BITMAPINFOHEADER) + ((ih->biBitCount <= 8) ? (sizeof(RGBQUAD) * (1 << ih->biBitCount)) : 0);
 
-    hbitmap = NtGdiCreateDIBitmap(hdc, ih, CBM_INIT, (LPBYTE)ih + offset, (LPBITMAPINFO)ih, DIB_RGB_COLORS);
+    hbitmap = NtGdiCreateDIBitmapInternal(hdc,
-
+                                          ih->biWidth,
+                                          ih->biHeight,
+                                          CBM_INIT,
+                                          (LPBYTE)ih+offset,
+                                          (LPBITMAPINFO)ih,
+                                          DIB_RGB_COLORS,
+                                          ih->biBitCount,
+                                          ih->biSizeImage,
+                                          0,
+                                          0);
     //UserReleaseDC(NULL, hdc, FALSE);
     UserReleaseDC(ClipboardWindow, hdc, FALSE);
 

reactos/subsystems/win32/win32k/objects/bitmaps.c

@@ -300,7 +300,18 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 			static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 };
 			BITMAPINFO bi;
 			RtlMoveMemory ( &(bi.bmiHeader), &bih, sizeof(bih) );
-			hBmpTmp = NtGdiCreateDIBitmap ( hDC, &bi.bmiHeader, 0, NULL, &bi, DIB_RGB_COLORS );
+			hBmpTmp = NtGdiCreateDIBitmapInternal(hDC,
+                                                  bi.bmiHeader.biWidth,
+                                                  bi.bmiHeader.biHeight,
+                                                  0,
+                                                  NULL,
+                                                  &bi,
+                                                  DIB_RGB_COLORS,
+                                                  bi.bmiHeader.biBitCount,
+                                                  bi.bmiHeader.biSizeImage,
+                                                  0,
+                                                  0);
+
 			//HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL);
 			if ( hBmpTmp )
 			{

reactos/subsystems/win32/win32k/objects/dibobj.c

@@ -801,29 +801,25 @@ NtGdiStretchDIBitsInternal(
 }
 
 
-HBITMAP FASTCALL
+HBITMAP
-IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
+FASTCALL
-                  DWORD init, LPCVOID bits, const BITMAPINFO *data,
+IntCreateDIBitmap(PDC Dc,
-                  UINT coloruse)
+                  INT width,
+                  INT height,
+                  UINT bpp,
+                  DWORD init,
+                  LPBYTE bits,
+                  PBITMAPINFO data,
+                  DWORD coloruse)
 {
   HBITMAP handle;
-
-  LONG width;
-  LONG height;
-  WORD planes;
-  WORD bpp;
-  LONG compr;
-  LONG dibsize;
   BOOL fColor;
 
-  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.
 
   if (bpp != 1) fColor = TRUE;
-  else if ((coloruse != DIB_RGB_COLORS) ||
+  else if ((coloruse != DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE;
-           (init != CBM_INIT) || !data) fColor = FALSE;
   else
   {
     if (data->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
@@ -845,7 +841,7 @@ IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
   else if (data->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
   {
     RGBTRIPLE *rgb = ((BITMAPCOREINFO *)data)->bmciColors;
-     DWORD col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue);
+    DWORD col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue);
 
     if ((col == RGB(0,0,0)))
     {
@@ -889,64 +885,62 @@ IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
 
 // The CreateDIBitmap function creates a device-dependent bitmap (DDB) from a DIB and, optionally, sets the bitmap bits
 // The DDB that is created will be whatever bit depth your reference DC is
-HBITMAP STDCALL NtGdiCreateDIBitmap(HDC hDc, const BITMAPINFOHEADER *Header,
+HBITMAP
-                                    DWORD Init, LPCVOID Bits, const BITMAPINFO *Data,
+APIENTRY
-                                    UINT ColorUse)
+NtGdiCreateDIBitmapInternal(IN HDC hDc,
+                            IN INT cx,
+                            IN INT cy,
+                            IN DWORD fInit,
+                            IN OPTIONAL LPBYTE pjInit,
+                            IN OPTIONAL LPBITMAPINFO pbmi,
+                            IN DWORD iUsage,
+                            IN UINT cjMaxInitInfo,
+                            IN UINT cjMaxBits,
+                            IN FLONG fl,
+                            IN HANDLE hcmXform)
 {
   PDC Dc;
   HBITMAP Bmp;
 
-  if (Header == NULL)
+  if (!hDc)
   {
-	  return NULL;
+     hDc =  IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE);
+     if (!hDc)
+     {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return NULL;
+     }
+
+     Dc = DC_LockDc(hDc);
+     if (!Dc)
+     {
+        NtGdiDeleteObjectApp(hDc);
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return NULL;
+     }
+
+     cjMaxInitInfo = 1;
+     Bmp = IntCreateDIBitmap(Dc, cx, cy, cjMaxInitInfo, fInit, pjInit, pbmi, iUsage);
+
+     DC_UnlockDc(Dc);
+     NtGdiDeleteObjectApp(hDc);
   }
-
+  else
-  if (Header->biSize == 0)
   {
-	  return NULL;
+     Dc = DC_LockDc(hDc);
+     if (!Dc)
+     {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return NULL;
+     }
+
+     Bmp = IntCreateDIBitmap(Dc, cx, cy, cjMaxInitInfo, fInit, pjInit, pbmi, iUsage);
+     DC_UnlockDc(Dc);
   }
-
-  if (NULL == hDc)
-  {
-	   BITMAPINFOHEADER *change_Header = (BITMAPINFOHEADER *)Header;
-       hDc =  IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE);
-       if (hDc == NULL)
-       {
-          SetLastWin32Error(ERROR_INVALID_HANDLE);
-          return NULL;
-       }
-      Dc = DC_LockDc(hDc);
-      if (Dc == NULL)
-      {
-          NtGdiDeleteObjectApp(hDc);
-          SetLastWin32Error(ERROR_INVALID_HANDLE);
-          return NULL;
-      }
-
-	  change_Header->biBitCount = 1;
-	  change_Header->biPlanes = 1;
-
-      Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse);
-      DC_UnlockDc(Dc);
-      NtGdiDeleteObjectApp(hDc);
-    }
-    else
-    {
-       Dc = DC_LockDc(hDc);
-       if (Dc == NULL)
-       {
-          SetLastWin32Error(ERROR_INVALID_HANDLE);
-          return NULL;
-       }
-       Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse);
-       DC_UnlockDc(Dc);
-    }
-
-
-
   return Bmp;
 }
 
+
 HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC,
                               IN OPTIONAL HANDLE hSection,
                               IN DWORD dwOffset,
@@ -1218,100 +1212,6 @@ INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse)
   }
 }
 
-/*
- * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006
- * from file dib.c from gdi32.dll or orginal version
- * did not calc the info right for some headers.
- */
-
-INT STDCALL
-DIB_GetBitmapInfo( const BITMAPINFOHEADER *header,
-				  PLONG width,
-				  PLONG height,
-				  PWORD planes,
-				  PWORD bpp,
-				  PLONG compr,
-				  PLONG size )
-{
-
-  if (header->biSize == sizeof(BITMAPCOREHEADER))
-  {
-     BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header;
-     *width  = core->bcWidth;
-     *height = core->bcHeight;
-     *planes = core->bcPlanes;
-     *bpp    = core->bcBitCount;
-     *compr  = 0;
-     *size   = 0;
-     return 0;
-  }
-
-  if (header->biSize == sizeof(BITMAPINFOHEADER))
-  {
-     *width  = header->biWidth;
-     *height = header->biHeight;
-     *planes = header->biPlanes;
-     *bpp    = header->biBitCount;
-     *compr  = header->biCompression;
-     *size   = header->biSizeImage;
-     return 1;
-  }
-
-  if (header->biSize == sizeof(BITMAPV4HEADER))
-  {
-      BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header;
-      *width  = v4hdr->bV4Width;
-      *height = v4hdr->bV4Height;
-      *planes = v4hdr->bV4Planes;
-      *bpp    = v4hdr->bV4BitCount;
-      *compr  = v4hdr->bV4V4Compression;
-      *size   = v4hdr->bV4SizeImage;
-      return 4;
-  }
-
-  if (header->biSize == sizeof(BITMAPV5HEADER))
-  {
-      BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header;
-      *width  = v5hdr->bV5Width;
-      *height = v5hdr->bV5Height;
-      *planes = v5hdr->bV5Planes;
-      *bpp    = v5hdr->bV5BitCount;
-      *compr  = v5hdr->bV5Compression;
-      *size   = v5hdr->bV5SizeImage;
-      return 5;
-  }
-  DPRINT("(%ld): wrong size for header\n", header->biSize );
-  return -1;
-}
-
-// Converts a Device Independent Bitmap (DIB) to a Device Dependant Bitmap (DDB)
-// The specified Device Context (DC) defines what the DIB should be converted to
-PBITMAPOBJ FASTCALL DIBtoDDB(HGLOBAL hPackedDIB, HDC hdc) // FIXME: This should be removed. All references to this function should
-						 // change to NtGdiSetDIBits
-{
-  HBITMAP hBmp = 0;
-  PBITMAPOBJ pBmp = NULL;
-  DIBSECTION *dib;
-  LPBYTE pbits = NULL;
-
-  // Get a pointer to the packed DIB's data
-  // pPackedDIB = (LPBYTE)GlobalLock(hPackedDIB);
-  dib = hPackedDIB;
-
-  pbits = (LPBYTE)(dib + DIB_BitmapInfoSize((BITMAPINFO*)&dib->dsBmih, DIB_RGB_COLORS));
-
-  // Create a DDB from the DIB
-  hBmp = NtGdiCreateDIBitmap ( hdc, &dib->dsBmih, CBM_INIT,
-    (LPVOID)pbits, (BITMAPINFO*)&dib->dsBmih, DIB_RGB_COLORS);
-
-  // GlobalUnlock(hPackedDIB);
-
-  // Retrieve the internal Pixmap from the DDB
-  pBmp = BITMAPOBJ_LockBitmap(hBmp);
-
-  return pBmp;
-}
-
 RGBQUAD * FASTCALL
 DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
 {

reactos/subsystems/win32/win32k/stubs/stubs.c

@@ -1679,30 +1679,6 @@ NtGdiCreateMetafileDC(IN HDC hdc)
 }
 
 
- /*
- * @unimplemented
- */
-
-HBITMAP
-APIENTRY
-NtGdiCreateDIBitmapInternal(
-    IN HDC hdc,
-    IN INT cx,
-    IN INT cy,
-    IN DWORD fInit,
-    IN OPTIONAL LPBYTE pjInit,
-    IN OPTIONAL LPBITMAPINFO pbmi,
-    IN DWORD iUsage,
-    IN UINT cjMaxInitInfo,
-    IN UINT cjMaxBits,
-    IN FLONG f,
-    IN HANDLE hcmXform)
-{
-    UNIMPLEMENTED;
-    return NULL;
-}
-
-
  /*
  * @unimplemented
  */

reactos/subsystems/win32/win32k/w32ksvc.db

@@ -716,7 +716,6 @@ NtUserSendMessage                       5
 NtUserSendMessageTimeout                8
 NtUserSendNotifyMessage                 4
 NtUserSetScrollBarInfo                  3
-NtGdiCreateDIBitmap                     6
 NtGdiGetFontFamilyInfo                  4
 NtGdiOffsetViewportOrgEx                4
 NtGdiOffsetWindowOrgEx                  4