From 9dbea6ef184d64ffd47f5cbf22c9ee786ca190a2 Mon Sep 17 00:00:00 2001 From: Mike Nordell Date: Fri, 12 Oct 2012 20:29:50 +0000 Subject: [PATCH] Disable test due to crash in XUL during Release call. ROSTESTS-81 svn path=/trunk/; revision=57542 --- rostests/winetests/mshtml/htmldoc.c | 6 +++++ rostests/winetests/mshtml/msxml_ros.diff | 31 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 rostests/winetests/mshtml/msxml_ros.diff diff --git a/rostests/winetests/mshtml/htmldoc.c b/rostests/winetests/mshtml/htmldoc.c index 65451b1793a..a59039a28ee 100644 --- a/rostests/winetests/mshtml/htmldoc.c +++ b/rostests/winetests/mshtml/htmldoc.c @@ -23,6 +23,8 @@ #include #include +#if ROSTESTS_81_IS_FIXED + #include "windef.h" #include "winbase.h" #include "initguid.h" @@ -5272,8 +5274,11 @@ 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(); @@ -5299,4 +5304,5 @@ START_TEST(htmldoc) DestroyWindow(container_hwnd); CoUninitialize(); +#endif /* ROSTESTS_81_IS_FIXED*/ } diff --git a/rostests/winetests/mshtml/msxml_ros.diff b/rostests/winetests/mshtml/msxml_ros.diff new file mode 100644 index 00000000000..1bf057e0094 --- /dev/null +++ b/rostests/winetests/mshtml/msxml_ros.diff @@ -0,0 +1,31 @@ +Index: htmldoc.c +=================================================================== +--- htmldoc.c (revision 57539) ++++ htmldoc.c (working copy) +@@ -23,6 +23,8 @@ + #include + #include + ++#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*/ + }