[PATCH v4 1/4] gdiplus: gdip_format_string() always passes valid gdip_format_string_info->format to callbacks.

[Dmitry Timoshkov]

From: Dmitry Timoshkov <[e-mail]>

Signed-off-by: Dmitry Timoshkov <[e-mail]>
---
 dlls/gdiplus/graphics.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 2419eea94db..a9aa56bf063 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5960,16 +5960,17 @@ static GpStatus measure_string_callback(struct gdip_format_string_info *info)
     if (args->linesfilled)
         (*args->linesfilled)++;
 
-    switch (info->format ? info->format->align : StringAlignmentNear)
+    switch (info->format->align)
     {
+    case StringAlignmentNear:
+    default:
+        break;
     case StringAlignmentCenter:
         bounds->X = bounds->X + (info->rect->Width/2) - (bounds->Width/2);
         break;
     case StringAlignmentFar:
         bounds->X = bounds->X + info->rect->Width - bounds->Width;
         break;
-    default:
-        break;
     }
 
     return Ok;
-- 
GitLab


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