Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-09 03:37:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable more crashing font tests.

Browse source 
svn path=/trunk/; revision=57308
This commit is contained in:
Mike Nordell 2012-09-15 19:31:48 +00:00
parent 09ee17cb70
commit 8436ea3985
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rostests/winetests/gdiplus/font.c
View file

@ -87,6 +87,7 @@ static void test_createfont(void)
GdipDeleteFontFamily(fontfamily); GdipDeleteFontFamily(fontfamily);
} }
#if CORE_6660_IS_FIXED
static void test_logfont(void) static void test_logfont(void)
{ {
LOGFONTA lfa, lfa2; LOGFONTA lfa, lfa2;
@ -274,6 +275,7 @@ static void test_fontfamily (void)
GdipDeleteFontFamily(clonedFontFamily); GdipDeleteFontFamily(clonedFontFamily);
} }
#endif // CORE_6660_IS_FIXED
static void test_fontfamily_properties (void) static void test_fontfamily_properties (void)
{ {
@ -740,8 +742,10 @@ START_TEST(font)
test_font_metrics(); test_font_metrics();
#endif #endif
test_createfont(); test_createfont();
#if CORE_6660_IS_FIXED
test_logfont(); test_logfont();
test_fontfamily(); test_fontfamily();
#endif
test_fontfamily_properties(); test_fontfamily_properties();
test_getgenerics(); test_getgenerics();
test_installedfonts(); test_installedfonts();

29
rostests/winetests/gdiplus/gdiplus_winetest_ros.diff
View file

@ -31,31 +31,32 @@ Index: graphics.c
Index: font.c Index: font.c
=================================================================== ===================================================================
--- font.c (revision 57206) --- font.c (revision 57301)
+++ font.c (working copy) +++ font.c (working copy)
@@ -485,6 +485,7 @@ @@ -87,6 +87,7 @@
GdipDeleteFontFamily(fontfamily); GdipDeleteFontFamily(fontfamily);
} }
+#if CORE_6660_IS_FIXED +#if CORE_6660_IS_FIXED
static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, static void test_logfont(void)
DWORD type, LPARAM lparam)
{ {
@@ -721,6 +722,7 @@ LOGFONTA lfa, lfa2;
GdipDeleteGraphics(graphics); @@ -274,6 +275,7 @@
DeleteDC(hdc);
GdipDeleteFontFamily(clonedFontFamily);
} }
+#endif // CORE_6660_IS_FIXED +#endif // CORE_6660_IS_FIXED
START_TEST(font) static void test_fontfamily_properties (void)
{ {
@@ -734,7 +736,9 @@ @@ -740,8 +742,10 @@
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+#if CORE_6660_IS_FIXED
test_font_metrics(); test_font_metrics();
+#endif #endif
test_createfont(); test_createfont();
+#if CORE_6660_IS_FIXED
test_logfont(); test_logfont();
test_fontfamily(); test_fontfamily();
+#endif
test_fontfamily_properties();
test_getgenerics();
test_installedfonts();