Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51884 Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- configure.ac | 1 + dlls/windows.devices.enumeration/Makefile.in | 7 + dlls/windows.devices.enumeration/classes.idl | 23 +++ dlls/windows.devices.enumeration/main.c | 157 ++++++++++++++++++ .../windows.devices.enumeration.spec | 3 + include/Makefile.in | 1 + include/windows.devices.enumeration.idl | 55 ++++++ 7 files changed, 247 insertions(+) create mode 100644 dlls/windows.devices.enumeration/Makefile.in create mode 100644 dlls/windows.devices.enumeration/classes.idl create mode 100644 dlls/windows.devices.enumeration/main.c create mode 100644 dlls/windows.devices.enumeration/windows.devices.enumeration.spec create mode 100644 include/windows.devices.enumeration.idl
diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..c897057a9df 100644 --- a/configure.ac +++ b/configure.ac @@ -3560,6 +3560,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32u/tests) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in new file mode 100644 index 00000000000..a2058b3d002 --- /dev/null +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.devices.enumeration.dll +IMPORTS = combase uuid + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.devices.enumeration/classes.idl b/dlls/windows.devices.enumeration/classes.idl new file mode 100644 index 00000000000..8d13d9bbef7 --- /dev/null +++ b/dlls/windows.devices.enumeration/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.devices.enumeration.dll + * + * Copyright 2021 Gijs Vermeulen + * + * 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.devices.enumeration.idl" diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c new file mode 100644 index 00000000000..a2a13861a88 --- /dev/null +++ b/dlls/windows.devices.enumeration/main.c @@ -0,0 +1,157 @@ +/* WinRT Windows.Devices.Enumeration implementation + * + * Copyright 2021 Gijs Vermeulen + * + * 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 <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Enumeration +#include "windows.devices.enumeration.h" + +WINE_DEFAULT_DEBUG_CHANNEL(enumeration); + +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); +} + +struct windows_devices_enumeration +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_devices_enumeration *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_devices_enumeration, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + 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)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( + IActivationFactory *iface) +{ + struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( + IActivationFactory *iface) +{ + struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_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 STDMETHODCALLTYPE windows_devices_enumeration_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_devices_enumeration_QueryInterface, + windows_devices_enumeration_AddRef, + windows_devices_enumeration_Release, + /* IInspectable methods */ + windows_devices_enumeration_GetIids, + windows_devices_enumeration_GetRuntimeClassName, + windows_devices_enumeration_GetTrustLevel, + /* IActivationFactory methods */ + windows_devices_enumeration_ActivateInstance, +}; + +static struct windows_devices_enumeration windows_devices_enumeration = +{ + {&activation_factory_vtbl}, + 1 +}; + +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) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_devices_enumeration.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.devices.enumeration/windows.devices.enumeration.spec b/dlls/windows.devices.enumeration/windows.devices.enumeration.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/windows.devices.enumeration/windows.devices.enumeration.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/include/Makefile.in b/include/Makefile.in index a9a478e5433..71d1b497b6d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -767,6 +767,7 @@ SOURCES = \ windef.h \ windns.h \ windot11.h \ + windows.devices.enumeration.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl new file mode 100644 index 00000000000..9aa2aaba441 --- /dev/null +++ b/include/windows.devices.enumeration.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2021 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Devices { + namespace Enumeration { + interface IDeviceInformationStatics; + interface IDeviceInformationStatics2; + } + } +} + +namespace Windows { + namespace Devices { + namespace Enumeration { + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Devices.Enumeration.IDeviceInformationStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Devices.Enumeration.IDeviceInformationStatics2, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass DeviceInformation + { + [default] interface Windows.Devices.Enumeration.IDeviceInformation; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; + } + } + } +}