Michael Stefaniuc : gdi32: Use wine_dbgstr_rect() to trace RECTs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4b7adc087adc95ab11d6f1aded70e111d5af7f04
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4b7adc087adc95ab11d6f1aded...

Author: Michael Stefaniuc 
Date:   Thu Apr 21 10:30:41 2016 +0200

gdi32: Use wine_dbgstr_rect() to trace RECTs.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/gdi32/enhmetafile.c | 11 +++++------
 dlls/gdi32/region.c      | 10 +++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 32d5e10..17ccd1f 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -1138,9 +1138,9 @@ BOOL WINAPI PlayEnhMetaFileRecord(
    rc.top = pExtTextOutA->emrtext.rcl.top;
    rc.right = pExtTextOutA->emrtext.rcl.right;
    rc.bottom = pExtTextOutA->emrtext.rcl.bottom;
-        TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n",
+        TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %s. flags %08x\n",
               pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y,
-              rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions);
+              wine_dbgstr_rect(&rc), pExtTextOutA->emrtext.fOptions);

old_mode = SetGraphicsMode(hdc, pExtTextOutA->iGraphicsMode);
         /* Reselect the font back into the dc so that the transformation
@@ -1174,9 +1174,9 @@ BOOL WINAPI PlayEnhMetaFileRecord(
    rc.top = pExtTextOutW->emrtext.rcl.top;
    rc.right = pExtTextOutW->emrtext.rcl.right;
    rc.bottom = pExtTextOutW->emrtext.rcl.bottom;
-        TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d.  rect = %d, %d - %d, %d. flags %08x\n",
+        TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d.  rect = %s. flags %08x\n",
               pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y,
-              rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions);
+              wine_dbgstr_rect(&rc), pExtTextOutW->emrtext.fOptions);

old_mode = SetGraphicsMode(hdc, pExtTextOutW->iGraphicsMode);
         /* Reselect the font back into the dc so that the transformation
@@ -2214,8 +2214,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
   tmprc.left = tmprc.top = 0;
   tmprc.right = tmprc.bottom = 1000;
   LPtoDP(hdc, (POINT*)&tmprc, 2);
-  TRACE("L:0,0 - 1000,1000 -> D:%d,%d - %d,%d\n", tmprc.left,
-	tmprc.top, tmprc.right, tmprc.bottom);
+  TRACE("L:0,0 - 1000,1000 -> D:%s\n", wine_dbgstr_rect(&tmprc));

return TRUE;
 }
diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c
index a5df6f1..47daab9 100644
--- a/dlls/gdi32/region.c
+++ b/dlls/gdi32/region.c
@@ -422,12 +422,9 @@ static void REGION_DumpRegion(WINEREGION *pReg)
 {
     RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects;

-    TRACE("Region %p: %d,%d - %d,%d %d rects\n", pReg,
-	    pReg->extents.left, pReg->extents.top,
-	    pReg->extents.right, pReg->extents.bottom, pReg->numRects);
+    TRACE("Region %p: %s %d rects\n", pReg, wine_dbgstr_rect(&pReg->extents), pReg->numRects);
     for(pRect = pReg->rects; pRect < pRectEnd; pRect++)
-        TRACE("\t%d,%d - %d,%d\n", pRect->left, pRect->top,
-		       pRect->right, pRect->bottom);
+        TRACE("\t%s\n", wine_dbgstr_rect(pRect));
     return;
 }

@@ -569,8 +566,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
    rect->top = obj->extents.top;
    rect->right = obj->extents.right;
    rect->bottom = obj->extents.bottom;
-	TRACE("%p (%d,%d-%d,%d)\n", hrgn,
-               rect->left, rect->top, rect->right, rect->bottom);
+        TRACE("%p %s\n", hrgn, wine_dbgstr_rect(rect));
    ret = get_region_type( obj );
    GDI_ReleaseObj(hrgn);
    return ret;