[PATCH v2 0/9] MR9618: windows.perception.stub: Stub SpatialAnchorExporter class.
-- v2: coremessaging: Synchronize IAsyncInfo implementation in async.c. windows.security.credentials.ui.userconsentverifier: Synchronize IAsyncInfo implementation in async.c. windows.devices.enumeration: Synchronize IAsyncInfo implementation in async.c. cryptowinrt: Synchronize IAsyncInfo implementation in async.c. windows.gaming.input: Synchronize IAsyncInfo implementation in async.c. windows.media.speech: Synchronize IAsyncInfo implementation in async.c. windows.perception.stub: Implement exporter_statics_RequestAccessAsync(). windows.perception.stub: Stub SpatialAnchorExporter class. include: Add defintions related to Windows.Perception.Spatial.SpatialAnchorExporter. https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- include/windows.perception.spatial.idl | 159 +++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/include/windows.perception.spatial.idl b/include/windows.perception.spatial.idl index d19330963f7..93be78a6d74 100644 --- a/include/windows.perception.spatial.idl +++ b/include/windows.perception.spatial.idl @@ -36,13 +36,24 @@ namespace Windows.Perception.Spatial { typedef struct SpatialBoundingFrustum SpatialBoundingFrustum; typedef struct SpatialBoundingOrientedBox SpatialBoundingOrientedBox; typedef struct SpatialBoundingSphere SpatialBoundingSphere; + typedef enum SpatialAnchorExportPurpose SpatialAnchorExportPurpose; interface ISpatialBoundingVolume; interface ISpatialBoundingVolumeStatics; interface ISpatialCoordinateSystem; + interface ISpatialAnchorRawCoordinateSystemAdjustedEventArgs; + interface ISpatialAnchor; + interface ISpatialAnchorStatics; + interface ISpatialAnchorExportSufficiency; + interface ISpatialAnchorExporter; + interface ISpatialAnchorExporterStatics; runtimeclass SpatialBoundingVolume; runtimeclass SpatialCoordinateSystem; + runtimeclass SpatialAnchorRawCoordinateSystemAdjustedEventArgs; + runtimeclass SpatialAnchor; + runtimeclass SpatialAnchorExportSufficiency; + runtimeclass SpatialAnchorExporter; declare { interface Windows.Foundation.Collections.IIterable<Windows.Perception.Spatial.SpatialBoundingVolume *>; @@ -52,6 +63,9 @@ namespace Windows.Perception.Spatial { interface Windows.Foundation.IReference<Windows.Perception.Spatial.SpatialBoundingBox>; interface Windows.Foundation.IReference<Windows.Perception.Spatial.SpatialBoundingFrustum>; interface Windows.Foundation.IReference<Windows.Perception.Spatial.SpatialBoundingOrientedBox>; + interface Windows.Foundation.TypedEventHandler<Windows.Perception.Spatial.SpatialAnchor *, Windows.Perception.Spatial.SpatialAnchorRawCoordinateSystemAdjustedEventArgs *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Perception.Spatial.SpatialAnchorExportSufficiency *>; + interface Windows.Foundation.IAsyncOperation<Windows.Perception.Spatial.SpatialAnchorExportSufficiency *>; } [ @@ -65,6 +79,15 @@ namespace Windows.Perception.Spatial { DeniedBySystem = 3, }; + [ + contract(Windows.Foundation.UniversalApiContract, 7.0) + ] + enum SpatialAnchorExportPurpose + { + Relocalization = 0, + Sharing = 1 + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0) ] @@ -157,6 +180,100 @@ namespace Windows.Perception.Spatial { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Perception.Spatial.SpatialAnchor), + uuid(a9928642-0174-311c-ae79-0e5107669f16), + ] + interface ISpatialAnchorStatics : IInspectable + { + [overload("TryCreateRelativeTo")] HRESULT TryCreateRelativeTo( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *coord_system, + [out] [retval] Windows.Perception.Spatial.SpatialAnchor **value + ); + [overload("TryCreateRelativeTo")] HRESULT TryCreateWithPositionRelativeTo( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *coord_system, + [in] Windows.Foundation.Numerics.Vector3 position, + [out] [retval] Windows.Perception.Spatial.SpatialAnchor **value + ); + [overload("TryCreateRelativeTo")] HRESULT TryCreateWithPositionAndOrientationRelativeTo( + [in] Windows.Perception.Spatial.SpatialCoordinateSystem *coord_system, + [in] Windows.Foundation.Numerics.Vector3 position, + [in] Windows.Foundation.Numerics.Quaternion orientation, + [out] [retval] Windows.Perception.Spatial.SpatialAnchor **value + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Perception.Spatial.SpatialAnchor), + uuid(0529e5ce-1d34-3702-bcec-eabff578a869), + ] + interface ISpatialAnchor : IInspectable + { + [propget] HRESULT CoordinateSystem([out] [retval] Windows.Perception.Spatial.SpatialCoordinateSystem **value); + [propget] HRESULT RawCoordinateSystem([out] [retval] Windows.Perception.Spatial.SpatialCoordinateSystem **value); + [eventadd] HRESULT RawCoordinateSystemAdjusted( + [in] Windows.Foundation.TypedEventHandler<Windows.Perception.Spatial.SpatialAnchor *, + Windows.Perception.Spatial.SpatialAnchorRawCoordinateSystemAdjustedEventArgs*> *handler, + [out] [retval] EventRegistrationToken *cookie + ); + [eventremove] HRESULT RawCoordinateSystemAdjusted([in] EventRegistrationToken cookie); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + exclusiveto(Windows.Perception.Spatial.SpatialAnchorExportSufficiency), + uuid(77c25b2b-3409-4088-b91b-fdfd05d1648f), + ] + interface ISpatialAnchorExportSufficiency : IInspectable + { + [propget] HRESULT IsMinimallySufficient([out] [retval] boolean *value); + [propget] HRESULT SufficiencyLevel([out] [retval] DOUBLE *value); + [propget] HRESULT RecommendedSufficiencyLevel([out] [retval] DOUBLE *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Perception.Spatial.SpatialAnchorRawCoordinateSystemAdjustedEventArgs), + uuid(a1e81eb8-56c7-3117-a2e4-81e0fcf28e00), + ] + interface ISpatialAnchorRawCoordinateSystemAdjustedEventArgs : IInspectable + { + [propget] HRESULT OldRawCoordinateSystemToNewRawCoordinateSystemTransform([out] [retval] Windows.Foundation.Numerics.Matrix4x4 *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + exclusiveto(Windows.Perception.Spatial.SpatialAnchorExporter), + uuid(9a2a4338-24fb-4269-89c5-88304aeef20f), + ] + interface ISpatialAnchorExporter : IInspectable + { + HRESULT GetAnchorExportSufficiencyAsync( + [in] Windows.Perception.Spatial.SpatialAnchor *anchor, + [in] Windows.Perception.Spatial.SpatialAnchorExportPurpose purpose, + [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Perception.Spatial.SpatialAnchorExportSufficiency*> **operation + ); + HRESULT TryExportAnchorAsync( + [in] Windows.Perception.Spatial.SpatialAnchor* anchor, + [in] Windows.Perception.Spatial.SpatialAnchorExportPurpose purpose, + [in] Windows.Storage.Streams.IOutputStream* stream, + [out] [retval] Windows.Foundation.IAsyncOperation<boolean>** operation + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + exclusiveto(Windows.Perception.Spatial.SpatialAnchorExporter), + uuid(ed2507b8-2475-439c-85ff-7fed341fdc88), + ] + interface ISpatialAnchorExporterStatics : IInspectable + { + HRESULT GetDefault([out] [retval] Windows.Perception.Spatial.SpatialAnchorExporter **value); + HRESULT RequestAccessAsync([out] [retval] Windows.Foundation.IAsyncOperation<Windows.Perception.Spatial.SpatialPerceptionAccessStatus> **result); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile), @@ -177,4 +294,46 @@ namespace Windows.Perception.Spatial { { [default] interface Windows.Perception.Spatial.ISpatialCoordinateSystem; } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.Perception.Spatial.ISpatialAnchorStatics, Windows.Foundation.UniversalApiContract, 2.0), + threading(both), + ] + runtimeclass SpatialAnchor + { + [default] interface Windows.Perception.Spatial.ISpatialAnchor; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + marshaling_behavior(agile), + threading(both), + ] + runtimeclass SpatialAnchorExportSufficiency + { + [default] interface Windows.Perception.Spatial.ISpatialAnchorExportSufficiency; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both), + ] + runtimeclass SpatialAnchorRawCoordinateSystemAdjustedEventArgs + { + [default] interface Windows.Perception.Spatial.ISpatialAnchorRawCoordinateSystemAdjustedEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + marshaling_behavior(agile), + static(Windows.Perception.Spatial.ISpatialAnchorExporterStatics, Windows.Foundation.UniversalApiContract, 7.0), + threading(both), + ] + runtimeclass SpatialAnchorExporter + { + [default] interface Windows.Perception.Spatial.ISpatialAnchorExporter; + } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.perception.stub/Makefile.in | 1 + dlls/windows.perception.stub/anchor.c | 155 ++++++++++++++++++ dlls/windows.perception.stub/classes.idl | 4 + dlls/windows.perception.stub/main.c | 2 + dlls/windows.perception.stub/private.h | 2 + .../tests/perception.c | 25 +++ 6 files changed, 189 insertions(+) create mode 100644 dlls/windows.perception.stub/anchor.c diff --git a/dlls/windows.perception.stub/Makefile.in b/dlls/windows.perception.stub/Makefile.in index f7b6065cb0d..0ba9db95a5e 100644 --- a/dlls/windows.perception.stub/Makefile.in +++ b/dlls/windows.perception.stub/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = combase user32 SOURCES = \ classes.idl \ + anchor.c \ holographic_space.c \ main.c \ observer.c diff --git a/dlls/windows.perception.stub/anchor.c b/dlls/windows.perception.stub/anchor.c new file mode 100644 index 00000000000..77baa0f2133 --- /dev/null +++ b/dlls/windows.perception.stub/anchor.c @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2025 Paul Gofman for CodeWeavers + * + * 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" + +#include "private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(perception); + +struct exporter +{ + IActivationFactory IActivationFactory_iface; + ISpatialAnchorExporterStatics ISpatialAnchorExporterStatics_iface; + LONG ref; +}; + +static inline struct exporter *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct exporter, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct exporter *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; + } + + if (IsEqualGUID( iid, &IID_ISpatialAnchorExporterStatics )) + { + *out = &impl->ISpatialAnchorExporterStatics_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 exporter *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct exporter *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %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( exporter_statics, ISpatialAnchorExporterStatics, struct exporter, IActivationFactory_iface ) + +static HRESULT WINAPI exporter_statics_GetDefault( ISpatialAnchorExporterStatics *iface, ISpatialAnchorExporter **value ) +{ + FIXME( "iface %p, value %p stub.\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI exporter_statics_RequestAccessAsync( ISpatialAnchorExporterStatics *iface, IAsyncOperation_SpatialPerceptionAccessStatus **result ) +{ + FIXME( "iface %p, result %p stub.\n", iface, result ); + return E_NOTIMPL; +} + +static const struct ISpatialAnchorExporterStaticsVtbl exporter_statics_vtbl = +{ + exporter_statics_QueryInterface, + exporter_statics_AddRef, + exporter_statics_Release, + /* IInspectable methods */ + exporter_statics_GetIids, + exporter_statics_GetRuntimeClassName, + exporter_statics_GetTrustLevel, + /* ISpatialAnchorExporterStatics methods */ + exporter_statics_GetDefault, + exporter_statics_RequestAccessAsync, +}; + +static struct exporter exporter_statics = +{ + {&factory_vtbl}, + {&exporter_statics_vtbl}, + 1, +}; + +IActivationFactory *anchor_exporter_factory = &exporter_statics.IActivationFactory_iface; diff --git a/dlls/windows.perception.stub/classes.idl b/dlls/windows.perception.stub/classes.idl index e79c20c715b..a901784a47e 100644 --- a/dlls/windows.perception.stub/classes.idl +++ b/dlls/windows.perception.stub/classes.idl @@ -24,6 +24,10 @@ import "windows.perception.spatial.surfaces.idl"; import "windows.graphics.holographic.idl"; + +namespace Windows.Perception.Spatial { + runtimeclass SpatialAnchorExporter; +} namespace Windows.Perception.Spatial.Surfaces { runtimeclass SpatialSurfaceObserver; } diff --git a/dlls/windows.perception.stub/main.c b/dlls/windows.perception.stub/main.c index de3b7d389e8..e47f794ab0e 100644 --- a/dlls/windows.perception.stub/main.c +++ b/dlls/windows.perception.stub/main.c @@ -42,6 +42,8 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **fa IActivationFactory_QueryInterface( observer_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Graphics_Holographic_HolographicSpace )) IActivationFactory_QueryInterface( holographic_space_factory, &IID_IActivationFactory, (void **)factory ); + if (!wcscmp( buffer, RuntimeClass_Windows_Perception_Spatial_SpatialAnchorExporter )) + IActivationFactory_QueryInterface( anchor_exporter_factory, &IID_IActivationFactory, (void **)factory ); if (*factory) return S_OK; return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h index bf233e72fd4..f89cd0905a3 100644 --- a/dlls/windows.perception.stub/private.h +++ b/dlls/windows.perception.stub/private.h @@ -32,6 +32,7 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Perception_Spatial #define WIDL_using_Windows_Perception_Spatial_Surfaces #include "windows.perception.spatial.surfaces.h" #define WIDL_using_Windows_Graphics_Holographic @@ -41,6 +42,7 @@ extern IActivationFactory *observer_factory; extern IActivationFactory *holographic_space_factory; +extern IActivationFactory *anchor_exporter_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.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 8fea17882b0..91cf7c36589 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -284,6 +284,30 @@ done: ok( ref == 1, "got ref %ld.\n", ref ); } +static void test_SpatialAnchorExporter(void) +{ + static const WCHAR *class_name = L"Windows.Perception.Spatial.SpatialAnchorExporter"; + IActivationFactory *factory; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( class_name, wcslen( class_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( class_name ) ); + return; + } + + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + START_TEST(perception) { HRESULT hr; @@ -293,6 +317,7 @@ START_TEST(perception) test_ObserverStatics(); test_HolographicSpaceStatics(); + test_SpatialAnchorExporter(); RoUninitialize(); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.perception.stub/Makefile.in | 2 + dlls/windows.perception.stub/anchor.c | 11 +- dlls/windows.perception.stub/async.c | 517 ++++++++++++++++++ .../windows.perception.stub/async_private.idl | 46 ++ dlls/windows.perception.stub/private.h | 7 + .../tests/perception.c | 146 +++++ 6 files changed, 727 insertions(+), 2 deletions(-) create mode 100644 dlls/windows.perception.stub/async.c create mode 100644 dlls/windows.perception.stub/async_private.idl diff --git a/dlls/windows.perception.stub/Makefile.in b/dlls/windows.perception.stub/Makefile.in index 0ba9db95a5e..36d4b7c97cd 100644 --- a/dlls/windows.perception.stub/Makefile.in +++ b/dlls/windows.perception.stub/Makefile.in @@ -2,8 +2,10 @@ MODULE = windows.perception.stub.dll IMPORTS = combase user32 SOURCES = \ + async_private.idl \ classes.idl \ anchor.c \ + async.c \ holographic_space.c \ main.c \ observer.c diff --git a/dlls/windows.perception.stub/anchor.c b/dlls/windows.perception.stub/anchor.c index 77baa0f2133..2bb5d04770d 100644 --- a/dlls/windows.perception.stub/anchor.c +++ b/dlls/windows.perception.stub/anchor.c @@ -119,6 +119,13 @@ static const struct IActivationFactoryVtbl factory_vtbl = DEFINE_IINSPECTABLE( exporter_statics, ISpatialAnchorExporterStatics, struct exporter, IActivationFactory_iface ) +static HRESULT request_access_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) +{ + result->vt = VT_UI4; + result->ulVal = SpatialPerceptionAccessStatus_DeniedBySystem; + return S_OK; +} + static HRESULT WINAPI exporter_statics_GetDefault( ISpatialAnchorExporterStatics *iface, ISpatialAnchorExporter **value ) { FIXME( "iface %p, value %p stub.\n", iface, value ); @@ -127,8 +134,8 @@ static HRESULT WINAPI exporter_statics_GetDefault( ISpatialAnchorExporterStatics static HRESULT WINAPI exporter_statics_RequestAccessAsync( ISpatialAnchorExporterStatics *iface, IAsyncOperation_SpatialPerceptionAccessStatus **result ) { - FIXME( "iface %p, result %p stub.\n", iface, result ); - return E_NOTIMPL; + TRACE( "iface %p, result %p stub.\n", iface, result ); + return async_operation_request_access_create( (IUnknown *)iface, NULL, request_access_async, result ); } static const struct ISpatialAnchorExporterStaticsVtbl exporter_statics_vtbl = diff --git a/dlls/windows.perception.stub/async.c b/dlls/windows.perception.stub/async.c new file mode 100644 index 00000000000..be8bbbaabbe --- /dev/null +++ b/dlls/windows.perception.stub/async.c @@ -0,0 +1,517 @@ +/* WinRT IAsync* implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 WIDL_using_Wine_Internal +#include "private.h" +#include "initguid.h" +#include "async_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(combase); + +#define Closed 4 +#define HANDLER_NOT_SET ((void *)~(ULONG_PTR)0) + +struct async_info +{ + IAsyncInfoImpl IAsyncInfoImpl_iface; + IAsyncInfo IAsyncInfo_iface; + IInspectable *IInspectable_outer; + LONG ref; + + async_operation_callback callback; + TP_WORK *async_run_work; + IUnknown *invoker; + IUnknown *param; + + CRITICAL_SECTION cs; + IAsyncOperationCompletedHandlerImpl *handler; + PROPVARIANT result; + AsyncStatus status; + HRESULT hr; +}; + +static inline struct async_info *impl_from_IAsyncInfoImpl( IAsyncInfoImpl *iface ) +{ + return CONTAINING_RECORD( iface, struct async_info, IAsyncInfoImpl_iface ); +} + +static HRESULT WINAPI async_impl_QueryInterface( IAsyncInfoImpl *iface, REFIID iid, void **out ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( 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_IAsyncInfoImpl )) + { + IInspectable_AddRef( (*out = &impl->IAsyncInfoImpl_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IAsyncInfo )) + { + IInspectable_AddRef( (*out = &impl->IAsyncInfo_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI async_impl_AddRef( IAsyncInfoImpl *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI async_impl_Release( IAsyncInfoImpl *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) + { + if (impl->handler && impl->handler != HANDLER_NOT_SET) IAsyncOperationCompletedHandlerImpl_Release( impl->handler ); + IAsyncInfo_Close( &impl->IAsyncInfo_iface ); + if (impl->param) IUnknown_Release( impl->param ); + if (impl->invoker) IUnknown_Release( impl->invoker ); + PropVariantClear( &impl->result ); + impl->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &impl->cs ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI async_impl_put_Completed( IAsyncInfoImpl *iface, IAsyncOperationCompletedHandlerImpl *handler ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, handler %p.\n", iface, handler ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + else if (impl->handler != HANDLER_NOT_SET) hr = E_ILLEGAL_DELEGATE_ASSIGNMENT; + else if ((impl->handler = handler)) + { + IAsyncOperationCompletedHandlerImpl_AddRef( impl->handler ); + + if (impl->status > Started) + { + IInspectable *operation = impl->IInspectable_outer; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + + return S_OK; + } + } + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_impl_get_Completed( IAsyncInfoImpl *iface, IAsyncOperationCompletedHandlerImpl **handler ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, handler %p.\n", iface, handler ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + if (impl->handler == NULL || impl->handler == HANDLER_NOT_SET) *handler = NULL; + else IAsyncOperationCompletedHandlerImpl_AddRef( (*handler = impl->handler) ); + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT *result ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + HRESULT hr = E_ILLEGAL_METHOD_CALL; + + TRACE( "iface %p, result %p.\n", iface, result ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Completed || impl->status == Error) + { + PropVariantCopy( result, &impl->result ); + hr = impl->hr; + } + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + +static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + + TRACE( "iface %p.\n", iface ); + + /* keep the async alive in the callback */ + IInspectable_AddRef( impl->IInspectable_outer ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); + + return S_OK; +} + +static const struct IAsyncInfoImplVtbl async_impl_vtbl = +{ + /* IUnknown methods */ + async_impl_QueryInterface, + async_impl_AddRef, + async_impl_Release, + /* IAsyncInfoImpl */ + async_impl_put_Completed, + async_impl_get_Completed, + async_impl_get_Result, + async_impl_Start, +}; + +DEFINE_IINSPECTABLE_OUTER( async_info, IAsyncInfo, struct async_info, IInspectable_outer ) + +static HRESULT WINAPI async_info_get_Id( IAsyncInfo *iface, UINT32 *id ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, id %p.\n", iface, id ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + *id = 1; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, status %p.\n", iface, status ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + *status = impl->status; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p, error_code %p.\n", iface, error_code ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) *error_code = hr = E_ILLEGAL_METHOD_CALL; + else *error_code = impl->hr; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_Cancel( IAsyncInfo *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; + else if (impl->status == Started) impl->status = Canceled; + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static HRESULT WINAPI async_info_Close( IAsyncInfo *iface ) +{ + struct async_info *impl = impl_from_IAsyncInfo( iface ); + HRESULT hr = S_OK; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->cs ); + if (impl->status == Started) + hr = E_ILLEGAL_STATE_CHANGE; + else if (impl->status != Closed) + { + CloseThreadpoolWork( impl->async_run_work ); + impl->async_run_work = NULL; + impl->status = Closed; + } + LeaveCriticalSection( &impl->cs ); + + return hr; +} + +static const struct IAsyncInfoVtbl async_info_vtbl = +{ + /* IUnknown methods */ + async_info_QueryInterface, + async_info_AddRef, + async_info_Release, + /* IInspectable methods */ + async_info_GetIids, + async_info_GetRuntimeClassName, + async_info_GetTrustLevel, + /* IAsyncInfo */ + async_info_get_Id, + async_info_get_Status, + async_info_get_ErrorCode, + async_info_Cancel, + async_info_Close, +}; + +static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) +{ + struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); + + async_info_complete( impl, TRUE ); +} + +static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, + IInspectable *outer, IAsyncInfoImpl **out ) +{ + struct async_info *impl; + HRESULT hr; + + if (!(impl = calloc( 1, sizeof(struct async_info) ))) return E_OUTOFMEMORY; + impl->IAsyncInfoImpl_iface.lpVtbl = &async_impl_vtbl; + impl->IAsyncInfo_iface.lpVtbl = &async_info_vtbl; + impl->IInspectable_outer = outer; + impl->ref = 1; + + impl->callback = callback; + impl->handler = HANDLER_NOT_SET; + impl->status = Started; + if (!(impl->async_run_work = CreateThreadpoolWork( async_info_callback, &impl->IAsyncInfoImpl_iface, NULL ))) + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + free( impl ); + return hr; + } + + if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); + if ((impl->param = param)) IUnknown_AddRef( impl->param ); + + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": async_info.cs" ); + + *out = &impl->IAsyncInfoImpl_iface; + return S_OK; +} + +struct async_access_status +{ + IAsyncOperation_SpatialPerceptionAccessStatus IAsyncOperation_SpatialPerceptionAccessStatus_iface; + IAsyncInfoImpl *IAsyncInfoImpl_inner; + LONG ref; +}; + +static inline struct async_access_status *impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( IAsyncOperation_SpatialPerceptionAccessStatus *iface ) +{ + return CONTAINING_RECORD( iface, struct async_access_status, IAsyncOperation_SpatialPerceptionAccessStatus_iface ); +} + +static HRESULT WINAPI async_access_status_QueryInterface( IAsyncOperation_SpatialPerceptionAccessStatus *iface, REFIID iid, void **out ) +{ + struct async_access_status *impl = impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( 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_IAsyncOperation_SpatialPerceptionAccessStatus )) + { + IInspectable_AddRef( (*out = &impl->IAsyncOperation_SpatialPerceptionAccessStatus_iface) ); + return S_OK; + } + + return IAsyncInfoImpl_QueryInterface( impl->IAsyncInfoImpl_inner, iid, out ); +} + +static ULONG WINAPI async_access_status_AddRef( IAsyncOperation_SpatialPerceptionAccessStatus *iface ) +{ + struct async_access_status *impl = impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI async_access_status_Release( IAsyncOperation_SpatialPerceptionAccessStatus *iface ) +{ + struct async_access_status *impl = impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) + { + /* guard against re-entry if inner releases an outer iface */ + InterlockedIncrement( &impl->ref ); + IAsyncInfoImpl_Release( impl->IAsyncInfoImpl_inner ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI async_access_status_GetIids( IAsyncOperation_SpatialPerceptionAccessStatus *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 async_access_status_GetRuntimeClassName( IAsyncOperation_SpatialPerceptionAccessStatus *iface, HSTRING *class_name ) +{ + return WindowsCreateString( L"Windows.Foundation.IAsyncOperation`1<SpatialPerceptionAccessStatus>", + ARRAY_SIZE(L"Windows.Foundation.IAsyncOperation`1<SpatialPerceptionAccessStatus>"), + class_name ); +} + +static HRESULT WINAPI async_access_status_GetTrustLevel( IAsyncOperation_SpatialPerceptionAccessStatus *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_access_status_put_Completed( IAsyncOperation_SpatialPerceptionAccessStatus *iface, IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *handler ) +{ + struct async_access_status *impl = impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( iface ); + TRACE( "iface %p, handler %p.\n", iface, handler ); + return IAsyncInfoImpl_put_Completed( impl->IAsyncInfoImpl_inner, (IAsyncOperationCompletedHandlerImpl *)handler ); +} + +static HRESULT WINAPI async_access_status_get_Completed( IAsyncOperation_SpatialPerceptionAccessStatus *iface, IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus **handler ) +{ + struct async_access_status *impl = impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( iface ); + TRACE( "iface %p, handler %p.\n", iface, handler ); + return IAsyncInfoImpl_get_Completed( impl->IAsyncInfoImpl_inner, (IAsyncOperationCompletedHandlerImpl **)handler ); +} + +static HRESULT WINAPI async_access_status_GetResults( IAsyncOperation_SpatialPerceptionAccessStatus *iface, SpatialPerceptionAccessStatus *results ) +{ + struct async_access_status *impl = impl_from_IAsyncOperation_SpatialPerceptionAccessStatus( iface ); + PROPVARIANT result = {.vt = VT_UI4}; + HRESULT hr; + + TRACE( "iface %p, results %p.\n", iface, results ); + + hr = IAsyncInfoImpl_get_Result( impl->IAsyncInfoImpl_inner, &result ); + *results = result.ulVal; + PropVariantClear( &result ); + return hr; +} + +static const struct IAsyncOperation_SpatialPerceptionAccessStatusVtbl async_access_status_vtbl = +{ + /* IUnknown methods */ + async_access_status_QueryInterface, + async_access_status_AddRef, + async_access_status_Release, + /* IInspectable methods */ + async_access_status_GetIids, + async_access_status_GetRuntimeClassName, + async_access_status_GetTrustLevel, + /* IAsyncOperation<SpatialPerceptionAccessStatusResult> */ + async_access_status_put_Completed, + async_access_status_get_Completed, + async_access_status_GetResults, +}; + +HRESULT async_operation_request_access_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, + IAsyncOperation_SpatialPerceptionAccessStatus **out ) +{ + struct async_access_status *impl; + HRESULT hr; + + *out = NULL; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + impl->IAsyncOperation_SpatialPerceptionAccessStatus_iface.lpVtbl = &async_access_status_vtbl; + impl->ref = 1; + + if (FAILED(hr = async_info_create( invoker, param, callback, (IInspectable *)&impl->IAsyncOperation_SpatialPerceptionAccessStatus_iface, &impl->IAsyncInfoImpl_inner )) || + FAILED(hr = IAsyncInfoImpl_Start( impl->IAsyncInfoImpl_inner ))) + { + if (impl->IAsyncInfoImpl_inner) IAsyncInfoImpl_Release( impl->IAsyncInfoImpl_inner ); + free( impl ); + return hr; + } + + *out = &impl->IAsyncOperation_SpatialPerceptionAccessStatus_iface; + TRACE( "created IAsyncOperation_SpatialPerceptionAccessStatus %p\n", *out ); + return S_OK; +} diff --git a/dlls/windows.perception.stub/async_private.idl b/dlls/windows.perception.stub/async_private.idl new file mode 100644 index 00000000000..40ea63ca4c1 --- /dev/null +++ b/dlls/windows.perception.stub/async_private.idl @@ -0,0 +1,46 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 header + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "propidl.idl"; +import "inspectable.idl"; +import "asyncinfo.idl"; +import "windowscontracts.idl"; + +namespace Wine.Internal { + /* type-pruning version of AsyncOperationCompletedHandlerImpl<T> */ + delegate HRESULT AsyncOperationCompletedHandlerImpl([in] IInspectable *async, [in] AsyncStatus status); + + [ + uuid(d81ab70d-82e0-481c-983d-401225d98a2c) + ] + interface IAsyncInfoImpl : IUnknown + { + [propput] HRESULT Completed([in] AsyncOperationCompletedHandlerImpl *handler); + [propget] HRESULT Completed([out, retval] AsyncOperationCompletedHandlerImpl **handler); + [propget] HRESULT Result([out, retval] PROPVARIANT *result); + HRESULT Start(); + } + + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); +} diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h index f89cd0905a3..9769a538fd5 100644 --- a/dlls/windows.perception.stub/private.h +++ b/dlls/windows.perception.stub/private.h @@ -40,10 +40,15 @@ #include "windows.graphics.holographic.h" #include "holographicspaceinterop.h" +#include "async_private.h" + extern IActivationFactory *observer_factory; extern IActivationFactory *holographic_space_factory; extern IActivationFactory *anchor_exporter_factory; +extern HRESULT async_operation_request_access_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, + IAsyncOperation_SpatialPerceptionAccessStatus **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ @@ -81,5 +86,7 @@ extern IActivationFactory *anchor_exporter_factory; } #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 ) +#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) #endif diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 91cf7c36589..abfceaa6659 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -28,6 +28,7 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Perception_Spatial #define WIDL_using_Windows_Perception_Spatial_Surfaces #include "windows.perception.spatial.surfaces.h" #define WIDL_using_Windows_Graphics_Holographic @@ -284,12 +285,107 @@ done: ok( ref == 1, "got ref %ld.\n", ref ); } +struct status_async_handler +{ + IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus_iface; + LONG refcount; + + IAsyncOperation_SpatialPerceptionAccessStatus *async; + AsyncStatus status; + BOOL invoked; + HANDLE event; +}; + +static inline struct status_async_handler *impl_from_IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus( + IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *iface ) +{ + return CONTAINING_RECORD( iface, struct status_async_handler, IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus_iface ); +} + +static HRESULT WINAPI status_async_handler_QueryInterface( IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *iface, + REFIID iid, void **out ) +{ + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus )) + { + IUnknown_AddRef( iface ); + *out = iface; + return S_OK; + } + + if (winetest_debug > 1) trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI status_async_handler_AddRef( IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *iface ) +{ + struct status_async_handler *impl = impl_from_IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus( iface ); + return InterlockedIncrement( &impl->refcount ); +} + +static ULONG WINAPI status_async_handler_Release( IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *iface ) +{ + struct status_async_handler *impl = impl_from_IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus( iface ); + ULONG ref = InterlockedDecrement( &impl->refcount ); + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI status_async_handler_Invoke( IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *iface, + IAsyncOperation_SpatialPerceptionAccessStatus *async, AsyncStatus status ) +{ + struct status_async_handler *impl = impl_from_IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus( iface ); + + if (winetest_debug > 1) trace( "iface %p, async %p, status %u\n", iface, async, status ); + + ok( !impl->invoked, "invoked twice\n" ); + impl->invoked = TRUE; + impl->async = async; + impl->status = status; + if (impl->event) SetEvent( impl->event ); + + return S_OK; +} + +static IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatusVtbl status_async_handler_vtbl = +{ + /*** IUnknown methods ***/ + status_async_handler_QueryInterface, + status_async_handler_AddRef, + status_async_handler_Release, + /*** IAsyncOperationCompletedHandler<boolean> methods ***/ + status_async_handler_Invoke, +}; + +static IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *status_async_handler_create( HANDLE event ) +{ + struct status_async_handler *impl; + + if (!(impl = calloc( 1, sizeof(*impl) ))) return NULL; + impl->IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus_iface.lpVtbl = &status_async_handler_vtbl; + impl->event = event; + impl->refcount = 1; + + return &impl->IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus_iface; +} + static void test_SpatialAnchorExporter(void) { static const WCHAR *class_name = L"Windows.Perception.Spatial.SpatialAnchorExporter"; + IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus *handler; + IAsyncOperation_SpatialPerceptionAccessStatus *access_status; + struct status_async_handler *handler_impl; + ISpatialAnchorExporterStatics *statics; + SpatialPerceptionAccessStatus status; IActivationFactory *factory; + AsyncStatus astatus; + IAsyncInfo *info; + HANDLE event; HSTRING str; HRESULT hr; + UINT32 id; LONG ref; hr = WindowsCreateString( class_name, wcslen( class_name ), &str ); @@ -304,6 +400,56 @@ static void test_SpatialAnchorExporter(void) return; } + check_interface( factory, &IID_IUnknown, FALSE ); + check_interface( factory, &IID_IInspectable, FALSE ); + check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_ISpatialAnchorExporterStatics, FALSE ); + + hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialAnchorExporterStatics, (void **)&statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = ISpatialAnchorExporterStatics_RequestAccessAsync( statics, &access_status ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + handler = (void *)0xdeadbeef; + hr = IAsyncOperation_SpatialPerceptionAccessStatus_get_Completed( access_status, &handler ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !handler, "got %p.\n", handler ); + + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + handler = status_async_handler_create( event ); + hr = IAsyncOperation_SpatialPerceptionAccessStatus_put_Completed( access_status, handler ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + handler_impl = impl_from_IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus( handler ); + if (!handler_impl->invoked) + { + /* Looks like it normally completes at once on Win11, while on some Win10 Testbot machines it doesn't. */ + WaitForSingleObject( event, INFINITE ); + } + CloseHandle( event ); + ok( handler_impl->invoked, "handler not invoked.\n" ); + ok( handler_impl->async == access_status, "got %p, %p.\n", handler_impl->async, access_status ); + ok( handler_impl->status == Completed, "got %d.\n", handler_impl->status ); + IAsyncOperationCompletedHandler_SpatialPerceptionAccessStatus_Release( handler ); + + hr = IAsyncOperation_SpatialPerceptionAccessStatus_GetResults( access_status, &status ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( status == SpatialPerceptionAccessStatus_DeniedBySystem, "got %d.\n", status ); + + hr = IAsyncOperation_SpatialPerceptionAccessStatus_QueryInterface( access_status, &IID_IAsyncInfo, (void **)&info ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IAsyncInfo_get_Id( info, &id ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( id == 1, "got %u.\n", id ); + hr = IAsyncInfo_get_Status( info, &astatus ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( astatus == Completed, "got %u.\n", id ); + IAsyncInfo_Release( info ); + + IAsyncOperation_SpatialPerceptionAccessStatus_Release( access_status ); + + ISpatialAnchorExporterStatics_Release( statics ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.media.speech/async.c | 62 ++++++++++++--------- dlls/windows.media.speech/async_private.idl | 2 +- dlls/windows.media.speech/recognizer.c | 14 +++-- dlls/windows.media.speech/synthesizer.c | 8 ++- 4 files changed, 52 insertions(+), 34 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 4e84afec2a5..fb8614546e6 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; } +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) /* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr; - if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); } static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/windows.media.speech/async_private.idl b/dlls/windows.media.speech/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/windows.media.speech/async_private.idl +++ b/dlls/windows.media.speech/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); } - typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 1b365f0f39d..37147463de5 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -382,8 +382,10 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog return E_NOTIMPL; } -static HRESULT session_start_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT session_start_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; + return S_OK; } @@ -431,8 +433,9 @@ static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSe return E_NOTIMPL; } -static HRESULT session_stop_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT session_stop_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; return S_OK; } @@ -487,8 +490,9 @@ static HRESULT WINAPI session_CancelAsync( ISpeechContinuousRecognitionSession * return E_NOTIMPL; } -static HRESULT session_pause_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT session_pause_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; return S_OK; } @@ -725,11 +729,13 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec return E_NOTIMPL; } -static HRESULT recognizer_compile_constraints_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT recognizer_compile_constraints_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { ISpeechRecognitionCompilationResult *compilation; HRESULT hr; + if (!called_async) return STATUS_PENDING; + if (SUCCEEDED(hr = compilation_result_create(SpeechRecognitionResultStatus_Success, &compilation))) { result->vt = VT_UNKNOWN; diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 67f028dc52f..d463bf1e6aa 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -838,11 +838,13 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus return E_NOTIMPL; } -static HRESULT synthesizer_synthesize_text_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT synthesizer_synthesize_text_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { ISpeechSynthesisStream *stream; HRESULT hr; + if (!called_async) return STATUS_PENDING; + if (SUCCEEDED(hr = synthesis_stream_create(&stream))) { result->vt = VT_UNKNOWN; @@ -859,11 +861,13 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize synthesizer_synthesize_text_to_stream_async, (IAsyncOperation_IInspectable **)operation); } -static HRESULT synthesizer_synthesize_ssml_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT synthesizer_synthesize_ssml_to_stream_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { ISpeechSynthesisStream *stream; HRESULT hr; + if (!called_async) return STATUS_PENDING; + if (SUCCEEDED(hr = synthesis_stream_create(&stream))) { result->vt = VT_UNKNOWN; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.gaming.input/async.c | 62 ++++++++++++--------- dlls/windows.gaming.input/async_private.idl | 2 +- dlls/windows.gaming.input/force_feedback.c | 20 +++++-- 3 files changed, 51 insertions(+), 33 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index bf356eabbab..7ac73faf3d6 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; } +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) /* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr; - if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); } static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/windows.gaming.input/async_private.idl b/dlls/windows.gaming.input/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/windows.gaming.input/async_private.idl +++ b/dlls/windows.gaming.input/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); } - typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index a8631e60c4a..4fb9f09c6ff 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -601,7 +601,7 @@ static HRESULT WINAPI motor_get_SupportedAxes( IForceFeedbackMotor *iface, enum return hr; } -static HRESULT motor_load_effect_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT motor_load_effect_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { struct effect *effect = impl_from_IForceFeedbackEffect( (IForceFeedbackEffect *)param ); IForceFeedbackMotor *motor = (IForceFeedbackMotor *)invoker; @@ -610,6 +610,8 @@ static HRESULT motor_load_effect_async( IUnknown *invoker, IUnknown *param, PROP IDirectInputEffect *dinput_effect; HRESULT hr; + if (!called_async) return STATUS_PENDING; + EnterCriticalSection( &effect->cs ); if (FAILED(hr = IForceFeedbackMotor_get_SupportedAxes( motor, &supported_axes ))) @@ -692,11 +694,13 @@ static HRESULT WINAPI motor_StopAllEffects( IForceFeedbackMotor *iface ) return IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_STOPALL ); } -static HRESULT motor_try_disable_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT motor_try_disable_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)invoker ); HRESULT hr; + if (!called_async) return STATUS_PENDING; + hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_SETACTUATORSOFF ); result->vt = VT_BOOL; result->boolVal = SUCCEEDED(hr); @@ -710,11 +714,13 @@ static HRESULT WINAPI motor_TryDisableAsync( IForceFeedbackMotor *iface, IAsyncO return async_operation_boolean_create( (IUnknown *)iface, NULL, motor_try_disable_async, async_op ); } -static HRESULT motor_try_enable_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT motor_try_enable_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)invoker ); HRESULT hr; + if (!called_async) return STATUS_PENDING; + hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_SETACTUATORSON ); result->vt = VT_BOOL; result->boolVal = SUCCEEDED(hr); @@ -728,11 +734,13 @@ static HRESULT WINAPI motor_TryEnableAsync( IForceFeedbackMotor *iface, IAsyncOp return async_operation_boolean_create( (IUnknown *)iface, NULL, motor_try_enable_async, async_op ); } -static HRESULT motor_try_reset_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT motor_try_reset_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)invoker ); HRESULT hr; + if (!called_async) return STATUS_PENDING; + hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_RESET ); result->vt = VT_BOOL; result->boolVal = SUCCEEDED(hr); @@ -746,12 +754,14 @@ static HRESULT WINAPI motor_TryResetAsync( IForceFeedbackMotor *iface, IAsyncOpe return async_operation_boolean_create( (IUnknown *)iface, NULL, motor_try_reset_async, async_op ); } -static HRESULT motor_unload_effect_async( IUnknown *iface, IUnknown *param, PROPVARIANT *result ) +static HRESULT motor_unload_effect_async( IUnknown *iface, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { struct effect *effect = impl_from_IForceFeedbackEffect( (IForceFeedbackEffect *)param ); IDirectInputEffect *dinput_effect; HRESULT hr; + if (!called_async) return STATUS_PENDING; + EnterCriticalSection( &effect->cs ); dinput_effect = effect->effect; effect->effect = NULL; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/cryptowinrt/async.c | 62 +++++++++++++++++------------- dlls/cryptowinrt/async_private.idl | 2 +- dlls/cryptowinrt/credentials.c | 4 +- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/cryptowinrt/async.c b/dlls/cryptowinrt/async.c index ad435881354..3a15782b6ad 100644 --- a/dlls/cryptowinrt/async.c +++ b/dlls/cryptowinrt/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; } +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) /* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr; - if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); } static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/cryptowinrt/async_private.idl b/dlls/cryptowinrt/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/cryptowinrt/async_private.idl +++ b/dlls/cryptowinrt/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); } - typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/cryptowinrt/credentials.c b/dlls/cryptowinrt/credentials.c index 960c5fabf8f..e58b1fb6990 100644 --- a/dlls/cryptowinrt/credentials.c +++ b/dlls/cryptowinrt/credentials.c @@ -118,8 +118,10 @@ static const struct IActivationFactoryVtbl factory_vtbl = DEFINE_IINSPECTABLE( credentials_statics, IKeyCredentialManagerStatics, struct credentials_statics, IActivationFactory_iface ); -static HRESULT is_supported_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT is_supported_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; + result->vt = VT_BOOL; result->boolVal = FALSE; return S_OK; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.devices.enumeration/async.c | 62 +++++++++++-------- .../async_private.idl | 2 +- dlls/windows.devices.enumeration/main.c | 6 +- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/dlls/windows.devices.enumeration/async.c b/dlls/windows.devices.enumeration/async.c index 0c4f6d647d2..2d9246c237c 100644 --- a/dlls/windows.devices.enumeration/async.c +++ b/dlls/windows.devices.enumeration/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; } +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) /* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr; - if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); } static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/windows.devices.enumeration/async_private.idl b/dlls/windows.devices.enumeration/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/windows.devices.enumeration/async_private.idl +++ b/dlls/windows.devices.enumeration/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); } - typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index 6a4505c9649..081260da759 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -725,7 +725,7 @@ static HRESULT WINAPI device_statics_CreateFromIdAsyncAdditionalProperties( IDev return E_NOTIMPL; } -static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { static const struct vector_iids iids = { @@ -742,7 +742,9 @@ static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT * const DEV_OBJECT *objects; HRESULT hr; - TRACE( "invoker %p, param %p, result %p\n", invoker, param, result ); + TRACE( "invoker %p, param %p, result %p, called_async %d\n", invoker, param, result, called_async ); + + if (!called_async) return STATUS_PENDING; params = impl_from_IUnknown( param ); if (params->expr) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- .../async.c | 62 +++++++++++-------- .../async_private.idl | 2 +- .../main.c | 4 +- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/async.c b/dlls/windows.security.credentials.ui.userconsentverifier/async.c index ea9db53d197..5f81f338119 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/async.c +++ b/dlls/windows.security.credentials.ui.userconsentverifier/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; } +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) /* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr; - if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); } static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/async_private.idl b/dlls/windows.security.credentials.ui.userconsentverifier/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/async_private.idl +++ b/dlls/windows.security.credentials.ui.userconsentverifier/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); } - typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/main.c b/dlls/windows.security.credentials.ui.userconsentverifier/main.c index e3c5e783f6d..51ba6350ea7 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/main.c +++ b/dlls/windows.security.credentials.ui.userconsentverifier/main.c @@ -118,8 +118,10 @@ static const struct IActivationFactoryVtbl factory_vtbl = DEFINE_IINSPECTABLE( user_consent_verifier_statics, IUserConsentVerifierStatics, struct user_consent_verifier_statics, IActivationFactory_iface ) -static HRESULT check_availability_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT check_availability_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; + result->vt = VT_UI4; result->ulVal = UserConsentVerifierAvailability_DeviceNotPresent; return S_OK; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/coremessaging/async.c | 62 ++++++++++++++++------------ dlls/coremessaging/async_private.idl | 2 +- dlls/coremessaging/main.c | 3 +- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/coremessaging/async.c b/dlls/coremessaging/async.c index 8f3869da5c7..71cd5037fb9 100644 --- a/dlls/coremessaging/async.c +++ b/dlls/coremessaging/async.c @@ -175,6 +175,39 @@ static HRESULT WINAPI async_impl_get_Result( IAsyncInfoImpl *iface, PROPVARIANT return hr; } +static BOOL async_info_complete( struct async_info *impl, BOOL called_async ) +{ + IInspectable *operation = impl->IInspectable_outer; + PROPVARIANT result = {0}; + HRESULT hr; + + hr = impl->callback( impl->invoker, impl->param, &result, called_async ); + if (!called_async && hr == STATUS_PENDING) return FALSE; + + EnterCriticalSection( &impl->cs ); + if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; + PropVariantCopy( &impl->result, &result ); + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncOperationCompletedHandlerImpl *handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection( &impl->cs ); + + IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); + IAsyncOperationCompletedHandlerImpl_Release( handler ); + } + else LeaveCriticalSection( &impl->cs ); + + /* release refcount acquired in Start */ + IInspectable_Release( operation ); + + PropVariantClear( &result ); + return TRUE; +} + static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); @@ -183,7 +216,7 @@ static HRESULT WINAPI async_impl_Start( IAsyncInfoImpl *iface ) /* keep the async alive in the callback */ IInspectable_AddRef( impl->IInspectable_outer ); - SubmitThreadpoolWork( impl->async_run_work ); + if (!async_info_complete( impl, FALSE )) SubmitThreadpoolWork( impl->async_run_work ); return S_OK; } @@ -305,33 +338,8 @@ static const struct IAsyncInfoVtbl async_info_vtbl = static void CALLBACK async_info_callback( TP_CALLBACK_INSTANCE *instance, void *iface, TP_WORK *work ) { struct async_info *impl = impl_from_IAsyncInfoImpl( iface ); - IInspectable *operation = impl->IInspectable_outer; - PROPVARIANT result = {0}; - HRESULT hr; - - hr = impl->callback( impl->invoker, impl->param, &result ); - - EnterCriticalSection( &impl->cs ); - if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - PropVariantCopy( &impl->result, &result ); - impl->hr = hr; - if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) - { - IAsyncOperationCompletedHandlerImpl *handler = impl->handler; - AsyncStatus status = impl->status; - impl->handler = NULL; /* Prevent concurrent invoke. */ - LeaveCriticalSection( &impl->cs ); - - IAsyncOperationCompletedHandlerImpl_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandlerImpl_Release( handler ); - } - else LeaveCriticalSection( &impl->cs ); - - /* release refcount acquired in Start */ - IInspectable_Release( operation ); - - PropVariantClear( &result ); + async_info_complete( impl, TRUE ); } static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback, diff --git a/dlls/coremessaging/async_private.idl b/dlls/coremessaging/async_private.idl index 10741572601..40ea63ca4c1 100644 --- a/dlls/coremessaging/async_private.idl +++ b/dlls/coremessaging/async_private.idl @@ -42,5 +42,5 @@ namespace Wine.Internal { HRESULT Start(); } - typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); + typedef HRESULT (*async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ); } diff --git a/dlls/coremessaging/main.c b/dlls/coremessaging/main.c index 0cb8380d373..6fa2e282be4 100644 --- a/dlls/coremessaging/main.c +++ b/dlls/coremessaging/main.c @@ -191,8 +191,9 @@ static HRESULT WINAPI dispatcher_queue_controller_get_DispatcherQueue( IDispatch return E_NOTIMPL; } -static HRESULT shutdown_queue_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +static HRESULT shutdown_queue_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result, BOOL called_async ) { + if (!called_async) return STATUS_PENDING; return S_OK; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
v2: - use universal async.c helper (after modifying it so it can be used for synchronous value return); - synchronize the introduced IAsyncInfo implementation changes with other modules. It seems to me that a few use cases could also use synchronous return and it is just common implementation which stipulated simulating the async result, but I so far wasn't testing that and was sticking to what patches subjects say, synchronizing async.c implementation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9618#note_124071
Then, maybe going forward, we can share the source for async.c (collecting all the currently defined template instances there in one file), define macro for instantiating IASyncInfo<type> (as all the instantiations actually look very similar)? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9618#note_124233
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9618
participants (3)
-
Paul Gofman -
Paul Gofman (＠gofman)
-
Rémi Bernon