Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tempoarily patch away SEGV-inducing code. See JIRA 6660 and 6661.

Browse source 
svn path=/trunk/; revision=57301
This commit is contained in:
Mike Nordell 2012-09-15 00:04:58 +00:00
parent be682db3a4
commit 01ddf15c62
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -485,6 +485,7 @@ static void test_heightgivendpi(void)
GdipDeleteFontFamily(fontfamily);
}
#if CORE_6660_IS_FIXED
static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme,
DWORD type, LPARAM lparam)
{
@ -721,6 +722,7 @@ static void test_font_metrics(void)
GdipDeleteGraphics(graphics);
DeleteDC(hdc);
}
#endif // CORE_6660_IS_FIXED
START_TEST(font)
{
@ -734,7 +736,9 @@ START_TEST(font)
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
#if CORE_6660_IS_FIXED
test_font_metrics();
#endif
test_createfont();
test_logfont();
test_fontfamily();

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

@ -28,3 +28,34 @@ Index: graphics.c
test_get_set_interpolation();
test_get_set_textrenderinghint();
test_getdc_scaled();
Index: font.c
===================================================================
--- font.c (revision 57206)
+++ font.c (working copy)
@@ -485,6 +485,7 @@
GdipDeleteFontFamily(fontfamily);
}
+#if CORE_6660_IS_FIXED
static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme,
DWORD type, LPARAM lparam)
{
@@ -721,6 +722,7 @@
GdipDeleteGraphics(graphics);
DeleteDC(hdc);
}
+#endif // CORE_6660_IS_FIXED
START_TEST(font)
{
@@ -734,7 +736,9 @@
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+#if CORE_6660_IS_FIXED
test_font_metrics();
+#endif
test_createfont();
test_logfont();
test_fontfamily();