wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Alex Henrie : wpp: Allow fully variadic macros.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 1cad3c00fefa635a0e3b1df12aaa295007b43028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cad3c00fefa635a0e3b1df1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 8 23:29:24 2021 -0600 wpp: Allow fully variadic macros. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppy.y | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5b7083b3813..0afc642d3e0 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -327,6 +327,7 @@ allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } emargs : margs { $$ = $1; } | margs ',' tELLIPSIS { nmacro_args *= -1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 1be6c7f8da59486f5fe611d237756a024d2c4924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be6c7f8da59486f5fe611d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 9 22:33:12 2021 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 428 +++++++++++++++++++++------------------------------------------ 1 file changed, 144 insertions(+), 284 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1be6c7f8da59486f5fe6…

1 0

Akihiro Sagawa : dbghelp: Get rid of useless while loop.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 70032f88639eb4a36aadb637fe54856541d88e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70032f88639eb4a36aadb637… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 9 22:33:14 2021 +0900 dbghelp: Get rid of useless while loop. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af84fb660b8..c6657c87f18 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2188,7 +2188,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, vector_init(&dirs, sizeof(const char*), 4); p = vector_add(&dirs, &ctx->pool); *p = compile_dir ? compile_dir : "."; - while (*traverse.data) while (traverse.data < traverse.end_data && *traverse.data) { const char* rel = (const char*)traverse.data;

1 0

Jacek Caban : gdi32: Factor out get_icm_profile.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 5f139f141118cf99157c648ad4974d342f32f8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f139f141118cf99157c648a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:02:03 2021 +0200 gdi32: Factor out get_icm_profile. And move it to dc.c. 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/dc.c | 17 +++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/icm.c | 32 ++++---------------------------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ae6119529f5..f7b56b06f6f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1241,3 +1241,20 @@ DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout ) return old_layout; } + +/********************************************************************** + * get_icm_profile (win32u.@) + */ +BOOL get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ) +{ + PHYSDEV physdev; + DC *dc; + BOOL ret; + + if (!(dc = get_dc_ptr(hdc))) return FALSE; + + physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); + ret = physdev->funcs->pGetICMProfile( physdev, allow_default, size, filename ); + release_dc_ptr(dc); + return ret; +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e1ba092a08e..efadf3a7c82 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -278,6 +278,8 @@ extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) DECLSPEC_HIDDEN; +extern BOOL get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, + WCHAR *filename ) DECLSPEC_HIDDEN; static inline int get_dib_stride( int width, int bpp ) { diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index 22aacb762e3..63377a9ab88 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -19,16 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +#include "gdi_private.h" #include "winnls.h" -#include "winreg.h" - -#include "ntgdi_private.h" #include "wine/debug.h" @@ -78,20 +70,13 @@ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) { WCHAR profile[MAX_PATH]; DWORD size = ARRAYSIZE(profile); - DC *dc; - BOOL ret = FALSE; TRACE( "%p, %p, 0x%08lx\n", hdc, func, lparam ); if (!func) return -1; - if ((dc = get_dc_ptr(hdc))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); - ret = physdev->funcs->pGetICMProfile( physdev, FALSE, &size, profile ); - release_dc_ptr(dc); - } + if (!get_icm_profile( hdc, FALSE, &size, profile )) return -1; /* FIXME: support multiple profiles */ - return ret ? func( profile, lparam ) : -1; + return func( profile, lparam ); } /********************************************************************** @@ -144,18 +129,9 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) */ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) { - BOOL ret = FALSE; - DC *dc = get_dc_ptr(hdc); - TRACE("%p, %p, %p\n", hdc, size, filename); - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); - ret = physdev->funcs->pGetICMProfile( physdev, TRUE, size, filename ); - release_dc_ptr(dc); - } - return ret; + return get_icm_profile( hdc, TRUE, size, filename ); } /**********************************************************************

1 0

Jacek Caban : gdi32: Use GetICMProfile driver entry point for EnumICMProfilesW.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 6403e88140895b50cbe08bd4e42601a9e4101349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6403e88140895b50cbe08bd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:01:51 2021 +0200 gdi32: Use GetICMProfile driver entry point for EnumICMProfilesW. When display ICM is not explicitly configured on Windows, GetICMProfile returns the default profile, but EnumICMProfiles does not enumerate anything. For non-default configuration, EnumICMProfiles returns configured profiles. 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/dibdrv/dc.c | 2 -- dlls/gdi32/driver.c | 8 +------ dlls/gdi32/emfdrv.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/icm.c | 15 +++++++----- dlls/gdi32/path.c | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/gdi.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/graphics.c | 58 ++------------------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 5 ++-- 14 files changed, 15 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6403e88140895b50cbe0…

1 0

Jacek Caban : gdi32: Support NULL prev_value in NtGdiGetAndSetDCDword.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: bf4cdfad5be250e4fc34441da3133e96a92c04fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4cdfad5be250e4fc34441d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:01:47 2021 +0200 gdi32: Support NULL prev_value in NtGdiGetAndSetDCDword. 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/dc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4ed09e91eb1..ae6119529f5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -830,6 +830,7 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre { PHYSDEV physdev; BOOL ret = TRUE; + DWORD prev; DC *dc; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -837,36 +838,36 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre switch (method) { case NtGdiSetMapMode: - *prev_value = dc->attr->map_mode; + prev = dc->attr->map_mode; ret = set_map_mode( dc, value ); break; case NtGdiSetBkColor: - *prev_value = dc->attr->background_color; + prev = dc->attr->background_color; set_bk_color( dc, value ); break; case NtGdiSetTextColor: - *prev_value = dc->attr->text_color; + prev = dc->attr->text_color; set_text_color( dc, value ); break; case NtGdiSetDCBrushColor: physdev = GET_DC_PHYSDEV( dc, pSetDCBrushColor ); - *prev_value = dc->attr->brush_color; + prev = dc->attr->brush_color; value = physdev->funcs->pSetDCBrushColor( physdev, value ); if (value != CLR_INVALID) dc->attr->brush_color = value; break; case NtGdiSetDCPenColor: physdev = GET_DC_PHYSDEV( dc, pSetDCPenColor ); - *prev_value = dc->attr->pen_color; + prev = dc->attr->pen_color; value = physdev->funcs->pSetDCPenColor( physdev, value ); if (value != CLR_INVALID) dc->attr->pen_color = value; break; case NtGdiSetGraphicsMode: - if (prev_value) *prev_value = dc->attr->graphics_mode; + prev = dc->attr->graphics_mode; ret = set_graphics_mode( dc, value ); break; @@ -877,7 +878,9 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre } release_dc_ptr( dc ); - return ret; + if (!ret || !prev_value) return FALSE; + *prev_value = prev; + return TRUE; }

1 0

Jacek Caban : gdi32: Use EMR_PLGBLT to record PlgBlt.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 03ec246e5282ab3f76e1df312272598eeba69260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03ec246e5282ab3f76e1df31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:01:02 2021 +0200 gdi32: Use EMR_PLGBLT to record PlgBlt. And use NtGdiPlgBlt. 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 | 23 +++++------ dlls/gdi32/emfdc.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdidc.c | 16 ++++++++ include/ntgdi.h | 3 ++ 5 files changed, 134 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a1b4b6fa393..33ce6966f87 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1014,12 +1014,11 @@ BOOL WINAPI NtGdiAlphaBlend( HDC hdcDst, int xDst, int yDst, int widthDst, int h } /********************************************************************* - * PlgBlt [GDI32.@] - * + * NtGdiPlgBlt (win32u.@) */ -BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, - HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, - INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) +BOOL WINAPI NtGdiPlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, + INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask, + DWORD bk_color ) { DWORD prev_mode; /* parallelogram coords */ @@ -1071,20 +1070,18 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) ) / det; - GetWorldTransform(hdcSrc,&SrcXf); + NtGdiGetTransform( hdcSrc, 0x203, &SrcXf ); combine_transform( &xf, &xf, &SrcXf ); /* save actual dest transform */ - GetWorldTransform(hdcDest,&oldDestXf); + NtGdiGetTransform( hdcDest, 0x203, &oldDestXf ); - SetWorldTransform(hdcDest,&xf); + NtGdiModifyWorldTransform( hdcDest, &xf, MWT_SET ); /* now destination and source DCs use same coords */ - MaskBlt(hdcDest,nXSrc,nYSrc,nWidth,nHeight, - hdcSrc, nXSrc,nYSrc, - hbmMask,xMask,yMask, - SRCCOPY); + NtGdiMaskBlt( hdcDest, nXSrc, nYSrc, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, + hbmMask, xMask, yMask, SRCCOPY, 0 ); /* restore dest DC */ - SetWorldTransform(hdcDest,&oldDestXf); + NtGdiModifyWorldTransform( hdcDest, &oldDestXf, MWT_SET ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, prev_mode, NULL ); return TRUE; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 66c87ef9412..79220a5e1e0 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1484,6 +1484,109 @@ err: return ret; } +BOOL EMFDC_PlgBlt( DC_ATTR *dc_attr, const POINT *points, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) +{ + unsigned char mask_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *mask_bits_info = (BITMAPINFO *)mask_info_buffer; + struct emf *emf = dc_attr->emf; + BITMAPINFO mask_info = {{ sizeof( mask_info.bmiHeader ) }}; + BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; + HBITMAP bitmap, blit_bitmap = NULL, mask_bitmap = NULL; + UINT bmi_size, size, mask_info_size = 0; + EMRPLGBLT *emr = NULL; + BITMAPINFO *bmi; + HDC blit_dc, mask_dc = NULL; + int x_min, y_min, x_max, y_max, i; + BOOL ret = FALSE; + + if (!(bitmap = GetCurrentObject( hdc_src, OBJ_BITMAP ))) return FALSE; + + blit_dc = hdc_src; + blit_bitmap = bitmap; + if (!(bmi_size = get_bitmap_info( &blit_dc, &blit_bitmap, &src_info ))) return FALSE; + + if (mask) + { + mask_dc = hdc_src; + mask_bitmap = mask; + if (!(mask_info_size = get_bitmap_info( &mask_dc, &mask_bitmap, &mask_info ))) goto err; + if (mask_info.bmiHeader.biBitCount == 1) + mask_info_size = sizeof(BITMAPINFOHEADER); /* don't include colors */ + } + else mask_info.bmiHeader.biSizeImage = 0; + + size = sizeof(*emr) + bmi_size + src_info.bmiHeader.biSizeImage + + mask_info_size + mask_info.bmiHeader.biSizeImage; + + if (!(emr = HeapAlloc(GetProcessHeap(), 0, size))) goto err; + + emr->emr.iType = EMR_PLGBLT; + emr->emr.nSize = size; + + /* FIXME: not exactly what native does */ + x_min = x_max = points[1].x + points[2].x - points[0].x; + y_min = y_max = points[1].y + points[2].y - points[0].y; + for (i = 0; i < ARRAYSIZE(emr->aptlDest); i++) + { + x_min = min( x_min, points[i].x ); + y_min = min( y_min, points[i].y ); + x_max = max( x_max, points[i].x ); + y_max = max( y_min, points[i].y ); + } + emr->rclBounds.left = x_min; + emr->rclBounds.top = y_min; + emr->rclBounds.right = x_max; + emr->rclBounds.bottom = y_max; + memcpy( emr->aptlDest, points, sizeof(emr->aptlDest) ); + emr->xSrc = x_src; + emr->ySrc = y_src; + emr->cxSrc = width; + emr->cySrc = height; + NtGdiGetTransform( hdc_src, 0x204, &emr->xformSrc ); + emr->crBkColorSrc = GetBkColor( hdc_src ); + emr->iUsageSrc = DIB_RGB_COLORS; + emr->offBmiSrc = sizeof(*emr); + emr->cbBmiSrc = bmi_size; + emr->offBitsSrc = emr->offBmiSrc + bmi_size; + emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; + emr->xMask = x_mask; + emr->yMask = y_mask; + emr->iUsageMask = DIB_PAL_MONO; + emr->offBmiMask = mask_info_size ? emr->offBitsSrc + emr->cbBitsSrc : 0; + emr->cbBmiMask = mask_info_size; + emr->offBitsMask = emr->offBmiMask + emr->cbBmiMask; + emr->cbBitsMask = mask_info.bmiHeader.biSizeImage; + + bmi = (BITMAPINFO *)((char *)emr + emr->offBmiSrc); + bmi->bmiHeader = src_info.bmiHeader; + ret = GetDIBits( blit_dc, blit_bitmap, 0, src_info.bmiHeader.biHeight, + (char *)emr + emr->offBitsSrc, bmi, DIB_RGB_COLORS ); + if (!ret) goto err; + + if (mask_info_size) + { + mask_bits_info->bmiHeader = mask_info.bmiHeader; + ret = GetDIBits( blit_dc, mask_bitmap, 0, mask_info.bmiHeader.biHeight, + (char *)emr + emr->offBitsMask, mask_bits_info, DIB_RGB_COLORS ); + if (ret) memcpy( (char *)emr + emr->offBmiMask, mask_bits_info, mask_info_size ); + } + + if (ret) + { + ret = emfdc_record( emf, (EMR *)emr ); + if (ret) emfdc_update_bounds( emf, &emr->rclBounds ); + } + +err: + HeapFree( GetProcessHeap(), 0, emr ); + if (mask_bitmap != mask) DeleteObject( mask_bitmap ); + if (mask_dc != hdc_src) DeleteObject( mask_dc ); + if (blit_bitmap != bitmap) DeleteObject( blit_bitmap ); + if (blit_dc != hdc_src) DeleteDC( blit_dc ); + return ret; +} + BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT usage, DWORD rop ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2f0a6b4c0d7..e1ba092a08e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -212,6 +212,8 @@ extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PaintRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ); +extern BOOL EMFDC_PlgBlt( DC_ATTR *dc_attr, const POINT *point, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezierTo( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *points, const BYTE *types, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 25ef85f2db5..61b318ce067 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1516,6 +1516,22 @@ BOOL WINAPI MaskBlt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_ds mask, x_mask, y_mask, rop, 0 /* FIXME */ ); } +/*********************************************************************** + * PlgBlt (GDI32.@) + */ +BOOL WINAPI PlgBlt( HDC hdc, const POINT *points, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PlgBlt( dc_attr, points, hdc_src, x_src, y_src, + width, height, mask, x_mask, y_mask )) + return FALSE; + return NtGdiPlgBlt( hdc, points, hdc_src, x_src, y_src, width, height, + mask, x_mask, y_mask, 0 /* FIXME */ ); +} + /****************************************************************************** * GdiAlphaBlend (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index cb7b9639e20..44a27878792 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -353,6 +353,9 @@ INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ); INT WINAPI NtGdiOffsetRgn( HRGN hrgn, INT x, INT y ); BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); HRGN WINAPI NtGdiPathToRegion( HDC hdc ); +BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, + DWORD bk_color ); BOOL WINAPI NtGdiPolyDraw(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, DWORD count, UINT function );

1 0

Jacek Caban : gdi32: Use EMR_MASKBLT to record MaskBlt.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: dcf7d7d5c4f550fa255b33adc0542f8a1934c48f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf7d7d5c4f550fa255b33ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:00:56 2021 +0200 gdi32: Use EMR_MASKBLT to record MaskBlt. And use NtGdiMaskBlt. 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 | 29 ++++++++------- dlls/gdi32/emfdc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 17 +++++++++ include/ntgdi.h | 3 ++ 5 files changed, 134 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf7d7d5c4f550fa255b…

1 0

Jacek Caban : gdi32: Factor out get_bitmap_info.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 839a951f673cf00decd33b212aff60127ffb72ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=839a951f673cf00decd33b21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:00:47 2021 +0200 gdi32: Factor out get_bitmap_info. 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/emfdc.c | 152 +++++++++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index df4515aee8e..84069bdba3a 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -107,6 +107,84 @@ static void emfdc_update_bounds( struct emf *emf, RECTL *rect ) } } +static UINT get_bitmap_info( HDC *hdc, HBITMAP *bitmap, BITMAPINFO *info ) +{ + HBITMAP blit_bitmap; + HDC blit_dc; + UINT info_size, bpp; + DIBSECTION dib; + + if (!(info_size = GetObjectW( *bitmap, sizeof(dib), &dib ))) return 0; + + if (info_size == sizeof(dib)) + { + blit_dc = *hdc; + 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, OBJ_PAL ))) return FALSE; + if (!GetPaletteEntries( palette, 0, 256, (PALETTEENTRY *)dib_info->bmiColors )) + return FALSE; + } + + if (!(blit_dc = NtGdiCreateCompatibleDC( *hdc ))) 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, 0, 0, SRCCOPY )) + goto err; + } + if (!GetDIBits( blit_dc, blit_bitmap, 0, INT_MAX, NULL, info, DIB_RGB_COLORS )) + goto err; + + bpp = info->bmiHeader.biBitCount; + if (bpp <= 8) + return sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); + else if (bpp == 16 || bpp == 32) + return sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); + + return sizeof(BITMAPINFOHEADER); + +err: + if (blit_dc && blit_dc != *hdc) DeleteDC( blit_dc ); + if (blit_bitmap && blit_bitmap != *bitmap) DeleteObject( blit_bitmap ); + return 0; +} + static UINT emfdc_add_handle( struct emf *emf, HGDIOBJ obj ) { UINT index; @@ -1178,80 +1256,18 @@ static BOOL emfdrv_stretchblt( struct emf *emf, INT x_dst, INT y_dst, INT width_ DWORD rop, DWORD type ) { BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; - UINT bmi_size, emr_size, size, bpp; + UINT bmi_size, emr_size, size; HBITMAP bitmap, blit_bitmap = NULL; EMRBITBLT *emr = NULL; BITMAPINFO *bmi; - DIBSECTION dib; HDC blit_dc; - int info_size; BOOL ret = FALSE; if (!(bitmap = GetCurrentObject( hdc_src, OBJ_BITMAP ))) return FALSE; - if (!(info_size = GetObjectW( bitmap, sizeof(dib), &dib ))) return FALSE; - - if (info_size == sizeof(DIBSECTION)) - { - 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; - 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); + blit_dc = hdc_src; + blit_bitmap = bitmap; + if (!(bmi_size = get_bitmap_info( &blit_dc, &blit_bitmap, &src_info ))) return FALSE; /* EMRSTRETCHBLT and EMRALPHABLEND have the same structure */ emr_size = type == EMR_BITBLT ? sizeof(EMRBITBLT) : sizeof(EMRSTRETCHBLT); @@ -1298,8 +1314,8 @@ static BOOL emfdrv_stretchblt( struct emf *emf, INT x_dst, INT y_dst, INT width_ err: HeapFree( GetProcessHeap(), 0, emr ); - if (blit_bitmap && blit_bitmap != bitmap) DeleteObject( blit_bitmap ); - if (blit_dc && blit_dc != hdc_src) DeleteDC( blit_dc ); + if (blit_bitmap != bitmap) DeleteObject( blit_bitmap ); + if (blit_dc != hdc_src) DeleteDC( blit_dc ); return ret; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 6e18d3d2e250e48bcd0df298a7406077bf9b45d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e18d3d2e250e48bcd0df298… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Sep 8 22:39:59 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 232 ++++++++++++++++++++------------------------------------------- 1 file changed, 74 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e18d3d2e250e48bcd0d…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021