[ros-diffs] [gschneider] 36608: GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size. This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example. Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info. Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp

[gschneider at svn.reactos.org]

Author: gschneider
Date: Wed Oct  1 05:49:10 2008
New Revision: 36608

URL: http://svn.reactos.org/svn/reactos?rev=36608&view=rev
Log:
GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size.
This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example.
Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info.
Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp

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

Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dibobj.c?rev=36608&r1=36607&r2=36608&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Oct  1 05:49:10 2008
@@ -552,7 +552,8 @@
                 coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx;
                 coreheader->bcPlanes = 1;
                 coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
-                coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy;
+                /* Resulting height may be smaller than original height */
+                coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
 
                 if (BitmapObj->SurfObj.lDelta > 0)
                     coreheader->bcHeight = -coreheader->bcHeight;
@@ -563,7 +564,8 @@
                 ProbeForWrite(Info, sizeof(BITMAPINFO), 1);
 
                 Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx;
-                Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy;
+                /* Resulting height may be smaller than original height */
+                Info->bmiHeader.biHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
                 /* Report negtive height for top-down bitmaps. */
                 if (BitmapObj->SurfObj.lDelta > 0)
                     Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight;
@@ -594,8 +596,9 @@
                             Info->bmiHeader.biCompression = BI_PNG;
                             break;
                     }
-
-                    Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits;
+                    /* Image size has to be calculated */
+                    Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, 
+                        Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight;
                     Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */
                     Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */
                     Info->bmiHeader.biClrUsed = 0;
@@ -707,8 +710,7 @@
                 if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
                 {
                     hDestBitmap = EngCreateBitmap(DestSize,
-                                                  /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */
-                                                  DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */
+                                                  DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount),
                                                   BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),
                                                   0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
                                                   Bits);