September 2021 - Wine-commits

Alexandre Julliard : winecfg: Use Unicode functions throughout.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: d02d50299b236690738563e1db8c08d1cb603f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d02d50299b236690738563e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 17:14:22 2021 +0200 winecfg: Use Unicode functions throughout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/Makefile.in | 2 +- programs/winecfg/about.c | 32 ++--- programs/winecfg/appdefaults.c | 240 ++++++++++++++++++------------------ programs/winecfg/audio.c | 16 +-- programs/winecfg/drive.c | 65 ++-------- programs/winecfg/driveui.c | 28 ++--- programs/winecfg/libraries.c | 270 ++++++++++++++++++++--------------------- programs/winecfg/main.c | 8 +- programs/winecfg/theme.c | 110 +++++++---------- programs/winecfg/winecfg.c | 163 ++----------------------- programs/winecfg/winecfg.h | 37 ++---- programs/winecfg/x11drvdlg.c | 72 +++++------ 12 files changed, 409 insertions(+), 634 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d02d50299b2366907385…

1 0

Alexandre Julliard : configure: Enable ws2_32 build on Windows.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 9a5f4b95db7acc12884717839931ff39b4b486d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a5f4b95db7acc1288471783… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 23:16:47 2021 +0200 configure: Enable ws2_32 build on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - 2 files changed, 2 deletions(-) diff --git a/configure b/configure index 99283e0ef18..5ed46f75b84 100755 --- a/configure +++ b/configure @@ -8357,7 +8357,6 @@ fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} enable_nsiproxy_sys=${enable_nsiproxy_sys:-no} - enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} with_x=${with_x:-no} diff --git a/configure.ac b/configure.ac index 26f74985924..68b666e455f 100644 --- a/configure.ac +++ b/configure.ac @@ -737,7 +737,6 @@ case $host_os in dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_nsiproxy_sys=${enable_nsiproxy_sys:-no} - enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} dnl Disable dependencies that are not useful on Windows

1 0

Gabriel Ivăncescu : jscript: Fix refcounting the object prototype fallback.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 59bb402bf1ff0a8492e910f6483b370a61d35f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59bb402bf1ff0a8492e910f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 6 20:01:59 2021 +0300 jscript: Fix refcounting the object prototype fallback. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 345bcd22020..e5d711a0a53 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1881,7 +1881,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); else - prot = ctx->object_prototype; + prot = jsdisp_addref(ctx->object_prototype); jsval_release(val); }

1 0

Jacek Caban : gdi32/tests: Add more metafile brush tests.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 08d377c02fbbd63c351e927dfc8525680ce34c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d377c02fbbd63c351e927d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:09:47 2021 +0200 gdi32/tests: Add more metafile brush tests. Based on brush.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/tests/metafile.c | 351 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 346 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d377c02fbbd63c351e…

1 0

Jacek Caban : gdi32: Allocate extra DWORD for EMR_CREATEDIBPATTERNBRUSHPT records.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: d94d1a8b263a020575bf8dd76509d9e603434095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94d1a8b263a020575bf8dd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:09:53 2021 +0200 gdi32: Allocate extra DWORD for EMR_CREATEDIBPATTERNBRUSHPT records. Like for EMR_CREATEMONOBRUSH. 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 479e0caa6b6..6dc7229b574 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -197,9 +197,16 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) info_size = get_dib_info_size( info, usage ); emr = HeapAlloc( GetProcessHeap(), 0, - sizeof(EMRCREATEDIBPATTERNBRUSHPT)+info_size+info->bmiHeader.biSizeImage ); + sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + + info_size+info->bmiHeader.biSizeImage ); if(!emr) break; + /* FIXME: There is an extra DWORD written by native before the BMI. + * Not sure what it's meant to contain. + */ + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); + *(DWORD *)(emr + 1) = 0x20000000; + if (logbrush.lbStyle == BS_PATTERN && info->bmiHeader.biBitCount == 1) { /* Presumably to reduce the size of the written EMF, MS supports an @@ -211,16 +218,11 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) */ emr->emr.iType = EMR_CREATEMONOBRUSH; usage = DIB_PAL_MONO; - /* FIXME: There is an extra DWORD written by native before the BMI. - * Not sure what it's meant to contain. - */ - emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); emr->cbBmi = sizeof( BITMAPINFOHEADER ); } else { emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; - emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ); emr->cbBmi = info_size; } emr->ihBrush = index = emfdc_add_handle( emf, brush );

1 0

Jacek Caban : gdi32: Copy brush bits in get_brush_bitmap_info.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 1ba1736238cfadcbd662471046d6b11ff38a258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba1736238cfadcbd6624710… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:10:44 2021 +0200 gdi32: Copy brush bits in get_brush_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/brush.c | 35 +++++++++++++++++++++++++++++------ dlls/gdi32/emfdc.c | 5 ++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/metadc.c | 19 ++----------------- dlls/gdi32/ntgdi_private.h | 1 - 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 7c43df0dfcf..8ef902f60b9 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -140,7 +140,7 @@ void free_brush_pattern( struct brush_pattern *pattern ) HeapFree( GetProcessHeap(), 0, pattern->info ); } -BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) +BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) { BRUSHOBJ *brush; BOOL ret = FALSE; @@ -149,11 +149,34 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (brush->pattern.info) { - memcpy( info, brush->pattern.info, get_dib_info_size( brush->pattern.info, brush->pattern.usage )); - if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) - fill_default_color_table( info ); - *bits = brush->pattern.bits.ptr; - *usage = brush->pattern.usage; + if (info) + { + memcpy( info, brush->pattern.info, + get_dib_info_size( brush->pattern.info, brush->pattern.usage )); + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) + fill_default_color_table( info ); + if (info->bmiHeader.biHeight < 0) + info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + } + if (bits) + { + /* always return a bottom-up DIB */ + if (brush->pattern.info->bmiHeader.biHeight < 0) + { + unsigned int i, width_bytes, height = -brush->pattern.info->bmiHeader.biHeight; + char *dst_ptr; + + width_bytes = get_dib_stride( brush->pattern.info->bmiHeader.biWidth, + brush->pattern.info->bmiHeader.biBitCount ); + dst_ptr = (char *)bits + (height - 1) * width_bytes; + for (i = 0; i < height; i++, dst_ptr -= width_bytes) + memcpy( dst_ptr, (char *)brush->pattern.bits.ptr + i * width_bytes, + width_bytes ); + } + else memcpy( bits, brush->pattern.bits.ptr, + brush->pattern.info->bmiHeader.biSizeImage ); + } + if (usage) *usage = brush->pattern.usage; ret = TRUE; } GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 6dc7229b574..300e2507852 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -190,10 +190,9 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; DWORD info_size; - void *bits; UINT usage; - if (!get_brush_bitmap_info( brush, info, &bits, &usage )) break; + if (!get_brush_bitmap_info( brush, info, NULL, &usage )) break; info_size = get_dib_info_size( info, usage ); emr = HeapAlloc( GetProcessHeap(), 0, @@ -232,7 +231,7 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) emr->emr.nSize = emr->offBits + emr->cbBits; memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); - memcpy( (BYTE *)emr + emr->offBits, bits, emr->cbBits ); + get_brush_bitmap_info( brush, NULL, (char *)emr + emr->offBits, NULL ); if (!emfdc_record( emf, &emr->emr )) index = 0; HeapFree( GetProcessHeap(), 0, emr ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 675a2990215..7a4a8773f3f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -224,4 +224,7 @@ extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, + UINT *usage ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index 1f9d2f86b77..f4b313ba5db 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -546,11 +546,9 @@ static INT16 metadc_create_brush( struct metadc *metadc, HBRUSH brush ) char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; DWORD info_size; - char *dst_ptr; - void *bits; UINT usage; - if (!get_brush_bitmap_info( brush, src_info, &bits, &usage )) goto done; + if (!get_brush_bitmap_info( brush, src_info, NULL, &usage )) goto done; info_size = get_dib_info_size( src_info, usage ); size = FIELD_OFFSET( METARECORD, rdParm[2] ) + @@ -562,22 +560,9 @@ static INT16 metadc_create_brush( struct metadc *metadc, HBRUSH brush ) mr->rdParm[0] = logbrush.lbStyle; mr->rdParm[1] = usage; dst_info = (BITMAPINFO *)(mr->rdParm + 2); - memcpy( dst_info, src_info, info_size ); + get_brush_bitmap_info( brush, dst_info, (char *)dst_info + info_size, NULL ); if (dst_info->bmiHeader.biClrUsed == 1 << dst_info->bmiHeader.biBitCount) dst_info->bmiHeader.biClrUsed = 0; - dst_ptr = (char *)dst_info + info_size; - - /* always return a bottom-up DIB */ - if (dst_info->bmiHeader.biHeight < 0) - { - int i, width_bytes = get_dib_stride( dst_info->bmiHeader.biWidth, - dst_info->bmiHeader.biBitCount ); - dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; - dst_ptr += (dst_info->bmiHeader.biHeight - 1) * width_bytes; - for (i = 0; i < dst_info->bmiHeader.biHeight; i++, dst_ptr -= width_bytes) - memcpy( dst_ptr, (char *)bits + i * width_bytes, width_bytes ); - } - else memcpy( dst_ptr, bits, src_info->bmiHeader.biSizeImage ); break; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index ec3db21a2bd..b8273e8a405 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -170,7 +170,6 @@ extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, extern HBRUSH create_brush( const LOGBRUSH *brush ); extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */ extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Use zero biClrUsed in emfdc_create_brush when possible.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 5863f0af57f145ac3f217342f2ac630a82079244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5863f0af57f145ac3f217342… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:01 2021 +0200 gdi32: Use zero biClrUsed in emfdc_create_brush when possible. 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 | 2 + dlls/gdi32/tests/metafile.c | 129 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 300e2507852..0fb2d99dcef 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -230,6 +230,8 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) emr->cbBits = info->bmiHeader.biSizeImage; emr->emr.nSize = emr->offBits + emr->cbBits; + if (info->bmiHeader.biClrUsed == 1 << info->bmiHeader.biBitCount) + info->bmiHeader.biClrUsed = 0; memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); get_brush_bitmap_info( brush, NULL, (char *)emr + emr->offBits, NULL ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5e10c654388..693353ea5f2 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1459,6 +1459,69 @@ static const unsigned char EMF_GRADIENTFILL_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char emf_pattern_brush_bits[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe6, 0xff, 0xff, 0xff, 0xe5, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xd8, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x77, 0x07, 0x00, 0x00, 0x3b, 0x04, 0x00, 0x00, + 0xfa, 0x01, 0x00, 0x00, 0x1f, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x12, 0xb7, 0x07, 0x00, + 0x4f, 0x5f, 0x04, 0x00, 0x5d, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, + 0x28, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x25, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, + 0xd4, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, + 0x28, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, + 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, + 0x1a, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, + 0x25, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + static const unsigned char mf_palette_brush_bits[] = { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0xb2, 0x03, @@ -3866,6 +3929,71 @@ static void test_mf_PatternBrush(void) HeapFree (GetProcessHeap(), 0, orig_lb); } +static void test_emf_pattern_brush(void) +{ + char buffer[sizeof(BITMAPINFOHEADER) + (2 + 32 * 32 / 8) * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + HDC hdc; + HENHMETAFILE emf; + LOGBRUSH *orig_lb; + HBRUSH bitmap_brush, dib_brush; + DWORD *bits; + unsigned int i; + BOOL ret; + + orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); + + orig_lb->lbStyle = BS_PATTERN; + orig_lb->lbColor = RGB(0, 0, 0); + orig_lb->lbHatch = (ULONG_PTR)CreateBitmap(8, 8, 1, 1, SAMPLE_PATTERN_BRUSH); + ok((HBITMAP)orig_lb->lbHatch != NULL, "CreateBitmap error %d.\n", GetLastError()); + + bitmap_brush = CreateBrushIndirect(orig_lb); + ok(bitmap_brush != 0, "CreateBrushIndirect error %d\n", GetLastError()); + + hdc = CreateEnhMetaFileA(NULL, NULL, NULL, NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + bitmap_brush = SelectObject(hdc, bitmap_brush); + ok(bitmap_brush != 0, "SelectObject error %d.\n", GetLastError()); + + memset(info, 0, sizeof(buffer)); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biHeight = 32; + info->bmiHeader.biWidth = 32; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + bits = (DWORD *)info->bmiColors; + for (i = 0; i < 32 * 32 / 8; i++) bits[i] = i; + + dib_brush = CreateDIBPatternBrushPt(info, DIB_RGB_COLORS); + ok(dib_brush != NULL, "CreatePatternBrush failed\n"); + + dib_brush = SelectObject(hdc, dib_brush); + ok(dib_brush != 0, "SelectObject error %d.\n", GetLastError()); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(emf, emf_pattern_brush_bits, sizeof(emf_pattern_brush_bits), + "emf_pattern_brush", FALSE)) + { + dump_emf_bits(emf, "emf_pattern_brush"); + dump_emf_records(emf, "emf_pattern_brush"); + } + + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %d\n", GetLastError()); + ret = DeleteObject(bitmap_brush); + ok(ret, "DeleteObject failed\n"); + ret = DeleteObject(dib_brush); + ok(ret, "DeleteObject failed\n"); + ret = DeleteObject((HBITMAP)orig_lb->lbHatch); + ok(ret, "DeleteObject failed\n"); + HeapFree(GetProcessHeap(), 0, orig_lb); +} + static void test_mf_palette_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD) + 16 * 16]; @@ -7492,6 +7620,7 @@ START_TEST(metafile) test_emf_attrs(); test_emf_select(); test_emf_blit(); + test_emf_pattern_brush(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Jacek Caban : gdi32: Move get_full_gdi_handle to objects.c.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: c0cdf0652f9f8c630d6c0e6a82e580d43d42463a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0cdf0652f9f8c630d6c0e6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:15 2021 +0200 gdi32: Move get_full_gdi_handle to objects.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/emfdc.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 1 + dlls/gdi32/gdiobj.c | 18 ------------------ dlls/gdi32/metadc.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/objects.c | 10 ++++++++++ dlls/gdi32/palette.c | 3 --- 8 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 0fb2d99dcef..2e237ff26ae 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -121,7 +121,7 @@ static UINT emfdc_add_handle( struct emf *emf, HGDIOBJ obj ) emf->handles, emf->handles_size * sizeof(emf->handles[0]) ); } - emf->handles[index] = get_full_gdi_handle( obj ); + emf->handles[index] = obj; emf->cur_handles++; if (emf->cur_handles > emf->emh->nHandles) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7a4a8773f3f..7ed11a17e2e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -31,6 +31,7 @@ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, DWORD type ) DECLSPEC_HIDDEN; DC_ATTR *get_dc_attr( HDC hdc ) DECLSPEC_HIDDEN; +HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; void GDI_hdc_using_object( HGDIOBJ obj, HDC hdc, void (*delete)( HDC hdc, HGDIOBJ handle )) DECLSPEC_HIDDEN; void GDI_hdc_not_using_object( HGDIOBJ obj, HDC hdc ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7f1a5a9cd24..d5645595984 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1838,6 +1838,7 @@ HPALETTE WINAPI SelectPalette( HDC hdc, HPALETTE palette, BOOL force_background { DC_ATTR *dc_attr; + palette = get_full_gdi_handle( palette ); if (is_meta_dc( hdc )) return ULongToHandle( METADC_SelectPalette( hdc, palette ) ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_SelectPalette( dc_attr, palette )) return 0; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 70148cdcb77..5787231d087 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -817,24 +817,6 @@ void *free_gdi_handle( HGDIOBJ handle ) } -/*********************************************************************** - * get_full_gdi_handle - * - * Return the full GDI handle from a possibly truncated value. - */ -HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) -{ - GDI_HANDLE_ENTRY *entry; - - if (!HIWORD( handle )) - { - EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) handle = entry_to_handle( entry ); - LeaveCriticalSection( &gdi_section ); - } - return handle; -} - /*********************************************************************** * get_any_obj_ptr * diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index f4b313ba5db..f988118f29a 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -491,7 +491,7 @@ static UINT metadc_add_handle( struct metadc *metadc, HGDIOBJ obj ) metadc->handles, metadc->handles_size * sizeof(metadc->handles[0]) ); } - metadc->handles[index] = get_full_gdi_handle( obj ); + metadc->handles[index] = obj; metadc->cur_handles++; if (metadc->cur_handles > metadc->mh->mtNoObjects) diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index b8273e8a405..3f241a87dbc 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -392,7 +392,6 @@ extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) D extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN; extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 5b1145c52a2..97b0fec5ecf 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -123,6 +123,12 @@ void *get_gdi_client_ptr( HGDIOBJ obj, DWORD type ) return (void *)(UINT_PTR)entry->UserPointer; } +HGDIOBJ get_full_gdi_handle( HGDIOBJ obj ) +{ + GDI_HANDLE_ENTRY *entry = handle_entry( obj ); + return entry ? entry_to_handle( entry ) : 0; +} + /*********************************************************************** * GetObjectType (GDI32.@) */ @@ -171,6 +177,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) struct hdc_list *hdc_list = NULL; struct wine_rb_entry *entry; + obj = get_full_gdi_handle( obj ); switch (gdi_handle_type( obj )) { case NTGDI_OBJ_DC: @@ -302,6 +309,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ obj ) TRACE( "(%p,%p)\n", hdc, obj ); + obj = get_full_gdi_handle( obj ); if (is_meta_dc( hdc )) return METADC_SelectObject( hdc, obj ); if (!(dc_attr = get_dc_attr( hdc ))) return 0; if (dc_attr->emf && !EMFDC_SelectObject( dc_attr, obj )) return 0; @@ -747,6 +755,7 @@ UINT WINAPI GetPaletteEntries( HPALETTE palette, UINT start, UINT count, PALETTE UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, const PALETTEENTRY *entries ) { + palette = get_full_gdi_handle( palette ); return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiSetPaletteEntries, FALSE ); } @@ -755,6 +764,7 @@ UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, */ BOOL WINAPI AnimatePalette( HPALETTE palette, UINT start, UINT count, const PALETTEENTRY *entries ) { + palette = get_full_gdi_handle( palette ); return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiAnimatePalette, FALSE ); } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a14ba9aeb08..e48d4501c6d 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -201,7 +201,6 @@ static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count, TRACE("hpal=%p,start=%i,count=%i\n",hpalette,start,count ); - hpalette = get_full_gdi_handle( hpalette ); if (hpalette == get_stock_object(DEFAULT_PALETTE)) return 0; palPtr = GDI_GetObjPtr( hpalette, NTGDI_OBJ_PAL ); if (!palPtr) return 0; @@ -254,7 +253,6 @@ static BOOL animate_palette( HPALETTE hPal, UINT StartIndex, UINT NumEntries, { TRACE("%p (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); - hPal = get_full_gdi_handle( hPal ); if( hPal != get_stock_object(DEFAULT_PALETTE) ) { PALETTEOBJ * palPtr; @@ -520,7 +518,6 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) TRACE("%p %p\n", hdc, hpal ); - hpal = get_full_gdi_handle( hpal ); if (GetObjectType(hpal) != OBJ_PAL) { WARN("invalid selected palette %p\n",hpal);

1 0

Jacek Caban : gdi32: Move metafile defines to gdi_private.h.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 691cb12e5bf04be5547d874c3ed6a4e58b49ddcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=691cb12e5bf04be5547d874c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:28 2021 +0200 gdi32: Move metafile defines to gdi_private.h. 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/gdi_private.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 43 ------------------------------------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7ed11a17e2e..af152e10644 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -42,6 +42,35 @@ static inline DWORD gdi_handle_type( HGDIOBJ obj ) return handle & NTGDI_HANDLE_TYPE_MASK; } +/* metafile defines */ + +#define META_EOF 0x0000 + +#define METAFILE_MEMORY 1 +#define METAFILE_DISK 2 + +#define MFVERSION 0x300 + +/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ +#define DIB_PAL_MONO 2 + +/* Format of comment record added by GetWinMetaFileBits */ +#include <pshpack2.h> +typedef struct +{ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ + WORD checksum; + DWORD flags; /* Always 0 */ + DWORD num_chunks; + DWORD chunk_size; + DWORD remaining_size; + DWORD emf_size; + BYTE emf_data[1]; +} emf_in_wmf_comment; +#include <poppack.h> + static inline BOOL is_meta_dc( HDC hdc ) { return gdi_handle_type( hdc ) == NTGDI_OBJ_METADC; @@ -124,7 +153,20 @@ extern INT METADC_StretchDIBits( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; + +extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; + /* enhanced metafiles */ + +#define WMFC_MAGIC 0x43464d57 + +typedef struct +{ + EMR emr; + INT nBreakExtra; + INT nBreakCount; +} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; + 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, @@ -225,6 +267,9 @@ extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, + BOOL on_disk ) DECLSPEC_HIDDEN; + extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 3f241a87dbc..1e379649591 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -30,21 +30,6 @@ #include "ntgdi.h" #include "wine/gdi_driver.h" -/* Metafile defines */ -#define META_EOF 0x0000 -/* values of mtType in METAHEADER. Note however that the disk image of a disk - based metafile has mtType == 1 */ -#define METAFILE_MEMORY 1 -#define METAFILE_DISK 2 -#define MFHEADERSIZE (sizeof(METAHEADER)) -#define MFVERSION 0x300 - -typedef struct { - EMR emr; - INT nBreakExtra; - INT nBreakCount; -} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; - /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) @@ -237,9 +222,6 @@ extern const struct gdi_dc_funcs font_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; -/* enhmetafile.c */ -extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN; - /* font.c */ struct font_gamma_ramp @@ -410,28 +392,6 @@ extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN; extern void combine_transform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) DECLSPEC_HIDDEN; -/* metafile.c */ -extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; - -/* Format of comment record added by GetWinMetaFileBits */ -#include <pshpack2.h> -typedef struct -{ - DWORD comment_id; /* WMFC */ - DWORD comment_type; /* Always 0x00000001 */ - DWORD version; /* Always 0x00010000 */ - WORD checksum; - DWORD flags; /* Always 0 */ - DWORD num_chunks; - DWORD chunk_size; - DWORD remaining_size; - DWORD emf_size; - BYTE emf_data[1]; -} emf_in_wmf_comment; -#include <poppack.h> - -#define WMFC_MAGIC 0x43464d57 - /* driver.c */ extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; @@ -566,9 +526,6 @@ static inline DC *get_physdev_dc( PHYSDEV dev ) return get_nulldrv_dc( dev ); } -/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ -#define DIB_PAL_MONO 2 - BOOL WINAPI FontIsLinked(HDC); BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size);

1 0

Jacek Caban : gdi32: Don't use gdi_private.h and ntgdi_private.h at the same time.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 3361a2f2ba6c42b9f4849c102dbe2c38df6c477b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3361a2f2ba6c42b9f4849c10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:38 2021 +0200 gdi32: Don't use gdi_private.h and ntgdi_private.h at the same time. 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 | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/emfdc.c | 2 +- dlls/gdi32/enhmetafile.c | 4 +++- dlls/gdi32/gdi_private.h | 16 ++++++++++++++++ dlls/gdi32/metadc.c | 1 - dlls/gdi32/metafile.c | 23 ++++++++++++++++++++++- dlls/gdi32/ntgdi_private.h | 3 ++- 8 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d8eaa1093f3..4ed09e91eb1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -30,7 +30,7 @@ #include "winternl.h" #include "winerror.h" #include "ntgdi_private.h" -#include "gdi_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dc); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b504e8c1a01..f539df6d41e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -93,7 +93,7 @@ static const struct gdi_obj_funcs dib_funcs = * * Return the size of the bitmap info structure including color table. */ -int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) +static int bitmap_info_size( const BITMAPINFO *info, WORD coloruse ) { unsigned int colors, size, masks = 0; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 2e237ff26ae..df4515aee8e 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -21,9 +21,9 @@ */ #include <assert.h> +#include <stdlib.h> #include "gdi_private.h" -#include "ntgdi_private.h" #include "winnls.h" #include "wine/debug.h" diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index a3147c9b0c4..4b1ccaa9206 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -35,13 +35,15 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <math.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winnls.h" #include "winerror.h" -#include "ntgdi_private.h" #include "gdi_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index af152e10644..2dddf361d5b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -23,6 +23,7 @@ #define __WINE_GDI_PRIVATE_H #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -273,4 +274,19 @@ 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; +static inline int get_dib_stride( int width, int bpp ) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + +/* only for use on sanitized BITMAPINFO structures */ +static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) +{ + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); + if (coloruse == DIB_PAL_COLORS) + return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); +} + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index f988118f29a..6b93dab63ce 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -22,7 +22,6 @@ #include <stdarg.h> -#include "ntgdi_private.h" #include "gdi_private.h" #include "winnls.h" #include "wine/wingdi16.h" diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 07f467914cc..3a49ec6be3d 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -56,7 +56,7 @@ #include "winnls.h" #include "winternl.h" #include "gdi_private.h" -#include "ntgdi_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(metafile); @@ -110,6 +110,27 @@ HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) return handle; } +static int bitmap_info_size( const BITMAPINFO *info, WORD coloruse ) +{ + unsigned int colors, size, masks = 0; + + if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; + return sizeof(BITMAPCOREHEADER) + colors * + ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + } + else /* assume BITMAPINFOHEADER */ + { + if (info->bmiHeader.biClrUsed) colors = min( info->bmiHeader.biClrUsed, 256 ); + else colors = info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + } +} + /****************************************************************** * convert_points * diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 1e379649591..7f21608b244 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -180,7 +180,6 @@ extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ -extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) DECLSPEC_HIDDEN; extern const RGBQUAD *get_default_color_table( int bpp ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; @@ -645,6 +644,8 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; + extern HMODULE gdi32_module DECLSPEC_HIDDEN; #endif /* __WINE_NTGDI_PRIVATE_H */

1 0