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

msscript: Added IServiceProvider stub. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-07-20 22:31:17 +03:00 committed by Alexandre Julliard
parent 681e905b6e
commit f2a8b5d2ab
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/msscript.ocx/msscript.c
View File

@ -57,6 +57,7 @@ struct ConnectionPoint {
typedef struct ScriptHost { typedef struct ScriptHost {
IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSite IActiveScriptSite_iface;
IServiceProvider IServiceProvider_iface;
LONG ref; LONG ref;
IActiveScript *script; IActiveScript *script;
@ -221,6 +222,11 @@ static inline ScriptHost *impl_from_IActiveScriptSite(IActiveScriptSite *iface)
return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSite_iface); return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSite_iface);
} }
static inline ScriptHost *impl_from_IServiceProvider(IServiceProvider *iface)
{
return CONTAINING_RECORD(iface, ScriptHost, IServiceProvider_iface);
}
/* IActiveScriptSite */ /* IActiveScriptSite */
static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv)
{ {
@ -232,6 +238,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface,
}else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) {
TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv);
*ppv = &This->IActiveScriptSite_iface; *ppv = &This->IActiveScriptSite_iface;
}else if(IsEqualGUID(&IID_IServiceProvider, riid)) {
TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);
*ppv = &This->IServiceProvider_iface;
}else { }else {
FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
*ppv = NULL; *ppv = NULL;
@ -370,6 +379,42 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = {
ActiveScriptSite_OnLeaveScript ActiveScriptSite_OnLeaveScript
}; };
/* IServiceProvider */
static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj)
{
ScriptHost *This = impl_from_IServiceProvider(iface);
return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj);
}
static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface)
{
ScriptHost *This = impl_from_IServiceProvider(iface);
return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface);
}
static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface)
{
ScriptHost *This = impl_from_IServiceProvider(iface);
return IActiveScriptSite_Release(&This->IActiveScriptSite_iface);
}
static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID service,
REFIID riid, void **obj)
{
ScriptHost *This = impl_from_IServiceProvider(iface);
FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(service), debugstr_guid(riid), obj);
return E_NOTIMPL;
}
static const IServiceProviderVtbl ServiceProviderVtbl = {
ServiceProvider_QueryInterface,
ServiceProvider_AddRef,
ServiceProvider_Release,
ServiceProvider_QueryService
};
static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret)
{ {
IObjectSafety *objsafety; IObjectSafety *objsafety;
@ -383,6 +428,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl;
host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl;
host->ref = 1; host->ref = 1;
host->script = NULL; host->script = NULL;
host->parse = NULL; host->parse = NULL;

2
dlls/msscript.ocx/tests/msscript.c
View File

@ -273,9 +273,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc
ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres);
hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service);
todo_wine
ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres);
if(SUCCEEDED(hres))
IServiceProvider_Release(service); IServiceProvider_Release(service);
site = pass; site = pass;