[PATCH 0/1] MR4542: winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified.

[Piotr Caban (＠piotr)]

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

[PATCH 1/1] winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 tools/winedump/emf.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c
index 42b1f9469af..253e7c658c2 100644
--- a/tools/winedump/emf.c
+++ b/tools/winedump/emf.c
@@ -384,6 +384,7 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset)
     {
         const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW));
         const int *dx = (const int *)((const BYTE *)etoW + etoW->emrtext.offDx);
+        int dx_size;
 
         printf("%s%-20s %08x\n", pfx, "EMR_EXTTEXTOUTW", length);
         printf("%sbounds (%s) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%s) flags %#x, %s\n",
@@ -392,10 +393,13 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset)
                debugstr_rect( &etoW->emrtext.rcl ), (UINT)etoW->emrtext.fOptions,
                debugstr_wn((LPCWSTR)((const BYTE *)etoW + etoW->emrtext.offString), etoW->emrtext.nChars));
         printf("%sdx_offset %u {", pfx, (UINT)etoW->emrtext.offDx);
-        for (i = 0; i < etoW->emrtext.nChars; ++i)
+        dx_size = etoW->emrtext.nChars;
+        if (etoW->emrtext.fOptions & ETO_PDY)
+            dx_size *= 2;
+        for (i = 0; i < dx_size; ++i)
         {
             printf("%d", dx[i]);
-            if (i != etoW->emrtext.nChars - 1)
+            if (i != dx_size - 1)
                 putchar(',');
         }
         printf("}\n");
-- 
GitLab

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

[PATCH 1/1] winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified.

[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=140499

Your paranoid android.


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

Report validation errors:
kernel32:console crashed (c0000005)