[ros-diffs] [mnordell] 57544: Disable correct test with ROSTESTS_81_IS_FIXED */

Author: mnordell
Date: Fri Oct 12 22:04:30 2012
New Revision: 57544

URL: http://svn.reactos.org/svn/reactos?rev=57544&view=rev
Log:
Disable correct test with ROSTESTS_81_IS_FIXED */

Removed:
    trunk/rostests/winetests/mshtml/msxml_ros.diff
Modified:
    trunk/rostests/winetests/mshtml/htmldoc.c
    trunk/rostests/winetests/mshtml/htmllocation.c

Modified: trunk/rostests/winetests/mshtml/htmldoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.…
==============================================================================
--- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Oct 12 22:04:30 2012
@@ -22,8 +22,6 @@
 #include <wine/test.h>
 #include <stdarg.h>
 #include <stdio.h>
-
-#if ROSTESTS_81_IS_FIXED
 
 #include "windef.h"
 #include "winbase.h"
@@ -5274,11 +5272,8 @@
     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 @@
 
     DestroyWindow(container_hwnd);
     CoUninitialize();
-#endif /* ROSTESTS_81_IS_FIXED*/
-}
+}

Modified: trunk/rostests/winetests/mshtml/htmllocation.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca…
==============================================================================
--- trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] Fri Oct 12 22:04:30 2012
@@ -21,6 +21,8 @@
 
 #include <wine/test.h>
 
+#if ROSTESTS_81_IS_FIXED
+
 #include "mshtml.h"
 #include "wininet.h"
 
@@ -349,9 +351,11 @@
     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 @@
         perform_test(location_tests+i);
 
     CoUninitialize();
-}
+#endif /* ROSTESTS_81_IS_FIXED */
+}

Removed: trunk/rostests/winetests/mshtml/msxml_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/msxml_ro…
==============================================================================
--- trunk/rostests/winetests/mshtml/msxml_ros.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/msxml_ros.diff (removed)
@@ -1,31 +1,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*/
- }