From 39cc02841033e370acadeed20ff370c941f99385 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Wed, 18 Feb 2015 10:50:00 +0000
Subject: [PATCH] [GDIPLUS_WINETEST] - Re-enable test_string_functions
 CORE-6659 ROSTESTS-78 #resolve

svn path=/trunk/; revision=66344
---
 .../gdiplus/gdiplus_winetest_ros.diff         | 62 -------------------
 rostests/winetests/gdiplus/graphics.c         |  4 --
 2 files changed, 66 deletions(-)
 delete mode 100644 rostests/winetests/gdiplus/gdiplus_winetest_ros.diff

diff --git a/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff b/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff
deleted file mode 100644
index 4d5d44ef95e..00000000000
--- a/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff
+++ /dev/null
@@ -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();
diff --git a/rostests/winetests/gdiplus/graphics.c b/rostests/winetests/gdiplus/graphics.c
index fca7720471c..79df301e5b0 100644
--- a/rostests/winetests/gdiplus/graphics.c
+++ b/rostests/winetests/gdiplus/graphics.c
@@ -2931,7 +2931,6 @@ static void test_GdipGetNearestColor(void)
     ReleaseDC(hwnd, hdc);
 }
 
-#if CORE_6659_IS_FIXED
 static void test_string_functions(void)
 {
     GpStatus status;
@@ -3300,7 +3299,6 @@ static void test_string_functions(void)
 
     ReleaseDC(hwnd, hdc);
 }
-#endif /* CORE_6659_IS_FIXED */
 
 static void test_get_set_interpolation(void)
 {
@@ -5620,9 +5618,7 @@ START_TEST(graphics)
     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();