system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 11:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: Do more initialization in create_plugin_host.

Browse source
This commit is contained in:
Jacek Caban 2014-12-11 16:26:09 +01:00 committed by Alexandre Julliard
parent 2ff987322f
commit 5bce604451
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dlls/mshtml/pluginhost.c
View file

@ -182,7 +182,7 @@ static void load_plugin(PluginHost *host)
FIXME("No IPersistPropertyBag iface\n");
}
static void activate_plugin(PluginHost *host)
static void initialize_plugin_object(PluginHost *host)
{
IClientSecurity *client_security;
IQuickActivate *quick_activate;
@ -191,12 +191,8 @@ static void activate_plugin(PluginHost *host)
IViewObjectEx *view_obj;
IDispatchEx *dispex;
IDispatch *disp;
RECT rect;
HRESULT hres;
if(!host->plugin_unk)
return;
/* Note native calls QI on plugin for an undocumented IID and CLSID_HTMLDocument */
/* FIXME: call FreezeEvents(TRUE) */
@ -281,6 +277,13 @@ static void activate_plugin(PluginHost *host)
FIXME("Use IOleCommandTarget\n");
IOleCommandTarget_Release(cmdtrg);
}
}
static void embed_plugin_object(PluginHost *host)
{
IOleObject *ole_obj;
RECT rect;
HRESULT hres;
hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj);
if(FAILED(hres)) {
@ -288,13 +291,11 @@ static void activate_plugin(PluginHost *host)
return;
}
if(ole_obj) {
get_pos_rect(host, &rect);
hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect);
IOleObject_Release(ole_obj);
if(FAILED(hres))
WARN("DoVerb failed: %08x\n", hres);
}
get_pos_rect(host, &rect);
hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect);
IOleObject_Release(ole_obj);
if(FAILED(hres))
WARN("DoVerb failed: %08x\n", hres);
if(host->ip_object) {
HWND hwnd;
@ -323,7 +324,7 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect)
if(!host->hwnd) {
host->hwnd = hwnd;
activate_plugin(host);
embed_plugin_object(host);
}
if(rect_changed && host->ip_object)
@ -2103,5 +2104,8 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container
container->plugin_host = host;
host->element = container;
initialize_plugin_object(host);
return S_OK;
}