[PATCH 1/2] gdi32: Simplify font table name tracing

Nikolay Sivov nsivov at codeweavers.com
Sun Aug 14 15:52:15 CDT 2016


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/gdi32/freetype.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 2e3b29a..d989b67 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4709,10 +4709,8 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf
     err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len);
     if (err)
     {
-        TRACE("Can't find table %c%c%c%c\n",
-              /* bytes were reversed */
-              HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)),
-              HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table)));
+        table = RtlUlongByteSwap( table );
+        TRACE("Can't find table %s\n", debugstr_an((char*)&table, 4));
 	return GDI_ERROR;
     }
     return len;
@@ -8281,9 +8279,8 @@ static DWORD freetype_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOI
         return dev->funcs->pGetFontData( dev, table, offset, buf, cbData );
     }
 
-    TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n",
-          physdev->font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)),
-          LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData);
+    TRACE("font=%p, table=%s, offset=0x%x, buf=%p, cbData=0x%x\n",
+          physdev->font, debugstr_an((char*)&table, 4), offset, buf, cbData);
 
     return get_font_data( physdev->font, table, offset, buf, cbData );
 }
-- 
2.8.1




More information about the wine-patches mailing list