[PATCH v2 0/1] MR3163: gdiplus: Remove unused argument in get_font_hfont

[David Kahurani (＠kahurani)]

StringFormat argument to get_font_hfont is unused and looks largely irrelevant to the font.

Signed-off-by: David Kahurani

--
  v2: gdiplus: Remove unused argument in get_font_hfont

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

[PATCH v2 1/1] gdiplus: Remove unused argument in get_font_hfont

[David Kahurani]

From: David Kahurani

Signed-off-by: David Kahurani 
---
 dlls/gdiplus/graphics.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 835c2889bd1..8e57bf11d33 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2299,8 +2299,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf)
 }

static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font,
-                           GDIPCONST GpStringFormat *format, HFONT *hfont,
-                           LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix)
+                           HFONT *hfont, LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix)
 {
     HDC hdc = CreateCompatibleDC(0);
     GpPointF pt[3];
@@ -5474,7 +5473,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
     if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23;
     if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23;

-    get_font_hfont(graphics, font, stringFormat, &gdifont, NULL, NULL);
+    get_font_hfont(graphics, font, &gdifont, NULL, NULL);
     oldfont = SelectObject(hdc, gdifont);

for (i=0; i<stringFormat->range_count; i++)
@@ -5608,7 +5607,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
     if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23;
     if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23;

-    get_font_hfont(graphics, font, format, &gdifont, NULL, NULL);
+    get_font_hfont(graphics, font, &gdifont, NULL, NULL);
     oldfont = SelectObject(hdc, gdifont);

set_rect(bounds, rect->X, rect->Y, 0.0f, 0.0f);
@@ -5792,7 +5791,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
         SelectClipRgn(hdc, rgn);
     }

-    get_font_hfont(graphics, font, format, &gdifont, NULL, NULL);
+    get_font_hfont(graphics, font, &gdifont, NULL, NULL);
     SelectObject(hdc, gdifont);

args.graphics = graphics;
@@ -7119,7 +7118,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT
     if (flags & unsupported_flags)
         FIXME("Ignoring flags %x\n", flags & unsupported_flags);

-    get_font_hfont(graphics, font, NULL, &hfont, NULL, matrix);
+    get_font_hfont(graphics, font, &hfont, NULL, matrix);

hdc = CreateCompatibleDC(0);
     SelectObject(hdc, hfont);
@@ -7243,7 +7242,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1
     pt = positions[0];
     gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &pt, 1);

-    get_font_hfont(graphics, font, format, &hfont, &lfw, matrix);
+    get_font_hfont(graphics, font, &hfont, &lfw, matrix);

if (!(flags & DriverStringOptionsRealizedAdvance) && length > 1)
     {
@@ -7347,7 +7346,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI
         heap_free(real_positions);
     }

-    get_font_hfont(graphics, font, format, &hfont, NULL, matrix);
+    get_font_hfont(graphics, font, &hfont, NULL, matrix);

hdc = CreateCompatibleDC(0);
     SelectObject(hdc, hfont);

[Akihiro Sagawa (＠sgwaki)]

Although I'm not the author of the code, I think the argument is useful for creating a vertical font when `StringFormatFlagsDirectionVertical` is specified in the format. I can't take the time to implement it right now, but why not leave the argument for that purpose?

[David Kahurani (＠kahurani)]

You are right. I will close this.

[PATCH v2 0/1] MR3163: gdiplus: Remove unused argument in get_font_hfont - closed

[David Kahurani (＠kahurani)]

This merge request was closed by David Kahurani.