From: Louis Lenders <xerox.xerox2000x@gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59498 v2: Add prototype to combaseapi.h --- dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 1 + include/combaseapi.h | 1 + include/objidlbase.idl | 22 ++++++++++++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index b16828fbfd2..a627d4779ec 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -3425,6 +3425,16 @@ BOOL WINAPI CoIsOle1Class(REFCLSID clsid) return FALSE; } +/*********************************************************************** + * CoRegisterActivationFilter (combase.@) + */ +HRESULT WINAPI CoRegisterActivationFilter(IActivationFilter *filter) +{ + FIXME("%p stub\n", filter); + + return E_NOTIMPL; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9018b013823..eb91169e31b 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -139,7 +139,7 @@ @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub CoReactivateObject -@ stub CoRegisterActivationFilter +@ stdcall CoRegisterActivationFilter(ptr) @ stdcall CoRegisterChannelHook(ptr ptr) @ stdcall CoRegisterClassObject(ptr ptr long long ptr) @ stdcall CoRegisterInitializeSpy(ptr ptr) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c600bc3d97d..1db01418392 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -65,6 +65,7 @@ @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryClientBlanket @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryProxyBlanket @ stub CoQueryReleaseObject +@ stdcall CoRegisterActivationFilter(ptr) combase.CoRegisterActivationFilter @ stdcall CoRegisterChannelHook(ptr ptr) combase.CoRegisterChannelHook @ stdcall CoRegisterClassObject(ptr ptr long long ptr) combase.CoRegisterClassObject @ stdcall CoRegisterInitializeSpy(ptr ptr) combase.CoRegisterInitializeSpy diff --git a/include/combaseapi.h b/include/combaseapi.h index 10b8bdc7404..60c9645863e 100644 --- a/include/combaseapi.h +++ b/include/combaseapi.h @@ -55,6 +55,7 @@ enum AgileReferenceOptions }; HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info); +HRESULT WINAPI CoRegisterActivationFilter(IActivationFilter *filter); HRESULT WINAPI RoGetAgileReference(enum AgileReferenceOptions options, REFIID riid, IUnknown *obj, IAgileReference **agile_reference); #ifdef __cplusplus diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 9a4eed4acb3..ec27c6da0b0 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -1249,5 +1249,27 @@ interface IObjContext : IContext void Reserved7(); } +[ + local, + object, + uuid(00000017-0000-0000-c000-000000000046) +] +interface IActivationFilter : IUnknown +{ + typedef enum tagACTIVATIONTYPE { + ACTIVATIONTYPE_UNCATEGORIZED = 0x0, + ACTIVATIONTYPE_FROM_MONIKER = 0x1, + ACTIVATIONTYPE_FROM_DATA = 0x2, + ACTIVATIONTYPE_FROM_STORAGE = 0x4, + ACTIVATIONTYPE_FROM_STREAM = 0x8, + ACTIVATIONTYPE_FROM_FILE = 0x10 + } ACTIVATIONTYPE; + + HRESULT HandleActivation( + [in] DWORD dwActivationType, + [in] REFCLSID rclsid, + [out] CLSID *pReplacementClsId); +} + cpp_quote("#endif /* defined USE_COM_CONTEXT_DEF */") cpp_quote("#endif /* defined _OBJIDLBASE_ */") -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10266