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

mshtml: Added ICustomDoc::SetUIHandler implementation.

This commit is contained in:
Jacek Caban 2010-11-29 00:18:01 +01:00 committed by Alexandre Julliard
parent 5680cf6293
commit 0863625bcc
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/mshtml/htmldoc.c
View File

@ -2087,6 +2087,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface)
IAdviseSink_Release(This->view_sink);
if(This->client)
IOleObject_SetClientSite(OLEOBJ(&This->basedoc), NULL);
if(This->hostui)
ICustomDoc_SetUIHandler(CUSTOMDOC(This), NULL);
if(This->in_place_active)
IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(&This->basedoc));
if(This->ipsite)
@ -2114,8 +2116,31 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface)
static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler)
{
HTMLDocumentObj *This = CUSTOMDOC_THIS(iface);
FIXME("(%p)->(%p)\n", This, pUIHandler);
return E_NOTIMPL;
IOleCommandTarget *cmdtrg;
HRESULT hres;
TRACE("(%p)->(%p)\n", This, pUIHandler);
if(This->custom_hostui && This->hostui == pUIHandler)
return S_OK;
This->custom_hostui = TRUE;
if(This->hostui)
IDocHostUIHandler_Release(This->hostui);
if(pUIHandler)
IDocHostUIHandler_AddRef(pUIHandler);
This->hostui = pUIHandler;
if(!pUIHandler)
return S_OK;
hres = IDocHostUIHandler_QueryInterface(pUIHandler, &IID_IOleCommandTarget, (void**)&cmdtrg);
if(SUCCEEDED(hres)) {
FIXME("custom UI handler supports IOleCommandTarget\n");
IOleCommandTarget_Release(cmdtrg);
}
return S_OK;
}
#undef CUSTOMDOC_THIS

1
dlls/mshtml/mshtml_private.h
View File

@ -411,6 +411,7 @@ struct HTMLDocumentObj {
IOleClientSite *client;
IDocHostUIHandler *hostui;
BOOL custom_hostui;
IOleInPlaceSite *ipsite;
IOleInPlaceFrame *frame;
IOleInPlaceUIWindow *ip_window;