gdi32: Create a sanitized BITMAPINFO in SetDIBitsToDevice and pass that to the drivers.

dlls/gdi32/dib.c

@@ -646,13 +646,16 @@ done:
  */
 INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
                            DWORD cy, INT xSrc, INT ySrc, UINT startscan,
-                           UINT lines, LPCVOID bits, const BITMAPINFO *info,
+                           UINT lines, LPCVOID bits, const BITMAPINFO *bmi,
                            UINT coloruse )
 {
+    char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
+    BITMAPINFO *info = (BITMAPINFO *)buffer;
     INT ret = 0;
     DC *dc;
 
     if (!bits) return 0;
+    if (!bitmapinfo_from_user_bitmapinfo( info, bmi, coloruse )) return 0;
 
     if ((dc = get_dc_ptr( hdc )))
     {

dlls/gdi32/enhmfdrv/bitblt.c

@@ -232,8 +232,7 @@ INT EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD width, DWOR
 {
     EMRSETDIBITSTODEVICE* pEMR;
     DWORD bmiSize = bitmap_info_size(info, wUsage);
-    DWORD bitsSize = get_dib_image_size( info );
-    DWORD size = sizeof(EMRSETDIBITSTODEVICE) + bmiSize + bitsSize;
+    DWORD size = sizeof(EMRSETDIBITSTODEVICE) + bmiSize + info->bmiHeader.biSizeImage;
 
     pEMR = HeapAlloc(GetProcessHeap(), 0, size);
     if (!pEMR) return 0;
@@ -253,12 +252,12 @@ INT EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD width, DWOR
     pEMR->offBmiSrc = sizeof(EMRSETDIBITSTODEVICE);
     pEMR->cbBmiSrc = bmiSize;
     pEMR->offBitsSrc = sizeof(EMRSETDIBITSTODEVICE) + bmiSize;
-    pEMR->cbBitsSrc = bitsSize;
+    pEMR->cbBitsSrc = info->bmiHeader.biSizeImage;
     pEMR->iUsageSrc = wUsage;
     pEMR->iStartScan = startscan;
     pEMR->cScans = lines;
     memcpy((BYTE*)pEMR + pEMR->offBmiSrc, info, bmiSize);
-    memcpy((BYTE*)pEMR + pEMR->offBitsSrc, bits, bitsSize);
+    memcpy((BYTE*)pEMR + pEMR->offBitsSrc, bits, info->bmiHeader.biSizeImage);
 
     if (EMFDRV_WriteRecord(dev, (EMR*)pEMR))
         EMFDRV_UpdateBBox(dev, &(pEMR->rclBounds));

dlls/gdi32/mfdrv/bitblt.c

@@ -171,8 +171,7 @@ INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx,
 
 {
     DWORD infosize = bitmap_info_size(info, coloruse);
-    DWORD imagesize = get_dib_image_size( info );
-    DWORD len = sizeof(METARECORD) + 8 * sizeof(WORD) + infosize + imagesize;
+    DWORD len = sizeof(METARECORD) + 8 * sizeof(WORD) + infosize + info->bmiHeader.biSizeImage;
     METARECORD *mr = HeapAlloc( GetProcessHeap(), 0, len );
     if(!mr) return 0;
 
@@ -188,7 +187,7 @@ INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx,
     mr->rdParm[7] = (INT16)yDst;
     mr->rdParm[8] = (INT16)xDst;
     memcpy(mr->rdParm + 9, info, infosize);
-    memcpy(mr->rdParm + 9 + infosize / 2, bits, imagesize);
+    memcpy(mr->rdParm + 9 + infosize / 2, bits, info->bmiHeader.biSizeImage);
     MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 );
     HeapFree( GetProcessHeap(), 0, mr );
     return lines;