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

mshtml: Added PluginHost's IServiceProvider stub implementation.

This commit is contained in:
Jacek Caban 2010-12-06 18:51:20 +01:00 committed by Alexandre Julliard
parent 4479194e48
commit c12d9ff8d7
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/mshtml/pluginhost.c
View File

@ -129,6 +129,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID
}else if(IsEqualGUID(&IID_IBindHost, riid)) { }else if(IsEqualGUID(&IID_IBindHost, riid)) {
TRACE("(%p)->(IID_IBindHost %p)\n", This, ppv); TRACE("(%p)->(IID_IBindHost %p)\n", This, ppv);
*ppv = &This->IBindHost_iface; *ppv = &This->IBindHost_iface;
}else if(IsEqualGUID(&IID_IServiceProvider, riid)) {
TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);
*ppv = &This->IServiceProvider_iface;
}else { }else {
WARN("Unsupported interface %s\n", debugstr_guid(riid)); WARN("Unsupported interface %s\n", debugstr_guid(riid));
*ppv = NULL; *ppv = NULL;
@ -691,6 +694,43 @@ static const IBindHostVtbl BindHostVtbl = {
PHBindHost_MonikerBindToObject PHBindHost_MonikerBindToObject
}; };
static inline PluginHost *impl_from_IServiceProvider(IServiceProvider *iface)
{
return CONTAINING_RECORD(iface, PluginHost, IServiceProvider_iface);
}
static HRESULT WINAPI PHServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv)
{
PluginHost *This = impl_from_IServiceProvider(iface);
return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv);
}
static ULONG WINAPI PHServiceProvider_AddRef(IServiceProvider *iface)
{
PluginHost *This = impl_from_IServiceProvider(iface);
return IOleClientSite_AddRef(&This->IOleClientSite_iface);
}
static ULONG WINAPI PHServiceProvider_Release(IServiceProvider *iface)
{
PluginHost *This = impl_from_IServiceProvider(iface);
return IOleClientSite_Release(&This->IOleClientSite_iface);
}
static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv)
{
PluginHost *This = impl_from_IServiceProvider(iface);
FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
return E_NOINTERFACE;
}
static const IServiceProviderVtbl ServiceProviderVtbl = {
PHServiceProvider_QueryInterface,
PHServiceProvider_AddRef,
PHServiceProvider_Release,
PHServiceProvider_QueryService
};
HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret)
{ {
PluginHost *host; PluginHost *host;
@ -706,6 +746,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret)
host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl;
host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl;
host->IBindHost_iface.lpVtbl = &BindHostVtbl; host->IBindHost_iface.lpVtbl = &BindHostVtbl;
host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl;
host->ref = 1; host->ref = 1;

1
dlls/mshtml/pluginhost.h
View File

@ -26,6 +26,7 @@ typedef struct {
IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; IOleInPlaceSiteEx IOleInPlaceSiteEx_iface;
IOleControlSite IOleControlSite_iface; IOleControlSite IOleControlSite_iface;
IBindHost IBindHost_iface; IBindHost IBindHost_iface;
IServiceProvider IServiceProvider_iface;
LONG ref; LONG ref;

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

@ -98,6 +98,7 @@ static const REFIID pluginhost_iids[] = {
&IID_IOleInPlaceSiteEx, &IID_IOleInPlaceSiteEx,
&IID_IOleControlSite, &IID_IOleControlSite,
&IID_IBindHost, &IID_IBindHost,
&IID_IServiceProvider,
NULL NULL
}; };