Index: rostests/winetests/gdi32/font.c
===================================================================
--- rostests/winetests/gdi32/font.c	(revision 75326)
+++ rostests/winetests/gdi32/font.c	(working copy)
@@ -21,7 +21,7 @@
 
 #include <stdarg.h>
 #include <assert.h>
-
+#include <stdio.h>
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -3837,8 +3837,8 @@
         ascent = GET_BE_WORD(tt_os2.usWinAscent);
         descent = abs((SHORT)GET_BE_WORD(tt_os2.usWinDescent));
         cell_height = ascent + descent;
-        ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n",
-           font_name, ntm->ntmCellHeight, cell_height, ascent, descent);
+        ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u for charset: %d & weight: %d & Italic: %d\n",
+           font_name, ntm->ntmCellHeight, cell_height, ascent, descent, lf->lfCharSet, lf->lfWeight, lf->lfItalic);
 
         version = GET_BE_WORD(tt_os2.version);
 
@@ -5477,7 +5477,7 @@
     EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0);
     if (efnd.total == 0)
         skip("%s is not installed\n", lf.lfFaceName);
-
+printf("efnd.total is %d for font: %s\n", efnd.total, lf.lfFaceName);
     for (i = 0; i < efnd.total; i++)
     {
         FamilyName = (char *)efnd.elf[i].elfLogFont.lfFaceName;
@@ -5524,9 +5524,9 @@
         ok(ret, "FULL_NAME (face name) could not be read\n");
         if (want_vertical) bufW = prepend_at(bufW);
         WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
-        ok(!lstrcmpA(FaceName, bufA), "%s: font face names don't match: returned %s, expect %s\n", FamilyName, FaceName, bufA);
+        ok(!lstrcmpA(FaceName, bufA), "#%d of %d:%s: font face names don't match: returned %s, expect %s\n", i, efnd.total, FamilyName, FaceName, bufA);
         otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName;
-        ok(!lstrcmpA(FaceName, otmStr), "%s: FaceName %s doesn't match otmpFaceName %s\n", FamilyName, FaceName, otmStr);
+        ok(!lstrcmpA(FaceName, otmStr), "#%d of %d:%s: FaceName %s doesn't match otmpFaceName %s\n", i, efnd.total, FamilyName, FaceName, otmStr);
 
         bufW[0] = 0;
         bufA[0] = 0;
@@ -5534,9 +5534,9 @@
         if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES);
         ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName);
         WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
-        ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA);
+        ok(!lstrcmpA(StyleName, bufA), "#%d of %d:%s: style names don't match: returned %s, expect %s\n", i, efnd.total, FamilyName, StyleName, bufA);
         otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName;
-        ok(!lstrcmpA(StyleName, otmStr), "%s: StyleName %s doesn't match otmpStyleName %s\n", FamilyName, StyleName, otmStr);
+        ok(!lstrcmpA(StyleName, otmStr), "#%d of %d:%s: StyleName %s doesn't match otmpStyleName %s\n", i, efnd.total, FamilyName, StyleName, otmStr);
 
         bufW[0] = 0;
         bufA[0] = 0;