August 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Make get_builtin_unix_funcs() static.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: faaad364297e45b968b534560c139c91fb81e056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faaad364297e45b968b53456… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 11:38:25 2021 +0200 ntdll: Make get_builtin_unix_funcs() static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2cca90ac952..8a1e35b6387 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -660,7 +660,7 @@ void *get_builtin_so_handle( void *module ) /*********************************************************************** * get_builtin_unix_funcs */ -NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) +static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) { const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; sigset_t sigset;

1 0

Huw Davies : nsiproxy: Implement TCP stats get_all_parameters.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: c9680e899198076f756f64bbc697d742f98292b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9680e899198076f756f64bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 13 08:35:49 2021 +0100 nsiproxy: Implement TCP stats get_all_parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 59 +++++++++++ dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/tcp.c | 190 +++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 29 ++++++ 6 files changed, 282 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9680e899198076f756f…

1 0

Jacek Caban : gdi32: Don't use bitblt_coords in emfdrv_stretchblt.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 7659c6ff7dacc594c29916571c87fb6f349c9db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7659c6ff7dacc594c2991657… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 12 11:59:59 2021 +0200 gdi32: Don't use bitblt_coords in emfdrv_stretchblt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/bitblt.c | 46 +++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index e1d90c281c4..87c6fc22300 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -28,8 +28,9 @@ #include "enhmetafiledrv.h" /* Generate an EMRBITBLT, EMRSTRETCHBLT or EMRALPHABLEND record depending on the type parameter */ -static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, HDC hdc_src, - struct bitblt_coords *src, DWORD rop, DWORD type ) +static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, INT x_dst, INT y_dst, INT width_dst, INT height_dst, + HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, + DWORD rop, DWORD type ) { BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; UINT bmi_size, emr_size, size, bpp; @@ -115,21 +116,21 @@ static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, HDC h emr->emr.iType = type; emr->emr.nSize = size; - emr->rclBounds.left = dst->log_x; - emr->rclBounds.top = dst->log_y; - emr->rclBounds.right = dst->log_x + dst->log_width - 1; - emr->rclBounds.bottom = dst->log_y + dst->log_height - 1; - emr->xDest = dst->log_x; - emr->yDest = dst->log_y; - emr->cxDest = dst->log_width; - emr->cyDest = dst->log_height; - emr->xSrc = src->log_x; - emr->ySrc = src->log_y; + emr->rclBounds.left = x_dst; + emr->rclBounds.top = y_dst; + emr->rclBounds.right = x_dst + width_dst - 1; + emr->rclBounds.bottom = y_dst + height_dst - 1; + emr->xDest = x_dst; + emr->yDest = y_dst; + emr->cxDest = width_dst; + emr->cyDest = height_dst; + emr->xSrc = x_src; + emr->ySrc = y_src; if (type == EMR_STRETCHBLT || type == EMR_ALPHABLEND) { EMRSTRETCHBLT *emr_stretchblt = (EMRSTRETCHBLT *)emr; - emr_stretchblt->cxSrc = src->log_width; - emr_stretchblt->cySrc = src->log_height; + emr_stretchblt->cxSrc = width_src; + emr_stretchblt->cySrc = height_src; } emr->dwRop = rop; NtGdiGetTransform( hdc_src, 0x204, &emr->xformSrc ); @@ -160,7 +161,9 @@ err: BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) { - return emfdrv_stretchblt( dev_dst, dst, dev_src->hdc, src, *(DWORD *)&func, EMR_ALPHABLEND ); + return emfdrv_stretchblt( dev_dst, dst->log_x, dst->log_y, dst->log_width, dst->log_height, + dev_src->hdc, src->log_x, src->log_y, src->log_width, src->log_height, + *(DWORD *)&func, EMR_ALPHABLEND ); } BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) @@ -207,13 +210,16 @@ BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, D return ret; } -BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, - PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) +BOOL CDECL EMFDRV_StretchBlt( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, DWORD rop ) { if (src->log_width == dst->log_width && src->log_height == dst->log_height) - return emfdrv_stretchblt( devDst, dst, devSrc->hdc, src, rop, EMR_BITBLT ); - else - return emfdrv_stretchblt( devDst, dst, devSrc->hdc, src, rop, EMR_STRETCHBLT ); + return emfdrv_stretchblt( dev_dst, dst->log_x, dst->log_y, dst->log_width, dst->log_height, + dev_src->hdc, src->log_x, src->log_y, src->log_width, src->log_height, + rop, EMR_BITBLT ); + return emfdrv_stretchblt( dev_dst, dst->log_x, dst->log_y, dst->log_width, dst->log_height, + dev_src->hdc, src->log_x, src->log_y, src->log_width, src->log_height, + rop, EMR_STRETCHBLT ); } INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst,

1 0

Jacek Caban : gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 7f9d847b9bcc21fc03fdd6beb2cb3285c2285b2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f9d847b9bcc21fc03fdd6be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 12 12:00:05 2021 +0200 gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/bitblt.c | 130 +++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 78 deletions(-) diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index a08d6ef6608..a3ebd2feadd 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -35,96 +35,70 @@ BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop } -/*********************************************************************** - * MFDRV_StretchBlt - * this function contains TWO ways for processing StretchBlt in metafiles, - * decide between rdFunction values META_STRETCHBLT or META_DIBSTRETCHBLT - * via #define STRETCH_VIA_DIB - */ -#define STRETCH_VIA_DIB - -BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, - PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) +static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, + HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, + DWORD rop ) { - BOOL ret; - DWORD len; + BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; + UINT bmi_size, size, bpp; + BITMAPINFO *bmi; METARECORD *mr; - BITMAP BM; -#ifdef STRETCH_VIA_DIB - LPBITMAPINFOHEADER lpBMI; - WORD nBPP; -#endif - HBITMAP hBitmap = GetCurrentObject(devSrc->hdc, OBJ_BITMAP); + HBITMAP bitmap; + BOOL ret; - if (devSrc->funcs == devDst->funcs) return FALSE; /* can't use a metafile DC as source */ + if (!(bitmap = GetCurrentObject( hdc_src, OBJ_BITMAP ))) return FALSE; + if (!GetDIBits( hdc_src, bitmap, 0, INT_MAX, NULL, &src_info, DIB_RGB_COLORS )) return FALSE; - if (GetObjectW(hBitmap, sizeof(BITMAP), &BM) != sizeof(BITMAP)) - { - WARN("bad bitmap object %p passed for hdc %p\n", hBitmap, devSrc->hdc); - return FALSE; - } -#ifdef STRETCH_VIA_DIB - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ - len = sizeof(METARECORD) + 10 * sizeof(INT16) - + sizeof(BITMAPINFOHEADER) + (nBPP <= 8 ? 1 << nBPP: 0) * sizeof(RGBQUAD) - + get_dib_stride( BM.bmWidth, nBPP ) * BM.bmHeight; - if (!(mr = HeapAlloc( GetProcessHeap(), 0, len))) - return FALSE; + bpp = src_info.bmiHeader.biBitCount; + if (bpp <= 8) + bmi_size = sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); + else if (bpp == 16 || bpp == 32) + bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); + else + bmi_size = sizeof(BITMAPINFOHEADER); + + size = FIELD_OFFSET( METARECORD, rdParm[10] ) + bmi_size + + src_info.bmiHeader.biSizeImage; + if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; mr->rdFunction = META_DIBSTRETCHBLT; - lpBMI=(LPBITMAPINFOHEADER)(mr->rdParm+10); - lpBMI->biSize = sizeof(BITMAPINFOHEADER); - lpBMI->biWidth = BM.bmWidth; - lpBMI->biHeight = BM.bmHeight; - lpBMI->biPlanes = 1; - lpBMI->biBitCount = nBPP; - lpBMI->biSizeImage = get_dib_image_size( (BITMAPINFO *)lpBMI ); - lpBMI->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; - lpBMI->biCompression = BI_RGB; - lpBMI->biXPelsPerMeter = MulDiv(GetDeviceCaps(devSrc->hdc,LOGPIXELSX),3937,100); - lpBMI->biYPelsPerMeter = MulDiv(GetDeviceCaps(devSrc->hdc,LOGPIXELSY),3937,100); - lpBMI->biClrImportant = 0; /* 1 meter = 39.37 inch */ - - TRACE("MF_StretchBltViaDIB->len = %d rop=%x PixYPM=%d Caps=%d\n", - len,rop,lpBMI->biYPelsPerMeter,GetDeviceCaps(devSrc->hdc, LOGPIXELSY)); - - if (GetDIBits(devSrc->hdc, hBitmap, 0, (UINT)lpBMI->biHeight, - (LPSTR)lpBMI + get_dib_info_size( (BITMAPINFO *)lpBMI, DIB_RGB_COLORS ), - (LPBITMAPINFO)lpBMI, DIB_RGB_COLORS)) -#else - len = sizeof(METARECORD) + 15 * sizeof(INT16) + BM.bmWidthBytes * BM.bmHeight; - if (!(mr = HeapAlloc( GetProcessHeap(), 0, len ))) - return FALSE; - mr->rdFunction = META_STRETCHBLT; - *(mr->rdParm +10) = BM.bmWidth; - *(mr->rdParm +11) = BM.bmHeight; - *(mr->rdParm +12) = BM.bmWidthBytes; - *(mr->rdParm +13) = BM.bmPlanes; - *(mr->rdParm +14) = BM.bmBitsPixel; - TRACE("len = %ld rop=%lx\n", len, rop); - if (GetBitmapBits( hBitmap, BM.bmWidthBytes * BM.bmHeight, mr->rdParm + 15)) -#endif + bmi = (BITMAPINFO *)&mr->rdParm[10]; + bmi->bmiHeader = src_info.bmiHeader; + TRACE( "size = %u rop=%x\n", size, rop ); + + ret = GetDIBits( hdc_src, bitmap, 0, src_info.bmiHeader.biHeight, (BYTE *)bmi + bmi_size, + bmi, DIB_RGB_COLORS ); + if (ret) { - mr->rdSize = len / sizeof(INT16); - *(mr->rdParm) = LOWORD(rop); - *(mr->rdParm + 1) = HIWORD(rop); - *(mr->rdParm + 2) = src->log_height; - *(mr->rdParm + 3) = src->log_width; - *(mr->rdParm + 4) = src->log_y; - *(mr->rdParm + 5) = src->log_x; - *(mr->rdParm + 6) = dst->log_height; - *(mr->rdParm + 7) = dst->log_width; - *(mr->rdParm + 8) = dst->log_y; - *(mr->rdParm + 9) = dst->log_x; - ret = MFDRV_WriteRecord( devDst, mr, mr->rdSize * 2); + mr->rdSize = size / sizeof(WORD); + mr->rdParm[0] = LOWORD(rop); + mr->rdParm[1] = HIWORD(rop); + mr->rdParm[2] = height_src; + mr->rdParm[3] = width_src; + mr->rdParm[4] = y_src; + mr->rdParm[5] = x_src; + mr->rdParm[6] = height_dst; + mr->rdParm[7] = width_dst; + mr->rdParm[8] = y_dst; + mr->rdParm[9] = x_dst; + ret = metadc_record( hdc, mr, size ); } - else - ret = FALSE; + HeapFree( GetProcessHeap(), 0, mr); return ret; } +/*********************************************************************** + * MFDRV_StretchBlt + */ +BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, + PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) +{ + return metadc_stretchblt( devDst->hdc, dst->log_x, dst->log_y, dst->log_width, dst->log_height, + devSrc->hdc, src->log_x, src->log_y, src->log_width, src->log_height, + rop ); +} + /*********************************************************************** * MFDRV_StretchDIBits */

1 0

Matteo Bruni : wined3d: Don't consider texture rectangles for buffers.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: aaf4ef6e62911e80f5c53ab7f1165ee180d26af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf4ef6e62911e80f5c53ab7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 11 19:18:53 2021 +0200 wined3d: Don't consider texture rectangles for buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f37c313e023..6215da8ce0f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -121,26 +121,26 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (base_type == WINED3D_GL_RES_TYPE_COUNT) base_type = gl_type; - if (type != WINED3D_RTYPE_BUFFER) + if (type == WINED3D_RTYPE_BUFFER) + break; + + if ((bind_flags & WINED3D_BIND_RENDER_TARGET) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) { - if ((bind_flags & WINED3D_BIND_RENDER_TARGET) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) - { - WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); - continue; - } - if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) - { - WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); - continue; - } - if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) - { - WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); - continue; - } + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); + continue; } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot

1 0

Matteo Bruni : d3dx10/tests: Don't fail tests when WMP support is missing.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: da217f9bd36901a2e5ca59de77d094530efebcb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da217f9bd36901a2e5ca59de… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 11 19:18:55 2021 +0200 d3dx10/tests: Don't fail tests when WMP support is missing. That's apparently the case on Vista (and Wine when compiled without jxrlib). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51305 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 30d766bf244..f00c6fe0484 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1887,7 +1887,8 @@ static void test_get_image_info(void) winetest_push_context("Test %u", i); hr = D3DX10GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -1909,12 +1910,14 @@ static void test_get_image_info(void) create_file(test_filename, test_image[i].data, test_image[i].size, path); hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -1940,12 +1943,14 @@ static void test_get_image_info(void) resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -2000,7 +2005,8 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { check_resource_info(resource, test_image + i, __LINE__);

1 0

Akihiro Sagawa : user32/listbox: Fix redraw after LB_SETCOUNT message.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 247185ba78a22bd0f84eeb753b59e377cebfd7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=247185ba78a22bd0f84eeb75… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 12 21:17:42 2021 +0900 user32/listbox: Fix redraw after LB_SETCOUNT message. 3ef790b9680cbf38fc93b4902e3ca6c9f57c5422 accidentally dropped updating LBS_DISPLAYCHANGED flag that had been done in LISTBOX_InvalidateItems() if the count value was changed. In fact, the newly added test shows LB_SETCOUNT message always causes WM_DRAWITEM requests regardless of the count value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51591 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 ++ dlls/user32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0122f928ba8..912adb716d0 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1839,6 +1839,8 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, UINT count ) if (!resize_storage(descr, count)) return LB_ERRSPACE; descr->nb_items = count; + if (descr->style & LBS_NOREDRAW) + descr->style |= LBS_DISPLAYCHANGED; if (count) { diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 7d0ae5a2157..7817d623134 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -447,7 +447,6 @@ static void test_ownerdraw(void) got_drawitem = 0; ret = RedrawWindow(hLB, NULL, 0, RDW_UPDATENOW); ok(ret, "RedrawWindow failed\n"); - todo_wine_if(testcase[i].message == LB_SETCOUNT) ok(got_drawitem == testcase[i].drawitem, "expected %u, got %u\n", testcase[i].drawitem, got_drawitem); DestroyWindow(hLB);

1 0

Jacek Caban : gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 2f7b9e29e475a3f2e8572439104afe4badd90d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7b9e29e475a3f2e8572439… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 12 12:00:31 2021 +0200 gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 13 ++++++++++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index fd505b13407..0024234ac2d 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -935,11 +935,11 @@ error: } /****************************************************************************** - * GdiAlphaBlend [GDI32.@] + * NtGdiAlphaBlend (win32u.@) */ -BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heightDst, - HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, - BLENDFUNCTION blendFunction) +BOOL WINAPI NtGdiAlphaBlend( HDC hdcDst, int xDst, int yDst, int widthDst, int heightDst, + HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, + BLENDFUNCTION blendFunction, HANDLE xform ) { BOOL ret = FALSE; DC *dcDst, *dcSrc; diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 9d930d17591..73959da2ec4 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -158,12 +158,19 @@ err: return ret; } +BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, + HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, + BLENDFUNCTION blend_function ) +{ + return emfdrv_stretchblt( dc_attr->emf, x_dst, y_dst, width_dst, height_dst, hdc_src, x_src, y_src, + width_src, height_src, *(DWORD *)&blend_function, EMR_ALPHABLEND ); +} + BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) { - return emfdrv_stretchblt( dev_dst, dst->log_x, dst->log_y, dst->log_width, dst->log_height, - dev_src->hdc, src->log_x, src->log_y, src->log_width, src->log_height, - *(DWORD *)&func, EMR_ALPHABLEND ); + /* FIXME: update bound rect */ + return TRUE; } BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3b99eb49d5d..305dec43c7f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -112,6 +112,9 @@ extern BOOL METADC_StretchBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width_dst, /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, + HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, + BLENDFUNCTION blend_function ); extern BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 685396f6893..b8faf9fb58c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1235,6 +1235,25 @@ BOOL WINAPI StretchBlt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height height_src, rop, 0 /* FIXME */ ); } +/****************************************************************************** + * GdiAlphaBlend (GDI32.@) + */ +BOOL WINAPI GdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, + HDC hdc_src, int x_src, int y_src, int width_src, int height_src, + BLENDFUNCTION blend_function) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc_dst ))) return FALSE; + if (dc_attr->emf && !EMFDC_AlphaBlend( dc_attr, x_dst, y_dst, width_dst, height_dst, + hdc_src, x_src, y_src, width_src, + height_src, blend_function )) + return FALSE; + return NtGdiAlphaBlend( hdc_dst, x_dst, y_dst, width_dst, height_dst, + hdc_src, x_src, y_src, width_src, height_src, + blend_function, 0 /* FIXME */ ); +} + /*********************************************************************** * BeginPath (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 63547f5bd4a..5d67798052a 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -145,6 +145,9 @@ typedef struct DC_ATTR INT WINAPI NtGdiAbortDoc( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc ); +BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, + HDC hdc_src, int x_src, int y_src, int width_src, int height_src, + BLENDFUNCTION blend_function, HANDLE xform ); BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FLOAT sweep_angle ); BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, INT bottom,

1 0

Jacek Caban : gdi32: Use NtGdiBitBlt for BitBlt.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 23ac1c6e62849e616c333238f093eae5c7cd516c URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ac1c6e62849e616c333238… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 12 12:00:25 2021 +0200 gdi32: Use NtGdiBitBlt for BitBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 9 ++++----- dlls/gdi32/enhmfdrv/bitblt.c | 12 ++++++++---- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 42 +++++++++++++++++++++++++++--------------- include/ntgdi.h | 2 ++ 6 files changed, 63 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index df3c658c53b..fd505b13407 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -569,12 +569,11 @@ BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWOR /*********************************************************************** * BitBlt (GDI32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, - INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop ) +BOOL WINAPI NtGdiBitBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width, INT height, + HDC hdc_src, INT x_src, INT y_src, DWORD rop, DWORD bk_color, FLONG fl ) { - if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, width, height, rop ); - else return StretchBlt( hdcDst, xDst, yDst, width, height, - hdcSrc, xSrc, ySrc, width, height, rop ); + return NtGdiStretchBlt( hdc_dst, x_dst, y_dst, width, height, + hdc_src, x_src, y_src, width, height, rop, bk_color ); } diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 8bd30ffb671..9d930d17591 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -215,15 +215,19 @@ static inline BOOL rop_uses_src( DWORD rop ) return ((rop >> 2) & 0x330000) != (rop & 0x330000); } +BOOL EMFDC_BitBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width, INT height, + HDC hdc_src, INT x_src, INT y_src, DWORD rop ) +{ + if (!rop_uses_src( rop )) return EMFDC_PatBlt( dc_attr, x_dst, y_dst, width, height, rop ); + return emfdrv_stretchblt( dc_attr->emf, x_dst, y_dst, width, height, + hdc_src, x_src, y_src, width, height, rop, EMR_BITBLT ); +} + BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, DWORD rop ) { if (!rop_uses_src( rop )) return EMFDC_PatBlt( dc_attr, x_dst, y_dst, width_dst, height_dst, rop ); - if (width_src == width_dst && height_src == height_dst) - return emfdrv_stretchblt( dc_attr->emf, x_dst, y_dst, width_dst, height_dst, - hdc_src, x_src, y_src, width_src, - height_src, rop, EMR_BITBLT ); return emfdrv_stretchblt( dc_attr->emf, x_dst, y_dst, width_dst, height_dst, hdc_src, x_src, y_src, width_src, height_src, rop, EMR_STRETCHBLT ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 44542f4ca26..3b99eb49d5d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -48,6 +48,8 @@ static inline BOOL is_meta_dc( HDC hdc ) extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL METADC_BitBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width, INT height, + HDC hdc_src, INT x_src, INT y_src, DWORD rop ); extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; @@ -116,6 +118,8 @@ extern BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend, DWORD type ) DECLSPEC_HIDDEN; extern BOOL EMFDC_BeginPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_BitBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width, INT height, + HDC hdc_src, INT x_src, INT y_src, DWORD rop ); extern BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f0b46fda854..685396f6893 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1195,6 +1195,24 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop return NtGdiPatBlt( hdc, left, top, width, height, rop ); } +/*********************************************************************** + * BitBlt (GDI32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH BitBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width, INT height, + HDC hdc_src, INT x_src, INT y_src, DWORD rop ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc_dst )) return METADC_BitBlt( hdc_dst, x_dst, y_dst, width, height, + hdc_src, x_src, y_src, rop ); + if (!(dc_attr = get_dc_attr( hdc_dst ))) return FALSE; + if (dc_attr->emf && !EMFDC_BitBlt( dc_attr, x_dst, y_dst, width, height, + hdc_src, x_src, y_src, rop )) + return FALSE; + return NtGdiBitBlt( hdc_dst, x_dst, y_dst, width, height, + hdc_src, x_src, y_src, rop, 0 /* FIXME */, 0 /* FIXME */ ); +} + /*********************************************************************** * StretchBlt (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 9bbecff9283..def8b5f9ee1 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -37,10 +37,11 @@ BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, - DWORD rop ) + DWORD rop, WORD type ) { BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; UINT bmi_size, size, bpp; + int i = 0, bitmap_offset; BITMAPINFO *bmi; METARECORD *mr; HBITMAP bitmap; @@ -57,11 +58,12 @@ static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT else bmi_size = sizeof(BITMAPINFOHEADER); - size = FIELD_OFFSET( METARECORD, rdParm[10] ) + bmi_size + + bitmap_offset = type == META_DIBBITBLT ? 8 : 10; + size = FIELD_OFFSET( METARECORD, rdParm[bitmap_offset] ) + bmi_size + src_info.bmiHeader.biSizeImage; if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; - mr->rdFunction = META_DIBSTRETCHBLT; - bmi = (BITMAPINFO *)&mr->rdParm[10]; + mr->rdFunction = type; + bmi = (BITMAPINFO *)&mr->rdParm[bitmap_offset]; bmi->bmiHeader = src_info.bmiHeader; TRACE( "size = %u rop=%x\n", size, rop ); @@ -70,16 +72,19 @@ static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT if (ret) { mr->rdSize = size / sizeof(WORD); - mr->rdParm[0] = LOWORD(rop); - mr->rdParm[1] = HIWORD(rop); - mr->rdParm[2] = height_src; - mr->rdParm[3] = width_src; - mr->rdParm[4] = y_src; - mr->rdParm[5] = x_src; - mr->rdParm[6] = height_dst; - mr->rdParm[7] = width_dst; - mr->rdParm[8] = y_dst; - mr->rdParm[9] = x_dst; + mr->rdParm[i++] = LOWORD(rop); + mr->rdParm[i++] = HIWORD(rop); + if (bitmap_offset > 8) + { + mr->rdParm[i++] = height_src; + mr->rdParm[i++] = width_src; + } + mr->rdParm[i++] = y_src; + mr->rdParm[i++] = x_src; + mr->rdParm[i++] = height_dst; + mr->rdParm[i++] = width_dst; + mr->rdParm[i++] = y_dst; + mr->rdParm[i++] = x_dst; ret = metadc_record( hdc, mr, size ); } @@ -88,6 +93,13 @@ static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT } +BOOL METADC_BitBlt( HDC hdc, INT x_dst, INT y_dst, INT width, INT height, + HDC hdc_src, INT x_src, INT y_src, DWORD rop ) +{ + return metadc_stretchblt( hdc, x_dst, y_dst, width, height, + hdc_src, x_src, y_src, width, height, rop, META_DIBBITBLT ); +} + /*********************************************************************** * METADC_StretchBlt */ @@ -96,7 +108,7 @@ BOOL METADC_StretchBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width_dst, INT he DWORD rop ) { return metadc_stretchblt( hdc_dst, x_dst, y_dst, width_dst, height_dst, - hdc_src, x_src, y_src, width_src, height_src, rop ); + hdc_src, x_src, y_src, width_src, height_src, rop, META_DIBSTRETCHBLT ); } /*********************************************************************** diff --git a/include/ntgdi.h b/include/ntgdi.h index 37d627d4666..63547f5bd4a 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -150,6 +150,8 @@ BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ); BOOL WINAPI NtGdiBeginPath( HDC hdc ); +BOOL WINAPI NtGdiBitBlt( HDC hdc_dst, INT x_dst, INT y_dst, INT width, INT height, HDC hdc_src, + INT x_src, INT y_src, DWORD rop, DWORD bk_color, FLONG fl ); BOOL WINAPI NtGdiCancelDC( HDC hdc ); BOOL WINAPI NtGdiCloseFigure( HDC hdc ); INT WINAPI NtGdiCombineRgn( HRGN dest, HRGN src1, HRGN src2, INT mode );

1 0

Jacek Caban : gdi32: Use GetDIBits in emfdrv_stretchblt.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 77c97174149a53ba06f6826fe6f4451c48adeef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77c97174149a53ba06f6826f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 12 11:59:53 2021 +0200 gdi32: Use GetDIBits in emfdrv_stretchblt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/bitblt.c | 133 +++++++++++++++++++++++++++---------------- 1 file changed, 84 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index ca3455459e5..e1d90c281c4 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -20,51 +20,98 @@ #include <stdarg.h> #include <string.h> +#include <assert.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "enhmetafiledrv.h" -#include "wine/debug.h" /* Generate an EMRBITBLT, EMRSTRETCHBLT or EMRALPHABLEND record depending on the type parameter */ -static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, +static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, HDC hdc_src, struct bitblt_coords *src, DWORD rop, DWORD type ) { - unsigned char src_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; - UINT bits_size, bmi_size, emr_size, size, bpp; - EMRSTRETCHBLT *emr_stretchblt; - struct gdi_image_bits bits; + BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; + UINT bmi_size, emr_size, size, bpp; + HBITMAP bitmap, blit_bitmap = NULL; + EMRBITBLT *emr = NULL; BITMAPINFO *bmi; - EMRBITBLT *emr; - DC *dc_src; - DWORD err; + DIBSECTION dib; + HDC blit_dc; + int info_size; BOOL ret = FALSE; - dc_src = get_physdev_dc(dev_src); - dev_src = GET_DC_PHYSDEV(dc_src, pGetImage); - err = dev_src->funcs->pGetImage(dev_src, src_info, &bits, src); - if (err) + if (!(bitmap = GetCurrentObject( hdc_src, OBJ_BITMAP ))) return FALSE; + if (!(info_size = GetObjectW( bitmap, sizeof(dib), &dib ))) return FALSE; + + if (info_size == sizeof(DIBSECTION)) { - SetLastError(err); - return FALSE; + blit_dc = hdc_src; + blit_bitmap = bitmap; } + else + { + unsigned char dib_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *dib_info = (BITMAPINFO *)dib_info_buffer; + BITMAP bmp = dib.dsBm; + HPALETTE palette; + void *bits; + + assert( info_size == sizeof(BITMAP) ); + + dib_info->bmiHeader.biSize = sizeof(dib_info->bmiHeader); + dib_info->bmiHeader.biWidth = bmp.bmWidth; + dib_info->bmiHeader.biHeight = bmp.bmHeight; + dib_info->bmiHeader.biPlanes = 1; + dib_info->bmiHeader.biBitCount = bmp.bmBitsPixel; + dib_info->bmiHeader.biCompression = BI_RGB; + dib_info->bmiHeader.biSizeImage = 0; + dib_info->bmiHeader.biXPelsPerMeter = 0; + dib_info->bmiHeader.biYPelsPerMeter = 0; + dib_info->bmiHeader.biClrUsed = 0; + dib_info->bmiHeader.biClrImportant = 0; + switch (dib_info->bmiHeader.biBitCount) + { + case 16: + ((DWORD *)dib_info->bmiColors)[0] = 0xf800; + ((DWORD *)dib_info->bmiColors)[1] = 0x07e0; + ((DWORD *)dib_info->bmiColors)[2] = 0x001f; + break; + case 32: + ((DWORD *)dib_info->bmiColors)[0] = 0xff0000; + ((DWORD *)dib_info->bmiColors)[1] = 0x00ff00; + ((DWORD *)dib_info->bmiColors)[2] = 0x0000ff; + break; + default: + if (dib_info->bmiHeader.biBitCount > 8) break; + if (!(palette = GetCurrentObject( hdc_src, OBJ_PAL ))) return FALSE; + if (!GetPaletteEntries( palette, 0, 256, (PALETTEENTRY *)dib_info->bmiColors )) + return FALSE; + } + + if (!(blit_dc = NtGdiCreateCompatibleDC( hdc_src ))) return FALSE; + if (!(blit_bitmap = CreateDIBSection( blit_dc, dib_info, DIB_RGB_COLORS, &bits, NULL, 0 ))) + goto err; + if (!SelectObject( blit_dc, blit_bitmap )) goto err; + if (!BitBlt( blit_dc, 0, 0, bmp.bmWidth, bmp.bmHeight, hdc_src, 0, 0, SRCCOPY )) + goto err; + } + if (!GetDIBits( blit_dc, blit_bitmap, 0, INT_MAX, NULL, &src_info, DIB_RGB_COLORS )) + goto err; - bpp = src_info->bmiHeader.biBitCount; + bpp = src_info.bmiHeader.biBitCount; if (bpp <= 8) bmi_size = sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); else if (bpp == 16 || bpp == 32) bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); else bmi_size = sizeof(BITMAPINFOHEADER); + /* EMRSTRETCHBLT and EMRALPHABLEND have the same structure */ emr_size = type == EMR_BITBLT ? sizeof(EMRBITBLT) : sizeof(EMRSTRETCHBLT); - bits_size = src_info->bmiHeader.biSizeImage; - size = emr_size + bmi_size + bits_size; + size = emr_size + bmi_size + src_info.bmiHeader.biSizeImage; - emr = HeapAlloc(GetProcessHeap(), 0, size); - if (!emr) goto err; + if (!(emr = HeapAlloc(GetProcessHeap(), 0, size))) goto err; emr->emr.iType = type; emr->emr.nSize = size; @@ -80,52 +127,40 @@ static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSD emr->ySrc = src->log_y; if (type == EMR_STRETCHBLT || type == EMR_ALPHABLEND) { - emr_stretchblt = (EMRSTRETCHBLT *)emr; + EMRSTRETCHBLT *emr_stretchblt = (EMRSTRETCHBLT *)emr; emr_stretchblt->cxSrc = src->log_width; emr_stretchblt->cySrc = src->log_height; } emr->dwRop = rop; - NtGdiGetTransform( dev_src->hdc, 0x204, &emr->xformSrc ); - emr->crBkColorSrc = GetBkColor(dev_src->hdc); + NtGdiGetTransform( hdc_src, 0x204, &emr->xformSrc ); + emr->crBkColorSrc = GetBkColor( hdc_src ); emr->iUsageSrc = DIB_RGB_COLORS; emr->offBmiSrc = emr_size; emr->cbBmiSrc = bmi_size; emr->offBitsSrc = emr_size + bmi_size; - emr->cbBitsSrc = bits_size; + emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; bmi = (BITMAPINFO *)((BYTE *)emr + emr->offBmiSrc); - memcpy(bmi, src_info, bmi_size); - memcpy((BYTE *)emr + emr->offBitsSrc, bits.ptr, bits_size); - - bmi->bmiHeader.biClrUsed = 0; - if (bmi->bmiHeader.biCompression == BI_RGB && bmi->bmiHeader.biBitCount == 16) - { - bmi->bmiHeader.biCompression = BI_BITFIELDS; - ((DWORD *)bmi->bmiColors)[0] = 0xf800; - ((DWORD *)bmi->bmiColors)[1] = 0x07e0; - ((DWORD *)bmi->bmiColors)[2] = 0x001f; - } - else if (bmi->bmiHeader.biCompression == BI_RGB && bmi->bmiHeader.biBitCount == 32) + bmi->bmiHeader = src_info.bmiHeader; + ret = GetDIBits( blit_dc, blit_bitmap, 0, src_info.bmiHeader.biHeight, (BYTE *)emr + emr->offBitsSrc, + bmi, DIB_RGB_COLORS ); + if (ret) { - bmi->bmiHeader.biCompression = BI_BITFIELDS; - ((DWORD *)bmi->bmiColors)[0] = 0xff0000; - ((DWORD *)bmi->bmiColors)[1] = 0x00ff00; - ((DWORD *)bmi->bmiColors)[2] = 0x0000ff; + ret = EMFDRV_WriteRecord( dev_dst, (EMR *)emr ); + if (ret) EMFDRV_UpdateBBox( dev_dst, &emr->rclBounds ); } - ret = EMFDRV_WriteRecord(dev_dst, (EMR *)emr); - if (ret) EMFDRV_UpdateBBox(dev_dst, &emr->rclBounds); - err: - HeapFree(GetProcessHeap(), 0, emr); - if (bits.free) bits.free(&bits); + HeapFree( GetProcessHeap(), 0, emr ); + if (blit_bitmap && blit_bitmap != bitmap) DeleteObject( blit_bitmap ); + if (blit_dc && blit_dc != hdc_src) DeleteDC( blit_dc ); return ret; } BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) { - return emfdrv_stretchblt(dev_dst, dst, dev_src, src, *(DWORD *)&func, EMR_ALPHABLEND); + return emfdrv_stretchblt( dev_dst, dst, dev_src->hdc, src, *(DWORD *)&func, EMR_ALPHABLEND ); } BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) @@ -176,9 +211,9 @@ BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) { if (src->log_width == dst->log_width && src->log_height == dst->log_height) - return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_BITBLT); + return emfdrv_stretchblt( devDst, dst, devSrc->hdc, src, rop, EMR_BITBLT ); else - return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_STRETCHBLT); + return emfdrv_stretchblt( devDst, dst, devSrc->hdc, src, rop, EMR_STRETCHBLT ); } INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst,

1 0