[tfaber] 66345: [GDIPLUS_WINETESTS] - Re-enable test_font_metrics, test_logfont and test_fontfamily. CORE-6660 ROSTESTS-79 CORE-6643 #resolve - Skip test_font_substitution instead. ROSTESTS-154

Author: tfaber
Date: Wed Feb 18 11:20:37 2015
New Revision: 66345

URL: http://svn.reactos.org/svn/reactos?rev=66345&view=rev
Log:
[GDIPLUS_WINETESTS]
- Re-enable test_font_metrics, test_logfont and test_fontfamily.
CORE-6660
ROSTESTS-79 CORE-6643 #resolve
- Skip test_font_substitution instead.
ROSTESTS-154

Modified:
    trunk/rostests/winetests/gdiplus/font.c

Modified: trunk/rostests/winetests/gdiplus/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?…
==============================================================================
--- trunk/rostests/winetests/gdiplus/font.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/gdiplus/font.c	[iso-8859-1] Wed Feb 18 11:20:37 2015
@@ -101,7 +101,6 @@
     GdipDeleteFontFamily(fontfamily);
 }
 
-#if CORE_6660_IS_FIXED
 static void test_logfont(void)
 {
     LOGFONTA lfa, lfa2;
@@ -283,7 +282,6 @@
 
     GdipDeleteFontFamily(clonedFontFamily);
 }
-#endif // CORE_6660_IS_FIXED
 
 static void test_fontfamily_properties (void)
 {
@@ -495,7 +493,6 @@
     GdipDeleteFontFamily(fontfamily);
 }
 
-#if CORE_6660_IS_FIXED
 static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme,
                                    DWORD type, LPARAM lparam)
 {
@@ -732,7 +729,6 @@
     GdipDeleteGraphics(graphics);
     DeleteDC(hdc);
 }
-#endif // CORE_6660_IS_FIXED
 
 static void test_font_substitution(void)
 {
@@ -1117,15 +1113,14 @@
     GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
 
     test_font_transform();
-    test_font_substitution();
-#if CORE_6660_IS_FIXED
+    if (!winetest_interactive)
+        skip("ROSTESTS-154: Skipping test_font_substitution because of improper
error handling\n");
+    else
+        test_font_substitution();
     test_font_metrics();
-#endif
     test_createfont();
-#if CORE_6660_IS_FIXED
     test_logfont();
     test_fontfamily();
-#endif
     test_fontfamily_properties();
     test_getgenerics();
     test_installedfonts();