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

ieframe: Forward more DocHost::Exec calls to embedders.

This commit is contained in:
Jacek Caban 2012-11-12 12:59:06 +01:00 committed by Alexandre Julliard
parent 47274313db
commit d22a8bbd66
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ieframe/dochost.c
View File

@ -526,6 +526,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
if(!pguidCmdGroup) {
switch(nCmdID) {
case OLECMDID_UPDATECOMMANDS:
case OLECMDID_SETDOWNLOADSTATE:
return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
default:
FIXME("Unimplemented cmdid %d\n", nCmdID);
@ -605,6 +606,9 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
}
}
if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup))
return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup));
return E_NOTIMPL;
}

3
dlls/ieframe/iexplore.c
View File

@ -789,8 +789,9 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url)
static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in,
VARIANT *out)
{
return S_OK;
return E_NOTIMPL;
}
static const IDocHostContainerVtbl DocHostContainerVtbl = {
IEDocHost_addref,
IEDocHost_release,

4
dlls/ieframe/tests/webbrowser.c
View File

@ -2753,7 +2753,7 @@ static void test_download(DWORD flags)
}
todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX);
todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS);
todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1);
CHECK_CALLED(Exec_SETDOWNLOADSTATE_1);
CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */
CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */
todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON);
@ -2771,7 +2771,7 @@ static void test_download(DWORD flags)
CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */
if(!is_first_load)
todo_wine CHECK_CALLED(GetHostInfo);
todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
todo_wine CHECK_CALLED(Invoke_TITLECHANGE);
CHECK_CALLED(Invoke_NAVIGATECOMPLETE2);
if(is_first_load)

6
dlls/ieframe/webbrowser.c
View File

@ -1219,11 +1219,13 @@ static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, D
}
if(!cmdtrg)
return S_OK;
return E_NOTIMPL;
hres = IOleCommandTarget_Exec(cmdtrg, cmd_group, cmdid, execopt, in, out);
IOleCommandTarget_Release(cmdtrg);
if(FAILED(hres))
if(SUCCEEDED(hres))
TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out));
else
FIXME("Exec failed\n");
return hres;