Francois Gouget : Tweak TRACE()s to simplify '\n' checks.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Fri Oct  6 13:01:06 2006 +0200

Tweak TRACE()s to simplify '\n' checks.

---

dlls/oleaut32/variant.c |    6 +++---
 dlls/usp10/usp10.c      |    5 +++--
 dlls/wintab32/context.c |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index c8044a9..3d1e67c 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2084,9 +2084,9 @@ HRESULT WINAPI VarNumFromParseNum(NUMPAR
     multiplier10 = pNumprs->nPwr10;
   }

-  TRACE("cDig %d; nPwr10 %d, whole %d, frac %d ", pNumprs->cDig,
-        pNumprs->nPwr10, wholeNumberDigits, fractionalDigits);
-  TRACE("mult %d; div %d\n", multiplier10, divisor10);
+  TRACE("cDig %d; nPwr10 %d, whole %d, frac %d mult %d; div %d\n",
+        pNumprs->cDig, pNumprs->nPwr10, wholeNumberDigits, fractionalDigits,
+        multiplier10, divisor10);

if (dwVtBits & (INTEGER_VTBITS|VTBIT_DECIMAL) &&
       (!fractionalDigits || !(dwVtBits & (REAL_VTBITS|VTBIT_CY|VTBIT_DECIMAL))))
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index c1fceff..8bcd38b 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -340,8 +340,9 @@ #define Script_Numeric 5
     pItems[index].a.s.fGcpClusters = 0;
     pItems[index].a.s.fReserved = 0;
     pItems[index].a.s.fEngineReserved = 0;
-    TRACE("New_Script=%d, eScript=%d ", New_Script, pItems[index].a.eScript);
-    TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt);
+    TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n",
+          New_Script, pItems[index].a.eScript, index, cnt,
+          pItems[index].iCharPos = cnt);

for (cnt=0; cnt < cInChars; cnt++)
     {
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 8fa544d..b22c2d2 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -94,7 +94,7 @@ static inline void DUMPCONTEXT(LOGCONTEX
         CHAR bits1[100];
         CHAR bits2[100];

-        sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li\n",
+        sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li",
     debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase,
 lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits),
 (UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask,
@@ -104,7 +104,7 @@ lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY,
 lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode,
 lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX,
 lc.lcSysSensY);
-        TRACE("context: %s",mmsg);
+        TRACE("context: %s\n",mmsg);
 }