Commit 6e26d8c4 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

shdocvw: Skip tests on IE 5.5.

parent 41193de1
...@@ -2808,10 +2808,7 @@ static void test_WebBrowser(BOOL do_download) ...@@ -2808,10 +2808,7 @@ static void test_WebBrowser(BOOL do_download)
hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IUnknown, (void**)&unk); &IID_IUnknown, (void**)&unk);
if(FAILED(hres)) { ok(hres == S_OK, "Creating WebBrowser object failed: %08x\n", hres);
win_skip("Could not create WebBrowser, probably too old IE\n");
return;
}
is_downloading = FALSE; is_downloading = FALSE;
is_first_load = TRUE; is_first_load = TRUE;
...@@ -2819,14 +2816,6 @@ static void test_WebBrowser(BOOL do_download) ...@@ -2819,14 +2816,6 @@ static void test_WebBrowser(BOOL do_download)
hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb);
ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres);
hres = IWebBrowser2_put_Resizable(wb, VARIANT_TRUE);
if(hres == E_NOTIMPL) {
win_skip("put_Resizable returned E_NOTIMPL, assuming IE <6\n");
IWebBrowser_Release(wb);
IUnknown_Release(unk);
return;
}
test_QueryInterface(unk); test_QueryInterface(unk);
test_ready_state(READYSTATE_UNINITIALIZED); test_ready_state(READYSTATE_UNINITIALIZED);
test_ClassInfo(unk); test_ClassInfo(unk);
...@@ -2873,16 +2862,34 @@ static void test_WebBrowser(BOOL do_download) ...@@ -2873,16 +2862,34 @@ static void test_WebBrowser(BOOL do_download)
ok(ref == 0, "ref=%d, expected 0\n", ref); ok(ref == 0, "ref=%d, expected 0\n", ref);
} }
START_TEST(webbrowser) static BOOL check_ie(void)
{ {
container_hwnd = create_container_window(); 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); OleInitialize(NULL);
trace("Testing WebBrowser (no download)...\n"); if(check_ie()) {
test_WebBrowser(FALSE); container_hwnd = create_container_window();
trace("Testing WebBrowser...\n");
test_WebBrowser(TRUE); trace("Testing WebBrowser (no download)...\n");
test_WebBrowser(FALSE);
trace("Testing WebBrowser...\n");
test_WebBrowser(TRUE);
}else {
win_skip("Skipping tests on too old IE\n");
}
OleUninitialize(); OleUninitialize();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment