marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Handle 0 count in GetCharacterPlacementW. 

Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Sven Baars 2020-02-17 16:28:52 +01:00 committed by Alexandre Julliard
parent 7ef3d8015a
commit 3c49e3e4c7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/font.c
View File

@ -3313,6 +3313,9 @@ GetCharacterPlacementW(
TRACE("%s, %d, %d, 0x%08x\n",
debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags);
if (!uCount)
return 0;
if (!lpResults)
return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0;

4
dlls/gdi32/tests/font.c
View File

@ -4951,9 +4951,9 @@ static void test_GetCharacterPlacement(void)
result.nGlyphs = 20;
size2 = GetCharacterPlacementA(hdc, "Wine Test", 0, 0, &result, 0);
ok(!size2, "Expected GetCharacterPlacementA to fail\n");
todo_wine ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs);
ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs);
ok(glyphs[0] == '!', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1));
todo_wine ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]);
ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]);
size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0);
ok(size2, "GetCharacterPlacementA failed!\n");