system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 09:24:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE.

Browse source 
Signed-off-by: Jinoh Kang <jinoh.kang.kr@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jinoh Kang 2021-11-06 01:37:35 +09:00 committed by Alexandre Julliard
parent da126e19e3
commit 9301a9e1f8
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/gdi32/emfdc.c
View file

@ -1815,6 +1815,7 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
EMRSETDIBITSTODEVICE *emr;
BOOL ret;
UINT bmi_size, img_size, payload_size, emr_size;
UINT src_height, stride;
BITMAPINFOHEADER bih;
BITMAPINFO *bi;
@ -1822,6 +1823,25 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE,
&bmi_size, &img_size )) return 0;
if (bih.biHeight >= 0)
{
src_height = (UINT)bih.biHeight;
if (src_height > y_src + height) src_height = y_src + height;
if (src_height < startscan) lines = 0;
else if (lines > src_height - startscan) lines = src_height - startscan;
if (!lines) return 0;
if (bih.biCompression == BI_RGB || bih.biCompression == BI_BITFIELDS)
{
/* truncate image and check for overflows */
stride = get_dib_stride( bih.biWidth, bih.biBitCount );
img_size = lines * stride;
if (img_size / stride != lines) return 0;
}
}
/* check for overflows */
payload_size = bmi_size + img_size;
if (payload_size < bmi_size) return 0;

7
dlls/gdi32/tests/metafile.c
View file

@ -7764,13 +7764,6 @@ static void test_emf_SetDIBitsToDevice(void)
{
winetest_push_context("Test %d", test_idx);
if (tests[test_idx].height != bitmap_height && !strcmp(winetest_platform, "wine"))
{
skip("Wine does not adjust cLines appropriately\n");
winetest_pop_context();
continue;
}
memset(&bmi, 0, sizeof(bmi));
if (tests[test_idx].infomode < 2)
{