dlls/gdi/dib.c GetDIBits

[Ulrich Czekalla]

Uwe,

Here you go. I hope it helps.

/Ulrich

On Wed, Jun 01, 2005 at 10:05:08AM +0200, Uwe Bonnes wrote:
> >>>>> "Ulrich" == Ulrich Czekalla <ulrich.czekalla at utoronto.ca> writes:
> 
>     Ulrich> This patch fixes a regression that happened quite sometime
>     Ulrich> ago. We don't always fill in the BITMAPINFO struct fields on the
>     Ulrich> way out and this broke my app because it uses these values to
>     Ulrich> allocate enough memory to hold the bits.
> 
> Ullrich,
> 
> I see a lot of indentation change and only 2 or 3 lines of real code
> change. Can you perhaps resent with the real code change better visible? I
> have a problem with CopyImage, maybe it is affected by the regression you
> fix. Tagging the changes for debugging can help me to be sure about the
> change.
> 
> Thanks
> 
> -- 
> Uwe Bonnes                bon at elektron.ikp.physik.tu-darmstadt.de
> 
> Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
> --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
-------------- next part --------------
Index: dlls/gdi/dib.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/dib.c,v
retrieving revision 1.10
diff -u -p -r1.10 dib.c
--- dlls/gdi/dib.c	13 Apr 2005 14:45:27 -0000	1.10
+++ dlls/gdi/dib.c	1 Jun 2005 13:42:20 -0000
@@ -939,9 +939,6 @@ INT WINAPI GetDIBits(
     else
     {
 	/* fill in struct members */
-
-        if (bpp == 0)
-        {
             if (core_header)
             {
                 BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) info;
@@ -963,7 +960,6 @@ INT WINAPI GetDIBits(
                 info->bmiHeader.biCompression = 0;
             }
             lines = abs(bmp->bitmap.bmHeight);
-        }
     }
 
     if (!core_header)