case 3000029:
case 3000030:
case 3000031:
+ case 3000032:
/* TODO */
return S_OK;
}
test_readyState(NULL);
return S_OK;
case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY:
+ case OLECMDID_PAGEAVAILABLE:
case 6058:
return E_FAIL; /* FIXME */
default:
}
if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) {
- if(nCmdID != 63 && (!is_refresh || nCmdID != 37))
+ if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37))
test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
case 83:
case 102:
+ case 133:
case 134: /* TODO */
case 135:
case 136: /* TODO */
+ case 137:
case 139: /* TODO */
case 143: /* TODO */
case 144: /* TODO */
case 178:
+ case 179:
return E_NOTIMPL;
default:
ok(puArgErr != NULL, "puArgErr == NULL\n");
ok(V_VT(pVarResult) == 0, "V_VT(pVarResult)=%d, expected 0\n", V_VT(pVarResult));
ok(wFlags == DISPATCH_PROPERTYGET, "wFlags=%08x, expected DISPATCH_PROPERTYGET\n", wFlags);
- test_readyState(NULL);
+
+ if(dispIdMember != DISPID_AMBIENT_SILENT && dispIdMember != DISPID_AMBIENT_OFFLINEIFNOTCONNECTED)
+ test_readyState(NULL);
switch(dispIdMember) {
case DISPID_AMBIENT_USERMODE:
{
static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}};
static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}};
+ static const IID IID_unk_travellog2 = {0xf6d02767,0x9c80,0x428d,{0xb9,0x74,0x3f,0x17,0x29,0x45,0x3f,0xdb}};
if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) {
*ppv = iface;
return S_OK;
}
- if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid))
+ if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)
+ && !IsEqualGUID(&IID_unk_travellog2, riid))
ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid));
*ppv = NULL;
ok(!pDispatch, "pDispatch = %p\n", pDispatch);
ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url);
- ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags);
+ ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags);
ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName));
if(!testing_submit) {
ok(!pPostData, "pPostData = %p\n", pPostData);
switch(load_state) {
case LD_DOLOAD:
case LD_NO:
- if(!nav_url)
+ if(!nav_url && !editmode)
ok(!elem, "elem != NULL\n");
default:
break;
hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL);
ok(hres == S_OK, "Advise failed: %08x\n", hres);
} else if(IsEqualGUID(&IID_IDispatch, riid)) {
+ IEnumConnections *enum_conn;
+ CONNECTDATA conn_data;
+ ULONG fetched;
+
hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie);
ok(hres == S_OK, "Advise failed: %08x\n", hres);
+
+ hres = IConnectionPoint_EnumConnections(cp, &enum_conn);
+ ok(hres == S_OK, "EnumConnections failed: %08x\n", hres);
+
+ fetched = 0;
+ hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched);
+ ok(hres == S_OK, "Next failed: %08x\n", hres);
+ ok(conn_data.pUnk == (IUnknown*)&EventDispatch, "conn_data.pUnk == EventDispatch\n");
+ ok(conn_data.dwCookie == cookie, "conn_data.dwCookie != cookie\n");
+ IUnknown_Release(conn_data.pUnk);
+
+ fetched = 0xdeadbeef;
+ hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched);
+ ok(hres == S_FALSE, "Next failed: %08x\n", hres);
+ ok(!fetched, "fetched = %d\n", fetched);
+
+ IEnumConnections_Release(enum_conn);
}
IConnectionPoint_Release(cp);
SET_EXPECT(NavigateWithBindCtx);
SET_EXPECT(Exec_Explorer_38); /* todo_wine */
}
+ if(editmode || is_refresh)
+ SET_EXPECT(Exec_ShellDocView_138);
expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */
while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
CHECK_CALLED(NavigateWithBindCtx);
todo_wine CHECK_NOT_CALLED(Exec_Explorer_38);
}
+ if(editmode || is_refresh)
+ CLEAR_CALLED(Exec_ShellDocView_138); /* IE11 */
if(!is_extern)
load_state = LD_COMPLETE;
CHECK_CALLED(TranslateUrl);
if(support_wbapp) {
CHECK_CALLED(FireBeforeNavigate2);
- CHECK_CALLED(Exec_ShellDocView_67);
+ CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */
if(!is_hash) {
CHECK_CALLED(Invoke_AMBIENT_SILENT);
CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres);
CHECK_CALLED(TranslateUrl);
- CHECK_CALLED(Exec_ShellDocView_67);
+ CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */
CHECK_CALLED(Invoke_AMBIENT_SILENT);
CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
CHECK_CALLED(Exec_ShellDocView_63);
hres = IPersistHistory_LoadHistory(per_hist, history_stream, NULL);
ok(hres == S_OK, "LoadHistory failed: %08x\n", hres);
- CHECK_CALLED_BROKEN(Exec_ShellDocView_138);
- CHECK_CALLED(Exec_ShellDocView_67);
+ CLEAR_CALLED(Exec_ShellDocView_138); /* Not called by IE11 */
+ CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */
CHECK_CALLED(FireBeforeNavigate2);
CHECK_CALLED(Invoke_AMBIENT_SILENT);
CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
CHECK_CALLED(TranslateUrl);
CHECK_CALLED(FireBeforeNavigate2);
- CHECK_CALLED(Exec_ShellDocView_67);
+ CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */
CHECK_CALLED(Invoke_AMBIENT_SILENT);
CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
CHECK_CALLED(Exec_ShellDocView_63);
- todo_wine CHECK_CALLED(Exec_ShellDocView_84);
+ CLEAR_CALLED(Exec_ShellDocView_84); /* Not called by IE11 */
CHECK_CALLED(CreateInstance);
CHECK_CALLED(Start);
CHECK_CALLED(Protocol_Read);