mshtml: Get rid of no longer needed Gecko checks in tests.
This commit is contained in:
parent
b2ffe78729
commit
785fb1d2e1
|
@ -5917,10 +5917,8 @@ typedef void (*domtest_t)(IHTMLDocument2*);
|
||||||
static void run_domtest(const char *str, domtest_t test)
|
static void run_domtest(const char *str, domtest_t test)
|
||||||
{
|
{
|
||||||
IHTMLDocument2 *doc;
|
IHTMLDocument2 *doc;
|
||||||
IHTMLElement *body = NULL;
|
|
||||||
ULONG ref;
|
ULONG ref;
|
||||||
MSG msg;
|
MSG msg;
|
||||||
HRESULT hres;
|
|
||||||
|
|
||||||
doc = create_doc_with_string(str);
|
doc = create_doc_with_string(str);
|
||||||
if(!doc)
|
if(!doc)
|
||||||
|
@ -5933,15 +5931,7 @@ static void run_domtest(const char *str, domtest_t test)
|
||||||
DispatchMessage(&msg);
|
DispatchMessage(&msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
hres = IHTMLDocument2_get_body(doc, &body);
|
|
||||||
ok(hres == S_OK, "get_body failed: %08x\n", hres);
|
|
||||||
|
|
||||||
if(body) {
|
|
||||||
IHTMLElement_Release(body);
|
|
||||||
test(doc);
|
test(doc);
|
||||||
}else {
|
|
||||||
skip("Could not get document body. Assuming no Gecko installed.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
ref = IHTMLDocument2_Release(doc);
|
ref = IHTMLDocument2_Release(doc);
|
||||||
ok(!ref ||
|
ok(!ref ||
|
||||||
|
@ -5949,39 +5939,8 @@ static void run_domtest(const char *str, domtest_t test)
|
||||||
"ref = %d\n", ref);
|
"ref = %d\n", ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gecko_installer_workaround(BOOL disable)
|
|
||||||
{
|
|
||||||
HKEY hkey;
|
|
||||||
DWORD res;
|
|
||||||
|
|
||||||
static BOOL has_url = FALSE;
|
|
||||||
static char url[2048];
|
|
||||||
|
|
||||||
if(!disable && !has_url)
|
|
||||||
return;
|
|
||||||
|
|
||||||
res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey);
|
|
||||||
if(res != ERROR_SUCCESS)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if(disable) {
|
|
||||||
DWORD type, size = sizeof(url);
|
|
||||||
|
|
||||||
res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size);
|
|
||||||
if(res == ERROR_SUCCESS && type == REG_SZ)
|
|
||||||
has_url = TRUE;
|
|
||||||
|
|
||||||
RegDeleteValue(hkey, "GeckoUrl");
|
|
||||||
}else {
|
|
||||||
RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1);
|
|
||||||
}
|
|
||||||
|
|
||||||
RegCloseKey(hkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
START_TEST(dom)
|
START_TEST(dom)
|
||||||
{
|
{
|
||||||
gecko_installer_workaround(TRUE);
|
|
||||||
CoInitialize(NULL);
|
CoInitialize(NULL);
|
||||||
|
|
||||||
run_domtest(doc_str1, test_doc_elem);
|
run_domtest(doc_str1, test_doc_elem);
|
||||||
|
@ -6001,5 +5960,4 @@ START_TEST(dom)
|
||||||
run_domtest(frameset_str, test_frameset);
|
run_domtest(frameset_str, test_frameset);
|
||||||
|
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
gecko_installer_workaround(FALSE);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,7 +184,6 @@ static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n',
|
||||||
|
|
||||||
static HRESULT QueryInterface(REFIID riid, void **ppv);
|
static HRESULT QueryInterface(REFIID riid, void **ppv);
|
||||||
static void test_MSHTML_QueryStatus(IUnknown*,DWORD);
|
static void test_MSHTML_QueryStatus(IUnknown*,DWORD);
|
||||||
static BOOL nogecko = FALSE;
|
|
||||||
|
|
||||||
#define test_readyState(u) _test_readyState(__LINE__,u)
|
#define test_readyState(u) _test_readyState(__LINE__,u)
|
||||||
static void _test_readyState(unsigned,IUnknown*);
|
static void _test_readyState(unsigned,IUnknown*);
|
||||||
|
@ -2919,26 +2918,12 @@ static void test_download(DWORD flags)
|
||||||
if(flags & DWL_TRYCSS)
|
if(flags & DWL_TRYCSS)
|
||||||
SET_CALLED(Exec_ShellDocView_84);
|
SET_CALLED(Exec_ShellDocView_84);
|
||||||
if(flags & DWL_CSS) {
|
if(flags & DWL_CSS) {
|
||||||
if(called_CreateInstance) {
|
|
||||||
CHECK_CALLED(CreateInstance);
|
CHECK_CALLED(CreateInstance);
|
||||||
CHECK_CALLED(Start);
|
CHECK_CALLED(Start);
|
||||||
CHECK_CALLED(LockRequest);
|
CHECK_CALLED(LockRequest);
|
||||||
CHECK_CALLED(Terminate);
|
CHECK_CALLED(Terminate);
|
||||||
CHECK_CALLED(Protocol_Read);
|
CHECK_CALLED(Protocol_Read);
|
||||||
CHECK_CALLED(UnlockRequest);
|
CHECK_CALLED(UnlockRequest);
|
||||||
}else {
|
|
||||||
skip("CreateInstance not called. Assuming no Gecko installed.\n");
|
|
||||||
|
|
||||||
SET_CALLED(Exec_ShellDocView_84);
|
|
||||||
SET_CALLED(CreateInstance);
|
|
||||||
SET_CALLED(Start);
|
|
||||||
SET_CALLED(LockRequest);
|
|
||||||
SET_CALLED(Terminate);
|
|
||||||
SET_CALLED(Protocol_Read);
|
|
||||||
SET_CALLED(UnlockRequest);
|
|
||||||
|
|
||||||
nogecko = TRUE;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
SET_CALLED(Exec_Explorer_69);
|
SET_CALLED(Exec_Explorer_69);
|
||||||
SET_CALLED(EnableModeless_TRUE); /* IE7 */
|
SET_CALLED(EnableModeless_TRUE); /* IE7 */
|
||||||
|
@ -3327,13 +3312,12 @@ static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname)
|
||||||
}
|
}
|
||||||
|
|
||||||
hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_FONTNAME, 0, in, out);
|
hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_FONTNAME, 0, in, out);
|
||||||
if(!nogecko)
|
|
||||||
ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08x\n", hres);
|
ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08x\n", hres);
|
||||||
|
|
||||||
if(in)
|
if(in)
|
||||||
VariantClear(in);
|
VariantClear(in);
|
||||||
|
|
||||||
if(out && !nogecko) {
|
if(out) {
|
||||||
ok(V_VT(out) == VT_BSTR, "V_VT(out) = %x\n", V_VT(out));
|
ok(V_VT(out) == VT_BSTR, "V_VT(out) = %x\n", V_VT(out));
|
||||||
if(V_VT(out) == VT_BSTR) {
|
if(V_VT(out) == VT_BSTR) {
|
||||||
if(exname)
|
if(exname)
|
||||||
|
@ -4300,7 +4284,6 @@ static void test_editing_mode(BOOL do_load)
|
||||||
|
|
||||||
test_exec_noargs(unk, IDM_JUSTIFYRIGHT);
|
test_exec_noargs(unk, IDM_JUSTIFYRIGHT);
|
||||||
test_timer(EXPECT_UPDATEUI);
|
test_timer(EXPECT_UPDATEUI);
|
||||||
if(!nogecko)
|
|
||||||
test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT,
|
test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT,
|
||||||
OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED);
|
OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED);
|
||||||
|
|
||||||
|
@ -4308,7 +4291,6 @@ static void test_editing_mode(BOOL do_load)
|
||||||
test_timer(EXPECT_UPDATEUI);
|
test_timer(EXPECT_UPDATEUI);
|
||||||
test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT,
|
test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT,
|
||||||
OLECMDF_SUPPORTED|OLECMDF_ENABLED);
|
OLECMDF_SUPPORTED|OLECMDF_ENABLED);
|
||||||
if(!nogecko)
|
|
||||||
test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER,
|
test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER,
|
||||||
OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED);
|
OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED);
|
||||||
|
|
||||||
|
@ -4348,36 +4330,6 @@ static void register_protocol(void)
|
||||||
IInternetSession_Release(session);
|
IInternetSession_Release(session);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gecko_installer_workaround(BOOL disable)
|
|
||||||
{
|
|
||||||
HKEY hkey;
|
|
||||||
DWORD res;
|
|
||||||
|
|
||||||
static BOOL has_url = FALSE;
|
|
||||||
static char url[2048];
|
|
||||||
|
|
||||||
if(!disable && !has_url)
|
|
||||||
return;
|
|
||||||
|
|
||||||
res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey);
|
|
||||||
if(res != ERROR_SUCCESS)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if(disable) {
|
|
||||||
DWORD type, size = sizeof(url);
|
|
||||||
|
|
||||||
res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size);
|
|
||||||
if(res == ERROR_SUCCESS && type == REG_SZ)
|
|
||||||
has_url = TRUE;
|
|
||||||
|
|
||||||
RegDeleteValue(hkey, "GeckoUrl");
|
|
||||||
}else {
|
|
||||||
RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1);
|
|
||||||
}
|
|
||||||
|
|
||||||
RegCloseKey(hkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void test_HTMLDoc_ISupportErrorInfo(void)
|
static void test_HTMLDoc_ISupportErrorInfo(void)
|
||||||
{
|
{
|
||||||
HRESULT hres;
|
HRESULT hres;
|
||||||
|
@ -4425,8 +4377,6 @@ static void test_IPersistHistory(void)
|
||||||
|
|
||||||
START_TEST(htmldoc)
|
START_TEST(htmldoc)
|
||||||
{
|
{
|
||||||
gecko_installer_workaround(TRUE);
|
|
||||||
|
|
||||||
CoInitialize(NULL);
|
CoInitialize(NULL);
|
||||||
container_hwnd = create_container_window();
|
container_hwnd = create_container_window();
|
||||||
register_protocol();
|
register_protocol();
|
||||||
|
@ -4445,6 +4395,4 @@ START_TEST(htmldoc)
|
||||||
|
|
||||||
DestroyWindow(container_hwnd);
|
DestroyWindow(container_hwnd);
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
|
|
||||||
gecko_installer_workaround(FALSE);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -516,7 +516,6 @@ static IHTMLDocument2 *create_and_load_doc(const char *str)
|
||||||
{
|
{
|
||||||
IHTMLDocument2 *doc;
|
IHTMLDocument2 *doc;
|
||||||
IHTMLElement *body = NULL;
|
IHTMLElement *body = NULL;
|
||||||
ULONG ref;
|
|
||||||
MSG msg;
|
MSG msg;
|
||||||
HRESULT hres;
|
HRESULT hres;
|
||||||
static const WCHAR ucPtr[] = {'b','a','c','k','g','r','o','u','n','d',0};
|
static const WCHAR ucPtr[] = {'b','a','c','k','g','r','o','u','n','d',0};
|
||||||
|
@ -535,13 +534,6 @@ static IHTMLDocument2 *create_and_load_doc(const char *str)
|
||||||
hres = IHTMLDocument2_get_body(doc, &body);
|
hres = IHTMLDocument2_get_body(doc, &body);
|
||||||
ok(hres == S_OK, "get_body failed: %08x\n", hres);
|
ok(hres == S_OK, "get_body failed: %08x\n", hres);
|
||||||
|
|
||||||
if(!body) {
|
|
||||||
skip("Could not get document body. Assuming no Gecko installed.\n");
|
|
||||||
ref = IHTMLDocument2_Release(doc);
|
|
||||||
ok(!ref, "ref = %d\n", ref);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check we can query for function on the IHTMLElementBody interface */
|
/* Check we can query for function on the IHTMLElementBody interface */
|
||||||
name = (WCHAR*)ucPtr;
|
name = (WCHAR*)ucPtr;
|
||||||
hres = IHTMLElement_GetIDsOfNames(body, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispID);
|
hres = IHTMLElement_GetIDsOfNames(body, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispID);
|
||||||
|
@ -1618,39 +1610,8 @@ static BOOL register_script_engine(void)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gecko_installer_workaround(BOOL disable)
|
|
||||||
{
|
|
||||||
HKEY hkey;
|
|
||||||
DWORD res;
|
|
||||||
|
|
||||||
static BOOL has_url = FALSE;
|
|
||||||
static char url[2048];
|
|
||||||
|
|
||||||
if(!disable && !has_url)
|
|
||||||
return;
|
|
||||||
|
|
||||||
res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey);
|
|
||||||
if(res != ERROR_SUCCESS)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if(disable) {
|
|
||||||
DWORD type, size = sizeof(url);
|
|
||||||
|
|
||||||
res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size);
|
|
||||||
if(res == ERROR_SUCCESS && type == REG_SZ)
|
|
||||||
has_url = TRUE;
|
|
||||||
|
|
||||||
RegDeleteValue(hkey, "GeckoUrl");
|
|
||||||
}else {
|
|
||||||
RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1);
|
|
||||||
}
|
|
||||||
|
|
||||||
RegCloseKey(hkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
START_TEST(script)
|
START_TEST(script)
|
||||||
{
|
{
|
||||||
gecko_installer_workaround(TRUE);
|
|
||||||
CoInitialize(NULL);
|
CoInitialize(NULL);
|
||||||
|
|
||||||
if(winetest_interactive || ! is_ie_hardened()) {
|
if(winetest_interactive || ! is_ie_hardened()) {
|
||||||
|
@ -1665,5 +1626,4 @@ START_TEST(script)
|
||||||
}
|
}
|
||||||
|
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
gecko_installer_workaround(FALSE);
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue