ieframe: Moved WebBrowser object tests to ieframe.

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@

dlls/ieframe/tests/ie.c

@@ -24,7 +24,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "initguid.h"
 #include "ole2.h"
 #include "exdisp.h"
 

dlls/ieframe/tests/webbrowser.c

@@ -3142,25 +3142,10 @@ 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");
@@ -3171,9 +3156,6 @@ START_TEST(webbrowser)
     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");
-    }
 
     OleUninitialize();
 }

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@

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"