mshtml: Fixed tests on Vista.

This commit is contained in:
Jacek Caban 2012-07-23 14:03:27 +02:00 committed by Alexandre Julliard
parent 592e6aa942
commit 68fa7d3b0e
1 changed files with 6 additions and 1 deletions

View File

@ -191,6 +191,7 @@ DEFINE_EXPECT(GetPendingUrl);
DEFINE_EXPECT(ActiveElementChanged); DEFINE_EXPECT(ActiveElementChanged);
DEFINE_EXPECT(IsErrorUrl); DEFINE_EXPECT(IsErrorUrl);
DEFINE_EXPECT(get_LocationURL); DEFINE_EXPECT(get_LocationURL);
DEFINE_EXPECT(CountEntries);
static IUnknown *doc_unk; static IUnknown *doc_unk;
static IMoniker *doc_mon; static IMoniker *doc_mon;
@ -3245,7 +3246,7 @@ static HRESULT WINAPI TravelLog_Clone(ITravelLog *iface, ITravelLog **pptl)
static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk)
{ {
ok(0, "unexpected call\n"); CHECK_EXPECT(CountEntries);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -5069,6 +5070,8 @@ static void test_download(DWORD flags)
SET_EXPECT(Exec_ShellDocView_140); SET_EXPECT(Exec_ShellDocView_140);
if(!is_js) { if(!is_js) {
SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE);
if(support_wbapp) /* Called on some Vista installations */
SET_EXPECT(CountEntries);
SET_EXPECT(Exec_HTTPEQUIV_DONE); SET_EXPECT(Exec_HTTPEQUIV_DONE);
} }
SET_EXPECT(SetStatusText); SET_EXPECT(SetStatusText);
@ -5158,6 +5161,8 @@ static void test_download(DWORD flags)
CLEAR_CALLED(Exec_ShellDocView_140); CLEAR_CALLED(Exec_ShellDocView_140);
if(!is_js) { if(!is_js) {
CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE);
if(support_wbapp) /* Called on some Vista installations */
CLEAR_CALLED(CountEntries);
CHECK_CALLED(Exec_HTTPEQUIV_DONE); CHECK_CALLED(Exec_HTTPEQUIV_DONE);
} }
SET_CALLED(SetStatusText); SET_CALLED(SetStatusText);