From ffb664f1c56a102da2058a635414ba79d0bc52fc Mon Sep 17 00:00:00 2001 From: Mohamad Al-Jaf Date: Sun, 18 Dec 2022 19:57:40 -0500 Subject: [PATCH] windows.perception.stub: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.perception.stub/Makefile.in | 9 ++ dlls/windows.perception.stub/classes.idl | 23 ++++ dlls/windows.perception.stub/main.c | 55 ++++++++ dlls/windows.perception.stub/observer.c | 117 ++++++++++++++++++ dlls/windows.perception.stub/private.h | 40 ++++++ .../windows.perception.stub/tests/Makefile.in | 5 + .../tests/perception.c | 86 +++++++++++++ .../windows.perception.stub.spec | 5 + 10 files changed, 345 insertions(+) create mode 100644 dlls/windows.perception.stub/Makefile.in create mode 100644 dlls/windows.perception.stub/classes.idl create mode 100644 dlls/windows.perception.stub/main.c create mode 100644 dlls/windows.perception.stub/observer.c create mode 100644 dlls/windows.perception.stub/private.h create mode 100644 dlls/windows.perception.stub/tests/Makefile.in create mode 100644 dlls/windows.perception.stub/tests/perception.c create mode 100644 dlls/windows.perception.stub/windows.perception.stub.spec diff --git a/configure b/configure index 296c3e45587..7618e8b4b15 100755 --- a/configure +++ b/configure @@ -1453,6 +1453,7 @@ enable_windows_media_devices enable_windows_media_speech enable_windows_media enable_windows_networking +enable_windows_perception_stub enable_windows_system_profile_systemmanufacturers enable_windows_ui enable_windowscodecs @@ -21706,6 +21707,8 @@ wine_fn_config_makefile dlls/windows.media.speech/tests enable_tests wine_fn_config_makefile dlls/windows.media enable_windows_media wine_fn_config_makefile dlls/windows.media/tests enable_tests wine_fn_config_makefile dlls/windows.networking enable_windows_networking +wine_fn_config_makefile dlls/windows.perception.stub enable_windows_perception_stub +wine_fn_config_makefile dlls/windows.perception.stub/tests enable_tests wine_fn_config_makefile dlls/windows.system.profile.systemmanufacturers enable_windows_system_profile_systemmanufacturers wine_fn_config_makefile dlls/windows.system.profile.systemmanufacturers/tests enable_tests wine_fn_config_makefile dlls/windows.ui enable_windows_ui diff --git a/configure.ac b/configure.ac index 140f26aec16..35af177b013 100644 --- a/configure.ac +++ b/configure.ac @@ -3114,6 +3114,8 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media) WINE_CONFIG_MAKEFILE(dlls/windows.media/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking) +WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub) +WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub/tests) WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers) WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers/tests) WINE_CONFIG_MAKEFILE(dlls/windows.ui) diff --git a/dlls/windows.perception.stub/Makefile.in b/dlls/windows.perception.stub/Makefile.in new file mode 100644 index 00000000000..c19496cdd66 --- /dev/null +++ b/dlls/windows.perception.stub/Makefile.in @@ -0,0 +1,9 @@ +MODULE = windows.perception.stub.dll +IMPORTS = combase + +C_SRCS = \ + main.c \ + observer.c + +IDL_SRCS = \ + classes.idl diff --git a/dlls/windows.perception.stub/classes.idl b/dlls/windows.perception.stub/classes.idl new file mode 100644 index 00000000000..7d0412fa9b2 --- /dev/null +++ b/dlls/windows.perception.stub/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.perception.stub.dll + * + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.perception.spatial.surfaces.idl" diff --git a/dlls/windows.perception.stub/main.c b/dlls/windows.perception.stub/main.c new file mode 100644 index 00000000000..094b1b60654 --- /dev/null +++ b/dlls/windows.perception.stub/main.c @@ -0,0 +1,55 @@ +/* WinRT Windows.Perception.Stub Implementation + * + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "initguid.h" +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(perception); + +static const char *debugstr_hstring( HSTRING hstr ) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer( hstr, &len ); + return wine_dbgstr_wn( str, len ); +} + +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID riid, void **out ) +{ + FIXME( "clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out ); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **factory ) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer( classid, NULL ); + + TRACE( "class %s, factory %p.\n", debugstr_hstring(classid), factory ); + + *factory = NULL; + + if (!wcscmp( buffer, RuntimeClass_Windows_Perception_Spatial_Surfaces_SpatialSurfaceObserver )) + IActivationFactory_QueryInterface( observer_factory, &IID_IActivationFactory, (void **)factory ); + + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/windows.perception.stub/observer.c b/dlls/windows.perception.stub/observer.c new file mode 100644 index 00000000000..f41a35beb70 --- /dev/null +++ b/dlls/windows.perception.stub/observer.c @@ -0,0 +1,117 @@ +/* WinRT Windows.Perception.Stub Observer Implementation + * + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(perception); + +struct observer +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct observer *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct observer, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct observer *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + *out = &impl->IActivationFactory_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct observer *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 observer *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, +}; + +static struct observer observer_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *observer_factory = &observer_statics.IActivationFactory_iface; diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h new file mode 100644 index 00000000000..497b3998a02 --- /dev/null +++ b/dlls/windows.perception.stub/private.h @@ -0,0 +1,40 @@ +/* WinRT Windows.Perception.Stub Implementation + * + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINDOWS_PERCEPTION_PRIVATE_H +#define __WINE_WINDOWS_PERCEPTION_PRIVATE_H + +#include + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Perception_Spatial_Surfaces +#include "windows.perception.spatial.surfaces.h" + +extern IActivationFactory *observer_factory; + +#endif diff --git a/dlls/windows.perception.stub/tests/Makefile.in b/dlls/windows.perception.stub/tests/Makefile.in new file mode 100644 index 00000000000..2bcb68cfb42 --- /dev/null +++ b/dlls/windows.perception.stub/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.perception.stub.dll +IMPORTS = combase + +C_SRCS = \ + perception.c diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c new file mode 100644 index 00000000000..f26a45788a6 --- /dev/null +++ b/dlls/windows.perception.stub/tests/perception.c @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include "initguid.h" +#include + +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "roapi.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Perception_Spatial_Surfaces +#include "windows.perception.spatial.surfaces.h" + +#include "wine/test.h" + +#define check_interface( obj, iid ) check_interface_( __LINE__, obj, iid ) +static void check_interface_( unsigned int line, void *obj, const IID *iid ) +{ + IUnknown *iface = obj; + IUnknown *unk; + HRESULT hr; + + hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); + ok_(__FILE__, line)( hr == S_OK, "got hr %#lx.\n", hr ); + IUnknown_Release( unk ); +} + +static void test_ObserverStatics(void) +{ + static const WCHAR *observer_statics_name = L"Windows.Perception.Spatial.Surfaces.SpatialSurfaceObserver"; + IActivationFactory *factory; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( observer_statics_name, wcslen( observer_statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( observer_statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + check_interface( factory, &IID_IAgileObject ); + + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + +START_TEST(perception) +{ + HRESULT hr; + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + + test_ObserverStatics(); + + RoUninitialize(); +} diff --git a/dlls/windows.perception.stub/windows.perception.stub.spec b/dlls/windows.perception.stub/windows.perception.stub.spec new file mode 100644 index 00000000000..55a1c9f8d92 --- /dev/null +++ b/dlls/windows.perception.stub/windows.perception.stub.spec @@ -0,0 +1,5 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stub DllGetActivationFactoryPerceptionStub +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub GetProxyDllInfo