Re: gdi32: Revert an unrelated part of 028617b90ba586bdb30723c700eea888c159ada7.

[Byeongsik Jeon]

Yes!!! See the  http://bugs.winehq.org/show_bug.cgi?id=17218

http://www.winehq.org/pipermail/wine-patches/2009-February/068752.html

http://www.winehq.org/pipermail/wine-patches/2009-February/068753.html

2009-02-27 (Fri), 17:57 +0800, Dmitry Timoshkov wrote:
> It was not a very nice idea to break bitmap fonts which request a custom
> width (therefore a transformation) in a patch that pretended to do something
> unrelated.
>
> dlls/gdi32/freetype.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
> index 6ca35c3..54bb999 100644
> --- a/dlls/gdi32/freetype.c
> +++ b/dlls/gdi32/freetype.c
> @@ -4606,9 +4606,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
>      }
>  if(ft_face->glyph->format != ft_glyph_format_outline &&
> -
>   (needsTransform || format == GGO_NATIVE || format == GGO_BEZIER ||
> -
>                      format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
> -
>                      format == GGO_GRAY8_BITMAP))
> -
>   (format == GGO_NATIVE || format == GGO_BEZIER ||
> -
>    format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
> -
>    format == GGO_GRAY8_BITMAP))
> {
>        TRACE("loaded a bitmap\n");
>        LeaveCriticalSection( &freetype_cs );

gdi32: Revert an unrelated part of 028617b90ba586bdb30723c700eea888c159ada7.

[Byeongsik Jeon]

And, my patch [1/2] is wrong. Dmitry's patch is right.

Additionally, my patch [2/2] has to committed. Because of the other
problem. It's also my mistake.
http://bugs.winehq.org/show_bug.cgi?id=17218#c18

2009-02-27 (Fri), 21:50 +0900, Byeongsik Jeon wrote:
> Yes!!! See the  http://bugs.winehq.org/show_bug.cgi?id=17218
>
> http://www.winehq.org/pipermail/wine-patches/2009-February/068752.html
>
> http://www.winehq.org/pipermail/wine-patches/2009-February/068753.html
>
> 2009-02-27 (Fri), 17:57 +0800, Dmitry Timoshkov wrote:
> > It was not a very nice idea to break bitmap fonts which request a custom
> > width (therefore a transformation) in a patch that pretended to do something
> > unrelated.
> >
> > dlls/gdi32/freetype.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
> > index 6ca35c3..54bb999 100644
> > --- a/dlls/gdi32/freetype.c
> > +++ b/dlls/gdi32/freetype.c
> > @@ -4606,9 +4606,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
> >      }
> >  if(ft_face->glyph->format != ft_glyph_format_outline &&
> > -
> >   (needsTransform || format == GGO_NATIVE || format == GGO_BEZIER ||
> > -
> >                      format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
> > -
> >                      format == GGO_GRAY8_BITMAP))
> > -
> >   (format == GGO_NATIVE || format == GGO_BEZIER ||
> > -
> >    format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
> > -
> >    format == GGO_GRAY8_BITMAP))
> > {
> >        TRACE("loaded a bitmap\n");
> >        LeaveCriticalSection( &freetype_cs );