#include <wine/test.h>
//#include <stdarg.h>
-//#include <stdio.h>
+#include <stdio.h>
//#include "windef.h"
//#include "winbase.h"
//#include "shobjidl.h"
#include <htiface.h>
#include <tlogstg.h>
+#include <exdispid.h>
#include "mshtml_test.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_0);
DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1);
DEFINE_EXPECT(Exec_ShellDocView_37);
+DEFINE_EXPECT(Exec_ShellDocView_62);
DEFINE_EXPECT(Exec_ShellDocView_63);
DEFINE_EXPECT(Exec_ShellDocView_67);
DEFINE_EXPECT(Exec_ShellDocView_84);
DEFINE_EXPECT(Exec_Explorer_38);
DEFINE_EXPECT(Exec_Explorer_69);
DEFINE_EXPECT(Exec_DOCCANNAVIGATE);
+DEFINE_EXPECT(Exec_DOCCANNAVIGATE_NULL);
DEFINE_EXPECT(Invoke_AMBIENT_USERMODE);
DEFINE_EXPECT(Invoke_AMBIENT_DLCONTROL);
DEFINE_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
DEFINE_EXPECT(OnChanged_READYSTATE);
DEFINE_EXPECT(OnChanged_1005);
DEFINE_EXPECT(OnChanged_1012);
+DEFINE_EXPECT(OnChanged_1014);
DEFINE_EXPECT(GetDisplayName);
DEFINE_EXPECT(BindToStorage);
DEFINE_EXPECT(IsSystemMoniker);
DEFINE_EXPECT(IsErrorUrl);
DEFINE_EXPECT(get_LocationURL);
DEFINE_EXPECT(CountEntries);
+DEFINE_EXPECT(FindConnectionPoint);
+DEFINE_EXPECT(EnumConnections);
+DEFINE_EXPECT(EnumConnections_Next);
+DEFINE_EXPECT(WindowClosing);
+DEFINE_EXPECT(NavigateWithBindCtx);
+static BOOL is_ie9plus;
static IUnknown *doc_unk;
static IMoniker *doc_mon;
static BOOL expect_LockContainer_fLock;
static BOOL complete, loading_js, loading_hash, is_refresh;
static DWORD status_code = HTTP_STATUS_OK;
static BOOL asynchronous_binding = FALSE;
-static BOOL support_wbapp, allow_new_window;
+static BOOL support_wbapp, allow_new_window, no_travellog;
static BOOL report_mime;
+static BOOL testing_submit;
+static BOOL resetting_document;
static int stream_read, protocol_read;
static IStream *history_stream;
static enum load_state_t {
static const char css_data[] = "body {color: red; margin: 0}";
static const WCHAR http_urlW[] =
- {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0};
+ {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_','s','n','a','p','s','h','o','t','/',0};
static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0};
static const WCHAR wszArial[] =
{'A','r','i','a','l',0};
-static const char *debugstr_guid(REFIID riid)
+static int strcmp_wa(LPCWSTR strw, const char *stra)
{
- static char buf[50];
-
- if(!riid)
- return "(null)";
-
- sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
- riid->Data1, riid->Data2, riid->Data3, riid->Data4[0],
- riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4],
- riid->Data4[5], riid->Data4[6], riid->Data4[7]);
-
- return buf;
+ CHAR buf[512];
+ WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
+ return lstrcmpA(stra, buf);
}
-static int strcmp_wa(LPCWSTR strw, const char *stra)
+static BOOL wstr_contains(const WCHAR *strw, const char *stra)
{
CHAR buf[512];
WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
- return lstrcmpA(stra, buf);
+ return strstr(buf, stra) != NULL;
}
static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub )
if(flags & EXPECT_SETTITLE)
SET_EXPECT(Exec_SETTITLE);
- while(!*b && GetMessage(&msg, doc_hwnd, 0, 0)) {
+ while(!*b && GetMessageA(&msg, doc_hwnd, 0, 0)) {
TranslateMessage(&msg);
- DispatchMessage(&msg);
+ DispatchMessageA(&msg);
}
if(flags & EXPECT_UPDATEUI) {
static IMoniker Moniker;
-#define test_GetCurMoniker(u,m,v) _test_GetCurMoniker(__LINE__,u,m,v)
-static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, const char *exurl)
+#define test_GetCurMoniker(u,m,v,t) _test_GetCurMoniker(__LINE__,u,m,v,t)
+static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, const char *exurl, BOOL is_todo)
{
IHTMLDocument2 *doc;
IPersistMoniker *permon;
hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url);
ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres);
- ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url));
+ if(is_todo)
+ todo_wine ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url));
+ else
+ ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url));
if(!*ptr)
ok_(__FILE__,line)(!lstrcmpW(url, doc_url), "url %s != doc_url %s\n", wine_dbgstr_w(url), wine_dbgstr_w(doc_url));
return E_NOINTERFACE; /* TODO */
if(!ignore_external_qi)
- ok(0, "unexpected riid: %s\n", debugstr_guid(riid));
+ ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid));
return E_NOINTERFACE;
}
bindinfo.cbSize = sizeof(bindinfo);
hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo);
ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres);
- ok(bindf == (BINDF_FROMURLMON|BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS),
- "bindf = %x\n", bindf);
+ if(!testing_submit)
+ ok(bindf == (BINDF_FROMURLMON|BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS),
+ "bindf = %x\n", bindf);
+ else
+ ok(bindf == (BINDF_FROMURLMON|BINDF_FORMS_SUBMIT|BINDF_PRAGMA_NO_CACHE|BINDF_HYPERLINK
+ |BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_GETNEWESTVERSION|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS),
+ "bindf = %x\n", bindf);
ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize=%d\n", bindinfo.cbSize);
ok(bindinfo.szExtraInfo == NULL, "bindinfo.szExtraInfo=%p\n", bindinfo.szExtraInfo);
/* TODO: test stgmedData */
ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08x\n", bindinfo.grfBindInfoF);
- ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb);
+ if(!testing_submit) {
+ ok(bindinfo.dwBindVerb == BINDVERB_GET, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb);
+ ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData);
+ ok(bindinfo.stgmedData.tymed == TYMED_NULL, "bindinfo.stgmedData.tymed=%d\n", bindinfo.stgmedData.tymed);
+ }else {
+ ok(bindinfo.dwBindVerb == BINDVERB_POST, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb);
+ ok(bindinfo.cbstgmedData == 8, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData);
+ ok(bindinfo.stgmedData.tymed == TYMED_HGLOBAL, "bindinfo.stgmedData.tymed=%d\n", bindinfo.stgmedData.tymed);
+ ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n");
+ }
ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb);
- ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData);
ok(bindinfo.dwOptions == 0x80000 ||
bindinfo.dwOptions == 0x4080000, /* win2k3 */
"bindinfo.dwOptions=%x\n", bindinfo.dwOptions);
protocol_read += *pcbRead = sizeof(css_data)-1;
memcpy(pv, css_data, sizeof(css_data)-1);
+
return S_OK;
}
static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv)
{
- ok(0, "unexpected call\n");
+ 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;
return E_NOINTERFACE;
}
static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID)
{
+ if(resetting_document)
+ return S_OK;
+
switch(dispID) {
case DISPID_READYSTATE:
CHECK_EXPECT2(OnChanged_READYSTATE);
case 1012:
CHECK_EXPECT2(OnChanged_1012);
return S_OK;
+ case 1014:
+ CHECK_EXPECT2(OnChanged_1014);
+ return S_OK;
case 1030:
case 3000022:
case 3000023:
case 3000029:
case 3000030:
case 3000031:
+ case 3000032:
/* TODO */
return S_OK;
}
return S_OK;
}
- ok(0, "unexpected call %s\n", debugstr_guid(riid));
+ ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid));
*ppv = NULL;
return E_NOINTERFACE;
}
REFIID riid,
void **ppvObject)
{
- ok(0, "unexpected call\n");
+ *ppvObject = NULL;
+
+ if(IsEqualGUID(&IID_IGetBindHandle, riid))
+ return E_NOINTERFACE;
+
+ ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid));
return E_NOINTERFACE;
}
static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl };
+DEFINE_GUID(IID_unk_binding, 0xf3d8f080,0xa5eb,0x476f,0x9d,0x19,0xa5,0xef,0x24,0xe5,0xc2,0xe6);
+
static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv)
{
if(IsEqualGUID(&IID_IUnknown, riid)) {
return S_OK;
}
- ok(0, "unexpected call\n");
+ if(IsEqualGUID(&IID_unk_binding, riid)) {
+ *ppv = NULL;
+ return E_NOINTERFACE;
+ }
+
+ trace("Binding::QI(%s)\n", wine_dbgstr_guid(riid));
+ *ppv = NULL;
return E_NOINTERFACE;
}
{
CHECK_EXPECT(Abort);
if(asynchronous_binding)
- PeekMessage(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE);
+ PeekMessageA(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE);
return S_OK;
}
if(IsEqualGUID(&IID_IMoniker_unk2, riid))
return E_NOINTERFACE; /* TODO */
- ok(0, "unexpected riid: %s\n", debugstr_guid(riid));
+ ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid));
return E_NOINTERFACE;
}
static HRESULT WINAPI Moniker_GetClassID(IMoniker *iface, CLSID *pClassID)
{
CHECK_EXPECT(GetClassID);
- ok(IsEqualGUID(pClassID, &IID_NULL), "pClassID = %s\n", debugstr_guid(pClassID));
+ ok(IsEqualGUID(pClassID, &IID_NULL), "pClassID = %s\n", wine_dbgstr_guid(pClassID));
return E_FAIL;
}
static const GUID undocumented_frame_iid = {0xfbece6c9,0x48d7,0x4a37,{0x8f,0xe3,0x6a,0xd4,0x27,0x2f,0xdd,0xac}};
if(!IsEqualGUID(&undocumented_frame_iid, riid))
- ok(0, "unexpected riid %s\n", debugstr_guid(riid));
+ ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid));
*ppv = NULL;
return E_NOINTERFACE;
static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText)
{
- CHECK_EXPECT2(SetStatusText);
+ if(!resetting_document)
+ CHECK_EXPECT2(SetStatusText);
if(!expect_status_text)
ok(pszStatusText == NULL, "pszStatusText=%p, expected NULL\n", pszStatusText);
return S_OK;
static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo)
{
- CHECK_EXPECT(GetHostInfo);
+ if(!resetting_document)
+ CHECK_EXPECT(GetHostInfo);
ok(iface == expect_uihandler_iface, "called on unexpected iface\n");
ok(pInfo != NULL, "pInfo=NULL\n");
if(pInfo) {
ok(ppchURLOut != NULL, "ppchURLOut == NULL\n");
ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut);
+ /* Not related to hash navigation, just return NULL and S_OK in some cases. */
+ if(loading_hash) {
+ *ppchURLOut = NULL;
+ return S_OK;
+ }
+
return S_FALSE;
}
ok(pchKey != NULL, "pchKey = NULL\n");
if(pchKey)
ok(!*pchKey, "*pchKey=%p, expected NULL\n", *pchKey);
- ok(!dw, "dw=%d, xepected 0\n", dw);
+ ok(!dw, "dw=%d, expected 0\n", dw);
return S_OK;
}
return S_OK;
}
+ *ppv = NULL;
+
if(IsEqualGUID(&IID_IOleCommandTarget, riid))
return E_NOINTERFACE;
- else if(IsEqualGUID(&IID_IDocHostShowUI, riid))
+ if(IsEqualGUID(&IID_IDocHostShowUI, riid))
return E_NOINTERFACE; /* TODO */
- ok(0, "unexpected call %s\n", debugstr_guid(riid));
+ trace("CustomDocHostUIHandler::QI(%s)\n", wine_dbgstr_guid(riid));
return E_NOINTERFACE;
}
static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup,
DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer))
- && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)
- || (nCmdID != 63 && (!is_refresh || nCmdID != 37))))
- test_readyState(NULL);
+ if(resetting_document)
+ return E_FAIL;
if(!pguidCmdGroup) {
+ test_readyState(NULL);
+
switch(nCmdID) {
case OLECMDID_SETPROGRESSMAX:
CHECK_EXPECT2(Exec_SETPROGRESSMAX);
test_readyState(NULL);
return S_OK;
case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY:
+ case OLECMDID_PAGEAVAILABLE:
case 6058:
return E_FAIL; /* FIXME */
default:
test_readyState(NULL);
load_state = LD_LOADING;
}else {
+ if(!is_refresh)
+ test_readyState(NULL);
if(nav_url)
- test_GetCurMoniker(doc_unk, NULL, nav_serv_url);
+ test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE);
else if(load_from_stream)
- test_GetCurMoniker(doc_unk, NULL, "about:blank");
+ test_GetCurMoniker(doc_unk, NULL, "about:blank", FALSE);
else if(!editmode)
- test_GetCurMoniker(doc_unk, doc_mon, NULL);
+ test_GetCurMoniker(doc_unk, doc_mon, NULL, FALSE);
}
ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut);
}
return S_OK;
+ case 62:
+ CHECK_EXPECT(Exec_ShellDocView_62);
+ ok(!pvaIn, "pvaIn != NULL\n");
+ ok(!pvaOut, "pvaOut != NULL\n");
+ return S_OK;
+
case 63: {
IHTMLPrivateWindow *priv_window;
HRESULT hres;
CHECK_EXPECT(Exec_ShellDocView_67);
ok(pvaIn != NULL, "pvaIn == NULL\n");
ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn));
- ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n",
+ ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected \"%s\"\n",
wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url);
ok(pvaOut != NULL, "pvaOut == NULL\n");
ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut));
if(pvaIn)
ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut));
+ test_readyState(NULL);
return E_NOTIMPL;
case 103:
ok(pvaIn == NULL, "pvaIn != NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n");
+ test_readyState(NULL);
return E_NOTIMPL;
case 105:
ok(pvaIn != NULL, "pvaIn == NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n");
+ test_readyState(NULL);
return E_NOTIMPL;
case 138:
CHECK_EXPECT2(Exec_ShellDocView_138);
ok(!pvaIn, "pvaIn != NULL\n");
ok(!pvaOut, "pvaOut != NULL\n");
+ test_readyState(NULL);
return S_OK;
case 140:
ok(pvaIn == NULL, "pvaIn != NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n");
+ test_readyState(NULL);
return E_NOTIMPL;
+ case 83:
+ case 101:
+ case 102:
+ case 132:
+ 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:
+ case 180:
+ case 181:
+ case 182:
+ case 183:
return E_NOTIMPL;
default:
}
if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) {
+ test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
switch(nCmdID) {
if(IsEqualGUID(&CGID_DocHostCmdPriv, pguidCmdGroup)) {
switch(nCmdID) {
case DOCHOST_DOCCANNAVIGATE:
- CHECK_EXPECT(Exec_DOCCANNAVIGATE);
- ok(pvaIn != NULL, "pvaIn == NULL\n");
+ if(pvaIn) {
+ CHECK_EXPECT(Exec_DOCCANNAVIGATE);
+ ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n");
+ /* FIXME: test V_UNKNOWN(pvaIn) == window */
+ }else {
+ CHECK_EXPECT(Exec_DOCCANNAVIGATE_NULL);
+ }
+
+ test_readyState(NULL);
ok(pvaOut == NULL, "pvaOut != NULL\n");
- ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n");
- /* FIXME: test V_UNKNOWN(pvaIn) == window */
return S_OK;
case 1: {
SAFEARRAY *sa;
VARIANT var;
HRESULT hres;
+ test_readyState(NULL);
+
ok(pvaIn != NULL, "pvaIn == NULL\n");
ok(pvaOut != NULL || broken(!pvaOut), "pvaOut != NULL\n");
ok(V_VT(pvaIn) == VT_ARRAY, "V_VT(pvaIn) = %d\n", V_VT(pvaIn));
ok(ind == 0, "Lower bound = %d\n", ind);
hres = SafeArrayGetUBound(sa, 1, &ind);
ok(hres == S_OK, "SafeArrayGetUBound failed: %x\n", hres);
- ok(ind == 7 || broken(ind == 5), "Upper bound = %d\n", ind);
+ ok(ind == 7 || ind == 8 /* IE11 */ ||broken(ind == 5), "Upper bound = %d\n", ind);
ind = 0;
SafeArrayGetElement(sa, &ind, &var);
}
if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) {
+ test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
switch(nCmdID) {
}
if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) {
+ test_readyState(NULL);
+
switch (nCmdID) {
case OLECMDID_PAGEACTIONBLOCKED: /* win2k3 */
SET_EXPECT(SetStatusText);
}
}
- ok(0, "unexpected pguidCmdGroup: %s\n", debugstr_guid(pguidCmdGroup));
+ ok(0, "unexpected pguidCmdGroup: %s\n", wine_dbgstr_guid(pguidCmdGroup));
return E_NOTIMPL;
}
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
+ if(resetting_document)
+ return E_FAIL;
+
ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n");
ok(pDispParams != NULL, "pDispParams == NULL\n");
ok(pExcepInfo == NULL, "pExcepInfo=%p, expected NULL\n", pExcepInfo);
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:
IHTMLDocument2 *doc;
BSTR state;
- ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid));
+ if(resetting_document)
+ return E_FAIL;
+
+ ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", wine_dbgstr_guid(riid));
ok(pDispParams != NULL, "pDispParams == NULL\n");
ok(pExcepInfo != NULL, "pExcepInfo == NULL\n");
ok(puArgErr != NULL, "puArgErr == NULL\n");
static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, void **ppv)
{
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))
- ok(0, "unexpected call %s\n", debugstr_guid(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;
return E_NOINTERFACE;
return E_NOTIMPL;
}
+static IBrowserService BrowserService;
static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk)
{
CHECK_EXPECT(CountEntries);
- return E_NOTIMPL;
+
+ ok(punk == (IUnknown*)&BrowserService, "punk != &BrowserService (%p)\n", punk);
+ return 0;
}
static HRESULT WINAPI TravelLog_Revert(ITravelLog *iface)
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 = %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));
- ok(!pPostData, "pPostData = %p\n", pPostData);
- ok(!cbPostData, "cbPostData = %d\n", cbPostData);
- ok(!lpszHeaders, "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders));
+ if(!testing_submit) {
+ ok(!pPostData, "pPostData = %p\n", pPostData);
+ ok(!cbPostData, "cbPostData = %d\n", cbPostData);
+ ok(!lpszHeaders || !strcmp_wa(lpszHeaders, "Referer: http://test.winehq.org/tests/winehq_snapshot/\r\n"),
+ "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders));
+ }else {
+ ok(cbPostData == 9, "cbPostData = %d\n", cbPostData);
+ ok(!memcmp(pPostData, "cmd=TEST", cbPostData), "pPostData = %p\n", pPostData);
+ ok(wstr_contains(lpszHeaders, "Content-Type: application/x-www-form-urlencoded\r\n"),
+ "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders));
+
+ }
ok(fPlayNavSound, "fPlayNavSound = %x\n", fPlayNavSound);
ok(pfCancel != NULL, "pfCancel = NULL\n");
ok(!*pfCancel, "*pfCancel = %x\n", *pfCancel);
IDocObjectService* This,
BSTR *pbstrPendingUrl)
{
- CHECK_EXPECT(GetPendingUrl);
+ if(!resetting_document)
+ CHECK_EXPECT(GetPendingUrl);
return E_NOTIMPL;
}
return E_NOINTERFACE;
}
-static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv)
+static HRESULT WINAPI WBE2Sink_QueryInterface(IDispatch *iface, REFIID riid, void **ppv)
{
+ if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) {
+ *ppv = iface;
+ return S_OK;
+ }
+
*ppv = NULL;
+ ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid));
+ return E_NOINTERFACE;
+}
- if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IWebBrowser, riid)
- || IsEqualGUID(&IID_IWebBrowserApp, riid) || IsEqualGUID(&IID_IWebBrowser2, riid)) {
- *ppv = iface;
+static HRESULT WINAPI WBE2Sink_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid,
+ LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult,
+ EXCEPINFO *pExcepInfo, UINT *puArgErr)
+{
+ ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n");
+ ok(pdp != NULL, "pDispParams == NULL\n");
+ ok(pExcepInfo == NULL, "pExcepInfo=%p, expected NULL\n", pExcepInfo);
+ ok(puArgErr == NULL, "puArgErr != NULL\n");
+ ok(pVarResult == NULL, "pVarResult != NULL\n");
+ ok(wFlags == DISPATCH_METHOD, "wFlags=%08x, expected DISPATCH_METHOD\n", wFlags);
+ ok(!pdp->cNamedArgs, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs);
+ ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs = %p\n", pdp->rgdispidNamedArgs);
+
+ switch(dispIdMember) {
+ case DISPID_WINDOWCLOSING: {
+ VARIANT *is_child = pdp->rgvarg+1, *cancel = pdp->rgvarg;
+
+ CHECK_EXPECT(WindowClosing);
+
+ ok(pdp->cArgs == 2, "pdp->cArgs = %d\n", pdp->cArgs);
+ ok(V_VT(is_child) == VT_BOOL, "V_VT(is_child) = %d\n", V_VT(is_child));
+ ok(!V_BOOL(is_child), "V_BOOL(is_child) = %x\n", V_BOOL(is_child));
+ ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel) = %d\n", V_VT(cancel));
+ ok(!*V_BOOLREF(cancel), "*V_BOOLREF(cancel) = %x\n", *V_BOOLREF(cancel));
+
+ *V_BOOLREF(cancel) = VARIANT_TRUE;
return S_OK;
}
+ default:
+ ok(0, "unexpected id %d\n", dispIdMember);
+ }
- if(IsEqualGUID(riid, &IID_IOleObject))
- return E_NOINTERFACE; /* TODO */
+ return E_NOTIMPL;
+}
+
+static const IDispatchVtbl WBE2SinkVtbl = {
+ WBE2Sink_QueryInterface,
+ Dispatch_AddRef,
+ Dispatch_Release,
+ Dispatch_GetTypeInfoCount,
+ Dispatch_GetTypeInfo,
+ Dispatch_GetIDsOfNames,
+ WBE2Sink_Invoke
+};
- ok(0, "unexpected call %s\n", debugstr_guid(riid));
+static IDispatch WBE2Sink = { &WBE2SinkVtbl };
+
+static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, LPVOID *ppv)
+{
+ ok(0, "unexpected call\n");
return E_NOINTERFACE;
}
-static ULONG WINAPI WebBrowser_AddRef(IWebBrowser2 *iface)
+static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface)
{
return 2;
}
-static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface)
+static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface)
{
return 1;
}
-static HRESULT WINAPI WebBrowser_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo)
+static BOOL next_called;
+
+static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *rgcd, ULONG *pcFetched)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ CHECK_EXPECT2(EnumConnections_Next);
+
+ ok(cConnections == 1, "cConnections = %d\n", cConnections);
+ ok(pcFetched != NULL, "pcFetched == NULL\n");
+
+ if(next_called) {
+ *pcFetched = 0;
+ return S_FALSE;
+ }
+
+ next_called = TRUE;
+ rgcd->pUnk = (IUnknown*)&WBE2Sink;
+ rgcd->dwCookie = 0xdeadbeef;
+ *pcFetched = 1;
+ return S_OK;
}
-static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid,
- LPTYPEINFO *ppTInfo)
+static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG ulConnections)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return E_NOINTERFACE;
}
-static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid,
- LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
+static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return E_NOINTERFACE;
}
-static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember,
- REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
- EXCEPINFO *pExepInfo, UINT *puArgErr)
+static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return E_NOINTERFACE;
}
-static HRESULT WINAPI WebBrowser_GoBack(IWebBrowser2 *iface)
+static const IEnumConnectionsVtbl EnumConnectionsVtbl = {
+ EnumConnections_QueryInterface,
+ EnumConnections_AddRef,
+ EnumConnections_Release,
+ EnumConnections_Next,
+ EnumConnections_Skip,
+ EnumConnections_Reset,
+ EnumConnections_Clone
+};
+
+static IEnumConnections EnumConnections = { &EnumConnectionsVtbl };
+
+static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, LPVOID *ppv)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return E_NOINTERFACE;
}
-static HRESULT WINAPI WebBrowser_GoForward(IWebBrowser2 *iface)
+static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 2;
}
-static HRESULT WINAPI WebBrowser_GoHome(IWebBrowser2 *iface)
+static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 1;
}
-static HRESULT WINAPI WebBrowser_GoSearch(IWebBrowser2 *iface)
+static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl,
- VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers)
+static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface,
+ IConnectionPointContainer **ppCPC)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface)
+static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, DWORD *pdwCookie)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level)
+static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface)
+static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ CHECK_EXPECT(EnumConnections);
+
+ *ppEnum = &EnumConnections;
+ next_called = FALSE;
+ return S_OK;
}
-static HRESULT WINAPI WebBrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp)
+static const IConnectionPointVtbl ConnectionPointVtbl =
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
-}
+ ConnectionPoint_QueryInterface,
+ ConnectionPoint_AddRef,
+ ConnectionPoint_Release,
+ ConnectionPoint_GetConnectionInterface,
+ ConnectionPoint_GetConnectionPointContainer,
+ ConnectionPoint_Advise,
+ ConnectionPoint_Unadvise,
+ ConnectionPoint_EnumConnections
+};
-static HRESULT WINAPI WebBrowser_get_Parent(IWebBrowser2 *iface, IDispatch **ppDisp)
+static IConnectionPoint ConnectionPointWBE2 = { &ConnectionPointVtbl };
+
+static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface,
+ REFIID riid, void **ppv)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return E_NOINTERFACE;
}
-static HRESULT WINAPI WebBrowser_get_Container(IWebBrowser2 *iface, IDispatch **ppDisp)
+static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 2;
}
-static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp)
+static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 1;
}
-static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
+static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface,
+ IEnumConnectionPoints **ppEnum)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_Type(IWebBrowser2 *iface, BSTR *Type)
+static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface,
+ REFIID riid, IConnectionPoint **ppCP)
{
- ok(0, "unexpected call\n");
+ CHECK_EXPECT(FindConnectionPoint);
+
+ if(IsEqualGUID(riid, &DIID_DWebBrowserEvents2)) {
+ *ppCP = &ConnectionPointWBE2;
+ return S_OK;
+ }
+
+ ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid));
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_Left(IWebBrowser2 *iface, LONG *pl)
+static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = {
+ ConnectionPointContainer_QueryInterface,
+ ConnectionPointContainer_AddRef,
+ ConnectionPointContainer_Release,
+ ConnectionPointContainer_EnumConnectionPoints,
+ ConnectionPointContainer_FindConnectionPoint
+};
+
+static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl };
+
+static void test_NavigateWithBindCtx(BSTR uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data,
+ VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ ok(!strcmp_wa(uri, nav_url), "uri = %s\n", wine_dbgstr_w(uri));
+ ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags));
+ ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags));
+ ok(!target_frame, "target_frame != NULL\n");
+ ok(!post_data, "post_data != NULL\n");
+ ok(!headers, "headers != NULL\n");
+ ok(bind_ctx != NULL, "bind_ctx == NULL\n");
+ ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment));
}
-static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, LONG Left)
+static HRESULT wb_qi(REFIID riid, void **ppv);
+
+static HRESULT WINAPI WebBrowserPriv_QueryInterface(IWebBrowserPriv *iface, REFIID riid, void **ppv)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return wb_qi(riid, ppv);
}
-static HRESULT WINAPI WebBrowser_get_Top(IWebBrowser2 *iface, LONG *pl)
+static ULONG WINAPI WebBrowserPriv_AddRef(IWebBrowserPriv *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 2;
}
-static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, LONG Top)
+static ULONG WINAPI WebBrowserPriv_Release(IWebBrowserPriv *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 1;
}
-static HRESULT WINAPI WebBrowser_get_Width(IWebBrowser2 *iface, LONG *pl)
+static HRESULT WINAPI WebBrowserPriv_NavigateWithBindCtx(IWebBrowserPriv *iface, VARIANT *uri, VARIANT *flags,
+ VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ trace("NavigateWithBindCtx\n");
+
+ CHECK_EXPECT(NavigateWithBindCtx);
+
+ ok(V_VT(uri) == VT_BSTR, "V_VT(uri) = %d\n", V_VT(uri));
+ test_NavigateWithBindCtx(V_BSTR(uri), flags, target_frame, post_data, headers, bind_ctx, url_fragment);
+ return S_OK;
}
-static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, LONG Width)
+static HRESULT WINAPI WebBrowserPriv_OnClose(IWebBrowserPriv *iface)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, LONG *pl)
+static const IWebBrowserPrivVtbl WebBrowserPrivVtbl = {
+ WebBrowserPriv_QueryInterface,
+ WebBrowserPriv_AddRef,
+ WebBrowserPriv_Release,
+ WebBrowserPriv_NavigateWithBindCtx,
+ WebBrowserPriv_OnClose
+};
+
+static IWebBrowserPriv WebBrowserPriv = { &WebBrowserPrivVtbl };
+
+static HRESULT WINAPI WebBrowserPriv2IE8_QueryInterface(IWebBrowserPriv2IE8 *iface, REFIID riid, void **ppv)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return wb_qi(riid, ppv);
}
-static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height)
+static ULONG WINAPI WebBrowserPriv2IE8_AddRef(IWebBrowserPriv2IE8 *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 2;
}
-static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName)
+static ULONG WINAPI WebBrowserPriv2IE8_Release(IWebBrowserPriv2IE8 *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 1;
}
-static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL)
+static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE8 *iface, IUri *uri, VARIANT *flags,
+ VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment)
{
- CHECK_EXPECT(get_LocationURL);
- return E_NOTIMPL;
+ BSTR str;
+ HRESULT hres;
+
+ trace("IE8: NavigateWithBindCtx2\n");
+
+ CHECK_EXPECT(NavigateWithBindCtx);
+
+ hres = IUri_GetDisplayUri(uri, &str);
+ ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres);
+ test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment);
+ SysFreeString(str);
+ return S_OK;
}
-static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
+static HRESULT WINAPI WebBrowserPriv2IE8_SetBrowserFrameOptions(IWebBrowserPriv2IE8 *iface, DWORD opt1, DWORD opt2)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_Quit(IWebBrowser2 *iface)
+static HRESULT WINAPI WebBrowserPriv2IE8_DetachConnectionPoints(IWebBrowserPriv2IE8 *iface)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_ClientToWindow(IWebBrowser2 *iface, int *pcx, int *pcy)
+static HRESULT WINAPI WebBrowserPriv2IE8_GetProcessId(IWebBrowserPriv2IE8 *iface, DWORD *pid)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_PutProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT vtValue)
+static HRESULT WINAPI WebBrowserPriv2IE8_CompatAttachEditEvents(IWebBrowserPriv2IE8 *iface)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_GetProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT *pvtValue)
+static HRESULT WINAPI WebBrowserPriv2IE8_HandleOpenOptions(IWebBrowserPriv2IE8 *iface, IUnknown *obj, BSTR bstr, int options)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name)
+static HRESULT WINAPI WebBrowserPriv2IE8_SetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR term)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND)
+static HRESULT WINAPI WebBrowserPriv2IE8_GetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR *term)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_FullName(IWebBrowser2 *iface, BSTR *FullName)
+static HRESULT WINAPI WebBrowserPriv2IE8_GetCurrentDocument(IWebBrowserPriv2IE8 *iface, IDispatch **doc)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_Path(IWebBrowser2 *iface, BSTR *Path)
+static const IWebBrowserPriv2IE8Vtbl WebBrowserPriv2IE8Vtbl = {
+ WebBrowserPriv2IE8_QueryInterface,
+ WebBrowserPriv2IE8_AddRef,
+ WebBrowserPriv2IE8_Release,
+ WebBrowserPriv2IE8_NavigateWithBindCtx2,
+ WebBrowserPriv2IE8_SetBrowserFrameOptions,
+ WebBrowserPriv2IE8_DetachConnectionPoints,
+ WebBrowserPriv2IE8_GetProcessId,
+ WebBrowserPriv2IE8_CompatAttachEditEvents,
+ WebBrowserPriv2IE8_HandleOpenOptions,
+ WebBrowserPriv2IE8_SetSearchTerm,
+ WebBrowserPriv2IE8_GetSearchTerm,
+ WebBrowserPriv2IE8_GetCurrentDocument
+};
+
+static IWebBrowserPriv2IE8 WebBrowserPriv2IE8 = { &WebBrowserPriv2IE8Vtbl };
+
+static HRESULT WINAPI WebBrowserPriv2IE9_QueryInterface(IWebBrowserPriv2IE9 *iface, REFIID riid, void **ppv)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return wb_qi(riid, ppv);
}
-static HRESULT WINAPI WebBrowser_get_Visible(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
+static ULONG WINAPI WebBrowserPriv2IE9_AddRef(IWebBrowserPriv2IE9 *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 2;
}
-static HRESULT WINAPI WebBrowser_put_Visible(IWebBrowser2 *iface, VARIANT_BOOL Value)
+static ULONG WINAPI WebBrowserPriv2IE9_Release(IWebBrowserPriv2IE9 *iface)
{
- ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return 1;
+}
+
+static HRESULT WINAPI WebBrowserPriv2IE9_NavigateWithBindCtx2(IWebBrowserPriv2IE9 *iface, IUri *uri, VARIANT *flags,
+ VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unknown)
+{
+ BSTR str;
+ HRESULT hres;
+
+ trace("IE9: NavigateWithBindCtx2\n");
+
+ CHECK_EXPECT(NavigateWithBindCtx);
+
+ hres = IUri_GetDisplayUri(uri, &str);
+ ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres);
+ test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment);
+ SysFreeString(str);
+ return S_OK;
+}
+
+static const IWebBrowserPriv2IE9Vtbl WebBrowserPriv2IE9Vtbl = {
+ WebBrowserPriv2IE9_QueryInterface,
+ WebBrowserPriv2IE9_AddRef,
+ WebBrowserPriv2IE9_Release,
+ WebBrowserPriv2IE9_NavigateWithBindCtx2
+};
+
+static IWebBrowserPriv2IE9 WebBrowserPriv2IE9 = { &WebBrowserPriv2IE9Vtbl };
+
+static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv)
+{
+ return wb_qi(riid, ppv);
+}
+
+static ULONG WINAPI WebBrowser_AddRef(IWebBrowser2 *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI WebBrowser_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid,
+ LPTYPEINFO *ppTInfo)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid,
+ LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember,
+ REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
+ EXCEPINFO *pExepInfo, UINT *puArgErr)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GoBack(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GoForward(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GoHome(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GoSearch(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl,
+ VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Parent(IWebBrowser2 *iface, IDispatch **ppDisp)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Container(IWebBrowser2 *iface, IDispatch **ppDisp)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Type(IWebBrowser2 *iface, BSTR *Type)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Left(IWebBrowser2 *iface, LONG *pl)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, LONG Left)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Top(IWebBrowser2 *iface, LONG *pl)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, LONG Top)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Width(IWebBrowser2 *iface, LONG *pl)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, LONG Width)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, LONG *pl)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL)
+{
+ CHECK_EXPECT(get_LocationURL);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_Quit(IWebBrowser2 *iface)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_ClientToWindow(IWebBrowser2 *iface, int *pcx, int *pcy)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_PutProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT vtValue)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_GetProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT *pvtValue)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_FullName(IWebBrowser2 *iface, BSTR *FullName)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Path(IWebBrowser2 *iface, BSTR *Path)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_get_Visible(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WebBrowser_put_Visible(IWebBrowser2 *iface, VARIANT_BOOL Value)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
}
static HRESULT WINAPI WebBrowser_get_StatusBar(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
static HRESULT WINAPI WebBrowser_get_AddressBar(IWebBrowser2 *iface, VARIANT_BOOL *Value)
{
- ok(0, "unexpected call\n");
+ trace("get_AddressBar: ignoring\n"); /* Some old IEs call it */
return E_NOTIMPL;
}
WebBrowser_put_Resizable
};
-static IWebBrowser2 WebBrowser2 = { &WebBrowser2Vtbl };
+static IWebBrowser2 WebBrowser2 = { &WebBrowser2Vtbl };
+
+static HRESULT wb_qi(REFIID riid, void **ppv)
+{
+ static const IID IID_IWebBrowserPriv2IE7 = {0x1af32b6c, 0xa3ba,0x48b9,{0xb2,0x4e,0x8a,0xa9,0xc4,0x1f,0x6e,0xcd}};
+ static const IID IID_IWebBrowserPriv2IE8XP = {0x486f6159,0x9f3f,0x4827,{0x82,0xd4,0x28,0x3c,0xef,0x39,0x77,0x33}};
+
+ *ppv = NULL;
+
+ if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IWebBrowser, riid)
+ || IsEqualGUID(&IID_IWebBrowserApp, riid) || IsEqualGUID(&IID_IWebBrowser2, riid)) {
+ *ppv = &WebBrowser2;
+ return S_OK;
+ }
+
+ if(IsEqualGUID(riid, &IID_IOleObject))
+ return E_NOINTERFACE; /* TODO */
+
+ if(IsEqualGUID(riid, &IID_IConnectionPointContainer)) {
+ *ppv = &ConnectionPointContainer;
+ return S_OK;
+ }
+
+ if(IsEqualGUID(riid, &IID_IWebBrowserPriv)) {
+ *ppv = &WebBrowserPriv;
+ return S_OK;
+ }
+
+ if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE8)) {
+ /* IE8 and IE9 versions use the same IID, but have different declarations. */
+ *ppv = is_ie9plus ? (void*)&WebBrowserPriv2IE9 : (void*)&WebBrowserPriv2IE8;
+ return S_OK;
+ }
+
+ if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE7)) {
+ trace("QI(IID_IWebBrowserPriv2IE7)\n");
+ return E_NOINTERFACE;
+ }
+
+ if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE8XP)) {
+ trace("QI(IID_IWebBrowserPriv2IE8XP)\n");
+ return E_NOINTERFACE;
+ }
+
+ ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid));
+ return E_NOINTERFACE;
+}
static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface,
REFIID riid, void **ppv)
*ppv = &WebBrowser2;
return S_OK;
}
- ok(0, "unexpected riid %s\n", debugstr_guid(riid));
+ ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid));
}
return E_NOINTERFACE;
return S_OK;
}
- ok(0, "unexpected riid %s\n", debugstr_guid(riid));
+ ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid));
*ppv = NULL;
return E_NOINTERFACE;
}
DEFINE_GUID(IID_IRenMailEditor, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
DEFINE_GUID(IID_unk4, 0x305104a6,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);
DEFINE_GUID(IID_IDocHostUIHandlerPriv, 0xf0d241d1,0x5d0e,0x4e85,0xbc,0xb4,0xfa,0xd7,0xf7,0xc5,0x52,0x8c);
+DEFINE_GUID(IID_unk5, 0x5f95accc,0xd7a1,0x4574,0xbc,0xcb,0x69,0x71,0x35,0xbc,0x41,0xde);
static HRESULT QueryInterface(REFIID riid, void **ppv)
{
return E_NOINTERFACE; /* ? */
else if(IsEqualGUID(&IID_unk4, riid))
return E_NOINTERFACE; /* ? */
+ else if(IsEqualGUID(&IID_unk5, riid))
+ return E_NOINTERFACE; /* IE10 */
else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid))
return E_NOINTERFACE; /* ? */
else
- ok(0, "unexpected riid %s\n", debugstr_guid(riid));
+ trace("QI(%s)\n", wine_dbgstr_guid(riid));
if(*ppv)
return S_OK;
continue_binding(callback);
}
- return DefWindowProc(hwnd, msg, wParam, lParam);
+ return DefWindowProcW(hwnd, msg, wParam, lParam);
}
static void test_doscroll(IUnknown *unk)
switch(load_state) {
case LD_DOLOAD:
case LD_NO:
- if(!nav_url)
+ if(!nav_url && !editmode)
ok(!elem, "elem != NULL\n");
default:
break;
"uninitialized"
};
- if(open_call)
+ if(open_call || resetting_document)
return; /* FIXME */
if(!unk)
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);
CHECK_CALLED(Exec_ShellDocView_37);
todo_wine CHECK_CALLED_BROKEN(IsErrorUrl);
}else {
- todo_wine CHECK_CALLED(GetTravelLog);
+ CHECK_CALLED(GetTravelLog);
}
CHECK_CALLED_BROKEN(Exec_ShellDocView_84);
todo_wine CHECK_CALLED(GetPendingUrl);
set_clientsite = container_locked = TRUE;
- test_GetCurMoniker((IUnknown*)persist, mon, NULL);
+ test_GetCurMoniker((IUnknown*)persist, mon, NULL, FALSE);
IBindCtx_Release(bind);
#define DWL_EXPECT_HISTUPDATE 0x0080
#define DWL_FROM_HISTORY 0x0100
#define DWL_REFRESH 0x0200
+#define DWL_EX_GETHOSTINFO 0x0400
+#define DWL_EXTERNAL 0x0800
static void test_download(DWORD flags)
{
+ const BOOL is_extern = (flags & DWL_EXTERNAL) != 0;
const BOOL is_js = (flags & DWL_JAVASCRIPT) != 0;
HWND hwnd;
BOOL *b;
MSG msg;
- b = is_js ? &called_Exec_SETDOWNLOADSTATE_0 : &called_Exec_HTTPEQUIV_DONE;
+ if(is_js)
+ b = &called_Exec_SETDOWNLOADSTATE_0;
+ else if(is_extern)
+ b = &called_NavigateWithBindCtx;
+ else
+ b = &called_Exec_HTTPEQUIV_DONE;
is_refresh = (flags & DWL_REFRESH) != 0;
hwnd = FindWindowA("Internet Explorer_Hidden", NULL);
}
if(flags & (DWL_VERBDONE|DWL_HTTP))
SET_EXPECT(Exec_SETPROGRESSMAX);
- if((flags & DWL_VERBDONE) && !load_from_stream && !is_js)
+ if(flags & DWL_EX_GETHOSTINFO)
SET_EXPECT(GetHostInfo);
SET_EXPECT(SetStatusText);
if(!(flags & DWL_EMPTY))
SET_EXPECT(Invoke_OnReadyStateChange_Loading);
if(!(flags & (DWL_EMPTY|DWL_JAVASCRIPT)))
SET_EXPECT(Invoke_OnReadyStateChange_Interactive);
- if(!is_js)
+ if(!is_js && !is_extern)
SET_EXPECT(Invoke_OnReadyStateChange_Complete);
SET_EXPECT(Exec_Explorer_69);
SET_EXPECT(EnableModeless_TRUE); /* IE7 */
SET_EXPECT(Frame_EnableModeless_TRUE); /* IE7 */
SET_EXPECT(EnableModeless_FALSE); /* IE7 */
SET_EXPECT(Frame_EnableModeless_FALSE); /* IE7 */
- if((nav_url && !is_js) || (flags & (DWL_CSS|DWL_HTTP)))
+ if((nav_url && !is_js && !is_extern) || (flags & (DWL_CSS|DWL_HTTP)))
SET_EXPECT(Exec_ShellDocView_37);
if(flags & DWL_HTTP) {
if(!(flags & DWL_FROM_HISTORY))
SET_EXPECT(Exec_HTTPEQUIV);
SET_EXPECT(Exec_SETTITLE);
}
- if(!is_js)
+ if(!is_js && !is_extern)
SET_EXPECT(OnChanged_1005);
SET_EXPECT(OnChanged_READYSTATE);
SET_EXPECT(Exec_SETPROGRESSPOS);
SET_EXPECT(Exec_ShellDocView_103);
SET_EXPECT(Exec_ShellDocView_105);
SET_EXPECT(Exec_ShellDocView_140);
- if(!is_js) {
+ if(!is_js && !is_extern) {
SET_EXPECT(Exec_MSHTML_PARSECOMPLETE);
if(support_wbapp) /* Called on some Vista installations */
SET_EXPECT(CountEntries);
SET_EXPECT(Exec_HTTPEQUIV_DONE);
}
- SET_EXPECT(SetStatusText);
if(nav_url || support_wbapp) {
SET_EXPECT(UpdateUI);
SET_EXPECT(Exec_UPDATECOMMANDS);
SET_EXPECT(Exec_Explorer_38);
SET_EXPECT(UpdateBackForwardState);
}
- if(!is_js) {
+ if(!is_js && !is_extern) {
if(!editmode && !(flags & DWL_REFRESH)) {
if(!(flags & DWL_EMPTY))
SET_EXPECT(FireNavigateComplete2);
SET_EXPECT(ActiveElementChanged);
}
SET_EXPECT(IsErrorUrl);
+ if(is_extern) {
+ SET_EXPECT(Exec_ShellDocView_62);
+ SET_EXPECT(Exec_DOCCANNAVIGATE_NULL);
+ 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 && GetMessage(&msg, NULL, 0, 0)) {
+ while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
- DispatchMessage(&msg);
+ DispatchMessageA(&msg);
}
if(flags & DWL_REFRESH) {
CHECK_CALLED(Exec_SETPROGRESSMAX);
if(flags & DWL_HTTP)
SET_CALLED(Exec_SETPROGRESSMAX);
- if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) {
+ if(flags & DWL_EX_GETHOSTINFO) {
if(nav_url)
todo_wine CHECK_CALLED(GetHostInfo);
else
}
if(flags & DWL_ONREADY_LOADING)
CHECK_CALLED(Invoke_OnReadyStateChange_Loading);
- if(!(flags & (DWL_EMPTY|DWL_JAVASCRIPT)))
- CHECK_CALLED(Invoke_OnReadyStateChange_Interactive);
- if(!is_js)
+ if(!(flags & (DWL_EMPTY|DWL_JAVASCRIPT))) {
+ if(!is_extern)
+ CHECK_CALLED(Invoke_OnReadyStateChange_Interactive);
+ else
+ todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Interactive);
+ }
+ if(!is_js && !is_extern)
CHECK_CALLED(Invoke_OnReadyStateChange_Complete);
SET_CALLED(Exec_Explorer_69);
SET_CALLED(EnableModeless_TRUE); /* IE7 */
SET_CALLED(Frame_EnableModeless_TRUE); /* IE7 */
SET_CALLED(EnableModeless_FALSE); /* IE7 */
SET_CALLED(Frame_EnableModeless_FALSE); /* IE7 */
- if(nav_url && !is_js && !(flags & DWL_REFRESH))
+ if(nav_url && !is_js && !is_extern && !(flags & DWL_REFRESH))
todo_wine CHECK_CALLED(Exec_ShellDocView_37);
else if(flags & (DWL_CSS|DWL_HTTP))
CLEAR_CALLED(Exec_ShellDocView_37); /* Called by IE9 */
CHECK_CALLED(Exec_SETTITLE);
}
if(!is_js) {
- CHECK_CALLED(OnChanged_1005);
+ if(!is_extern)
+ CHECK_CALLED(OnChanged_1005);
CHECK_CALLED(OnChanged_READYSTATE);
CHECK_CALLED(Exec_SETPROGRESSPOS);
}else {
CLEAR_CALLED(OnChanged_READYSTATE); /* sometimes called */
todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS);
}
- if(!(flags & DWL_EMPTY))
- CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
+ if(!(flags & DWL_EMPTY)) {
+ if(!is_extern)
+ CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
+ else
+ todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
+ }
CLEAR_CALLED(Exec_ShellDocView_103);
CLEAR_CALLED(Exec_ShellDocView_105);
CLEAR_CALLED(Exec_ShellDocView_140);
- if(!is_js) {
+ if(!is_js && !is_extern) {
CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE);
if(support_wbapp) /* Called on some Vista installations */
CLEAR_CALLED(CountEntries);
CLEAR_CALLED(UpdateUI);
CLEAR_CALLED(Exec_UPDATECOMMANDS);
CLEAR_CALLED(Exec_SETTITLE);
- if(flags & DWL_EXPECT_HISTUPDATE)
- CHECK_CALLED(Exec_Explorer_38);
+ if(flags & DWL_EXPECT_HISTUPDATE) {
+ if(flags & DWL_FROM_HISTORY)
+ CHECK_CALLED_BROKEN(Exec_Explorer_38); /* Some old IEs don't call it. */
+ else
+ CHECK_CALLED(Exec_Explorer_38);
+ }
todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState);
}
- if(!is_js) {
+ if(!is_js && !is_extern) {
if(!editmode && !(flags & DWL_REFRESH)) {
if(!(flags & DWL_EMPTY)) {
if(support_wbapp)
todo_wine CHECK_CALLED(ActiveElementChanged);
}
todo_wine CHECK_CALLED_BROKEN(IsErrorUrl);
+ if(is_extern) {
+ CHECK_CALLED(Exec_ShellDocView_62);
+ CHECK_CALLED(Exec_DOCCANNAVIGATE_NULL);
+ CHECK_CALLED(NavigateWithBindCtx);
+ todo_wine CHECK_NOT_CALLED(Exec_Explorer_38);
+ }
+ if(editmode || is_refresh)
+ CLEAR_CALLED(Exec_ShellDocView_138); /* IE11 */
- load_state = LD_COMPLETE;
+ if(!is_extern)
+ load_state = LD_COMPLETE;
test_readyState(NULL);
}
}
}
+static void test_put_hash(IHTMLDocument2 *doc, const char *new_hash)
+{
+ static char nav_url_buff[256];
+ IHTMLLocation *location;
+ BSTR str;
+ char *psharp;
+ HRESULT hres;
+
+ trace("put_hash, url = %s, new hash = %s\n", nav_url, new_hash);
+
+ location = NULL;
+ hres = IHTMLDocument2_get_location(doc, &location);
+ ok(hres == S_OK, "get_location failed: %08x\n", hres);
+ ok(location != NULL, "location == NULL\n");
+
+ SET_EXPECT(TranslateUrl);
+ SET_EXPECT(Exec_ShellDocView_67);
+ SET_EXPECT(FireBeforeNavigate2);
+ SET_EXPECT(FireDocumentComplete);
+ SET_EXPECT(FireNavigateComplete2);
+
+ /* Edit nav_url */
+ strcpy(nav_url_buff, nav_url);
+ psharp = strchr(nav_url_buff, '#');
+ if (psharp)
+ *psharp = '\0';
+ strcat(nav_url_buff, new_hash);
+ nav_url = nav_url_buff;
+
+ str = a2bstr(new_hash);
+ hres = IHTMLLocation_put_hash(location, str);
+ ok (hres == S_OK, "put_hash failed: %08x\n", hres);
+ SysFreeString(str);
+
+ CHECK_CALLED(TranslateUrl);
+ CHECK_CALLED_BROKEN(Exec_ShellDocView_67); /* Broken on Win7 and 8 */
+ CHECK_CALLED(FireBeforeNavigate2);
+ CHECK_CALLED(FireDocumentComplete);
+ CHECK_CALLED(FireNavigateComplete2);
+
+
+ /* Check the result */
+ hres = IHTMLLocation_get_hash(location, &str);
+ ok(hres == S_OK, "get_hash failed: %08x\n", hres);
+ ok(!strcmp_wa(str, new_hash), "expected %s, got %s\n", new_hash, wine_dbgstr_w(str));
+ SysFreeString(str);
+
+ IHTMLLocation_Release(location);
+}
+
static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *href, const char *new_nav_url, BOOL is_js,
BOOL is_hash, DWORD dwl_flags)
{
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);
}
if(doc_mon) {
- test_GetCurMoniker(doc_unk, doc_mon, NULL);
+ test_GetCurMoniker(doc_unk, doc_mon, NULL, FALSE);
doc_mon = NULL;
}
ok(!strcmp_wa(str2, prev_nav_url), "unexpected address bar url: %s, expected %s\n", wine_dbgstr_w(str2), prev_nav_url);
SysFreeString(str2);
- if(is_js)
+ if(is_js) {
ignore_external_qi = TRUE;
- test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING) | dwl_flags);
+ dwl_flags |= DWL_JAVASCRIPT;
+ }else {
+ if(!(dwl_flags & DWL_EXTERNAL))
+ dwl_flags |= DWL_EX_GETHOSTINFO;
+ dwl_flags |= DWL_ONREADY_LOADING;
+ }
+ test_download(DWL_VERBDONE | dwl_flags);
if(is_js)
ignore_external_qi = FALSE;
ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres);
if(is_js)
ok(!strcmp_wa(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2));
+ else if (dwl_flags & DWL_EXTERNAL)
+ todo_wine ok(!strcmp_wa(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2));
else
ok(!strcmp_wa(str2, nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2));
SysFreeString(str2);
ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres);
prev_url = nav_url;
- nav_url = "http://www.winehq.org/#test";
- nav_serv_url = "http://www.winehq.org/";
+ nav_url = "http://test.winehq.org/tests/winehq_snapshot/#hash_test";
+ nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/";
SET_EXPECT(Exec_ShellDocView_138);
SET_EXPECT(Exec_ShellDocView_67);
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);
load_state = LD_LOADING;
test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE);
- test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY);
+ test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY|DWL_EX_GETHOSTINFO);
IPersistHistory_Release(per_hist);
IStream_Release(history_stream);
history_stream = NULL;
}
+static void test_OmHistory(IHTMLDocument2 *doc)
+{
+ IHTMLWindow2 *win;
+ IOmHistory *hist;
+ short len;
+ HRESULT hres;
+
+ hres = IHTMLDocument2_get_parentWindow(doc, &win);
+ ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres);
+
+ hres = IHTMLWindow2_get_history(win, &hist);
+ ok(hres == S_OK, "get_history failed: %08x\n", hres);
+ IHTMLWindow2_Release(win);
+
+ SET_EXPECT(CountEntries);
+ hres = IOmHistory_get_length(hist, &len);
+ CHECK_CALLED(CountEntries);
+ ok(hres == S_OK, "get_length failed: %08x\n", hres);
+ ok(len == 0, "len = %d\n", len);
+
+ IOmHistory_Release(hist);
+}
+
static void test_refresh(IHTMLDocument2 *doc)
{
IOleCommandTarget *cmdtrg;
IOleCommandTarget_Release(cmdtrg);
- test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH);
+ test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH|DWL_EX_GETHOSTINFO);
}
static void test_open_window(IHTMLDocument2 *doc, BOOL do_block)
hres = IHTMLWindow2_close(new_window);
ok(hres == S_OK, "close failed: %08x\n", hres);
+ IHTMLWindow2_Release(new_window);
}
IHTMLWindow2_Release(window);
}
+static void test_window_close(IHTMLDocument2 *doc)
+{
+ IHTMLWindow2 *window;
+ HRESULT hres;
+
+ hres = IHTMLDocument2_get_parentWindow(doc, &window);
+ ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres);
+
+ SET_EXPECT(FindConnectionPoint);
+ SET_EXPECT(EnumConnections);
+ SET_EXPECT(EnumConnections_Next);
+ SET_EXPECT(WindowClosing);
+
+ hres = IHTMLWindow2_close(window);
+ ok(hres == S_OK, "close failed: %08x\n", hres);
+
+ CHECK_CALLED(FindConnectionPoint);
+ CHECK_CALLED(EnumConnections);
+ CHECK_CALLED(EnumConnections_Next);
+ CHECK_CALLED(WindowClosing);
+
+ IHTMLWindow2_Release(window);
+}
+
static void test_elem_from_point(IHTMLDocument2 *doc)
{
IHTMLElement *elem;
ok(hres == S_OK, "clear failed: %08x\n", hres);
}
-static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = {
+static const OLECMDF expect_cmds[] = {
0,
OLECMDF_SUPPORTED, /* OLECMDID_OPEN */
OLECMDF_SUPPORTED, /* OLECMDID_NEW */
return;
hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL);
- ok(hres == S_OK, "QueryStatus(%u) failed: %08x\n", cmdid, hres);
+ ok(hres == cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED, "QueryStatus(%u) failed: %08x\n", cmdid, hres);
IOleCommandTarget_Release(cmdtrg);
static void test_OleCommandTarget(IHTMLDocument2 *doc)
{
IOleCommandTarget *cmdtrg;
- OLECMD cmds[OLECMDID_GETPRINTTEMPLATE];
+ OLECMD cmds[sizeof(expect_cmds)/sizeof(*expect_cmds)-1];
int i;
HRESULT hres;
if(FAILED(hres))
return;
- for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) {
+ for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) {
cmds[i].cmdID = i+1;
cmds[i].cmdf = 0xf0f0;
}
CHECK_CALLED(QueryStatus_OPEN);
CHECK_CALLED(QueryStatus_NEW);
- for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) {
+ for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) {
ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %x\n", i, cmds[i].cmdID);
if(i+1 == OLECMDID_FIND)
continue;
editmode = TRUE;
- if(loaded)
+ if(loaded) {
load_state = LD_DOLOAD;
-
- if(loaded)
SET_EXPECT(GetClassID);
+ }
SET_EXPECT(SetStatusText);
SET_EXPECT(Exec_ShellDocView_37);
SET_EXPECT(GetHostInfo);
IOleCommandTarget_Release(cmdtrg);
}
+static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor)
+{
+ IOleCommandTarget *cmdtrg;
+ VARIANT v;
+ HRESULT hres;
+
+ hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg);
+ ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres);
+ if(FAILED(hres))
+ return;
+
+ V_VT(&v) = VT_I4;
+ V_I4(&v) = factor;
+
+ SET_EXPECT(GetOverrideKeyPath);
+ hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM,
+ OLECMDEXECOPT_DODEFAULT, &v, NULL);
+ ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres);
+ CLEAR_CALLED(GetOverrideKeyPath);
+
+ IOleCommandTarget_Release(cmdtrg);
+
+ test_QueryStatus((IUnknown*)doc, NULL, OLECMDID_OPTICAL_ZOOM, 0);
+}
+
static void test_IsDirty(IHTMLDocument2 *doc, HRESULT exhres)
{
IPersistStreamInit *perinit;
CHECK_CALLED(Invoke_AMBIENT_USERAGENT);
CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */
CLEAR_CALLED(GetOverrideKeyPath); /* Called by IE9 */
- todo_wine CHECK_CALLED(GetTravelLog);
+ CHECK_CALLED(GetTravelLog);
CHECK_CALLED_BROKEN(Exec_ShellDocView_84);
set_clientsite = TRUE;
IHTMLWindow2_Release(top_window);
if(hres == E_NOINTERFACE) {
win_skip("ITravelLogClient not supported\n");
+ no_travellog = TRUE;
return;
}
ok(hres == S_OK, "Could not get ITraveLogClient iface: %08x\n", hres);
todo_wine CHECK_CALLED(GetPendingUrl);
test_timer(EXPECT_SETTITLE);
- test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank");
+ test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE);
IPersistStreamInit_Release(init);
}
todo_wine CHECK_CALLED(GetPendingUrl);
test_timer(EXPECT_SETTITLE);
- test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank");
+ test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE);
IPersistStreamInit_Release(init);
}
ipsex = FALSE;
inplace_deactivated = FALSE;
complete = FALSE;
+ testing_submit = FALSE;
expect_uihandler_iface = &DocHostUIHandler;
}
test_external(doc, FALSE);
test_ViewAdviseSink(doc);
test_ConnectionPointContainer(doc);
- test_GetCurMoniker((IUnknown*)doc, NULL, NULL);
+ test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE);
test_Persist(doc, &Moniker);
if(!do_load)
test_OnAmbientPropertyChange2(doc);
if(do_load) {
set_custom_uihandler(doc, &CustomDocHostUIHandler);
test_download(DWL_CSS|DWL_TRYCSS);
- test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL);
+ test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL, FALSE);
test_elem_from_point(doc);
}
test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);
test_OleCommandTarget_fail(doc);
test_OleCommandTarget(doc);
+ test_exec_optical_zoom(doc, 200);
+ test_exec_optical_zoom(doc, 100);
test_OnAmbientPropertyChange(doc);
test_Window(doc, TRUE);
test_external(doc, TRUE);
test_CloseView();
test_Close(doc, TRUE);
test_OnAmbientPropertyChange2(doc);
- test_GetCurMoniker((IUnknown*)doc, do_load ? &Moniker : NULL, NULL);
+ test_GetCurMoniker((IUnknown*)doc, do_load ? &Moniker : NULL, NULL, FALSE);
if(!do_load) {
/* Activate HTMLDocument again, calling UIActivate after showing the window */
set_custom_uihandler(doc, &CustomDocHostUIHandler);
test_ViewAdviseSink(doc);
test_ConnectionPointContainer(doc);
- test_GetCurMoniker((IUnknown*)doc, NULL, NULL);
+ test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE);
test_Persist(doc, &Moniker);
test_Navigate(doc);
test_InPlaceDeactivate(doc, TRUE);
test_Close(doc, FALSE);
test_IsDirty(doc, S_FALSE);
- test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL);
+ test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL, FALSE);
test_clear(doc);
- test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL);
+ test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL, FALSE);
if(view)
IOleDocumentView_Release(view);
b = InternetGetCookieW(http_urlW, NULL, buf, &size);
ok(b, "InternetGetCookieW failed: %08x\n", GetLastError());
ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf));
- ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2));
+ if(str2)
+ ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2));
SysFreeString(str);
SysFreeString(str2);
b = InternetGetCookieW(http_urlW, NULL, buf, &size);
ok(b, "InternetGetCookieW failed: %08x\n", GetLastError());
ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf));
- ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2));
+ if(str2)
+ ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2));
SysFreeString(str);
SysFreeString(str2);
}
test_ViewAdviseSink(doc);
test_ConnectionPointContainer(doc);
- test_GetCurMoniker((IUnknown*)doc, NULL, NULL);
+ test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE);
test_Persist(doc, http_mon);
test_Navigate(doc);
test_download(DWL_HTTP);
test_cookies(doc);
test_IsDirty(doc, S_FALSE);
test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);
- test_GetCurMoniker((IUnknown*)doc, http_mon, NULL);
+ test_GetCurMoniker((IUnknown*)doc, http_mon, NULL, FALSE);
test_travellog(doc);
test_binding_ui((IUnknown*)doc);
- nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */
+ nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */
if(support_wbapp) {
- test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0);
+ test_put_href(doc, FALSE, "#test", "http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0);
+ test_put_hash(doc, "#hash_test");
test_travellog(doc);
test_refresh(doc);
}
test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0);
if(support_wbapp) {
test_load_history(doc);
+ test_OmHistory(doc);
test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0);
}
test_open_window(doc, TRUE);
if(!support_wbapp) /* FIXME */
test_open_window(doc, FALSE);
+ if(support_wbapp) {
+ test_put_href(doc, FALSE, NULL, "http://test.winehq.org/tests/file.winetest", FALSE, FALSE, DWL_EXTERNAL);
+ test_window_close(doc);
+ }
test_InPlaceDeactivate(doc, TRUE);
test_Close(doc, FALSE);
test_IsDirty(doc, S_FALSE);
- test_GetCurMoniker((IUnknown*)doc, NULL, prev_url);
+ test_GetCurMoniker((IUnknown*)doc, NULL, prev_url, support_wbapp);
if(view)
IOleDocumentView_Release(view);
ok(!ref, "ref=%d, expected 0\n", ref);
}
+static void put_inner_html(IHTMLElement *elem, const char *html)
+{
+ BSTR str = a2bstr(html);
+ HRESULT hres;
+
+ hres = IHTMLElement_put_innerHTML(elem, str);
+ ok(hres == S_OK, "put_innerHTML failed: %08x\n", hres);
+
+ SysFreeString(str);
+}
+
+static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const char *id)
+{
+ IHTMLDocument3 *doc3;
+ BSTR str = a2bstr(id);
+ IHTMLElement *ret;
+ HRESULT hres;
+
+ hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3);
+ ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres);
+
+ hres = IHTMLDocument3_getElementById(doc3, str, &ret);
+ ok(hres == S_OK, "getElementById failed: %08x\n", hres);
+
+ IHTMLDocument3_Release(doc3);
+ return ret;
+}
+
+static void reset_document(IHTMLDocument2 *doc)
+{
+ IPersistStreamInit *init;
+ HRESULT hres;
+
+ hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init);
+ ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres);
+ if(FAILED(hres))
+ return;
+
+ resetting_document = TRUE;
+
+ hres = IPersistStreamInit_InitNew(init);
+ ok(hres == S_OK, "Load failed: %08x\n", hres);
+
+ resetting_document = FALSE;
+
+ test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE);
+
+ IPersistStreamInit_Release(init);
+}
+
+static void test_submit(void)
+{
+ IHTMLElement *body, *form_elem;
+ IHTMLFormElement *form;
+ IHTMLDocument2 *doc;
+ HRESULT hres;
+
+ if(no_travellog)
+ return;
+
+ trace("Testing submit...\n");
+
+ support_wbapp = TRUE;
+
+ if(!winetest_interactive && is_ie_hardened()) {
+ win_skip("IE running in Enhanced Security Configuration\n");
+ return;
+ }
+
+ init_test(LD_DOLOAD);
+ ipsex = TRUE;
+
+ doc = create_document();
+ doc_unk = (IUnknown*)doc;
+
+ test_ConnectionPointContainer(doc);
+ test_ViewAdviseSink(doc);
+ test_Persist(doc, &Moniker);
+ test_Navigate(doc);
+ test_download(DWL_CSS|DWL_TRYCSS);
+
+ hres = IHTMLDocument2_get_body(doc, &body);
+ ok(hres == S_OK, "get_body failed: %08x\n", hres);
+ ok(body != NULL, "body = NULL\n");
+
+ put_inner_html(body, "<form action='test_submit' method='post' id='fid'><input type='hidden' name='cmd' value='TEST'></form>");
+ IHTMLElement_Release(body);
+
+ form_elem = get_elem_by_id(doc, "fid");
+ ok(form_elem != NULL, "form = NULL\n");
+
+ hres = IHTMLElement_QueryInterface(form_elem, &IID_IHTMLFormElement, (void**)&form);
+ ok(hres == S_OK, "Could not get IHTMLFormElement: %08x\n", hres);
+ IHTMLElement_Release(form_elem);
+
+ nav_url = nav_serv_url = "winetest:test_submit";
+ testing_submit = TRUE;
+
+ SET_EXPECT(TranslateUrl);
+ SET_EXPECT(FireBeforeNavigate2);
+ SET_EXPECT(Exec_ShellDocView_67);
+ SET_EXPECT(Invoke_AMBIENT_SILENT);
+ SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
+ SET_EXPECT(Exec_ShellDocView_63);
+ SET_EXPECT(Exec_ShellDocView_84);
+ SET_EXPECT(CreateInstance);
+ SET_EXPECT(Start);
+ SET_EXPECT(Protocol_Read);
+ SET_EXPECT(LockRequest);
+ SET_EXPECT(GetClassID);
+ SET_EXPECT(Exec_ShellDocView_138);
+ SET_EXPECT(OnViewChange);
+
+ SET_EXPECT(UnlockRequest);
+ SET_EXPECT(Terminate);
+
+ hres = IHTMLFormElement_submit(form);
+ ok(hres == S_OK, "submit failed: %08x\n", hres);
+
+ CHECK_CALLED(TranslateUrl);
+ CHECK_CALLED(FireBeforeNavigate2);
+ CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */
+ CHECK_CALLED(Invoke_AMBIENT_SILENT);
+ CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
+ CHECK_CALLED(Exec_ShellDocView_63);
+ CLEAR_CALLED(Exec_ShellDocView_84); /* Not called by IE11 */
+ CHECK_CALLED(CreateInstance);
+ CHECK_CALLED(Start);
+ CHECK_CALLED(Protocol_Read);
+ CHECK_CALLED(LockRequest);
+ todo_wine CHECK_CALLED(GetClassID);
+ CLEAR_CALLED(Exec_ShellDocView_138); /* called only by some versions */
+ CLEAR_CALLED(OnViewChange); /* called only by some versions */
+
+ todo_wine CHECK_NOT_CALLED(UnlockRequest);
+ todo_wine CHECK_NOT_CALLED(Terminate);
+
+ IHTMLFormElement_Release(form);
+
+ test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL, FALSE);
+
+ SET_EXPECT(UnlockRequest);
+ reset_document(doc);
+ todo_wine CHECK_CALLED(UnlockRequest);
+
+ test_InPlaceDeactivate(doc, TRUE);
+ test_Close(doc, FALSE);
+
+ if(view)
+ IOleDocumentView_Release(view);
+ view = NULL;
+
+ release_document(doc);
+}
+
static void test_QueryService(IHTMLDocument2 *doc, BOOL success)
{
IHTMLWindow2 *window, *sp_window;
test_DoVerb(oleobj);
test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);
- test_GetCurMoniker((IUnknown*)doc, NULL, NULL);
+ test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE);
test_StreamLoad(doc);
test_download(DWL_VERBDONE|DWL_TRYCSS);
test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);
IOleObject_Release(oleobj);
- test_GetCurMoniker((IUnknown*)doc, NULL, NULL);
+ test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE);
test_StreamInitNew(doc);
SET_EXPECT(Invoke_OnReadyStateChange_Interactive);
IOleDocumentView_Release(docview);
}
-static void test_editing_mode(BOOL do_load)
+static void test_editing_mode(BOOL do_load, BOOL use_design_mode)
{
IHTMLDocument2 *doc;
IUnknown *unk;
DWORD conn;
HRESULT hres;
- trace("Testing HTMLDocument (edit%s)...\n", do_load ? " load" : "");
+ trace("Testing HTMLDocument (edit%s%s)...\n", do_load ? " load" : "", use_design_mode ? " using designMode" : "");
init_test(do_load ? LD_DOLOAD : LD_NO);
call_UIActivate = CallUIActivate_AfterShow;
if(do_load)
test_Persist(doc, &Moniker);
stream_read = protocol_read = 0;
- test_exec_editmode(unk, do_load);
- test_UIDeactivate();
- call_UIActivate = CallUIActivate_None;
+
+ if(!use_design_mode) {
+ test_exec_editmode(unk, do_load);
+ test_UIDeactivate();
+ call_UIActivate = CallUIActivate_None;
+ }else {
+ BSTR on;
+
+ SET_EXPECT(Exec_SETTITLE);
+ test_download(DWL_VERBDONE|DWL_CSS|DWL_TRYCSS);
+ CLEAR_CALLED(Exec_SETTITLE);
+
+ editmode = TRUE;
+ load_state = LD_DOLOAD;
+ readystate_set_loading = TRUE;
+
+ SET_EXPECT(OnChanged_1005);
+ SET_EXPECT(ActiveElementChanged);
+ SET_EXPECT(GetClassID);
+ SET_EXPECT(SetStatusText);
+ SET_EXPECT(Exec_ShellDocView_37);
+ SET_EXPECT(GetHostInfo);
+ SET_EXPECT(GetDisplayName);
+ SET_EXPECT(Invoke_AMBIENT_SILENT);
+ SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
+ SET_EXPECT(OnChanged_READYSTATE);
+ SET_EXPECT(Invoke_OnReadyStateChange_Loading);
+ SET_EXPECT(IsSystemMoniker);
+ SET_EXPECT(Exec_ShellDocView_84);
+ SET_EXPECT(BindToStorage);
+ SET_EXPECT(InPlaceUIWindow_SetActiveObject);
+ SET_EXPECT(HideUI);
+ SET_EXPECT(ShowUI);
+ SET_EXPECT(InPlaceFrame_SetBorderSpace);
+ SET_EXPECT(OnChanged_1014);
+
+ on = a2bstr("On");
+ hres = IHTMLDocument2_put_designMode(doc, on);
+ SysFreeString(on);
+ ok(hres == S_OK, "put_designMode failed: %08x\n", hres);
+
+ todo_wine CHECK_CALLED(OnChanged_1005);
+ todo_wine CHECK_CALLED(ActiveElementChanged);
+ CHECK_CALLED(GetClassID);
+ CHECK_CALLED(SetStatusText);
+ CHECK_CALLED(Exec_ShellDocView_37);
+ CHECK_CALLED(GetHostInfo);
+ CHECK_CALLED(GetDisplayName);
+ CHECK_CALLED(Invoke_AMBIENT_SILENT);
+ CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
+ CHECK_CALLED(OnChanged_READYSTATE);
+ CHECK_CALLED(Invoke_OnReadyStateChange_Loading);
+ CLEAR_CALLED(IsSystemMoniker); /* IE7 */
+ CHECK_CALLED_BROKEN(Exec_ShellDocView_84);
+ CHECK_CALLED(BindToStorage);
+ CHECK_CALLED(InPlaceUIWindow_SetActiveObject);
+ CHECK_CALLED(HideUI);
+ CHECK_CALLED(ShowUI);
+ CHECK_CALLED(InPlaceFrame_SetBorderSpace);
+ CHECK_CALLED(OnChanged_1014);
+
+ test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE);
+ }
+
IOleObject_Release(oleobj);
test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);
- test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0));
+ test_download(DWL_VERBDONE | DWL_EX_GETHOSTINFO | (do_load ? DWL_CSS|DWL_TRYCSS : 0));
SET_EXPECT(SetStatusText); /* ignore race in native mshtml */
test_timer(EXPECT_UPDATEUI);
CHECK_CALLED(QueryStatus_SETPROGRESSTEXT);
CHECK_CALLED(Exec_SETPROGRESSMAX);
CHECK_CALLED(Exec_SETPROGRESSPOS);
- todo_wine CHECK_CALLED(GetTravelLog);
+ CHECK_CALLED(GetTravelLog);
CHECK_CALLED_BROKEN(Exec_ShellDocView_84);
hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite);
{
IHTMLDocument2 *doc;
IHTMLDocument5 *doc5;
+ IHTMLDocument7 *doc7;
HRESULT hres;
doc = create_document();
if(!doc)
return FALSE;
+ hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7);
+ if(SUCCEEDED(hres)) {
+ is_ie9plus = TRUE;
+ IHTMLDocument7_Release(doc7);
+ }
+
+ trace("is_ie9plus %x\n", is_ie9plus);
+
hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5);
if(SUCCEEDED(hres))
IHTMLDocument5_Release(doc5);
hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IUnknown, (void**)&unk);
ok(hres == S_OK, "got 0x%08x\n", hres);
ok(iface_cmp((IUnknown*)doc, unk), "got wrong pointer\n");
+ IUnknown_Release(unk);
+ hres = IServiceProvider_QueryService(provider, &SID_SHTMLEditServices, &IID_IHTMLEditServices, (void**)&unk);
+ ok(hres == S_OK, "QueryService(HTMLEditServices) failed: %08x\n", hres);
IUnknown_Release(unk);
+
IServiceProvider_Release(provider);
release_document(doc);
}
test_HTMLDocument(TRUE, TRUE);
test_HTMLDocument_StreamLoad();
test_HTMLDocument_StreamInitNew();
- test_editing_mode(FALSE);
- test_editing_mode(TRUE);
+ test_editing_mode(FALSE, FALSE);
+ test_editing_mode(TRUE, FALSE);
+ test_editing_mode(TRUE, TRUE);
test_HTMLDocument_http(FALSE);
test_HTMLDocument_http(TRUE);
+
+ test_submit();
test_UIActivate(FALSE, FALSE, FALSE);
test_UIActivate(FALSE, TRUE, FALSE);
test_UIActivate(FALSE, TRUE, TRUE);
projects / reactos.git / blobdiff