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

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

Browse source
This commit is contained in:
Nikolay Sivov 2023-11-27 09:08:38 +01:00 committed by Alexandre Julliard
parent 169a23a140
commit e63b00b1ad
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

@ -1899,13 +1899,14 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst,
UINT bmi_size, img_size, payload_size, emr_size;
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,
&bmi_size, &img_size )) return 0;
/* 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 (EMRSTRETCHDIBITS) + payload_size;
@ -1914,14 +1915,6 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst,
/* allocate record */
if (!(emr = HeapAlloc(GetProcessHeap(), 0, emr_size ))) return 0;
/* 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 );
/* fill in the EMR header at the front of our piece of memory */
emr->emr.iType = EMR_STRETCHDIBITS;
emr->emr.nSize = emr_size;
@ -1937,7 +1930,7 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst,
emr->iUsageSrc = usage;
emr->offBmiSrc = sizeof (EMRSTRETCHDIBITS);
emr->cbBmiSrc = bmi_size;
emr->offBitsSrc = emr->offBmiSrc + bmi_size;
emr->offBitsSrc = emr->offBmiSrc + aligned_size(bmi_size);
emr->cbBitsSrc = img_size;
emr->cxSrc = width_src;
@ -1948,6 +1941,16 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst,
emr->rclBounds.right = x_dst + width_dst - 1;
emr->rclBounds.bottom = y_dst + height_dst - 1;
/* 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, emr->cbBmiSrc );
/* write bitmap bits to the record */
ptr = memcpy ( (BYTE *)emr + emr->offBitsSrc, bits, img_size );
pad_record( ptr, emr->cbBitsSrc );
/* save the record we just created */
ret = emfdc_record( get_dc_emf( dc_attr ), &emr->emr );
if (ret) emfdc_update_bounds( get_dc_emf( dc_attr ), &emr->rclBounds );