system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 19:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdi32/emf: Align and pad bitmap data in EMRSETDIBITSTODEVICE records.

Browse source
This commit is contained in:
Nikolay Sivov 2023-11-27 09:22:47 +01:00 committed by Alexandre Julliard
parent e63b00b1ad
commit 7c479e797f
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/gdi32/emfdc.c
View file

@ -1968,6 +1968,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
UINT src_height, stride;
BITMAPINFOHEADER bih;
BITMAPINFO *bi;
void *ptr;
/* calculate the size of the colour table and the image */
if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE,
@ -1993,7 +1994,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
}
/* check for overflows */
payload_size = bmi_size + img_size;
payload_size = aligned_size(bmi_size) + aligned_size(img_size);
if (payload_size < bmi_size) return 0;
emr_size = sizeof (EMRSETDIBITSTODEVICE) + payload_size;
@ -2002,14 +2003,6 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
/* allocate record */
if (!(emr = HeapAlloc( GetProcessHeap(), 0, emr_size ))) return FALSE;
/* write a bitmap info header (with colours) to the record */
bi = (BITMAPINFO *)&emr[1];
bi->bmiHeader = bih;
emf_copy_colours_from_user_bitmapinfo( bi, info, usage );
/* write bitmap bits to the record */
memcpy ( (BYTE *)&emr[1] + bmi_size, bits, img_size );
emr->emr.iType = EMR_SETDIBITSTODEVICE;
emr->emr.nSize = emr_size;
emr->rclBounds.left = x_dst;
@ -2024,12 +2017,22 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
emr->cySrc = height;
emr->offBmiSrc = sizeof(EMRSETDIBITSTODEVICE);
emr->cbBmiSrc = bmi_size;
emr->offBitsSrc = sizeof(EMRSETDIBITSTODEVICE) + bmi_size;
emr->offBitsSrc = sizeof(EMRSETDIBITSTODEVICE) + aligned_size(bmi_size);
emr->cbBitsSrc = img_size;
emr->iUsageSrc = usage;
emr->iStartScan = startscan;
emr->cScans = lines;
/* write a bitmap info header (with colours) to the record */
bi = (BITMAPINFO *)((BYTE *)emr + emr->offBmiSrc);
bi->bmiHeader = bih;
emf_copy_colours_from_user_bitmapinfo( bi, info, usage );
pad_record( bi, bmi_size );
/* write bitmap bits to the record */
ptr = memcpy ( (BYTE *)emr + emr->offBitsSrc, bits, img_size );
pad_record( ptr, img_size );
if ((ret = emfdc_record( get_dc_emf( dc_attr ), (EMR*)emr )))
emfdc_update_bounds( get_dc_emf( dc_attr ), &emr->rclBounds );