ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieframe: Moved WebBrowser object tests to ieframe.

This commit is contained in:
Jacek Caban 2011-08-02 11:34:10 +02:00 committed by Alexandre Julliard
parent ff127a3461
commit 81bb472db9
5 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ieframe/tests/Makefile.in
View File

@ -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@

1
dlls/ieframe/tests/ie.c
View File

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

36
dlls/shdocvw/tests/webbrowser.c → dlls/ieframe/tests/webbrowser.c
View File

@ -3142,38 +3142,20 @@ 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();
container_hwnd = create_container_window();
trace("Testing WebBrowser (no download)...\n");
test_WebBrowser(FALSE, FALSE);
test_WebBrowser(FALSE, TRUE);
trace("Testing WebBrowser...\n");
test_WebBrowser(TRUE, FALSE);
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");
}
trace("Testing WebBrowser (no download)...\n");
test_WebBrowser(FALSE, FALSE);
test_WebBrowser(FALSE, TRUE);
trace("Testing WebBrowser...\n");
test_WebBrowser(TRUE, FALSE);
test_WebBrowser(TRUE, TRUE);
trace("Testing WebBrowser w/o container-based olecmd...\n");
test_WebBrowser_NoContainerOlecmd();
OleUninitialize();
}

5
dlls/shdocvw/tests/Makefile.in
View File

@ -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@

1
dlls/shdocvw/tests/intshcut.c
View File

@ -29,6 +29,7 @@
#include "winreg.h"
#include "winerror.h"
#include "initguid.h"
#include "shlobj.h"
#include "shobjidl.h"
#include "shlguid.h"