ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Round the layout rectangle down instead of up in gdip_format_string().

This commit is contained in:
Dmitry Timoshkov 2012-08-20 12:07:57 +09:00 committed by Alexandre Julliard
parent 003333e6cb
commit e9aef40c26
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/gdiplus/graphics.c
View File

@ -4728,8 +4728,8 @@ GpStatus gdip_format_string(HDC hdc,
stringdup = GdipAlloc((length + 1) * sizeof(WCHAR));
if(!stringdup) return OutOfMemory;
nwidth = roundr(rect->Width);
nheight = roundr(rect->Height);
nwidth = rect->Width;
nheight = rect->Height;
if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX;
if (rect->Height >= INT_MAX || rect->Height < 0.5) nheight = INT_MAX;

4
dlls/gdiplus/tests/graphics.c
View File

@ -3865,10 +3865,8 @@ todo_wine
set_rect_empty(&bounds);
status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines);
expect(Ok, status);
todo_wine
expect(2, glyphs);
expect(1, lines);
todo_wine
expectf_(width_2, bounds.Width, 0.01);
expectf(height, bounds.Height);
@ -3878,10 +3876,8 @@ todo_wine
set_rect_empty(&bounds);
status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines);
expect(Ok, status);
todo_wine
expect(1, glyphs);
expect(1, lines);
todo_wine
expectf_(width_1, bounds.Width, 0.01);
expectf(height, bounds.Height);