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

mshtml/tests: Fixed more test failures on win10. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2015-10-28 14:49:18 +01:00 committed by Alexandre Julliard
parent 1b8f84cc3b
commit 79c59085b1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/mshtml/tests/htmldoc.c
View File

@ -872,7 +872,12 @@ static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl };
static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv)
{ {
ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(riid, &IID_INewWindowManager)) {
*ppv = iface;
return S_OK;
}
trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid));
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -2873,8 +2878,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
} }
if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) {
if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37))
test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
switch(nCmdID) { switch(nCmdID) {
@ -2888,6 +2891,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
test_readyState(NULL); test_readyState(NULL);
load_state = LD_LOADING; load_state = LD_LOADING;
}else { }else {
if(!is_refresh)
test_readyState(NULL);
if(nav_url) if(nav_url)
test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE); test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE);
else if(load_from_stream) else if(load_from_stream)
@ -2951,6 +2956,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
if(pvaIn) if(pvaIn)
ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut)); ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut));
test_readyState(NULL);
return E_NOTIMPL; return E_NOTIMPL;
case 103: case 103:
@ -2959,6 +2965,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaIn == NULL, "pvaIn != NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n");
test_readyState(NULL);
return E_NOTIMPL; return E_NOTIMPL;
case 105: case 105:
@ -2967,12 +2974,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaIn != NULL, "pvaIn == NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n");
test_readyState(NULL);
return E_NOTIMPL; return E_NOTIMPL;
case 138: case 138:
CHECK_EXPECT2(Exec_ShellDocView_138); CHECK_EXPECT2(Exec_ShellDocView_138);
ok(!pvaIn, "pvaIn != NULL\n"); ok(!pvaIn, "pvaIn != NULL\n");
ok(!pvaOut, "pvaOut != NULL\n"); ok(!pvaOut, "pvaOut != NULL\n");
test_readyState(NULL);
return S_OK; return S_OK;
case 140: case 140:
@ -2981,6 +2990,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaIn == NULL, "pvaIn != NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n");
test_readyState(NULL);
return E_NOTIMPL; return E_NOTIMPL;
case 83: case 83: