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

ieframe: Improve setting different client site in OleObject_SetClientSite. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-04-13 17:11:53 +02:00 committed by Alexandre Julliard
parent 4f6f0f09fd
commit 3fbd56b08e
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dlls/ieframe/oleobject.c
View File

@ -283,7 +283,7 @@ static HRESULT on_silent_change(WebBrowser *This)
return S_OK; return S_OK;
} }
static void release_client_site(WebBrowser *This) static void release_client_site(WebBrowser *This, BOOL destroy_win)
{ {
release_dochost_client(&This->doc_host); release_dochost_client(&This->doc_host);
@ -297,7 +297,7 @@ static void release_client_site(WebBrowser *This)
This->client_closed = NULL; This->client_closed = NULL;
} }
if(This->shell_embedding_hwnd) { if(destroy_win && This->shell_embedding_hwnd) {
DestroyWindow(This->shell_embedding_hwnd); DestroyWindow(This->shell_embedding_hwnd);
This->shell_embedding_hwnd = NULL; This->shell_embedding_hwnd = NULL;
} }
@ -459,6 +459,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
WebBrowser *This = impl_from_IOleObject(iface); WebBrowser *This = impl_from_IOleObject(iface);
IDocHostUIHandler *hostui; IDocHostUIHandler *hostui;
IOleCommandTarget *olecmd; IOleCommandTarget *olecmd;
BOOL get_olecmd = TRUE;
IOleContainer *container; IOleContainer *container;
IDispatch *disp; IDispatch *disp;
HRESULT hres; HRESULT hres;
@ -473,7 +474,14 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
if(This->client == pClientSite) if(This->client == pClientSite)
return S_OK; return S_OK;
release_client_site(This); if(This->client && pClientSite) {
get_olecmd = FALSE;
olecmd = This->doc_host.olecmd;
if(olecmd)
IOleCommandTarget_AddRef(olecmd);
}
release_client_site(This, !pClientSite);
if(!pClientSite) { if(!pClientSite) {
on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, FALSE); on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, FALSE);
@ -497,31 +505,46 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))
This->doc_host.hostui = hostui; This->doc_host.hostui = hostui;
hres = IOleClientSite_GetContainer(This->client, &container); if(get_olecmd) {
if(SUCCEEDED(hres)) { hres = IOleClientSite_GetContainer(This->client, &container);
ITargetContainer *target_container;
hres = IOleContainer_QueryInterface(container, &IID_ITargetContainer,
(void**)&target_container);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
FIXME("Unsupported ITargetContainer\n"); ITargetContainer *target_container;
ITargetContainer_Release(target_container);
hres = IOleContainer_QueryInterface(container, &IID_ITargetContainer,
(void**)&target_container);
if(SUCCEEDED(hres)) {
FIXME("Unsupported ITargetContainer\n");
ITargetContainer_Release(target_container);
}
hres = IOleContainer_QueryInterface(container, &IID_IOleCommandTarget, (void**)&olecmd);
if(FAILED(hres))
olecmd = NULL;
IOleContainer_Release(container);
}else {
hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd);
if(FAILED(hres))
olecmd = NULL;
} }
hres = IOleContainer_QueryInterface(container, &IID_IOleCommandTarget, (void**)&olecmd);
if(FAILED(hres))
olecmd = NULL;
IOleContainer_Release(container);
}else {
hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd);
if(FAILED(hres))
olecmd = NULL;
} }
This->doc_host.olecmd = olecmd; This->doc_host.olecmd = olecmd;
create_shell_embedding_hwnd(This); if(This->shell_embedding_hwnd) {
IOleInPlaceSite *inplace;
HWND parent;
hres = IOleClientSite_QueryInterface(This->client, &IID_IOleInPlaceSite, (void**)&inplace);
if(SUCCEEDED(hres)) {
hres = IOleInPlaceSite_GetWindow(inplace, &parent);
IOleInPlaceSite_Release(inplace);
if(SUCCEEDED(hres))
SHSetParentHwnd(This->shell_embedding_hwnd, parent);
}
}else {
create_shell_embedding_hwnd(This);
}
on_offlineconnected_change(This); on_offlineconnected_change(This);
on_silent_change(This); on_silent_change(This);
@ -1198,5 +1221,5 @@ void WebBrowser_OleObject_Init(WebBrowser *This)
void WebBrowser_OleObject_Destroy(WebBrowser *This) void WebBrowser_OleObject_Destroy(WebBrowser *This)
{ {
release_client_site(This); release_client_site(This, TRUE);
} }