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

[GDIPLUS_WINETESTS]

Browse source 
- Re-enable test_font_metrics, test_logfont and test_fontfamily.
CORE-6660
ROSTESTS-79 CORE-6643 #resolve
- Skip test_font_substitution instead.
ROSTESTS-154

svn path=/trunk/; revision=66345
This commit is contained in:
Thomas Faber 2015-02-18 11:20:37 +00:00
parent 39cc028410
commit 8c6ef59bc5
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,6 @@ 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;
@ -283,7 +282,6 @@ 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)
{ {
@ -495,7 +493,6 @@ static void test_heightgivendpi(void)
GdipDeleteFontFamily(fontfamily); GdipDeleteFontFamily(fontfamily);
} }
#if CORE_6660_IS_FIXED
static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme,
DWORD type, LPARAM lparam) DWORD type, LPARAM lparam)
{ {
@ -732,7 +729,6 @@ static void test_font_metrics(void)
GdipDeleteGraphics(graphics); GdipDeleteGraphics(graphics);
DeleteDC(hdc); DeleteDC(hdc);
} }
#endif // CORE_6660_IS_FIXED
static void test_font_substitution(void) static void test_font_substitution(void)
{ {
@ -1117,15 +1113,14 @@ START_TEST(font)
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
test_font_transform(); test_font_transform();
test_font_substitution(); if (!winetest_interactive)
#if CORE_6660_IS_FIXED skip("ROSTESTS-154: Skipping test_font_substitution because of improper error handling\n");
else
test_font_substitution();
test_font_metrics(); test_font_metrics();
#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();