February 2024 - Wine-commits

Zebediah Figura : kernelbase: Use scheme_is_opaque() in UrlIs().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 5ca8e4b00d9b95813552d5e43fb3a7d633eedf17 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ca8e4b00d9b95813552d5e43fb3a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 23:42:57 2024 -0600 kernelbase: Use scheme_is_opaque() in UrlIs(). --- dlls/kernelbase/path.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 71f63d25b94..548982e4e7e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4816,16 +4816,7 @@ BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) case URLIS_OPAQUE: base.cbSize = sizeof(base); if (ParseURLA(url, &base) != S_OK) return FALSE; /* invalid scheme */ - switch (base.nScheme) - { - case URL_SCHEME_MAILTO: - case URL_SCHEME_SHELL: - case URL_SCHEME_JAVASCRIPT: - case URL_SCHEME_VBSCRIPT: - case URL_SCHEME_ABOUT: - return TRUE; - } - return FALSE; + return scheme_is_opaque( base.nScheme ); case URLIS_FILEURL: return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, url, 5, "file:", 5) == CSTR_EQUAL);

1 0

Zebediah Figura : shlwapi/tests: Add many more tests for UrlCanonicalize().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: f74f8b9ef37dd9cd7ee3a2b0022934ba33215d96 URL: https://gitlab.winehq.org/wine/wine/-/commit/f74f8b9ef37dd9cd7ee3a2b0022934… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 23:44:13 2024 -0600 shlwapi/tests: Add many more tests for UrlCanonicalize(). --- dlls/shlwapi/tests/url.c | 1165 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1083 insertions(+), 82 deletions(-)

1 0

Fabian Maurer : user32/sysparams: Only allow dpi awareness tests to return invalid on windows.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: d34cbe61db29a7e387fb033dec5510c2214c0548 URL: https://gitlab.winehq.org/wine/wine/-/commit/d34cbe61db29a7e387fb033dec5510… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Feb 9 20:07:11 2024 +0100 user32/sysparams: Only allow dpi awareness tests to return invalid on windows. We can't use IsValidDpiAwarenessContext since this uses GetAwarenessFromDpiAwarenessContext which we're testing --- dlls/user32/tests/sysparams.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3f25baf3589..ba6ed0c8b4c 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3929,18 +3929,19 @@ static void test_dpi_context(void) switch (i) { case 0x10: - ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_UNAWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; case 0x11: - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; case 0x12: ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); break; case 0x22: - ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + todo_wine + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; default: @@ -3955,18 +3956,19 @@ static void test_dpi_context(void) switch (i) { case 0x10: - ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_UNAWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x11: - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x12: ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x22: - ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + todo_wine + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; default: @@ -3987,16 +3989,12 @@ static void test_dpi_context(void) ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: - if (pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i )) - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "%Ix: wrong value %u\n", ~i, awareness ); - else - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness ); + todo_wine + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: - if (pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i )) - ok( awareness == DPI_AWARENESS_UNAWARE, "%Ix: wrong value %u\n", ~i, awareness ); - else - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness ); + todo_wine + ok( awareness == DPI_AWARENESS_UNAWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness );

1 0

Fabian Maurer : user32/sysparams: Handle more contexts in GetAwarenessFromDpiAwarenessContext.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 5ffed8830cbc619219eae9a9f48b5f83bced7ad4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ffed8830cbc619219eae9a9f48b5f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Feb 9 20:11:44 2024 +0100 user32/sysparams: Handle more contexts in GetAwarenessFromDpiAwarenessContext. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55630 --- dlls/user32/sysparams.c | 4 ++++ dlls/user32/tests/sysparams.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 18e02f1524b..ec8dc11af17 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -656,14 +656,18 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT case 0x10: case 0x11: case 0x12: + case 0x22: case 0x80000010: case 0x80000011: case 0x80000012: + case 0x80000022: return (ULONG_PTR)context & 3; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: return ~(ULONG_PTR)context; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: + return ~(ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; default: return DPI_AWARENESS_INVALID; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ba6ed0c8b4c..16756ecb06a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3940,7 +3940,6 @@ static void test_dpi_context(void) ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); break; case 0x22: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; @@ -3967,7 +3966,6 @@ static void test_dpi_context(void) ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x22: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; @@ -3989,7 +3987,6 @@ static void test_dpi_context(void) ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED:

1 0

Daniel Lehman : oleaut32: Handle exponent in VarBstrFromR[48] in non-English locales.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 834558245bac2e7e85a0e21da66bcf355431ba5d URL: https://gitlab.winehq.org/wine/wine/-/commit/834558245bac2e7e85a0e21da66bcf… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Feb 6 22:46:20 2024 -0800 oleaut32: Handle exponent in VarBstrFromR[48] in non-English locales. --- dlls/oleaut32/tests/vartype.c | 8 ++++---- dlls/oleaut32/vartype.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e567f5a5fed..c6772a7be14 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4570,11 +4570,11 @@ static void test_VarBstrFromR4(void) { 1.0e14, L"1E+14" }, { 999999999999999.0, L"1E+15" }, { 1000000000000000.0, L"1E+15" }, - { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1200000000000000.0, L"1,2E+15" }, { 1.0e15, L"1E+15" }, { 1.000e16, L"1E+16" }, - { 1.234e16, L"1,234E+16", TRUE }, + { 1.234e16, L"1,234E+16" }, { M_PI, L"3,141593" }, { 0.0, NULL } @@ -4710,11 +4710,11 @@ static void test_VarBstrFromR8(void) { 1.0e14, L"100000000000000" }, { 999999999999999.0, L"999999999999999" }, { 1000000000000000.0, L"1E+15" }, - { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1200000000000000.0, L"1,2E+15" }, { 1.0e15, L"1E+15" }, { 1.000e16, L"1E+16" }, - { 1.234e16, L"1,234E+16", TRUE }, + { 1.234e16, L"1,234E+16" }, { 0.0, NULL } }; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index d51cee3ee82..3ab404f33f8 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6497,7 +6497,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl } else { - WCHAR *p; + WCHAR *p, *e; WCHAR numbuff[256]; WCHAR empty[] = L""; NUMBERFMTW minFormat; @@ -6512,9 +6512,11 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl (WCHAR *)&minFormat.LeadingZero, sizeof(DWORD)/sizeof(WCHAR) ); /* count number of decimal digits in string */ - p = wcschr( buff, '.' ); - if (p) minFormat.NumDigits = lstrlenW(p + 1); + p = wcschr(buff, '.'); + e = wcschr(p ? ++p : buff, 'E'); + if (p) minFormat.NumDigits = e ? e - p : lstrlenW(p); + if (e) *e = '\0'; numbuff[0] = '\0'; if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, ARRAY_SIZE(numbuff))) { @@ -6523,6 +6525,11 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl } else { + if (e) + { + *e = 'E'; + wcscat(numbuff, e); + } TRACE("created minimal NLS string %s\n", debugstr_w(numbuff)); bstrOut = SysAllocString(numbuff); }

1 0

Mohamad Al-Jaf : include: Add windows.security.authentication.onlineid.idl file.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: f0b32fa5417ddd79d3f069d3f9785204150c0a27 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0b32fa5417ddd79d3f069d3f97852… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Dec 3 04:14:58 2022 -0500 include: Add windows.security.authentication.onlineid.idl file. --- include/Makefile.in | 1 + .../windows.security.authentication.onlineid.idl | 67 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) 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; + } +}

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Add stub DLL.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 9809102897332169786b71a38359a7ed76aa71b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9809102897332169786b71a38359a7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 00:12:09 2022 -0500 windows.security.authentication.onlineid: Add stub DLL. --- configure | 3 + 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 +++++++++++++++ .../windows.security.authentication.onlineid.spec | 3 + 10 files changed, 331 insertions(+)

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Add IOnlineIdSystemAuthenticatorStatics stub interface.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: a3ef7d7487f0bc46e29cd2317a5121cba7c35c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3ef7d7487f0bc46e29cd2317a5121… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 00:25:06 2022 -0500 windows.security.authentication.onlineid: Add IOnlineIdSystemAuthenticatorStatics stub interface. --- .../authenticator.c | 39 +++++++++ .../private.h | 40 +++++++++ .../tests/onlineid.c | 6 ++ .../windows.security.authentication.onlineid.idl | 96 ++++++++++++++++++++++ 4 files changed, 181 insertions(+)

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Add IOnlineIdServiceTicketRequestFactory stub interface.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: df9b41afcb3292ff4abfb8d3782569b1e106bbd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/df9b41afcb3292ff4abfb8d3782569… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jan 9 01:27:30 2023 -0500 windows.security.authentication.onlineid: Add IOnlineIdServiceTicketRequestFactory stub interface. --- .../Makefile.in | 3 +- .../main.c | 2 + .../private.h | 1 + .../tests/onlineid.c | 34 +++++ .../ticket.c | 154 +++++++++++++++++++++ .../windows.security.authentication.onlineid.idl | 17 +++ 6 files changed, 210 insertions(+), 1 deletion(-)

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Implement IOnlineIdSystemAuthenticatorStatics::get_Default().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 23f360b1dbeae91a8da217fdd0b16a9a5083963b URL: https://gitlab.winehq.org/wine/wine/-/commit/23f360b1dbeae91a8da217fdd0b16a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 9 01:53:10 2023 -0400 windows.security.authentication.onlineid: Implement IOnlineIdSystemAuthenticatorStatics::get_Default(). 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 );

1 0