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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ff34939400805e75fda9c658c3b28bf54adeb5e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff34939400805e75fda9c658c3...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Tue Sep 25 14:18:44 2012 +0200

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

---

 dlls/mshtml/pluginhost.c    |    6 ++++--
 dlls/mshtml/tests/activex.c |    3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c
index ee7773f..e4b85a8 100644
--- a/dlls/mshtml/pluginhost.c
+++ b/dlls/mshtml/pluginhost.c
@@ -875,8 +875,10 @@ static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *ifac
 static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(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)
diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c
index ebd2057..775a676 100644
--- a/dlls/mshtml/tests/activex.c
+++ b/dlls/mshtml/tests/activex.c
@@ -903,6 +903,9 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
     hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site);
     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);
     no_redraw = 0xdeadbeef;
     hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0);