[PATCH v2 0/5] MR5021: windows.security.authentication.onlineid: Implement IOnlineIdSystemAuthenticatorStatics::get_Default().
I originally added this for Minecraft Education Edition to see if it would help with a sign-in issue, but it didn't seem to so I didn't create an MR for it. But this library is also used by Office and other apps. For Office, there are 2 reports[[1](https://forum.winehq.org/viewtopic.php?p=138513)][[2](https://forum.winehq.org/viewtopic.php?t=38500)] that say this is the cause of an installation crash. I can't confirm it as I don't have an Office subscription. I have some more patches for this that Minecraft Education Edition calls but I don't know if they're helpful for Office. -- v2: windows.security.authentication.onlineid: Implement IOnlineIdSystemAuthenticatorStatics::get_Default(). windows.security.authentication.onlineid: Add IOnlineIdServiceTicketRequestFactory stub interface. windows.security.authentication.onlineid: Add IOnlineIdSystemAuthenticatorStatics stub interface. windows.security.authentication.onlineid: Add stub DLL. https://gitlab.winehq.org/wine/wine/-/merge_requests/5021
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + ...ndows.security.authentication.onlineid.idl | 67 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 include/windows.security.authentication.onlineid.idl diff --git a/include/Makefile.in b/include/Makefile.in index f70aeb9414b..077cb9eaccf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -857,6 +857,7 @@ SOURCES = \ windows.networking.idl \ windows.perception.spatial.idl \ windows.perception.spatial.surfaces.idl \ + windows.security.authentication.onlineid.idl \ windows.security.credentials.idl \ windows.security.credentials.ui.idl \ windows.security.cryptography.idl \ diff --git a/include/windows.security.authentication.onlineid.idl b/include/windows.security.authentication.onlineid.idl new file mode 100644 index 00000000000..dcbec66976d --- /dev/null +++ b/include/windows.security.authentication.onlineid.idl @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.system.idl"; + +namespace Windows.Security.Authentication.OnlineId { + interface IOnlineIdSystemAuthenticatorForUser; + interface IOnlineIdSystemAuthenticatorStatics; + + runtimeclass OnlineIdSystemAuthenticator; + runtimeclass OnlineIdSystemAuthenticatorForUser; + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticator), + uuid(85047792-f634-41e3-96a4-5164e902c740) + ] + interface IOnlineIdSystemAuthenticatorStatics : IInspectable + { + [propget] HRESULT Default([out, retval] Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticatorForUser **value); + HRESULT GetForUser([in] Windows.System.User *user, [out, retval] Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticatorForUser **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + static(Windows.Security.Authentication.OnlineId.IOnlineIdSystemAuthenticatorStatics, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass OnlineIdSystemAuthenticator + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass OnlineIdSystemAuthenticatorForUser + { + [default] interface Windows.Security.Authentication.OnlineId.IOnlineIdSystemAuthenticatorForUser; + } +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5021
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- configure.ac | 2 + .../Makefile.in | 7 ++ .../authenticator.c | 116 ++++++++++++++++++ .../classes.idl | 23 ++++ .../main.c | 46 +++++++ .../private.h | 40 ++++++ .../tests/Makefile.in | 5 + .../tests/onlineid.c | 86 +++++++++++++ ...dows.security.authentication.onlineid.spec | 3 + 9 files changed, 328 insertions(+) create mode 100644 dlls/windows.security.authentication.onlineid/Makefile.in create mode 100644 dlls/windows.security.authentication.onlineid/authenticator.c create mode 100644 dlls/windows.security.authentication.onlineid/classes.idl create mode 100644 dlls/windows.security.authentication.onlineid/main.c create mode 100644 dlls/windows.security.authentication.onlineid/private.h create mode 100644 dlls/windows.security.authentication.onlineid/tests/Makefile.in create mode 100644 dlls/windows.security.authentication.onlineid/tests/onlineid.c create mode 100644 dlls/windows.security.authentication.onlineid/windows.security.authentication.onlineid.spec diff --git a/configure.ac b/configure.ac index ba1be1bf9d3..807ceb9c1c3 100644 --- a/configure.ac +++ b/configure.ac @@ -3222,6 +3222,8 @@ WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking) WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub) WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.security.authentication.onlineid) +WINE_CONFIG_MAKEFILE(dlls/windows.security.authentication.onlineid/tests) WINE_CONFIG_MAKEFILE(dlls/windows.security.credentials.ui.userconsentverifier) WINE_CONFIG_MAKEFILE(dlls/windows.security.credentials.ui.userconsentverifier/tests) WINE_CONFIG_MAKEFILE(dlls/windows.storage.applicationdata) diff --git a/dlls/windows.security.authentication.onlineid/Makefile.in b/dlls/windows.security.authentication.onlineid/Makefile.in new file mode 100644 index 00000000000..abd95443750 --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.security.authentication.onlineid.dll +IMPORTS = combase + +SOURCES = \ + authenticator.c \ + classes.idl \ + main.c diff --git a/dlls/windows.security.authentication.onlineid/authenticator.c b/dlls/windows.security.authentication.onlineid/authenticator.c new file mode 100644 index 00000000000..44918d2fbb1 --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/authenticator.c @@ -0,0 +1,116 @@ +/* WinRT Windows.Security.Authentication.Onlineid Implementation + * + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(onlineid); + +struct authenticator_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct authenticator_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct authenticator_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct authenticator_statics *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + *out = &impl->IActivationFactory_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct authenticator_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct authenticator_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct authenticator_statics authenticator_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *authenticator_factory = &authenticator_statics.IActivationFactory_iface; diff --git a/dlls/windows.security.authentication.onlineid/classes.idl b/dlls/windows.security.authentication.onlineid/classes.idl new file mode 100644 index 00000000000..7b644de1fc4 --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.security.authentication.onlineid.dll + * + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.security.authentication.onlineid.idl" diff --git a/dlls/windows.security.authentication.onlineid/main.c b/dlls/windows.security.authentication.onlineid/main.c new file mode 100644 index 00000000000..1d9cce22e03 --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/main.c @@ -0,0 +1,46 @@ +/* WinRT Windows.Security.Authentication.Onlineid Implementation + * + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "initguid.h" +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(onlineid); + +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID riid, void **out ) +{ + FIXME( "clsid %s, riid %s, out %p stub!\n", debugstr_guid( clsid ), debugstr_guid( riid ), out ); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **factory ) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer( classid, NULL ); + + TRACE( "class %s, factory %p.\n", debugstr_hstring( classid ), factory ); + + *factory = NULL; + + if (!wcscmp( buffer, RuntimeClass_Windows_Security_Authentication_OnlineId_OnlineIdSystemAuthenticator )) + IActivationFactory_QueryInterface( authenticator_factory, &IID_IActivationFactory, (void **)factory ); + + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/windows.security.authentication.onlineid/private.h b/dlls/windows.security.authentication.onlineid/private.h new file mode 100644 index 00000000000..db0dcb075fe --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/private.h @@ -0,0 +1,40 @@ +/* WinRT Windows.Security.Authentication.Onlineid Implementation + * + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ONLINEID_PRIVATE_H +#define __WINE_ONLINEID_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Security_Authentication_OnlineId +#include "windows.security.authentication.onlineid.h" + +extern IActivationFactory *authenticator_factory; + +#endif diff --git a/dlls/windows.security.authentication.onlineid/tests/Makefile.in b/dlls/windows.security.authentication.onlineid/tests/Makefile.in new file mode 100644 index 00000000000..10b0bedf35e --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.security.authentication.onlineid.dll +IMPORTS = combase + +SOURCES = \ + onlineid.c diff --git a/dlls/windows.security.authentication.onlineid/tests/onlineid.c b/dlls/windows.security.authentication.onlineid/tests/onlineid.c new file mode 100644 index 00000000000..5ed57af737b --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/tests/onlineid.c @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include "initguid.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "roapi.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Security_Authentication_OnlineId +#include "windows.security.authentication.onlineid.h" + +#include "wine/test.h" + +#define check_interface( obj, iid ) check_interface_( __LINE__, obj, iid ) +static void check_interface_( unsigned int line, void *obj, const IID *iid ) +{ + IUnknown *iface = obj; + IUnknown *unk; + HRESULT hr; + + hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); + ok_(__FILE__, line)( hr == S_OK, "got hr %#lx.\n", hr ); + IUnknown_Release( unk ); +} + +static void test_AuthenticatorStatics(void) +{ + static const WCHAR *authenticator_statics_name = L"Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticator"; + IActivationFactory *factory = (void *)0xdeadbeef; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( authenticator_statics_name, wcslen( authenticator_statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( authenticator_statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + check_interface( factory, &IID_IAgileObject ); + + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + +START_TEST(onlineid) +{ + HRESULT hr; + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + + test_AuthenticatorStatics(); + + RoUninitialize(); +} diff --git a/dlls/windows.security.authentication.onlineid/windows.security.authentication.onlineid.spec b/dlls/windows.security.authentication.onlineid/windows.security.authentication.onlineid.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/windows.security.authentication.onlineid.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5021
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../authenticator.c | 39 ++++++++ .../private.h | 40 ++++++++ .../tests/onlineid.c | 6 ++ ...ndows.security.authentication.onlineid.idl | 96 +++++++++++++++++++ 4 files changed, 181 insertions(+) diff --git a/dlls/windows.security.authentication.onlineid/authenticator.c b/dlls/windows.security.authentication.onlineid/authenticator.c index 44918d2fbb1..c79dbdc89b6 100644 --- a/dlls/windows.security.authentication.onlineid/authenticator.c +++ b/dlls/windows.security.authentication.onlineid/authenticator.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(onlineid); struct authenticator_statics { IActivationFactory IActivationFactory_iface; + IOnlineIdSystemAuthenticatorStatics IOnlineIdSystemAuthenticatorStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IOnlineIdSystemAuthenticatorStatics )) + { + *out = &impl->IOnlineIdSystemAuthenticatorStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,40 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( authenticator_statics, IOnlineIdSystemAuthenticatorStatics, struct authenticator_statics, IActivationFactory_iface ) + +static HRESULT WINAPI authenticator_statics_get_Default( IOnlineIdSystemAuthenticatorStatics *iface, + IOnlineIdSystemAuthenticatorForUser **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_statics_GetForUser( IOnlineIdSystemAuthenticatorStatics *iface, __x_ABI_CWindows_CSystem_CIUser *user, + IOnlineIdSystemAuthenticatorForUser **value ) +{ + FIXME( "iface %p, user %p, value %p stub!\n", iface, user, value ); + return E_NOTIMPL; +} + +static const struct IOnlineIdSystemAuthenticatorStaticsVtbl authenticator_statics_vtbl = +{ + authenticator_statics_QueryInterface, + authenticator_statics_AddRef, + authenticator_statics_Release, + /* IInspectable methods */ + authenticator_statics_GetIids, + authenticator_statics_GetRuntimeClassName, + authenticator_statics_GetTrustLevel, + /* IOnlineIdSystemAuthenticatorStatics methods */ + authenticator_statics_get_Default, + authenticator_statics_GetForUser, +}; + static struct authenticator_statics authenticator_statics = { {&factory_vtbl}, + {&authenticator_statics_vtbl}, 1, }; diff --git a/dlls/windows.security.authentication.onlineid/private.h b/dlls/windows.security.authentication.onlineid/private.h index db0dcb075fe..987b348fe88 100644 --- a/dlls/windows.security.authentication.onlineid/private.h +++ b/dlls/windows.security.authentication.onlineid/private.h @@ -32,9 +32,49 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_System +#include "windows.system.h" #define WIDL_using_Windows_Security_Authentication_OnlineId #include "windows.security.authentication.onlineid.h" extern IActivationFactory *authenticator_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.security.authentication.onlineid/tests/onlineid.c b/dlls/windows.security.authentication.onlineid/tests/onlineid.c index 5ed57af737b..0dd265536ee 100644 --- a/dlls/windows.security.authentication.onlineid/tests/onlineid.c +++ b/dlls/windows.security.authentication.onlineid/tests/onlineid.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_AuthenticatorStatics(void) { static const WCHAR *authenticator_statics_name = L"Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticator"; + IOnlineIdSystemAuthenticatorStatics *authenticator_statics = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; HSTRING str; HRESULT hr; @@ -69,6 +70,11 @@ static void test_AuthenticatorStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IOnlineIdSystemAuthenticatorStatics, (void **)&authenticator_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IOnlineIdSystemAuthenticatorStatics_Release( authenticator_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } diff --git a/include/windows.security.authentication.onlineid.idl b/include/windows.security.authentication.onlineid.idl index dcbec66976d..fe01f1635fd 100644 --- a/include/windows.security.authentication.onlineid.idl +++ b/include/windows.security.authentication.onlineid.idl @@ -28,11 +28,64 @@ import "windows.foundation.idl"; import "windows.system.idl"; namespace Windows.Security.Authentication.OnlineId { + typedef enum OnlineIdSystemTicketStatus OnlineIdSystemTicketStatus; + + interface IOnlineIdServiceTicketRequest; + interface IOnlineIdServiceTicketRequestFactory; interface IOnlineIdSystemAuthenticatorForUser; interface IOnlineIdSystemAuthenticatorStatics; + interface IOnlineIdSystemIdentity; + interface IOnlineIdSystemTicketResult; + runtimeclass OnlineIdServiceTicketRequest; runtimeclass OnlineIdSystemAuthenticator; runtimeclass OnlineIdSystemAuthenticatorForUser; + runtimeclass OnlineIdSystemIdentity; + runtimeclass OnlineIdSystemTicketResult; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest *>; + interface Windows.Foundation.Collections.IIterator<Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Authentication.OnlineId.OnlineIdSystemTicketResult *>; + interface Windows.Foundation.IAsyncOperation<Windows.Security.Authentication.OnlineId.OnlineIdSystemTicketResult *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0) + ] + enum OnlineIdSystemTicketStatus + { + Success = 0, + Error = 1, + ServiceConnectionError = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest), + uuid(297445d3-fb63-4135-8909-4e354c061466) + ] + interface IOnlineIdServiceTicketRequest : IInspectable + { + [propget] HRESULT Service([out, retval] HSTRING *value); + [propget] HRESULT Policy([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticatorForUser), + uuid(5798befb-1de4-4186-a2e6-b563f86aaf44) + ] + interface IOnlineIdSystemAuthenticatorForUser : IInspectable + { + [overload("GetTicketAsync")] HRESULT GetTicketAsync( + [in] Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest *request, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Authentication.OnlineId.OnlineIdSystemTicketResult *> **operation + ); + [propput] HRESULT ApplicationId([in] GUID value); + [propget] HRESULT ApplicationId([out, retval] GUID *value); + [propget] HRESULT User([out, retval] Windows.System.User **user); + } [ contract(Windows.Foundation.UniversalApiContract, 4.0), @@ -45,6 +98,29 @@ namespace Windows.Security.Authentication.OnlineId { HRESULT GetForUser([in] Windows.System.User *user, [out, retval] Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticatorForUser **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Security.Authentication.OnlineId.OnlineIdSystemTicketResult), + uuid(db0a5ff8-b098-4acd-9d13-9e640652b5b6) + ] + interface IOnlineIdSystemTicketResult : IInspectable + { + [propget] HRESULT Identity([out, retval] Windows.Security.Authentication.OnlineId.OnlineIdSystemIdentity **value); + [propget] HRESULT Status([out, retval] Windows.Security.Authentication.OnlineId.OnlineIdSystemTicketStatus *value); + [propget] HRESULT ExtendedError([out, retval] HRESULT *value); + } + + [ + activatable(Windows.Security.Authentication.OnlineId.IOnlineIdServiceTicketRequestFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass OnlineIdServiceTicketRequest + { + [default] interface Windows.Security.Authentication.OnlineId.IOnlineIdServiceTicketRequest; + } + [ contract(Windows.Foundation.UniversalApiContract, 4.0), marshaling_behavior(agile), @@ -64,4 +140,24 @@ namespace Windows.Security.Authentication.OnlineId { { [default] interface Windows.Security.Authentication.OnlineId.IOnlineIdSystemAuthenticatorForUser; } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass OnlineIdSystemIdentity + { + [default] interface Windows.Security.Authentication.OnlineId.IOnlineIdSystemIdentity; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass OnlineIdSystemTicketResult + { + [default] interface Windows.Security.Authentication.OnlineId.IOnlineIdSystemTicketResult; + } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5021
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../Makefile.in | 3 +- .../main.c | 2 + .../private.h | 1 + .../tests/onlineid.c | 34 ++++ .../ticket.c | 154 ++++++++++++++++++ ...ndows.security.authentication.onlineid.idl | 17 ++ 6 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 dlls/windows.security.authentication.onlineid/ticket.c diff --git a/dlls/windows.security.authentication.onlineid/Makefile.in b/dlls/windows.security.authentication.onlineid/Makefile.in index abd95443750..ee3a15b2617 100644 --- a/dlls/windows.security.authentication.onlineid/Makefile.in +++ b/dlls/windows.security.authentication.onlineid/Makefile.in @@ -4,4 +4,5 @@ IMPORTS = combase SOURCES = \ authenticator.c \ classes.idl \ - main.c + main.c \ + ticket.c diff --git a/dlls/windows.security.authentication.onlineid/main.c b/dlls/windows.security.authentication.onlineid/main.c index 1d9cce22e03..4e310d8839f 100644 --- a/dlls/windows.security.authentication.onlineid/main.c +++ b/dlls/windows.security.authentication.onlineid/main.c @@ -40,6 +40,8 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **fa if (!wcscmp( buffer, RuntimeClass_Windows_Security_Authentication_OnlineId_OnlineIdSystemAuthenticator )) IActivationFactory_QueryInterface( authenticator_factory, &IID_IActivationFactory, (void **)factory ); + if (!wcscmp( buffer, RuntimeClass_Windows_Security_Authentication_OnlineId_OnlineIdServiceTicketRequest )) + IActivationFactory_QueryInterface( ticket_factory, &IID_IActivationFactory, (void **)factory ); if (*factory) return S_OK; return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/windows.security.authentication.onlineid/private.h b/dlls/windows.security.authentication.onlineid/private.h index 987b348fe88..96df5d91066 100644 --- a/dlls/windows.security.authentication.onlineid/private.h +++ b/dlls/windows.security.authentication.onlineid/private.h @@ -38,6 +38,7 @@ #include "windows.security.authentication.onlineid.h" extern IActivationFactory *authenticator_factory; +extern IActivationFactory *ticket_factory; #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.security.authentication.onlineid/tests/onlineid.c b/dlls/windows.security.authentication.onlineid/tests/onlineid.c index 0dd265536ee..f58fbb09078 100644 --- a/dlls/windows.security.authentication.onlineid/tests/onlineid.c +++ b/dlls/windows.security.authentication.onlineid/tests/onlineid.c @@ -79,6 +79,39 @@ static void test_AuthenticatorStatics(void) ok( ref == 1, "got ref %ld.\n", ref ); } +static void test_TicketStatics(void) +{ + static const WCHAR *ticket_statics_name = L"Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest"; + IOnlineIdServiceTicketRequest *ticket_statics = (void *)0xdeadbeef; + IActivationFactory *factory = (void *)0xdeadbeef; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( ticket_statics_name, wcslen( ticket_statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( ticket_statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + + hr = IActivationFactory_QueryInterface( factory, &IID_IOnlineIdServiceTicketRequestFactory, (void **)&ticket_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IOnlineIdServiceTicketRequest_Release( ticket_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + START_TEST(onlineid) { HRESULT hr; @@ -87,6 +120,7 @@ START_TEST(onlineid) ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); test_AuthenticatorStatics(); + test_TicketStatics(); RoUninitialize(); } diff --git a/dlls/windows.security.authentication.onlineid/ticket.c b/dlls/windows.security.authentication.onlineid/ticket.c new file mode 100644 index 00000000000..c162f5dfe5c --- /dev/null +++ b/dlls/windows.security.authentication.onlineid/ticket.c @@ -0,0 +1,154 @@ +/* WinRT Windows.Security.Authentication.Onlineid Implementation + * + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(onlineid); + +struct ticket_request_factory_statics +{ + IActivationFactory IActivationFactory_iface; + IOnlineIdServiceTicketRequestFactory IOnlineIdServiceTicketRequestFactory_iface; + LONG ref; +}; + +static inline struct ticket_request_factory_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct ticket_request_factory_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct ticket_request_factory_statics *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + *out = &impl->IActivationFactory_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IOnlineIdServiceTicketRequestFactory )) + { + *out = &impl->IOnlineIdServiceTicketRequestFactory_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct ticket_request_factory_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct ticket_request_factory_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +DEFINE_IINSPECTABLE( ticket_request_factory_statics, IOnlineIdServiceTicketRequestFactory, struct ticket_request_factory_statics, IActivationFactory_iface ) + +static HRESULT WINAPI ticket_request_factory_statics_CreateOnlineIdServiceTicketRequest( IOnlineIdServiceTicketRequestFactory *iface, HSTRING service, + HSTRING policy, IOnlineIdServiceTicketRequest **request ) +{ + FIXME( "iface %p, service %s, policy %s, request %p stub!\n", iface, debugstr_hstring( service ), debugstr_hstring( policy ), request ); + return E_NOTIMPL; +} + +static HRESULT WINAPI ticket_request_factory_statics_CreateOnlineIdServiceTicketRequestAdvanced( IOnlineIdServiceTicketRequestFactory *iface, HSTRING service, + IOnlineIdServiceTicketRequest **request ) +{ + FIXME( "iface %p, service %s, request %p stub!\n", iface, debugstr_hstring( service ), request ); + return E_NOTIMPL; +} + +static const struct IOnlineIdServiceTicketRequestFactoryVtbl ticket_request_factory_statics_vtbl = +{ + ticket_request_factory_statics_QueryInterface, + ticket_request_factory_statics_AddRef, + ticket_request_factory_statics_Release, + /* IInspectable methods */ + ticket_request_factory_statics_GetIids, + ticket_request_factory_statics_GetRuntimeClassName, + ticket_request_factory_statics_GetTrustLevel, + /* IOnlineIdServiceTicketRequestFactory methods */ + ticket_request_factory_statics_CreateOnlineIdServiceTicketRequest, + ticket_request_factory_statics_CreateOnlineIdServiceTicketRequestAdvanced, +}; + +static struct ticket_request_factory_statics ticket_request_factory_statics = +{ + {&factory_vtbl}, + {&ticket_request_factory_statics_vtbl}, + 1, +}; + +IActivationFactory *ticket_factory = &ticket_request_factory_statics.IActivationFactory_iface; diff --git a/include/windows.security.authentication.onlineid.idl b/include/windows.security.authentication.onlineid.idl index fe01f1635fd..a96518f78cc 100644 --- a/include/windows.security.authentication.onlineid.idl +++ b/include/windows.security.authentication.onlineid.idl @@ -71,6 +71,23 @@ namespace Windows.Security.Authentication.OnlineId { [propget] HRESULT Policy([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest), + uuid(bebb0a08-9e73-4077-9614-08614c0bc245) + ] + interface IOnlineIdServiceTicketRequestFactory : IInspectable + { + HRESULT CreateOnlineIdServiceTicketRequest( + [in] HSTRING service, [in] HSTRING policy, + [out, retval] Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest **request + ); + HRESULT CreateOnlineIdServiceTicketRequestAdvanced( + [in] HSTRING service, + [out, retval] Windows.Security.Authentication.OnlineId.OnlineIdServiceTicketRequest **request + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 4.0), exclusiveto(Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticatorForUser), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5021
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Called by Minecraft Education Edition. --- .../authenticator.c | 125 +++++++++++++++++- .../tests/onlineid.c | 9 ++ 2 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/windows.security.authentication.onlineid/authenticator.c b/dlls/windows.security.authentication.onlineid/authenticator.c index c79dbdc89b6..b781be2595f 100644 --- a/dlls/windows.security.authentication.onlineid/authenticator.c +++ b/dlls/windows.security.authentication.onlineid/authenticator.c @@ -115,13 +115,134 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct authenticator +{ + IOnlineIdSystemAuthenticatorForUser IOnlineIdSystemAuthenticatorForUser_iface; + LONG ref; +}; + +static inline struct authenticator *impl_from_IOnlineIdSystemAuthenticatorForUser( IOnlineIdSystemAuthenticatorForUser *iface ) +{ + return CONTAINING_RECORD( iface, struct authenticator, IOnlineIdSystemAuthenticatorForUser_iface ); +} + +static HRESULT WINAPI authenticator_QueryInterface( IOnlineIdSystemAuthenticatorForUser *iface, REFIID iid, void **out ) +{ + struct authenticator *impl = impl_from_IOnlineIdSystemAuthenticatorForUser( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IOnlineIdSystemAuthenticatorForUser )) + { + *out = &impl->IOnlineIdSystemAuthenticatorForUser_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI authenticator_AddRef( IOnlineIdSystemAuthenticatorForUser *iface ) +{ + struct authenticator *impl = impl_from_IOnlineIdSystemAuthenticatorForUser( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI authenticator_Release( IOnlineIdSystemAuthenticatorForUser *iface ) +{ + struct authenticator *impl = impl_from_IOnlineIdSystemAuthenticatorForUser( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI authenticator_GetIids( IOnlineIdSystemAuthenticatorForUser *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_GetRuntimeClassName( IOnlineIdSystemAuthenticatorForUser *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_GetTrustLevel( IOnlineIdSystemAuthenticatorForUser *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_GetTicketAsync( IOnlineIdSystemAuthenticatorForUser *iface, IOnlineIdServiceTicketRequest *request, + IAsyncOperation_OnlineIdSystemTicketResult **operation ) +{ + FIXME( "iface %p, request %p, operation %p stub!\n", iface, request, operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_put_ApplicationId( IOnlineIdSystemAuthenticatorForUser *iface, GUID value ) +{ + FIXME( "iface %p, value %s stub!\n", iface, debugstr_guid( &value ) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_get_ApplicationId( IOnlineIdSystemAuthenticatorForUser *iface, GUID *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_get_User( IOnlineIdSystemAuthenticatorForUser *iface, __x_ABI_CWindows_CSystem_CIUser **user ) +{ + FIXME( "iface %p, user %p stub!\n", iface, user ); + return E_NOTIMPL; +} + +static const struct IOnlineIdSystemAuthenticatorForUserVtbl authenticator_vtbl = +{ + authenticator_QueryInterface, + authenticator_AddRef, + authenticator_Release, + /* IInspectable methods */ + authenticator_GetIids, + authenticator_GetRuntimeClassName, + authenticator_GetTrustLevel, + /* IOnlineIdSystemAuthenticatorForUser methods */ + authenticator_GetTicketAsync, + authenticator_put_ApplicationId, + authenticator_get_ApplicationId, + authenticator_get_User, +}; + DEFINE_IINSPECTABLE( authenticator_statics, IOnlineIdSystemAuthenticatorStatics, struct authenticator_statics, IActivationFactory_iface ) static HRESULT WINAPI authenticator_statics_get_Default( IOnlineIdSystemAuthenticatorStatics *iface, IOnlineIdSystemAuthenticatorForUser **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct authenticator *impl; + + TRACE( "iface %p, value %p\n", iface, value ); + + if (!value) return E_POINTER; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IOnlineIdSystemAuthenticatorForUser_iface.lpVtbl = &authenticator_vtbl; + impl->ref = 1; + + *value = &impl->IOnlineIdSystemAuthenticatorForUser_iface; + TRACE( "created IOnlineIdSystemAuthenticatorForUser %p.\n", *value ); + return S_OK; } static HRESULT WINAPI authenticator_statics_GetForUser( IOnlineIdSystemAuthenticatorStatics *iface, __x_ABI_CWindows_CSystem_CIUser *user, diff --git a/dlls/windows.security.authentication.onlineid/tests/onlineid.c b/dlls/windows.security.authentication.onlineid/tests/onlineid.c index f58fbb09078..e8f4e06ded3 100644 --- a/dlls/windows.security.authentication.onlineid/tests/onlineid.c +++ b/dlls/windows.security.authentication.onlineid/tests/onlineid.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_AuthenticatorStatics(void) { static const WCHAR *authenticator_statics_name = L"Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticator"; + IOnlineIdSystemAuthenticatorForUser *authenticator_for_user = (void *)0xdeadbeef; IOnlineIdSystemAuthenticatorStatics *authenticator_statics = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; HSTRING str; @@ -73,6 +74,14 @@ static void test_AuthenticatorStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IOnlineIdSystemAuthenticatorStatics, (void **)&authenticator_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IOnlineIdSystemAuthenticatorStatics_get_Default( authenticator_statics, NULL ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + hr = IOnlineIdSystemAuthenticatorStatics_get_Default( authenticator_statics, &authenticator_for_user ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( authenticator_for_user, &IID_IAgileObject ); + + IOnlineIdSystemAuthenticatorForUser_Release( authenticator_for_user ); ref = IOnlineIdSystemAuthenticatorStatics_Release( authenticator_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5021
Looks okay but it would be nice to be sure that it's actually helping. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5021#note_60207
On Tue Feb 6 14:11:59 2024 +0000, Rémi Bernon wrote:
Looks okay but it would be nice to be sure that it's actually helping. FWIW this class is required for a cloud feature
With the System Ticket feature, an app can provide cloud services to a user and store user info even if the user is not signed on with their Microsoft account (MSA). The app can acquire information about the local user account on a system, as well as information about the system itself, in order to keep track of settings and data for this user.
https://learn.microsoft.com/en-us/uwp/api/windows.security.authentication.on... Regarding office, it requires numerous workarounds so it's time consuming to test. Adding this class for Minecraft Education Edition didn't break anything. I think Affinity Photo may have used it as well and it too worked without issue. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5021#note_60228
participants (3)
-
Mohamad Al-Jaf -
Mohamad Al-Jaf (＠maljaf)
-
Rémi Bernon