diff --git a/configure b/configure index 5758297f9f4..264acaa59a3 100755 --- a/configure +++ b/configure @@ -14888,6 +14888,7 @@ wine_fn_config_dll httpapi enable_httpapi wine_fn_config_dll iccvid enable_iccvid po wine_fn_config_dll icmp enable_icmp wine_fn_config_dll ieframe enable_ieframe implib,po +wine_fn_config_test dlls/ieframe/tests ieframe_test wine_fn_config_dll ifsmgr.vxd enable_win16 wine_fn_config_dll imaadp32.acm enable_imaadp32_acm wine_fn_config_dll imagehlp enable_imagehlp implib diff --git a/configure.ac b/configure.ac index 8126c7b5723..2521c7181af 100644 --- a/configure.ac +++ b/configure.ac @@ -2528,6 +2528,7 @@ WINE_CONFIG_DLL(httpapi) WINE_CONFIG_DLL(iccvid,,[po]) WINE_CONFIG_DLL(icmp) WINE_CONFIG_DLL(ieframe,,[implib,po]) +WINE_CONFIG_TEST(dlls/ieframe/tests) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) WINE_CONFIG_DLL(imagehlp,,[implib]) diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in new file mode 100644 index 00000000000..c1d103191db --- /dev/null +++ b/dlls/ieframe/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = ieframe.dll +IMPORTS = ole32 + +C_SRCS = \ + ie.c + +@MAKE_TEST_RULES@ diff --git a/dlls/shdocvw/tests/ie.c b/dlls/ieframe/tests/ie.c similarity index 95% rename from dlls/shdocvw/tests/ie.c rename to dlls/ieframe/tests/ie.c index 336a62e4296..7a87469a1c2 100644 --- a/dlls/shdocvw/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "ole2.h" #include "exdisp.h" @@ -58,10 +59,7 @@ static void test_InternetExplorer(void) hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_SERVER, &IID_IUnknown, (void**)&unk); - if(FAILED(hres)) { - win_skip("Could not create InternetExplorer object\n"); - return; - } + ok(hres == S_OK, "Could not create InternetExplorer instance: %08x\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 53f21301f70..10474a1c72b 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -2,7 +2,6 @@ TESTDLL = shdocvw.dll IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 C_SRCS = \ - ie.c \ intshcut.c \ shdocvw.c \ shortcut.c \