[PATCH 0/1] MR3387: gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform

[David Kahurani (＠kahurani)]

These APIs should take into consideration the gdi_transform when calculating font properties

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com>

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

[PATCH 1/1] gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform

[David Kahurani]

From: David Kahurani <k.kahurani(a)gmail.com>

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com>
---
 dlls/gdiplus/font.c       |  2 +-
 dlls/gdiplus/tests/font.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 8b85f567aab..2a82a6a0bd5 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -485,7 +485,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW
     pt[1].Y = 0.0;
     pt[2].X = 0.0;
     pt[2].Y = 1.0;
-    GdipTransformMatrixPoints(&matrix, pt, 3);
+    gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3);
     angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X));
     rel_height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y)+
                       (pt[2].X - pt[0].X) * (pt[2].X - pt[0].X));
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index a2aea904bb1..30cf159e140 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -1239,6 +1239,20 @@ static void test_font_transform(void)
     todo_wine
     expectf_(1532.984985, bounds.Height, 0.05);
 
+    GdipDeleteGraphics(graphics);
+
+    SetMapMode( hdc, MM_ISOTROPIC);
+    SetWindowExtEx(hdc, 200, 200, NULL);
+    SetViewportExtEx(hdc, 100, 100, NULL);
+    status = GdipCreateFromHDC(hdc, &graphics);
+    expect(Ok, status);
+    status = GdipGetLogFontA(font, graphics, &lf);
+    expect(Ok, status);
+    expect(-50, lf.lfHeight);
+    expect(0, lf.lfWidth);
+    expect(0, lf.lfEscapement);
+    expect(0, lf.lfOrientation);
+
     GdipDeleteMatrix(matrix);
     GdipDeleteFont(font);
     GdipDeleteGraphics(graphics);
-- 
GitLab

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

[PATCH 1/1] gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform

[Marvin]

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=135124

Your paranoid android.


=== debian11 (32 bit report) ===

gdiplus:
graphics.c:3794: Test failed: 4: expected 20000 (20000.000000), got -4000000
graphics.c:3794: Test failed: 5: expected 40000 (40000.000000), got -8000000
graphics.c:3794: Test failed: 6: expected 833 (833.333313), got -6944
graphics.c:3794: Test failed: 7: expected 1667 (1666.666626), got -13889
graphics.c:3794: Test failed: 8: expected 200 (200.000000), got -400
graphics.c:3794: Test failed: 9: expected 400 (400.000000), got -800
graphics.c:3794: Test failed: 10: expected 2362 (2362.204834), got -55800
graphics.c:3794: Test failed: 11: expected 4724 (4724.409668), got -111600
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3965: Test failed: 4: expected -100, got -20000
graphics.c:3965: Test failed: 5: expected -100, got -20000
graphics.c:3965: Test failed: 6: expected -100, got -833
graphics.c:3965: Test failed: 7: expected -100, got -833
graphics.c:3965: Test failed: 8: expected -100, got -200
graphics.c:3965: Test failed: 9: expected -100, got -200
graphics.c:3965: Test failed: 10: expected -100, got -2362
graphics.c:3965: Test failed: 11: expected -100, got -2362

=== debian11b (64 bit WoW report) ===

gdiplus:
graphics.c:3794: Test failed: 4: expected 20000 (20000.000000), got -4000000
graphics.c:3794: Test failed: 5: expected 40000 (40000.000000), got -8000000
graphics.c:3794: Test failed: 6: expected 833 (833.333313), got -6944
graphics.c:3794: Test failed: 7: expected 1667 (1666.666626), got -13889
graphics.c:3794: Test failed: 8: expected 200 (200.000000), got -400
graphics.c:3794: Test failed: 9: expected 400 (400.000000), got -800
graphics.c:3794: Test failed: 10: expected 2362 (2362.204834), got -55800
graphics.c:3794: Test failed: 11: expected 4724 (4724.409668), got -111600
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 1: expected 75 (75.000000), got -150
graphics.c:3875: Test failed: 4: expected 75 (75.000000), got -15000
graphics.c:3875: Test failed: 5: expected 75 (75.000000), got -30000
graphics.c:3875: Test failed: 6: expected 225 (225.000000), got -1875
graphics.c:3875: Test failed: 7: expected 225 (225.000000), got -3750
graphics.c:3875: Test failed: 8: expected 225 (225.000000), got -450
graphics.c:3875: Test failed: 9: expected 225 (225.000000), got -900
graphics.c:3875: Test failed: 10: expected 225 (225.000000), got -5315
graphics.c:3875: Test failed: 11: expected 225 (225.000000), got -10630
graphics.c:3875: Test failed: 15: expected 75 (75.000000), got -150
graphics.c:3965: Test failed: 4: expected -100, got -20000
graphics.c:3965: Test failed: 5: expected -100, got -20000
graphics.c:3965: Test failed: 6: expected -100, got -833
graphics.c:3965: Test failed: 7: expected -100, got -833
graphics.c:3965: Test failed: 8: expected -100, got -200
graphics.c:3965: Test failed: 9: expected -100, got -200
graphics.c:3965: Test failed: 10: expected -100, got -2362
graphics.c:3965: Test failed: 11: expected -100, got -2362