From 0c051e6759d7f46bf408e9650330ba55f732103a Mon Sep 17 00:00:00 2001
From: Mike Nordell <tamlin@algonet.se>
Date: Fri, 12 Oct 2012 22:04:30 +0000
Subject: [PATCH] Disable correct test with ROSTESTS_81_IS_FIXED */

svn path=/trunk/; revision=57544
---
 rostests/winetests/mshtml/htmldoc.c      |  6 -----
 rostests/winetests/mshtml/htmllocation.c |  5 ++++
 rostests/winetests/mshtml/msxml_ros.diff | 31 ------------------------
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 rostests/winetests/mshtml/msxml_ros.diff

diff --git a/rostests/winetests/mshtml/htmldoc.c b/rostests/winetests/mshtml/htmldoc.c
index a59039a28ee..65451b1793a 100644
--- a/rostests/winetests/mshtml/htmldoc.c
+++ b/rostests/winetests/mshtml/htmldoc.c
@@ -23,8 +23,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#if ROSTESTS_81_IS_FIXED
-
 #include "windef.h"
 #include "winbase.h"
 #include "initguid.h"
@@ -5274,11 +5272,8 @@ static void test_IPersistHistory(void)
     ok(ref == 0, "ref=%d, expected 0\n", ref);
 }
 
-#endif /* ROSTESTS_81_IS_FIXED*/
-
 START_TEST(htmldoc)
 {
-#if ROSTESTS_81_IS_FIXED
     CoInitialize(NULL);
     container_hwnd = create_container_window();
     register_protocol();
@@ -5304,5 +5299,4 @@ START_TEST(htmldoc)
 
     DestroyWindow(container_hwnd);
     CoUninitialize();
-#endif /* ROSTESTS_81_IS_FIXED*/
 }
diff --git a/rostests/winetests/mshtml/htmllocation.c b/rostests/winetests/mshtml/htmllocation.c
index 7de9a94166e..11a416e347b 100644
--- a/rostests/winetests/mshtml/htmllocation.c
+++ b/rostests/winetests/mshtml/htmllocation.c
@@ -21,6 +21,8 @@
 
 #include <wine/test.h>
 
+#if ROSTESTS_81_IS_FIXED
+
 #include "mshtml.h"
 #include "wininet.h"
 
@@ -349,9 +351,11 @@ static void perform_test(const struct location_test* test)
     IMoniker_Release(url_mon);
     IBindCtx_Release(bc);
 }
+#endif /* ROSTESTS_81_IS_FIXED */
 
 START_TEST(htmllocation)
 {
+#if ROSTESTS_81_IS_FIXED
     int i;
 
     CoInitialize(NULL);
@@ -360,4 +364,5 @@ START_TEST(htmllocation)
         perform_test(location_tests+i);
 
     CoUninitialize();
+#endif /* ROSTESTS_81_IS_FIXED */
 }
diff --git a/rostests/winetests/mshtml/msxml_ros.diff b/rostests/winetests/mshtml/msxml_ros.diff
deleted file mode 100644
index 1bf057e0094..00000000000
--- a/rostests/winetests/mshtml/msxml_ros.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: htmldoc.c
-===================================================================
---- htmldoc.c	(revision 57539)
-+++ htmldoc.c	(working copy)
-@@ -23,6 +23,8 @@
- #include <stdarg.h>
- #include <stdio.h>
- 
-+#if ROSTESTS_81_IS_FIXED
-+
- #include "windef.h"
- #include "winbase.h"
- #include "initguid.h"
-@@ -5272,8 +5274,11 @@
-     ok(ref == 0, "ref=%d, expected 0\n", ref);
- }
- 
-+#endif /* ROSTESTS_81_IS_FIXED*/
-+
- START_TEST(htmldoc)
- {
-+#if ROSTESTS_81_IS_FIXED
-     CoInitialize(NULL);
-     container_hwnd = create_container_window();
-     register_protocol();
-@@ -5299,4 +5304,5 @@
- 
-     DestroyWindow(container_hwnd);
-     CoUninitialize();
-+#endif /* ROSTESTS_81_IS_FIXED*/
- }