[PATCH 0/4] MR9962: twinapi.appcore: Add statics2_GetForCurrentView() stub.
For React Native. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9962
From: Zhiyi Zhang <zzhang@codeweavers.com> --- dlls/twinapi.appcore/Makefile.in | 1 + dlls/twinapi.appcore/classes.idl | 4 + dlls/twinapi.appcore/core_application.c | 115 ++++++++++++++++++++++++ dlls/twinapi.appcore/main.c | 2 + dlls/twinapi.appcore/private.h | 3 + 5 files changed, 125 insertions(+) create mode 100644 dlls/twinapi.appcore/core_application.c diff --git a/dlls/twinapi.appcore/Makefile.in b/dlls/twinapi.appcore/Makefile.in index a68379ff96b..c8228475016 100644 --- a/dlls/twinapi.appcore/Makefile.in +++ b/dlls/twinapi.appcore/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ application_view.c \ classes.idl \ client_device_information.c \ + core_application.c \ main.c diff --git a/dlls/twinapi.appcore/classes.idl b/dlls/twinapi.appcore/classes.idl index 3ad10afa227..83aba1c4133 100644 --- a/dlls/twinapi.appcore/classes.idl +++ b/dlls/twinapi.appcore/classes.idl @@ -31,6 +31,7 @@ import "windows.security.exchangeactivesyncprovisioning.idl"; import "windows.system.profile.idl"; import "windows.system.userprofile.idl"; import "windows.ui.viewmanagement.idl"; +import "windows.applicationmodel.core.idl"; namespace Windows.Security.ExchangeActiveSyncProvisioning { runtimeclass EasClientDeviceInformation; @@ -44,3 +45,6 @@ namespace Windows.System.UserProfile { namespace Windows.UI.ViewManagement { runtimeclass ApplicationView; } +namespace Windows.ApplicationModel.Core { + runtimeclass CoreApplication; +} diff --git a/dlls/twinapi.appcore/core_application.c b/dlls/twinapi.appcore/core_application.c new file mode 100644 index 00000000000..c3325581bf2 --- /dev/null +++ b/dlls/twinapi.appcore/core_application.c @@ -0,0 +1,115 @@ +/* WinRT Windows.ApplicationModel.Core.CoreApplication implementation + * + * Copyright 2025 Zhiyi Zhang 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" + +WINE_DEFAULT_DEBUG_CHANNEL(twinapi); + +struct factory +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct factory *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct factory, IActivationFactory_iface ); +} + +static HRESULT WINAPI activation_factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct factory *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p stub!\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + IActivationFactory_AddRef( &impl->IActivationFactory_iface ); + *out = &impl->IActivationFactory_iface; + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI activation_factory_AddRef( IActivationFactory *iface ) +{ + struct factory *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI activation_factory_Release( IActivationFactory *iface ) +{ + struct factory *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI activation_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 activation_factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI activation_factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI activation_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + activation_factory_QueryInterface, + activation_factory_AddRef, + activation_factory_Release, + /* IInspectable methods */ + activation_factory_GetIids, + activation_factory_GetRuntimeClassName, + activation_factory_GetTrustLevel, + /* IActivationFactory methods */ + activation_factory_ActivateInstance, +}; + +static struct factory factory = +{ + {&activation_factory_vtbl}, + 1, +}; + +IActivationFactory *core_application_factory = &factory.IActivationFactory_iface; diff --git a/dlls/twinapi.appcore/main.c b/dlls/twinapi.appcore/main.c index eab55d33e1a..0021499dfae 100644 --- a/dlls/twinapi.appcore/main.c +++ b/dlls/twinapi.appcore/main.c @@ -77,6 +77,8 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **fa IActivationFactory_QueryInterface( advertising_manager_factory, &IID_IActivationFactory, (void **)factory ); else if (!wcscmp( buffer, RuntimeClass_Windows_UI_ViewManagement_ApplicationView )) IActivationFactory_QueryInterface( application_view_factory, &IID_IActivationFactory, (void **)factory ); + else if (!wcscmp( buffer, RuntimeClass_Windows_ApplicationModel_Core_CoreApplication )) + IActivationFactory_QueryInterface( core_application_factory, &IID_IActivationFactory, (void **)factory ); if (*factory) return S_OK; return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/twinapi.appcore/private.h b/dlls/twinapi.appcore/private.h index bb62d7f6332..8439c983cb5 100644 --- a/dlls/twinapi.appcore/private.h +++ b/dlls/twinapi.appcore/private.h @@ -38,6 +38,8 @@ #include "windows.system.userprofile.h" #define WIDL_using_Windows_UI_ViewManagement #include "windows.ui.viewmanagement.h" +#define WIDL_using_Windows_ApplicationModel_Core +#include "windows.applicationmodel.core.h" #include "wine/debug.h" @@ -45,6 +47,7 @@ extern IActivationFactory *application_view_factory; extern IActivationFactory *client_device_information_factory; extern IActivationFactory *analytics_info_factory; extern IActivationFactory *advertising_manager_factory; +extern IActivationFactory *core_application_factory; #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9962
From: Zhiyi Zhang <zzhang@codeweavers.com> --- dlls/twinapi.appcore/tests/twinapi.c | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index 35c33fb96fa..a7c5ece3256 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -39,6 +39,8 @@ #include "windows.system.userprofile.h" #define WIDL_using_Windows_UI_ViewManagement #include "windows.ui.viewmanagement.h" +#define WIDL_using_Windows_ApplicationModel_Core +#include "windows.applicationmodel.core.h" #include "wine/test.h" @@ -264,6 +266,35 @@ static void test_ApplicationView(void) ok( ref == 1, "got ref %ld.\n", ref ); } +static void test_CoreApplication(void) +{ + static const WCHAR *class_name = RuntimeClass_Windows_ApplicationModel_Core_CoreApplication; + 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 (FAILED( hr )) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( class_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown, TRUE ); + check_interface( factory, &IID_IInspectable, TRUE ); + check_interface( factory, &IID_IAgileObject, TRUE ); + check_interface( factory, &IID_IActivationFactory, TRUE ); + + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + START_TEST(twinapi) { HRESULT hr; @@ -275,6 +306,7 @@ START_TEST(twinapi) test_AnalyticsVersionInfo(); test_AdvertisingManager(); test_ApplicationView(); + test_CoreApplication(); RoUninitialize(); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9962
From: Zhiyi Zhang <zzhang@codeweavers.com> --- dlls/twinapi.appcore/tests/twinapi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index a7c5ece3256..addbf7f1bec 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -238,7 +238,9 @@ static void test_AdvertisingManager(void) static void test_ApplicationView(void) { static const WCHAR *class_name = RuntimeClass_Windows_UI_ViewManagement_ApplicationView; + IApplicationViewStatics2 *app_view_statics2; IActivationFactory *factory; + IApplicationView *app_view; HSTRING str; HRESULT hr; LONG ref; @@ -262,6 +264,17 @@ static void test_ApplicationView(void) check_interface( factory, &IID_IApplicationViewStatics, TRUE ); check_interface( factory, &IID_IApplicationViewStatics2, TRUE ); + /* Test IApplicationViewStatics2 */ + hr = IActivationFactory_QueryInterface( factory, &IID_IApplicationViewStatics2, + (void **)&app_view_statics2 ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = IApplicationViewStatics2_GetForCurrentView( app_view_statics2, &app_view ); + todo_wine + ok( hr == 0x80070490, "got hr %#lx.\n", hr ); + + IApplicationViewStatics2_Release( app_view_statics2 ); + ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9962
From: Zhiyi Zhang <zzhang@codeweavers.com> --- dlls/twinapi.appcore/application_view.c | 2 +- dlls/twinapi.appcore/tests/twinapi.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/twinapi.appcore/application_view.c b/dlls/twinapi.appcore/application_view.c index 334f0dcded0..07519f9de61 100644 --- a/dlls/twinapi.appcore/application_view.c +++ b/dlls/twinapi.appcore/application_view.c @@ -158,7 +158,7 @@ DEFINE_IINSPECTABLE(statics2, IApplicationViewStatics2, struct factory, IActivat static HRESULT WINAPI statics2_GetForCurrentView(IApplicationViewStatics2 *iface, IApplicationView **current) { FIXME("iface %p, current %p stub!\n", iface, current); - return E_NOTIMPL; + return 0x80070490; } static HRESULT WINAPI statics2_get_TerminateAppOnFinalViewClose(IApplicationViewStatics2 *iface, boolean *value) diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index addbf7f1bec..5cd1fb60a09 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -270,7 +270,6 @@ static void test_ApplicationView(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IApplicationViewStatics2_GetForCurrentView( app_view_statics2, &app_view ); - todo_wine ok( hr == 0x80070490, "got hr %#lx.\n", hr ); IApplicationViewStatics2_Release( app_view_statics2 ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9962
participants (2)
-
Zhiyi Zhang -
Zhiyi Zhang (＠zhiyi)