Module: wine Branch: master Commit: ddbe3a70255185a628823d9d5dbd01b2f00cb529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddbe3a70255185a628823d9d5... Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:14 2018 +0000 combase: Add stub for RoRegisterForApartmentShutdown. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 88139fb..d27130c 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize @ stub RoUnregisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ff89232..ec4a6cd 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -263,7 +263,7 @@ @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate @ stub RoReportUnhandledError diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 9cceb82..ffcb0e9 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -232,3 +232,22 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) *identifier = 0xdeadbeef; return S_OK; } + +/*********************************************************************** + * RoRegisterForApartmentShutdown (combase.@) + */ +HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, + UINT64 *identifier, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE *cookie) +{ + HRESULT hr; + + FIXME("(%p, %p, %p): stub\n", callback, identifier, cookie); + + hr = RoGetApartmentIdentifier(identifier); + if (FAILED(hr)) + return hr; + + if (cookie) + *cookie = (void *)0xcafecafe; + return S_OK; +}