[PATCH 0/1] MR3093: gdiplus: Allow NULL format in GdipAddPathString

[David Kahurani (＠kahurani)]

GdipAddPathString accepts NULL for format and presumably uses
the default format for formating

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

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

[PATCH 1/1] gdiplus: Allow NULL format in GdipAddPathString

[David Kahurani]

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

GdipAddPathString accepts NULL for format and presumably uses
the default format for formating

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com>
---
 dlls/gdiplus/graphicspath.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 656069d7ffe..5f34b37ddd8 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -999,9 +999,12 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT
     TEXTMETRICW textmetric;
 
     TRACE("(%p, %s, %d, %p, %d, %f, %p, %p)\n", path, debugstr_w(string), length, family, style, emSize, layoutRect, format);
-    if (!path || !string || !family || !emSize || !layoutRect || !format)
+    if (!path || !string || !family || !emSize || !layoutRect)
         return InvalidParameter;
 
+    if (!format)
+        format = &default_drawstring_format;
+
     status = GdipGetEmHeight(family, style, &native_height);
     if (status != Ok)
         return status;
-- 
GitLab

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

[PATCH 0/1] MR3093: gdiplus: Allow NULL format in GdipAddPathString - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3093