[ros-diffs] [mnordell] 57301: Tempoarily patch away SEGV-inducing code. See JIRA 6660 and 6661.

Author: mnordell
Date: Sat Sep 15 00:04:58 2012
New Revision: 57301

URL: http://svn.reactos.org/svn/reactos?rev=57301&view=rev
Log:
Tempoarily patch away SEGV-inducing code. See JIRA 6660 and 6661.

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?…
==============================================================================
--- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Sep 15 00:04:58 2012
@@ -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();

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
00:04:58 2012
@@ -28,3 +28,34 @@
      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();