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

mshtml: Return S_OK in plugin host's CanInPlaceActivate implementation.

This commit is contained in:
Jacek Caban 2012-09-25 14:18:44 +02:00 committed by Alexandre Julliard
parent f90798572a
commit ff34939400
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/mshtml/pluginhost.c
View File

@ -875,8 +875,10 @@ static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *ifac
static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(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);
return S_OK;
} }
static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface)

3
dlls/mshtml/tests/activex.c
View File

@ -903,6 +903,9 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site); hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site);
ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08x\n", hres); ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08x\n", hres);
hres = IOleInPlaceSiteEx_CanInPlaceActivate(ip_site);
ok(hres == S_OK, "CanInPlaceActivate failed: %08x\n", hres);
SET_EXPECT(InPlaceObject_GetWindow); SET_EXPECT(InPlaceObject_GetWindow);
no_redraw = 0xdeadbeef; no_redraw = 0xdeadbeef;
hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0); hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0);