[PATCH 0/1] MR3407: gdiplus: Disable StringFormatFlagsLineLimit

List overview All Threads

newer

older

[PATCH v2 0/1] MR3407: gdiplus:...

[PATCH 0/1] MR3389: Use PCSC...

David Kahurani (＠kahurani)

25 Jul 2023 25 Jul '23

2:21 p.m.

Builtin gdiplus behaves as documented but tests are indicating that Windows behaviour sometimes differs from the documentation.

I believe this issue is at least one of the contributing issues to bug https://bugs.winehq.org/show_bug.cgi?id=46947, if not the sole issue. I propose that this flag be disabled until it is well understood.

Signed-off-by: David Kahurani k.kahurani@gmail.com

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3407

Show replies by date

David Kahurani

25 Jul 25 Jul

2:21 p.m.

New subject: [PATCH 1/1] gdiplus: Disable StringFormatFlagsLineLimit

From: David Kahurani k.kahurani@gmail.com

Builtin gdiplus behaves as documented but tests are indicating that Windows behaviour sometimes differs from the documentation

Signed-off-by: David Kahurani k.kahurani@gmail.com --- dlls/gdiplus/graphics.c | 5 ++- dlls/gdiplus/tests/stringformat.c | 56 +++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6dc34707bbf..54d92356bda 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5309,7 +5309,10 @@ GpStatus gdip_format_string(HDC hdc, if(height + size.cy > nheight) { if (format->attr & StringFormatFlagsLineLimit) - break; + { + FIXME("Ignoring StringFormatFlagsLineLimit \n"); + } + bounds.Height = nheight - (height + size.cy); } else diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 71fb860e474..680f8412e89 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -373,12 +373,26 @@ static void test_getgenericdefault(void) expect(Ok, stat); }

+void set_rect_empty(RectF *rect) +{ + rect->X = 0; + rect->Y = 0; + rect->Width = 0; + rect->Height = 0; +} + static void test_stringformatflags(void) { GpStringFormat *format; GpStatus stat; - - INT flags; + HDC hdc; + GpGraphics *graphics; + LOGFONTA lf; + GpFont *font; + RectF rect, bounds; + REAL height; + const WCHAR *string = L"Hello"; + INT flags, linesfilled;

stat = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, stat); @@ -430,6 +444,44 @@ static void test_stringformatflags(void) expect(Ok, stat); expect(0xdeadbeef, flags);

+ /* This test illustrates StringFormatFlagsLineLimit behaviour that goes contrary + * to the documentation + */ + hdc = CreateCompatibleDC(0); + GdipCreateFromHDC(hdc, &graphics); + memset(&lf, 0, sizeof(lf)); + + lstrcpyA(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -100; + stat = GdipCreateFontFromLogfontA(hdc, &lf, &font); + expect(Ok, stat); + stat = GdipGetFontHeight(font, graphics, &height); + stat = GdipSetStringFormatFlags(format, StringFormatFlagsLineLimit); + expect(Ok, stat); + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsLineLimit, flags); + /* Get an estimate of line height */ + set_rect_empty(&rect); + set_rect_empty(&bounds); + stat = GdipMeasureString(graphics, string, 5, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, stat); + + /* request to draw in a shallow rectangle with half the line height */ + rect.Height = bounds.Height / 2; + rect.Width = 600; + set_rect_empty(&bounds); + stat = GdipMeasureString(graphics, string, 5, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, stat); + todo_wine + expectf(rect.Height, bounds.Height); + todo_wine + expect(1, linesfilled); + + DeleteObject(hdc); + GdipDeleteGraphics(graphics); + GdipDeleteFont(font); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3407

Marvin

3:25 p.m.

New subject: [PATCH 1/1] gdiplus: Disable StringFormatFlagsLineLimit

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=135210

Your paranoid android.

=== w7u_2qxl (32 bit report) ===