October 2023 - Wine-Commits

Alex Henrie : uninstaller: Don't overallocate in FetchFromRootKey.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 8943fcbca4963ac6740a5c6e13d5fc9b7748cad2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8943fcbca4963ac6740a5c6e13d5fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Sep 9 12:06:36 2023 -0600 uninstaller: Don't overallocate in FetchFromRootKey. --- programs/uninstaller/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 027937ba255..15f63976838 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -258,7 +258,7 @@ static int FetchFromRootKey(HKEY root) type == REG_DWORD && value == 1) { command = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName)) * sizeof(WCHAR)); + sizeof(L"msiexec /x") + wcslen(subKeyName) * sizeof(WCHAR)); wsprintfW(command, L"msiexec /x%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"UninstallString", NULL, NULL, NULL, &uninstlen))

1 0

Zebediah Figura : ddraw: Always create surfaces with WINED3D_BIND_SHADER_RESOURCE if possible.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: ee7d047dd55a4b2338eb2d64f85b7d984b39812f URL: https://gitlab.winehq.org/wine/wine/-/commit/ee7d047dd55a4b2338eb2d64f85b7d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 5 17:22:20 2023 -0500 ddraw: Always create surfaces with WINED3D_BIND_SHADER_RESOURCE if possible. --- dlls/ddraw/surface.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2be29834d78..f3c12bfccdb 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6182,8 +6182,9 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, wined3d_desc->depth = 1; wined3d_desc->size = 0; - if ((caps & DDSCAPS_TEXTURE) || (caps2 & DDSCAPS2_CUBEMAP)) - wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + /* Always specify WINED3D_BIND_SHADER_RESOURCE. + * Surfaces without it can be bound on software devices on ddraw < 4. */ + wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (caps & DDSCAPS_ZBUFFER) wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; else if (caps & DDSCAPS_3DDEVICE) @@ -6307,10 +6308,29 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d } else { + /* DDSCAPS_TEXTURE is not actually necessary to bind a surface as a + * texture for a software device. Worse, one can bind a hardware + * surface to a software device. However, some formats (e.g. YUY2) can + * live on the GPU but truly aren't texturable, and we don't want to + * fail to create them. + * + * Hence, if we fail to create a texture, and the user didn't + * explicitly ask for a texture, strip WINED3D_BIND_SHADER_RESOURCE and + * try again. */ + if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) - return hr; + { + if ((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) || (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) + return hr; + + wined3d_desc.bind_flags &= ~WINED3D_BIND_SHADER_RESOURCE; + if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, + layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, + texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) + return hr; + } } if ((desc->dwFlags & DDSD_LPSURFACE) @@ -6788,19 +6808,11 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { if (!(desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) { - unsigned int bind_flags = 0; + unsigned int bind_flags = WINED3D_BIND_SHADER_RESOURCE; DWORD usage = 0; if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { usage |= WINED3DUSAGE_LEGACY_CUBEMAP; - bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - } - else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - } - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) bind_flags |= WINED3D_BIND_DEPTH_STENCIL; else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)

1 0

Nikolay Sivov : gdi32/tests: Add some tests for FixBrushOrgEx().
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: e04e10b37bcba953f0b0e43caf0efca09da5a75c URL: https://gitlab.winehq.org/wine/wine/-/commit/e04e10b37bcba953f0b0e43caf0efc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 15:25:14 2023 +0200 gdi32/tests: Add some tests for FixBrushOrgEx(). It appears to be a stub on modern systems. Does not generate EMF output either. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/brush.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index b23e73ac65f..8df3c48a20d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -411,16 +411,36 @@ static void test_brush_org( void ) { HDC hdc = GetDC( 0 ); POINT old, pt; + BOOL ret; - SetBrushOrgEx( hdc, 0, 0, &old ); + ret = SetBrushOrgEx( hdc, 0, 0, &old ); + ok(ret, "Unexpected return value %d.\n", ret); - SetBrushOrgEx( hdc, 1, 1, &pt ); + ret = SetBrushOrgEx( hdc, 1, 1, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y ); - SetBrushOrgEx( hdc, 0x10000, -1, &pt ); + ret = SetBrushOrgEx( hdc, 0x10000, -1, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); ok( pt.x == 1 && pt.y == 1, "got %ld,%ld\n", pt.x, pt.y ); - SetBrushOrgEx( hdc, old.x, old.y, &pt ); + ret = SetBrushOrgEx( hdc, old.x, old.y, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); ok( pt.x == 0x10000 && pt.y == -1, "got %ld,%ld\n", pt.x, pt.y ); + ret = GetBrushOrgEx( hdc, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); + ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y ); + pt.x = 10; + pt.y = 20; + ret = FixBrushOrgEx( hdc, 2, 3, &pt ); + todo_wine + ok(!ret, "Unexpected return value %d.\n", ret); + todo_wine + ok( pt.x == 10 && pt.y == 20, "got %ld,%ld\n", pt.x, pt.y ); + ret = GetBrushOrgEx( hdc, &pt ); + ok(ret, "Unexpected return value %d.\n", ret); + todo_wine + ok( pt.x == 0 && pt.y == 0, "got %ld,%ld\n", pt.x, pt.y ); + ReleaseDC( 0, hdc ); }

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier: Implement IUserConsentVerifierStatics::CheckAvailabilityAsync().
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: a8f6183030d22bee01ac2bc6c8e9292837d8ea55 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8f6183030d22bee01ac2bc6c8e929… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:09 2023 -0400 windows.security.credentials.ui.userconsentverifier: Implement IUserConsentVerifierStatics::CheckAvailabilityAsync(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55709 --- .../Makefile.in | 4 +- .../async.c | 509 +++++++++++++++++++++ .../main.c | 11 +- .../private.h | 8 + .../provider.idl | 46 ++ 5 files changed, 575 insertions(+), 3 deletions(-)

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier/tests: Add IUserConsentVerifierStatics::CheckAvailabilityAsync() tests.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: a6a9419a3433c48f727ea9234d47b21e07889573 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6a9419a3433c48f727ea9234d47b2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:16 2023 -0400 windows.security.credentials.ui.userconsentverifier/tests: Add IUserConsentVerifierStatics::CheckAvailabilityAsync() tests. --- .../tests/verifier.c | 211 ++++++++++++++++++++- 1 file changed, 206 insertions(+), 5 deletions(-)

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier: Add stub DLL.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: d7b7114dd958adb3feea79eb86d29e1b8546f3b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7b7114dd958adb3feea79eb86d29e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:01 2023 -0400 windows.security.credentials.ui.userconsentverifier: Add stub DLL. --- configure | 3 + configure.ac | 2 + .../Makefile.in | 8 ++ .../classes.idl | 23 ++++ .../main.c | 138 +++++++++++++++++++++ .../private.h | 38 ++++++ .../tests/Makefile.in | 5 + .../tests/verifier.c | 85 +++++++++++++ ...ecurity.credentials.ui.userconsentverifier.spec | 3 + 9 files changed, 305 insertions(+)

1 0

Nikolay Sivov : gdi32/emf: Add SetBrushOrgEx() recording.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 86708b36f87b98d5689a19d8504fa6bc8ec7ebda URL: https://gitlab.winehq.org/wine/wine/-/commit/86708b36f87b98d5689a19d8504fa6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 12:46:30 2023 +0200 gdi32/emf: Add SetBrushOrgEx() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/dc.c | 1 + dlls/gdi32/emfdc.c | 10 ++++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 02c6a8c84cd..21005fa0719 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1060,6 +1060,7 @@ BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, POINT *oldorg ) { DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetBrushOrgEx( dc_attr, x, y )) return FALSE; if (oldorg) *oldorg = dc_attr->brush_org; dc_attr->brush_org.x = x; dc_attr->brush_org.y = y; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index e94f3c69b12..231b4ae217d 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2129,6 +2129,16 @@ BOOL EMFDC_SetBkColor( DC_ATTR *dc_attr, COLORREF color ) return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); } +BOOL EMFDC_SetBrushOrgEx( DC_ATTR *dc_attr, INT x, INT y ) +{ + EMRSETBRUSHORGEX emr; + + emr.emr.iType = EMR_SETBRUSHORGEX; + emr.emr.nSize = sizeof(emr); + emr.ptlOrigin.x = x; + emr.ptlOrigin.y = y; + return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); +} BOOL EMFDC_SetTextColor( DC_ATTR *dc_attr, COLORREF color ) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d9bf1c32895..8fa5c06e014 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -233,6 +233,7 @@ BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ); BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ); BOOL EMFDC_SetBkColor( DC_ATTR *dc_attr, COLORREF color ); BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ); +BOOL EMFDC_SetBrushOrgEx( DC_ATTR *dc_attr, INT x, INT y ); BOOL EMFDC_SetDCBrushColor( DC_ATTR *dc_attr, COLORREF color ); BOOL EMFDC_SetDCPenColor( DC_ATTR *dc_attr, COLORREF color ); INT EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dest, INT y_dest, DWORD width, DWORD height,

1 0

Mohamad Al-Jaf : windows.security.credentials.ui.userconsentverifier: Add IUserConsentVerifierStatics stub interface.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: c2d0b2fdf21f2f2b8794eea086a3d9eeb1064dea URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d0b2fdf21f2f2b8794eea086a3d9… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:39:05 2023 -0400 windows.security.credentials.ui.userconsentverifier: Add IUserConsentVerifierStatics stub interface. --- .../main.c | 38 ++++++++++++++++++++++ .../private.h | 38 ++++++++++++++++++++++ .../tests/verifier.c | 6 ++++ 3 files changed, 82 insertions(+) diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/main.c b/dlls/windows.security.credentials.ui.userconsentverifier/main.c index 159d58d3a4f..d86601331fb 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/main.c +++ b/dlls/windows.security.credentials.ui.userconsentverifier/main.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(credentials); struct user_consent_verifier_statics { IActivationFactory IActivationFactory_iface; + IUserConsentVerifierStatics IUserConsentVerifierStatics_iface; LONG ref; }; @@ -50,6 +51,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IUserConsentVerifierStatics )) + { + *out = &impl->IUserConsentVerifierStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -108,9 +116,39 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( user_consent_verifier_statics, IUserConsentVerifierStatics, struct user_consent_verifier_statics, IActivationFactory_iface ) + +static HRESULT WINAPI user_consent_verifier_statics_CheckAvailabilityAsync( IUserConsentVerifierStatics *iface, IAsyncOperation_UserConsentVerifierAvailability **result ) +{ + FIXME( "iface %p, result %p stub!\n", iface, result ); + return E_NOTIMPL; +} + +static HRESULT WINAPI user_consent_verifier_statics_RequestVerificationAsync( IUserConsentVerifierStatics *iface, HSTRING message, + IAsyncOperation_UserConsentVerificationResult **result ) +{ + FIXME( "iface %p, message %s, result %p stub!\n", iface, debugstr_hstring( message ), result ); + return E_NOTIMPL; +} + +static const struct IUserConsentVerifierStaticsVtbl user_consent_verifier_statics_vtbl = +{ + user_consent_verifier_statics_QueryInterface, + user_consent_verifier_statics_AddRef, + user_consent_verifier_statics_Release, + /* IInspectable methods */ + user_consent_verifier_statics_GetIids, + user_consent_verifier_statics_GetRuntimeClassName, + user_consent_verifier_statics_GetTrustLevel, + /* IUserConsentVerifierStatics methods */ + user_consent_verifier_statics_CheckAvailabilityAsync, + user_consent_verifier_statics_RequestVerificationAsync, +}; + static struct user_consent_verifier_statics user_consent_verifier_statics = { {&factory_vtbl}, + {&user_consent_verifier_statics_vtbl}, 1, }; diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/private.h b/dlls/windows.security.credentials.ui.userconsentverifier/private.h index e9aa9d1cd96..dc22b85ffab 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/private.h +++ b/dlls/windows.security.credentials.ui.userconsentverifier/private.h @@ -35,4 +35,42 @@ #define WIDL_using_Windows_Security_Credentials_UI #include "windows.security.credentials.ui.h" +#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.credentials.ui.userconsentverifier/tests/verifier.c b/dlls/windows.security.credentials.ui.userconsentverifier/tests/verifier.c index 096696a2a70..39245fd2b14 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/tests/verifier.c +++ b/dlls/windows.security.credentials.ui.userconsentverifier/tests/verifier.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_UserConsentVerifierStatics(void) { static const WCHAR *user_consent_verifier_statics_name = L"Windows.Security.Credentials.UI.UserConsentVerifier"; + IUserConsentVerifierStatics *user_consent_verifier_statics = NULL; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -68,6 +69,11 @@ static void test_UserConsentVerifierStatics(void) check_interface( factory, &IID_IUnknown ); check_interface( factory, &IID_IInspectable ); + hr = IActivationFactory_QueryInterface( factory, &IID_IUserConsentVerifierStatics, (void **)&user_consent_verifier_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IUserConsentVerifierStatics_Release( user_consent_verifier_statics ); + ok( ref == 1, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Alexandre Julliard : winebuild: Add a helper to output an asm function header.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 945883438a31eda151bf19484619eb1a2d3cf63a URL: https://gitlab.winehq.org/wine/wine/-/commit/945883438a31eda151bf19484619eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 20:46:40 2023 +0200 winebuild: Add a helper to output an asm function header. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 47 ++++++++++------------------------------------- tools/winebuild/relay.c | 18 +++++------------- tools/winebuild/spec16.c | 4 +--- tools/winebuild/utils.c | 28 ++++++++++++++++------------ 5 files changed, 33 insertions(+), 66 deletions(-)

1 0

Mohamad Al-Jaf : include: Add windows.security.credentials.ui.idl file.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 5ff9ffb3684c8b7b42dceff446dfa2e50e3b8c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ff9ffb3684c8b7b42dceff446dfa2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Oct 8 00:38:52 2023 -0400 include: Add windows.security.credentials.ui.idl file. --- include/Makefile.in | 1 + include/windows.security.credentials.ui.idl | 91 +++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 5f61344324d..ef0c48ed9ef 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -855,6 +855,7 @@ SOURCES = \ windows.perception.spatial.idl \ windows.perception.spatial.surfaces.idl \ windows.security.credentials.idl \ + windows.security.credentials.ui.idl \ windows.security.cryptography.idl \ windows.security.isolation.idl \ windows.storage.fileproperties.idl \ diff --git a/include/windows.security.credentials.ui.idl b/include/windows.security.credentials.ui.idl new file mode 100644 index 00000000000..3457ea1ec33 --- /dev/null +++ b/include/windows.security.credentials.ui.idl @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2023 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.storage.streams.idl"; + +namespace Windows.Security.Credentials.UI { + typedef enum UserConsentVerificationResult UserConsentVerificationResult; + typedef enum UserConsentVerifierAvailability UserConsentVerifierAvailability; + + interface IUserConsentVerifierStatics; + + runtimeclass UserConsentVerifier; + + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Credentials.UI.UserConsentVerificationResult>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Credentials.UI.UserConsentVerifierAvailability>; + interface Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.UI.UserConsentVerificationResult>; + interface Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.UI.UserConsentVerifierAvailability>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UserConsentVerificationResult + { + Verified = 0, + DeviceNotPresent = 1, + NotConfiguredForUser = 2, + DisabledByPolicy = 3, + DeviceBusy = 4, + RetriesExhausted = 5, + Canceled = 6, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UserConsentVerifierAvailability + { + Available = 0, + DeviceNotPresent = 1, + NotConfiguredForUser = 2, + DisabledByPolicy = 3, + DeviceBusy = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Credentials.UI.UserConsentVerifier), + uuid(af4f3f91-564c-4ddc-b8b5-973447627c65) + ] + interface IUserConsentVerifierStatics : IInspectable + { + HRESULT CheckAvailabilityAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.UI.UserConsentVerifierAvailability> **result); + HRESULT RequestVerificationAsync([in] HSTRING message, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.UI.UserConsentVerificationResult> **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Security.Credentials.UI.IUserConsentVerifierStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass UserConsentVerifier + { + } +}

1 0