Re: gdi32: correct the test message in font.c that was out of sync with the test. [RESEND]

[Alexandre Julliard]

"Reece Dunn" <msclrhd(a)googlemail.com> writes:
> diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
> index 7e560d2..bfdb0af 100644
> --- a/dlls/gdi32/tests/font.c
> +++ b/dlls/gdi32/tests/font.c
> @@ -604,7 +604,7 @@ static void test_GetGlyphIndices(void)
>      flags |= GGI_MARK_NONEXISTING_GLYPHS;
>      charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags);
>      ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount);
> -    ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]);
> +    ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char or UNICODE_NOCHAR, not %04x\n", glyphs[4]);

UNICODE_NOCHAR is a nonexistent char too. And if someone really cares
about the exact details they can always look at the test, we don't need
to duplicate all of it in the error message.

-- 
Alexandre Julliard
julliard(a)winehq.org

gdi32: correct the test message in font.c that was out of sync with the test. [RESEND]

[Reece Dunn]

On 07/02/2008, Alexandre Julliard <julliard(a)winehq.org> wrote:
> "Reece Dunn" <msclrhd(a)googlemail.com> writes:
> > diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
> > index 7e560d2..bfdb0af 100644
> > --- a/dlls/gdi32/tests/font.c
> > +++ b/dlls/gdi32/tests/font.c
> > @@ -604,7 +604,7 @@ static void test_GetGlyphIndices(void)
> >      flags |= GGI_MARK_NONEXISTING_GLYPHS;
> >      charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags);
> >      ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount);
> > -    ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]);
> > +    ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char or UNICODE_NOCHAR, not %04x\n", glyphs[4]);
>
> UNICODE_NOCHAR is a nonexistent char too. And if someone really cares
> about the exact details they can always look at the test, we don't need
> to duplicate all of it in the error message.

Ok, I'll drop this patch from my list.

- Reece