April 2012 - Wine-commits - list.winehq.org

André Hentschel : Wine 1.5.3 freigegeben (try 2)
by Jeremy Newman 30 Apr '12

30 Apr '12

Module: website Branch: master Commit: 64b095566a4e0b3615b4bccdb0dd4e8d82afc644 URL: http://source.winehq.org/git/website.git/?a=commit;h=64b095566a4e0b3615b4bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 27 21:11:51 2012 +0200 Wine 1.5.3 freigegeben (try 2) --- news/de/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012042701.xml b/news/de/2012042701.xml new file mode 100644 index 0000000..38857bf --- /dev/null +++ b/news/de/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>27. April 2012</date> +<title>Wine 1.5.3 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung zur Verfolgung der Grenzen des Grafikzeichenbereichs.</li> + <li>Einige Fehlerbehebungen am eigenen Internet Explorer.</li> + <li>Unterstützung für das Anzeigen von ARM Code im Wine Debugger.</li> + <li>Verschiedene DirectMusic Verbesserungen.</li> + <li>Bessere Namensraum Unterstützung in MSXML.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Lucas Fialho Zawacki : Add Portuguese translation for release 1.5.3
by Jeremy Newman 30 Apr '12

30 Apr '12

Module: website Branch: master Commit: 1113c8d75abbacf26ac7275fe2c5e092a79d59e2 URL: http://source.winehq.org/git/website.git/?a=commit;h=1113c8d75abbacf26ac727… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Apr 27 17:25:59 2012 -0300 Add Portuguese translation for release 1.5.3 --- news/pt/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012042701.xml b/news/pt/2012042701.xml new file mode 100644 index 0000000..d9a2e4f --- /dev/null +++ b/news/pt/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>27 de Abril de 2012</date> +<title>Wine 1.5.3 Lançado</title> +<body> + A versão de desenvolvimento 1.5.3 já está disponível. + <a href="{$root}/announce/1.5.3">Novidades</a> desta versão: +<ul> + <li>Suporte a rastreamento de limites gráficos.</li> + <li>Diversas correções ao Internet Explorer padrão do Wine.</li> + <li>Suporte a visualização de código ARM no debugger do Wine.</li> + <li>Diversas melhorias no DirectMusic.</li> + <li>Maior suporte a namespaces no MSXML.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2"> disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news> \ No newline at end of file

1 0

Eduardo García : Spanish translation for release 1.5.3
by Jeremy Newman 30 Apr '12

30 Apr '12

Module: website Branch: master Commit: 7a25ef63205d4b33649759a0714d6ab23d6a209c URL: http://source.winehq.org/git/website.git/?a=commit;h=7a25ef63205d4b33649759… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat Apr 28 14:03:51 2012 +0200 Spanish translation for release 1.5.3 With regards. Eduardo >From 2843bc385ee522809235ddc969961153578f434a Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 28 Apr 2012 13:55:34 +0200 Subject: Spanish translation for release 1.5.3 --- news/es/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/es/2012042701.xml b/news/es/2012042701.xml new file mode 100644 index 0000000..8ac0cc9 --- /dev/null +++ b/news/es/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>Abril 27, 2012</date> +<title>Wine 1.5.3 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.3 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.3">Novedades</a> en esta versión: +<ul> + <li>Soporte para la monitorización de límites de gráficos.</li> + <li>Varias correcciones en el Internet Explorer integrado.</li> + <li>Soporte para visualizar código ARM en el depurador de código de Wine.</li> + <li>Varias mejoras para DirectMusic.</li> + <li>Soporte mejorado para espacios de nombres en MSXML.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.3
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: website Branch: master Commit: cb468fbe118af6913881c09770417cbe07b93f71 URL: http://source.winehq.org/git/website.git/?a=commit;h=cb468fbe118af6913881c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 19:58:52 2012 +0200 Wine release 1.5.3 --- news/en/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012042701.xml b/news/en/2012042701.xml new file mode 100644 index 0000000..7d759a1 --- /dev/null +++ b/news/en/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>April 27, 2012</date> +<title>Wine 1.5.3 Released</title> +<body> + The Wine development release 1.5.3 is now available. + <a href="{$root}/announce/1.5.3">What's new</a> in this release: +<ul> + <li>Support for graphics bounds tracking.</li> + <li>A number of fixes to the builtin Internet Explorer.</li> + <li>Support for displaying ARM code in the Wine debugger.</li> + <li>Various DirectMusic improvements.</li> + <li>Better namespace support in MSXML.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.3.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 016afa041b86b48c5f6c65f78498b56dd946db33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016afa041b86b48c5f6c65f78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 19:48:58 2012 +0200 Release 1.5.3. --- ANNOUNCE | 898 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 448 insertions(+), 470 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=016afa041b86b48c5f6c6…

1 0

Tag wine-1.5.3 : Alexandre Julliard : Release 1.5.3
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: refs/tags/wine-1.5.3 Tag: 66bd8933e1f12d3f97871b04eadbd99e2f872f5a URL: http://source.winehq.org/git/wine.git/?a=tag;h=66bd8933e1f12d3f97871b04eadb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 19:48:58 2012 +0200 Release 1.5.3

1 0

Jacek Caban : jscript: Use stack_push_int in interp_bneg.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 424b63119c06796b75f60653c9850d97bf3951a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424b63119c06796b75f60653c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 10:49:26 2012 +0200 jscript: Use stack_push_int in interp_bneg. --- dlls/jscript/engine.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 35339c8..e15ef52 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2268,7 +2268,7 @@ static HRESULT interp_gteq(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.8 */ static HRESULT interp_bneg(exec_ctx_t *ctx) { - VARIANT *v, r; + VARIANT *v; INT i; HRESULT hres; @@ -2280,9 +2280,7 @@ static HRESULT interp_bneg(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - V_VT(&r) = VT_I4; - V_I4(&r) = ~i; - return stack_push(ctx, &r); + return stack_push_int(ctx, ~i); } /* ECMA-262 3rd Edition 11.4.9 */

1 0

Jacek Caban : jscript: Removed unused do_*_tag_format arguments.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 30acd235dd509fcbbf97c254a29a6dd67d31de01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30acd235dd509fcbbf97c254a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 10:49:36 2012 +0200 jscript: Removed unused do_*_tag_format arguments. --- dlls/jscript/string.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e8b279c..b629d57 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -158,8 +158,8 @@ static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI return stringobj_to_string(jsthis, retv); } -static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, const WCHAR *tagname) +static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, VARIANT *retv, + jsexcept_t *ei, const WCHAR *tagname) { const WCHAR *str; DWORD length; @@ -189,9 +189,8 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } -static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, - const WCHAR *tagname, const WCHAR *attr) +static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, DISPPARAMS *dp, VARIANT *retv, + jsexcept_t *ei, const WCHAR *tagname, const WCHAR *attr) { static const WCHAR tagfmtW[] = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; @@ -262,28 +261,28 @@ static HRESULT String_anchor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS static const WCHAR fontW[] = {'A',0}; static const WCHAR colorW[] = {'N','A','M','E',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } static HRESULT String_big(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR bigtagW[] = {'B','I','G',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, bigtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, bigtagW); } static HRESULT String_blink(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR blinktagW[] = {'B','L','I','N','K',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, blinktagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, blinktagW); } static HRESULT String_bold(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR boldtagW[] = {'B',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, boldtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, boldtagW); } /* ECMA-262 3rd Edition 15.5.4.5 */ @@ -442,7 +441,7 @@ static HRESULT String_fixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP VARIANT *retv, jsexcept_t *ei) { static const WCHAR fixedtagW[] = {'T','T',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, fixedtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, fixedtagW); } static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -451,7 +450,7 @@ static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static const WCHAR fontW[] = {'F','O','N','T',0}; static const WCHAR colorW[] = {'C','O','L','O','R',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -460,7 +459,7 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D static const WCHAR fontW[] = {'F','O','N','T',0}; static const WCHAR colorW[] = {'S','I','Z','E',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -533,7 +532,7 @@ static HRESULT String_italics(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI VARIANT *retv, jsexcept_t *ei) { static const WCHAR italicstagW[] = {'I',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, italicstagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, italicstagW); } /* ECMA-262 3rd Edition 15.5.4.8 */ @@ -614,7 +613,7 @@ static HRESULT String_link(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPP static const WCHAR fontW[] = {'A',0}; static const WCHAR colorW[] = {'H','R','E','F',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } /* ECMA-262 3rd Edition 15.5.4.10 */ @@ -1153,7 +1152,7 @@ static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP VARIANT *retv, jsexcept_t *ei) { static const WCHAR smalltagW[] = {'S','M','A','L','L',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, smalltagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, smalltagW); } static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -1285,14 +1284,14 @@ static HRESULT String_strike(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS VARIANT *retv, jsexcept_t *ei) { static const WCHAR striketagW[] = {'S','T','R','I','K','E',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, striketagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, striketagW); } static HRESULT String_sub(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR subtagW[] = {'S','U','B',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, subtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, subtagW); } /* ECMA-262 3rd Edition 15.5.4.15 */ @@ -1439,7 +1438,7 @@ static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA VARIANT *retv, jsexcept_t *ei) { static const WCHAR suptagW[] = {'S','U','P',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, suptagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, suptagW); } static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

1 0

Alexandre Julliard : gdi32: Add a SetBoundsRect driver entry point.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 3009e03df7eb31c1b23b12d3e0de9cb36884e9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3009e03df7eb31c1b23b12d3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 12:26:44 2012 +0200 gdi32: Add a SetBoundsRect driver entry point. --- dlls/gdi32/dc.c | 36 ++++++++++++++++-------------------- dlls/gdi32/dibdrv/dc.c | 13 +++++++++++++ dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/mfdrv/init.c | 10 ++++++++++ dlls/gdi32/tests/dc.c | 5 ++++- dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 14 ++++++++++++++ dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 10 files changed, 68 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3009e03df7eb31c1b23b1…

1 0

Alexandre Julliard : gdi32: Store the bounds rectangle as a pointer in the DIB driver.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 3ea711dd7ce7c56b5d6294241d2c41be16c3a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea711dd7ce7c56b5d6294241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 13:15:24 2012 +0200 gdi32: Store the bounds rectangle as a pointer in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 10 +++++----- dlls/gdi32/dibdrv/dc.c | 33 +++++++++++---------------------- dlls/gdi32/dibdrv/dibdrv.h | 4 ++-- dlls/gdi32/dibdrv/graphics.c | 15 ++++++++------- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 2d088c3..e35c4cb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -964,7 +964,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info clip = tmp_rgn; } else if (!clip) clip = pdev->clip; - add_clipped_bounds( &pdev->bounds, &dst->visrect, clip ); + add_clipped_bounds( pdev, &dst->visrect, clip ); } if (!get_clipped_rects( dib, &dst->visrect, clip, &clipped_rects )) @@ -1021,7 +1021,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); src_dib.bits.is_copy = bits->is_copy; - add_clipped_bounds( &pdev->bounds, &dst->visrect, pdev->clip ); + add_clipped_bounds( pdev, &dst->visrect, pdev->clip ); return blend_rect( &pdev->dib, &dst->visrect, &src_dib, &src->visrect, pdev->clip, blend ); update_format: @@ -1407,7 +1407,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; @@ -1419,7 +1419,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; @@ -1431,7 +1431,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = vert[2].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds )) ret = FALSE; } break; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b861f79..00d6c01 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -298,19 +298,22 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl return clip_rects->count; } -void add_clipped_bounds( RECT *bounds, const RECT *rect, HRGN clip ) +void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) { const WINEREGION *region; RECT rc; + if (!dev->bounds) return; if (clip) { if (!(region = get_wine_region( clip ))) return; - if (!rect) add_bounds_rect( bounds, &region->extents ); - else if (intersect_rect( &rc, rect, &region->extents )) add_bounds_rect( bounds, &rc ); + if (!rect) rc = region->extents; + else intersect_rect( &rc, rect, &region->extents ); release_wine_region( clip ); } - else if (rect) add_bounds_rect( bounds, rect ); + else rc = *rect; + + add_bounds_rect( dev->bounds, &rc ); } /********************************************************************** @@ -325,7 +328,6 @@ static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, clear_dib_info(&pdev->dib); clear_dib_info(&pdev->brush.dib); clear_dib_info(&pdev->pen_brush.dib); - reset_bounds( &pdev->bounds ); push_dc_driver( dev, &pdev->dev, &dib_driver ); return TRUE; } @@ -395,28 +397,15 @@ static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** - * dibdrv_GetBoundsRect - */ -static UINT dibdrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) -{ - dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - - if (is_rect_empty( &pdev->bounds )) return DCB_RESET; - if (rect) *rect = pdev->bounds; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; -} - -/*********************************************************************** * dibdrv_SetBoundsRect */ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - if (is_rect_empty( &pdev->bounds )) return DCB_RESET; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; + if (flags & DCB_DISABLE) pdev->bounds = NULL; + else if (flags & DCB_ENABLE) pdev->bounds = rect; + return DCB_RESET; /* we don't have device-specific bounds */ } /*********************************************************************** @@ -640,7 +629,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ - dibdrv_GetBoundsRect, /* pGetBoundsRect */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7efb882..9431ff0 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -96,7 +96,7 @@ typedef struct dibdrv_physdev dib_brush brush; HRGN clip; - RECT bounds; + RECT *bounds; /* pen */ DWORD pen_style, pen_endcap, pen_join; @@ -247,7 +247,7 @@ extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; -extern void add_clipped_bounds( RECT *bounds, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; +extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e904efd..ddf6205 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -92,6 +92,7 @@ static void add_pen_lines_bounds( dibdrv_physdev *dev, int count, const POINT *p RECT bounds, rect; int width = 0; + if (!dev->bounds) return; reset_bounds( &bounds ); if (dev->pen_uses_region) @@ -127,7 +128,7 @@ static void add_pen_lines_bounds( dibdrv_physdev *dev, int count, const POINT *p points++; } - add_clipped_bounds( &dev->bounds, &bounds, dev->clip ); + add_clipped_bounds( dev, &bounds, dev->clip ); } /* compute the points for the first quadrant of an ellipse, counterclockwise from the x axis */ @@ -703,7 +704,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, origin.y += metrics.gmCellIncY; } } - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); done: free_clipped_rects( &clipped_rects ); @@ -805,7 +806,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; - rgn = CreateRectRgn( 0, 0, 0, 0 ); + if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; row.left = x; row.right = x + 1; row.top = y; @@ -813,7 +814,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) fill_row( &pdev->dib, pdev->clip, &row, pixel, type, rgn ); - add_clipped_bounds( &pdev->bounds, NULL, rgn ); + add_clipped_bounds( pdev, NULL, rgn ); brush_region( pdev, rgn ); DeleteObject( rgn ); @@ -908,7 +909,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - add_bounds_rect( &pdev->bounds, &dst->visrect ); + add_clipped_bounds( pdev, &dst->visrect, 0 ); return brush_rect( pdev, &pdev->brush, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); } @@ -938,7 +939,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } release_wine_region( rgn ); - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); return TRUE; } @@ -1277,7 +1278,7 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) rect.top = pt.y; rect.right = rect.left + 1; rect.bottom = rect.top + 1; - add_clipped_bounds( &pdev->bounds, &rect, pdev->clip ); + add_clipped_bounds( pdev, &rect, pdev->clip ); /* SetPixel doesn't do the 1bpp massaging like other fg colors */ pixel = get_pixel_color( pdev, color, FALSE );

1 0