[ros-diffs] [mnordell] 57308: Disable more crashing font tests.

Author: mnordell
Date: Sat Sep 15 19:31:48 2012
New Revision: 57308

URL: http://svn.reactos.org/svn/reactos?rev=57308&view=rev
Log:
Disable more crashing font tests.

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

Modified: trunk/rostests/winetests/gdiplus/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?r...
==============================================================================
--- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Sep 15 19:31:48 2012
@@ -87,6 +87,7 @@
     GdipDeleteFontFamily(fontfamily);
 }

+#if CORE_6660_IS_FIXED
 static void test_logfont(void)
 {
     LOGFONTA lfa, lfa2;
@@ -274,6 +275,7 @@

GdipDeleteFontFamily(clonedFontFamily);
 }
+#endif // CORE_6660_IS_FIXED

static void test_fontfamily_properties (void)
 {
@@ -740,8 +742,10 @@
     test_font_metrics();
 #endif
     test_createfont();
+#if CORE_6660_IS_FIXED
     test_logfont();
     test_fontfamily();
+#endif
     test_fontfamily_properties();
     test_getgenerics();
     test_installedfonts();

Modified: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus_...
==============================================================================
--- trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] Sat Sep 15 19:31:48 2012
@@ -31,31 +31,32 @@

Index: font.c
 ===================================================================
---- font.c      (revision 57206)
+--- font.c      (revision 57301)
 +++ font.c      (working copy)
-@@ -485,6 +485,7 @@
+@@ -87,6 +87,7 @@
      GdipDeleteFontFamily(fontfamily);
  }

+#if CORE_6660_IS_FIXED
- static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme,
-                                    DWORD type, LPARAM lparam)
+ static void test_logfont(void)
  {
-@@ -721,6 +722,7 @@
-     GdipDeleteGraphics(graphics);
-     DeleteDC(hdc);
+     LOGFONTA lfa, lfa2;
+@@ -274,6 +275,7 @@
+
+     GdipDeleteFontFamily(clonedFontFamily);
  }
 +#endif // CORE_6660_IS_FIXED

- START_TEST(font)
+ static void test_fontfamily_properties (void)
  {
-@@ -734,7 +736,9 @@
-
-     GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
-
+@@ -740,8 +742,10 @@
+     test_font_metrics();
+ #endif
+     test_createfont();
 +#if CORE_6660_IS_FIXED
-     test_font_metrics();
-+#endif
-     test_createfont();
      test_logfont();
      test_fontfamily();
++#endif
+     test_fontfamily_properties();
+     test_getgenerics();
+     test_installedfonts();