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

mshtml: Added more plugin in place activation support.

Browse Source
This commit is contained in:
Jacek Caban 2010-12-13 16:00:58 +01:00 committed by Alexandre Julliard
parent 073a48abe4
commit 41ca6568be
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/mshtml/pluginhost.c
View File

@ -208,21 +208,39 @@ static void activate_plugin(PluginHost *host)
IOleObject_Release(ole_obj); IOleObject_Release(ole_obj);
if(FAILED(hres)) if(FAILED(hres))
WARN("DoVerb failed: %08x\n", hres); WARN("DoVerb failed: %08x\n", hres);
if(host->ip_object) {
HWND hwnd;
hres = IOleInPlaceObject_GetWindow(host->ip_object, &hwnd);
if(SUCCEEDED(hres))
TRACE("hwnd %p\n", hwnd);
}
} }
void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect)
{ {
BOOL rect_changed = FALSE;
if(!hwnd || (host->hwnd && host->hwnd != hwnd)) { if(!hwnd || (host->hwnd && host->hwnd != hwnd)) {
FIXME("unhandled hwnd\n"); FIXME("unhandled hwnd\n");
return; return;
} }
host->rect = *rect; TRACE("%p %s\n", hwnd, wine_dbgstr_rect(rect));
if(memcmp(rect, &host->rect, sizeof(RECT))) {
host->rect = *rect;
rect_changed = TRUE;
}
if(!host->hwnd) { if(!host->hwnd) {
host->hwnd = hwnd; host->hwnd = hwnd;
activate_plugin(host); activate_plugin(host);
} }
if(rect_changed && host->ip_object)
IOleInPlaceObject_SetObjectRects(host->ip_object, &host->rect, &host->rect);
} }
static inline PluginHost *impl_from_IOleClientSite(IOleClientSite *iface) static inline PluginHost *impl_from_IOleClientSite(IOleClientSite *iface)
@ -602,8 +620,11 @@ static ULONG WINAPI PHInPlaceSite_Release(IOleInPlaceSiteEx *iface)
static HRESULT WINAPI PHInPlaceSite_GetWindow(IOleInPlaceSiteEx *iface, HWND *phwnd) static HRESULT WINAPI PHInPlaceSite_GetWindow(IOleInPlaceSiteEx *iface, HWND *phwnd)
{ {
PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); PluginHost *This = impl_from_IOleInPlaceSiteEx(iface);
FIXME("(%p)->(%p)\n", This, phwnd);
return E_NOTIMPL; TRACE("(%p)->(%p)\n", This, phwnd);
*phwnd = This->hwnd;
return S_OK;
} }
static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *iface, BOOL fEnterMode) static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *iface, BOOL fEnterMode)
@ -693,8 +714,15 @@ static HRESULT WINAPI PHInPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOO
static HRESULT WINAPI PHInPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface)
{ {
PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); PluginHost *This = impl_from_IOleInPlaceSiteEx(iface);
FIXME("(%p)\n", This);
return E_NOTIMPL; TRACE("(%p)\n", This);
if(This->ip_object) {
IOleInPlaceObject_Release(This->ip_object);
This->ip_object = NULL;
}
return S_OK;
} }
static HRESULT WINAPI PHInPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface)