ieframe: Moved ie.c tests to ieframe.

This commit is contained in:
Jacek Caban 2011-07-28 13:32:01 +02:00 committed by Alexandre Julliard
parent a8c6fda501
commit f42d9e2ef2
5 changed files with 11 additions and 5 deletions

1
configure vendored
View File

@ -14888,6 +14888,7 @@ wine_fn_config_dll httpapi enable_httpapi
wine_fn_config_dll iccvid enable_iccvid po wine_fn_config_dll iccvid enable_iccvid po
wine_fn_config_dll icmp enable_icmp wine_fn_config_dll icmp enable_icmp
wine_fn_config_dll ieframe enable_ieframe implib,po 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 ifsmgr.vxd enable_win16
wine_fn_config_dll imaadp32.acm enable_imaadp32_acm wine_fn_config_dll imaadp32.acm enable_imaadp32_acm
wine_fn_config_dll imagehlp enable_imagehlp implib wine_fn_config_dll imagehlp enable_imagehlp implib

View File

@ -2528,6 +2528,7 @@ WINE_CONFIG_DLL(httpapi)
WINE_CONFIG_DLL(iccvid,,[po]) WINE_CONFIG_DLL(iccvid,,[po])
WINE_CONFIG_DLL(icmp) WINE_CONFIG_DLL(icmp)
WINE_CONFIG_DLL(ieframe,,[implib,po]) WINE_CONFIG_DLL(ieframe,,[implib,po])
WINE_CONFIG_TEST(dlls/ieframe/tests)
WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16)
WINE_CONFIG_DLL(imaadp32.acm) WINE_CONFIG_DLL(imaadp32.acm)
WINE_CONFIG_DLL(imagehlp,,[implib]) WINE_CONFIG_DLL(imagehlp,,[implib])

View File

@ -0,0 +1,7 @@
TESTDLL = ieframe.dll
IMPORTS = ole32
C_SRCS = \
ie.c
@MAKE_TEST_RULES@

View File

@ -24,6 +24,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "initguid.h"
#include "ole2.h" #include "ole2.h"
#include "exdisp.h" #include "exdisp.h"
@ -58,10 +59,7 @@ static void test_InternetExplorer(void)
hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_SERVER, hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_SERVER,
&IID_IUnknown, (void**)&unk); &IID_IUnknown, (void**)&unk);
if(FAILED(hres)) { ok(hres == S_OK, "Could not create InternetExplorer instance: %08x\n", hres);
win_skip("Could not create InternetExplorer object\n");
return;
}
hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb);
ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres);

View File

@ -2,7 +2,6 @@ TESTDLL = shdocvw.dll
IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32
C_SRCS = \ C_SRCS = \
ie.c \
intshcut.c \ intshcut.c \
shdocvw.c \ shdocvw.c \
shortcut.c \ shortcut.c \