[PATCH v3] gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.

[Huw Davies]

On Fri, Sep 25, 2020 at 04:25:13PM +0300, Arkadiusz Hiler wrote:
> Turns out GetGlyphOutlineW() is using only two bytes for the character,
> the rest is discarded.

s/Turns out//
and potenitally just remove the whole sentence.


> --- a/dlls/gdi32/tests/font.c
> +++ b/dlls/gdi32/tests/font.c
> @@ -5823,6 +5823,56 @@ todo_wine
>      ReleaseDC(NULL, hdc);
>  }
>  
> +static void test_GetGlyphOutline_character(void)
> +{
> +    HFONT hfont, hfont_old;
> +    LOGFONTA lf;
> +    HDC hdc;
> +    DWORD ret;
> +    GLYPHMETRICS gm1, gm2, gmn;
> +    char test_chars[] = { 'A', 'D', '!', '\0' };
> +
> +    memset(&lf, 0, sizeof(lf));
> +    lf.lfHeight = 72;
> +    lstrcpyA(lf.lfFaceName, "wine_test");
> +
> +    hfont = CreateFontIndirectA(&lf);
> +    ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError());
> +
> +    hdc = GetDC(NULL);
> +
> +    hfont_old = SelectObject(hdc, hfont);
> +    ok(hfont_old != NULL, "SelectObject failed\n");
> +
> +    ret = GetGlyphOutlineW(hdc, 'Z', GGO_METRICS, &gmn, 0, NULL, &mat);
> +    ok(ret != GDI_ERROR, "GetGlyphOutlineW failed to default to .notdef for character 'Z'\n");
> +
> +    for (char *current_char = test_chars; *current_char != '\0'; current_char++)

To be compatible with older C compilers define the variable at the beginning of scope.

> +    {
> +        ret = GetGlyphOutlineW(hdc, *current_char, GGO_METRICS, &gm1, 0, NULL, &mat);
> +        ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for '%c'\n", *current_char);
> +        ok(memcmp(&gm1, &gmn, sizeof(gmn)) != 0, "the test character '%c' matches .notdef\n", *current_char);
> +
> +        ret = GetGlyphOutlineW(hdc, 0x10000 + *current_char, GGO_METRICS, &gm2, 0, NULL, &mat);
> +        ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for 0x10000 + '%c'\n", *current_char);
> +        ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics, expected character 0x10000 + '%c' to match character '%c'\n", *current_char, *current_char);

This line is too long mainly because the message it too wordy.  Something like
"GetGlyphOutlineW returned wrong metrics for character 0x10000 + '%c'\n"
is more than enough.

> +    }
> +
> +    ret = GetGlyphOutlineW(hdc, 0x3, GGO_METRICS|GGO_GLYPH_INDEX, &gm1, 0, NULL, &mat);
> +    ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n");
> +
> +    ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat);
> +    ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n");
> +
> +    ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm1, 0, NULL, &mat);

This should be fetching into gm2 not gm1.

> +    ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n");
> +    ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics, expected glyph 0x10003 to match glyph 0x3\n");

This line is also rather long / wordy.

Huw.