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

shdocvw: Store IDocHostUIHandler interface in the WebBrowser object.

This commit is contained in:
Jacek Caban 2006-01-25 13:14:57 +01:00 committed by Alexandre Julliard
parent 1de825f746
commit 9cbe52b111
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/shdocvw/dochost.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005 Jacek Caban for CodeWeavers
* Copyright 2005-2006 Jacek Caban for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -239,19 +239,14 @@ static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface,
DOCHOSTUIINFO *pInfo)
{
WebBrowser *This = DOCHOSTUI_THIS(iface);
IDocHostUIHandler *handler;
HRESULT hres;
TRACE("(%p)->(%p)\n", This, pInfo);
if(This->client) {
hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, (void**)&handler);
if(SUCCEEDED(hres)) {
hres = IDocHostUIHandler_GetHostInfo(handler, pInfo);
IDocHostUIHandler_Release(handler);
if(SUCCEEDED(hres))
return hres;
}
if(This->hostui) {
hres = IDocHostUIHandler_GetHostInfo(This->hostui, pInfo);
if(SUCCEEDED(hres))
return hres;
}
pInfo->dwFlags = DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_OPENNEWWIN
@ -328,21 +323,11 @@ static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *ifac
LPOLESTR *pchKey, DWORD dw)
{
WebBrowser *This = DOCHOSTUI_THIS(iface);
IDocHostUIHandler *handler;
HRESULT hres;
TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);
if(!This->client)
return S_OK;
hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler,
(void**)&handler);
if(SUCCEEDED(hres)) {
hres = IDocHostUIHandler_GetOptionKeyPath(handler, pchKey, dw);
IDocHostUIHandler_Release(handler);
return hres;
}
if(This->hostui)
return IDocHostUIHandler_GetOptionKeyPath(This->hostui, pchKey, dw);
return S_OK;
}
@ -430,5 +415,7 @@ void WebBrowser_DocHost_Init(WebBrowser *This)
{
This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl;
This->hostui = NULL;
This->doc_view_hwnd = NULL;
}

8
dlls/shdocvw/oleobject.c
View File

@ -124,6 +124,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface)
static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE pClientSite)
{
WebBrowser *This = OLEOBJ_THIS(iface);
HRESULT hres;
TRACE("(%p)->(%p)\n", This, pClientSite);
@ -139,6 +140,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
This->shell_embedding_hwnd = NULL;
}
if(This->hostui)
IDocHostUIHandler_Release(This->hostui);
if(This->client)
IOleClientSite_Release(This->client);
@ -152,6 +155,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
This->client = pClientSite;
IOleClientSite_AddRef(pClientSite);
hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler,
(void**)&This->hostui);
if(FAILED(hres))
This->hostui = NULL;
create_shell_embedding_hwnd(This);
return S_OK;

2
dlls/shdocvw/shdocvw.h
View File

@ -2,6 +2,7 @@
* Header includes for shdocvw.dll
*
* Copyright 2001 John R. Sheets (for CodeWeavers)
* Copyright 2005-2006 Jacek Caban for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -94,6 +95,7 @@ typedef struct {
IOleClientSite *client;
IOleContainer *container;
IOleDocumentView *view;
IDocHostUIHandler *hostui;
LPOLESTR url;