[PATCH 0/1] MR9379: gdi32: Ignore provided glyph position if ExtTextOutW() needs complex text processing.

[Nikolay Sivov (＠nsivov)]

On Windows playing back a metafile with Arabic text does not use provided
positions for individual glyphs, but instead shapes it properly.
This change should not affect anything that does not require complex processing.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

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

[PATCH 1/1] gdi32: Ignore provided glyph position if ExtTextOutW() needs complex text processing.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

On Windows playing back a metafile with Arabic text does not use provided
positions for individual glyphs, but instead shapes it properly.
This change should not affect anything that does not require complex processing.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/gdi32/text.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c
index c3a704bbfea..b0a3e98f588 100644
--- a/dlls/gdi32/text.c
+++ b/dlls/gdi32/text.c
@@ -439,7 +439,7 @@ static BOOL BIDI_Reorder( HDC hDC,               /* [in] Display DC */
                 for (i = 0; i < uCount; i++)
                     lpOrder[i] = i;
             }
-            return TRUE;
+            return FALSE;
         }
     }
 
@@ -975,8 +975,11 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect,
         bidi_flags = (dc_attr->text_align & TA_RTLREADING) || (flags & ETO_RTLREADING)
             ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR;
 
-        BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL,
-                      &glyphs, &glyphs_count, NULL );
+        if (BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL,
+                      &glyphs, &glyphs_count, NULL ))
+        {
+            dx = NULL;
+        }
 
         flags |= ETO_IGNORELANGUAGE;
         if (glyphs)
-- 
GitLab

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

[PATCH 0/1] MR9379: gdi32: Ignore provided glyph position if ExtTextOutW() needs complex text processing. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9379