commit a465c95fd17aafcbf98ea20a2517a049f9d8b31f
author Dmitry Timoshkov <dmitry@codeweavers.com> Thu May 13 19:41:10 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 13 19:41:10 2004 +0000
tree 861f88801b9feeeef2ff361735ee95af2e32e05a
parent c5da9b2f3bca03868163f4f8e7bd7e8573ff20d2

Accept EMR_EXTTEXTOUT records with emrtext.offDx set to 0.

objects/enhmetafile.c

diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index e89473b..efe6b0c 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -1000,15 +1000,27 @@
     {
 	PEMREXTTEXTOUTA pExtTextOutA = (PEMREXTTEXTOUTA)mr;
 	RECT rc;
+        INT *dx = NULL;
 
 	rc.left = pExtTextOutA->emrtext.rcl.left;
 	rc.top = pExtTextOutA->emrtext.rcl.top;
 	rc.right = pExtTextOutA->emrtext.rcl.right;
 	rc.bottom = pExtTextOutA->emrtext.rcl.bottom;
+        TRACE("EMR_EXTTEXTOUTA: x,y = %ld, %ld. rect = %ld, %ld - %ld, %ld. flags %08lx\n",
+              pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y,
+              rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions);
+
+        /* Linux version of pstoedit produces EMFs with offDx set to 0.
+         * These files can be enumerated and played under Win98 just
+         * fine, but at least Win2k chokes on them.
+         */
+        if (pExtTextOutA->emrtext.offDx)
+            dx = (INT *)((BYTE *)mr + pExtTextOutA->emrtext.offDx);
+
 	ExtTextOutA(hdc, pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y,
 	    pExtTextOutA->emrtext.fOptions, &rc,
 	    (LPSTR)((BYTE *)mr + pExtTextOutA->emrtext.offString), pExtTextOutA->emrtext.nChars,
-	    (INT *)((BYTE *)mr + pExtTextOutA->emrtext.offDx));
+	    dx);
 	break;
     }
 
@@ -1016,6 +1028,7 @@
     {
 	PEMREXTTEXTOUTW pExtTextOutW = (PEMREXTTEXTOUTW)mr;
 	RECT rc;
+        INT *dx = NULL;
 
 	rc.left = pExtTextOutW->emrtext.rcl.left;
 	rc.top = pExtTextOutW->emrtext.rcl.top;
@@ -1025,10 +1038,17 @@
               pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y,
               rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions);
 
+        /* Linux version of pstoedit produces EMFs with offDx set to 0.
+         * These files can be enumerated and played under Win98 just
+         * fine, but at least Win2k chokes on them.
+         */
+        if (pExtTextOutW->emrtext.offDx)
+            dx = (INT *)((BYTE *)mr + pExtTextOutW->emrtext.offDx);
+
 	ExtTextOutW(hdc, pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y,
 	    pExtTextOutW->emrtext.fOptions, &rc,
 	    (LPWSTR)((BYTE *)mr + pExtTextOutW->emrtext.offString), pExtTextOutW->emrtext.nChars,
-	    (INT *)((BYTE *)mr + pExtTextOutW->emrtext.offDx));
+	    dx);
 	break;
     }