Jacek Caban : ieframe: Moved WebBrowser object tests to ieframe.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 81bb472db9d3e3d7ab19a5635c325493d9a209c1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=81bb472db9d3e3d7ab19a5635c...

Author: Jacek Caban 
Date:   Tue Aug  2 11:34:10 2011 +0200

ieframe: Moved WebBrowser object tests to ieframe.

---

dlls/ieframe/tests/Makefile.in               |    5 ++-
 dlls/ieframe/tests/ie.c                      |    1 -
 dlls/{shdocvw => ieframe}/tests/webbrowser.c |   38 +++++++-------------------
 dlls/shdocvw/tests/Makefile.in               |    5 +--
 dlls/shdocvw/tests/intshcut.c                |    1 +
 5 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in
index c1d1031..fe4b1dd 100644
--- a/dlls/ieframe/tests/Makefile.in
+++ b/dlls/ieframe/tests/Makefile.in
@@ -1,7 +1,8 @@
 TESTDLL   = ieframe.dll
-IMPORTS   = ole32
+IMPORTS   = ole32 oleaut32 user32 gdi32

C_SRCS = \
-	ie.c
+	ie.c \
+	webbrowser.c

@MAKE_TEST_RULES@
diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c
index 7a87469..6f62e23 100644
--- a/dlls/ieframe/tests/ie.c
+++ b/dlls/ieframe/tests/ie.c
@@ -24,7 +24,6 @@

#include "windef.h"
 #include "winbase.h"
-#include "initguid.h"
 #include "ole2.h"
 #include "exdisp.h"

diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c
similarity index 99%
rename from dlls/shdocvw/tests/webbrowser.c
rename to dlls/ieframe/tests/webbrowser.c
index eeb0a49..29ca521 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/ieframe/tests/webbrowser.c
@@ -3142,38 +3142,20 @@ static void test_WebBrowser_NoContainerOlecmd(void)
     ok(ref == 0, "ref=%d, expected 0\n", ref);
 }

-static BOOL check_ie(void)
-{
-    IHTMLDocument5 *doc;
-    HRESULT hres;
-
-    hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
-            &IID_IHTMLDocument5, (void**)&doc);
-    if(FAILED(hres))
-      return FALSE;
-
-    IHTMLDocument5_Release(doc);
-    return TRUE;
-}
-
 START_TEST(webbrowser)
 {
     OleInitialize(NULL);

-    if(check_ie()) {
-      container_hwnd = create_container_window();
-
-      trace("Testing WebBrowser (no download)...\n");
-      test_WebBrowser(FALSE, FALSE);
-      test_WebBrowser(FALSE, TRUE);
-      trace("Testing WebBrowser...\n");
-      test_WebBrowser(TRUE, FALSE);
-      test_WebBrowser(TRUE, TRUE);
-      trace("Testing WebBrowser w/o container-based olecmd...\n");
-      test_WebBrowser_NoContainerOlecmd();
-    }else {
-      win_skip("Skipping tests on too old IE\n");
-    }
+    container_hwnd = create_container_window();
+
+    trace("Testing WebBrowser (no download)...\n");
+    test_WebBrowser(FALSE, FALSE);
+    test_WebBrowser(FALSE, TRUE);
+    trace("Testing WebBrowser...\n");
+    test_WebBrowser(TRUE, FALSE);
+    test_WebBrowser(TRUE, TRUE);
+    trace("Testing WebBrowser w/o container-based olecmd...\n");
+    test_WebBrowser_NoContainerOlecmd();

OleUninitialize();
 }
diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in
index 10474a1..e4cf689 100644
--- a/dlls/shdocvw/tests/Makefile.in
+++ b/dlls/shdocvw/tests/Makefile.in
@@ -1,10 +1,9 @@
 TESTDLL   = shdocvw.dll
-IMPORTS   = shell32 ole32 oleaut32 user32 gdi32 advapi32
+IMPORTS   = shell32 ole32 oleaut32 advapi32

C_SRCS = \
    intshcut.c \
    shdocvw.c \
-	shortcut.c \
-	webbrowser.c
+	shortcut.c

@MAKE_TEST_RULES@
diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c
index ca28450..205419b 100644
--- a/dlls/shdocvw/tests/intshcut.c
+++ b/dlls/shdocvw/tests/intshcut.c
@@ -29,6 +29,7 @@
 #include "winreg.h"
 #include "winerror.h"

+#include "initguid.h"
 #include "shlobj.h"
 #include "shobjidl.h"
 #include "shlguid.h"