gdi32/tests: Use if(0) instead of #if 0 to make sure code still compiles.

Francois Gouget fgouget at free.fr
Mon Sep 26 16:41:14 CDT 2011


Fix the compilation warnings and errors this revealed.
---
 dlls/gdi32/tests/font.c |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 51a4c77..097a6c3 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1365,11 +1365,10 @@ todo_wine {
         for (n = 0; n < ret; n++)
         {
             DWORD j;
-#if 0
-            if (kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127)
+            /* Disabled to limit console spam */
+            if (0 && kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127)
                 trace("{'%c','%c',%d},\n",
                       kern_pair[n].wFirst, kern_pair[n].wSecond, kern_pair[n].iKernAmount);
-#endif
             for (j = 0; j < kd[i].total_kern_pairs; j++)
             {
                 if (kern_pair[n].wFirst == kd[i].kern_pair[j].wFirst &&
@@ -1821,6 +1820,7 @@ static void test_GetFontUnicodeRanges(void)
     HFONT hfont, hfont_old;
     DWORD size;
     GLYPHSET *gs;
+    DWORD i;
 
     if (!pGetFontUnicodeRanges)
     {
@@ -1845,10 +1845,10 @@ static void test_GetFontUnicodeRanges(void)
 
     size = pGetFontUnicodeRanges(hdc, gs);
     ok(size, "GetFontUnicodeRanges failed\n");
-#if 0
-    for (i = 0; i < gs->cRanges; i++)
-        trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs);
-#endif
+
+    if (0) /* Disabled to limit console spam */
+        for (i = 0; i < gs->cRanges; i++)
+            trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs);
     trace("found %u ranges\n", gs->cRanges);
 
     HeapFree(GetProcessHeap(), 0, gs);
@@ -1879,10 +1879,9 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO
     ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight);
 
     if (type != TRUETYPE_FONTTYPE) return 1;
-#if 0
-    trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n",
-          lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic);
-#endif
+    if (0) /* Disabled to limit console spam */
+        trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n",
+              lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic);
     if (efd->total < MAX_ENUM_FONTS)
         efd->lf[efd->total++] = *lf;
     else
@@ -1898,10 +1897,9 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm,
     ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight);
 
     if (type != TRUETYPE_FONTTYPE) return 1;
-#if 0
-    trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n",
-          lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic);
-#endif
+    if (0) /* Disabled to limit console spam */
+        trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n",
+              wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic);
     if (efd->total < MAX_ENUM_FONTS)
         efd->lf[efd->total++] = *lf;
     else
-- 
1.7.5.4




More information about the wine-patches mailing list