Author: tfaber Date: Wed Feb 18 10:50:00 2015 New Revision: 66344
URL: http://svn.reactos.org/svn/reactos?rev=66344&view=rev Log: [GDIPLUS_WINETEST] - Re-enable test_string_functions CORE-6659 ROSTESTS-78 #resolve
Removed: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff Modified: trunk/rostests/winetests/gdiplus/graphics.c
Removed: 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 (removed) @@ -1,62 +0,0 @@ -Index: graphics.c -=================================================================== ---- graphics.c (revision 57206) -+++ graphics.c (working copy) -@@ -2819,6 +2819,7 @@ - ReleaseDC(hwnd, hdc); - } - -+#if CORE_6659_IS_FIXED - static void test_string_functions(void) - { - GpStatus status; -@@ -3138,6 +3139,7 @@ - - ReleaseDC(hwnd, hdc); - } -+#endif /* CORE_6659_IS_FIXED */ - - static void test_get_set_interpolation(void) - { -@@ -3361,7 +3363,9 @@ - test_clear(); - test_textcontrast(); - test_fromMemoryBitmap(); -+#if CORE_6659_IS_FIXED - test_string_functions(); -+#endif - test_get_set_interpolation(); - test_get_set_textrenderinghint(); - test_getdc_scaled(); - -Index: font.c -=================================================================== ---- font.c (revision 57301) -+++ font.c (working copy) -@@ -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/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphics... ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Wed Feb 18 10:50:00 2015 @@ -2931,7 +2931,6 @@ ReleaseDC(hwnd, hdc); }
-#if CORE_6659_IS_FIXED static void test_string_functions(void) { GpStatus status; @@ -3300,7 +3299,6 @@
ReleaseDC(hwnd, hdc); } -#endif /* CORE_6659_IS_FIXED */
static void test_get_set_interpolation(void) { @@ -5620,9 +5618,7 @@ test_clear(); test_textcontrast(); test_fromMemoryBitmap(); -#if CORE_6659_IS_FIXED test_string_functions(); -#endif test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled();