[PATCH 0/6] MR6917: windows.networking.connectivity: Implement IConnectionProfile::GetNetworkConnectivityLevel().
Needed by Just Cause 4. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- configure.ac | 2 + .../Makefile.in | 8 ++ .../classes.idl | 23 ++++ dlls/windows.networking.connectivity/main.c | 44 +++++++ .../network_information.c | 115 ++++++++++++++++++ .../windows.networking.connectivity/private.h | 42 +++++++ .../tests/Makefile.in | 5 + .../tests/connectivity.c | 86 +++++++++++++ .../windows.networking.connectivity.spec | 10 ++ 9 files changed, 335 insertions(+) create mode 100644 dlls/windows.networking.connectivity/Makefile.in create mode 100644 dlls/windows.networking.connectivity/classes.idl create mode 100644 dlls/windows.networking.connectivity/main.c create mode 100644 dlls/windows.networking.connectivity/network_information.c create mode 100644 dlls/windows.networking.connectivity/private.h create mode 100644 dlls/windows.networking.connectivity/tests/Makefile.in create mode 100644 dlls/windows.networking.connectivity/tests/connectivity.c create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity.spec diff --git a/configure.ac b/configure.ac index de80d65b240..a15d65998ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3231,6 +3231,8 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) 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.connectivity) +WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname) WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking) diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in new file mode 100644 index 00000000000..f7fa3cb0002 --- /dev/null +++ b/dlls/windows.networking.connectivity/Makefile.in @@ -0,0 +1,8 @@ +MODULE = windows.networking.connectivity.dll +IMPORTS = combase +EXTRAIDLFLAGS = -DDO_NO_IMPORTS + +SOURCES = \ + classes.idl \ + main.c \ + network_information.c diff --git a/dlls/windows.networking.connectivity/classes.idl b/dlls/windows.networking.connectivity/classes.idl new file mode 100644 index 00000000000..b42f11f40d4 --- /dev/null +++ b/dlls/windows.networking.connectivity/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.networking.connectivity.dll + * + * Copyright (C) 2024 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.networking.connectivity.idl" diff --git a/dlls/windows.networking.connectivity/main.c b/dlls/windows.networking.connectivity/main.c new file mode 100644 index 00000000000..607dd50cf84 --- /dev/null +++ b/dlls/windows.networking.connectivity/main.c @@ -0,0 +1,44 @@ +/* WinRT Windows.Networking.Connectivity Implementation + * + * Copyright (C) 2024 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" + +WINE_DEFAULT_DEBUG_CHANNEL(connectivity); + +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_Networking_Connectivity_NetworkInformation )) + IActivationFactory_QueryInterface( network_information_factory, &IID_IActivationFactory, (void **)factory ); + + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/windows.networking.connectivity/network_information.c b/dlls/windows.networking.connectivity/network_information.c new file mode 100644 index 00000000000..62b5f3680f1 --- /dev/null +++ b/dlls/windows.networking.connectivity/network_information.c @@ -0,0 +1,115 @@ +/* WinRT Windows.Networking.Connectivity.NetworkInformation Implementation + * + * Copyright (C) 2024 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" + +WINE_DEFAULT_DEBUG_CHANNEL(connectivity); + +struct network_information_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct network_information_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct network_information_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct network_information_statics *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 network_information_statics *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 network_information_statics *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 network_information_statics network_information_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *network_information_factory = &network_information_statics.IActivationFactory_iface; diff --git a/dlls/windows.networking.connectivity/private.h b/dlls/windows.networking.connectivity/private.h new file mode 100644 index 00000000000..0055b143d4f --- /dev/null +++ b/dlls/windows.networking.connectivity/private.h @@ -0,0 +1,42 @@ +/* WinRT Windows.Networking.Connectivity Implementation + * + * Copyright (C) 2024 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_NETWORKING_CONNECTIVITY_PRIVATE_H +#define __WINE_WINDOWS_NETWORKING_CONNECTIVITY_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "activation.h" + +#include "wine/debug.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Networking_Connectivity +#include "windows.networking.connectivity.h" + +extern IActivationFactory *network_information_factory; + +#endif diff --git a/dlls/windows.networking.connectivity/tests/Makefile.in b/dlls/windows.networking.connectivity/tests/Makefile.in new file mode 100644 index 00000000000..351f6ceeafc --- /dev/null +++ b/dlls/windows.networking.connectivity/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.networking.connectivity.dll +IMPORTS = combase + +SOURCES = \ + connectivity.c diff --git a/dlls/windows.networking.connectivity/tests/connectivity.c b/dlls/windows.networking.connectivity/tests/connectivity.c new file mode 100644 index 00000000000..83bd13ff0e4 --- /dev/null +++ b/dlls/windows.networking.connectivity/tests/connectivity.c @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2024 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 <stdarg.h> + +#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_Networking_Connectivity +#include "windows.networking.connectivity.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_NetworkInformationStatics(void) +{ + static const WCHAR *network_information_statics_name = L"Windows.Networking.Connectivity.NetworkInformation"; + IActivationFactory *factory; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( network_information_statics_name, wcslen( network_information_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( network_information_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(connectivity) +{ + HRESULT hr; + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + + test_NetworkInformationStatics(); + + RoUninitialize(); +} diff --git a/dlls/windows.networking.connectivity/windows.networking.connectivity.spec b/dlls/windows.networking.connectivity/windows.networking.connectivity.spec new file mode 100644 index 00000000000..e8e1a03b168 --- /dev/null +++ b/dlls/windows.networking.connectivity/windows.networking.connectivity.spec @@ -0,0 +1,10 @@ +@ stub SetHostNameMediaStreamingMode +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub FixDisabledComponentsForTeredo +@ stub RefreshTeredoClientState +@ stub TeredoExtAcquireTeredoConsumerHandle +@ stub TeredoExtReleaseTeredoConsumerHandle -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../network_information.c | 84 +++++++++++++++++++ .../windows.networking.connectivity/private.h | 40 +++++++++ .../tests/connectivity.c | 6 ++ 3 files changed, 130 insertions(+) diff --git a/dlls/windows.networking.connectivity/network_information.c b/dlls/windows.networking.connectivity/network_information.c index 62b5f3680f1..2e203cea88e 100644 --- a/dlls/windows.networking.connectivity/network_information.c +++ b/dlls/windows.networking.connectivity/network_information.c @@ -21,9 +21,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(connectivity); +static EventRegistrationToken dummy_cookie = {.value = 0xdeadbeef}; + struct network_information_statics { IActivationFactory IActivationFactory_iface; + INetworkInformationStatics INetworkInformationStatics_iface; LONG ref; }; @@ -48,6 +51,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_INetworkInformationStatics )) + { + *out = &impl->INetworkInformationStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -106,9 +116,83 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( network_information_statics, INetworkInformationStatics, struct network_information_statics, IActivationFactory_iface ) + +static HRESULT WINAPI network_information_statics_GetConnectionProfiles( INetworkInformationStatics *iface, IVectorView_ConnectionProfile **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_information_statics_GetInternetConnectionProfile( INetworkInformationStatics *iface, IConnectionProfile **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_information_statics_GetLanIdentifiers( INetworkInformationStatics *iface, IVectorView_LanIdentifier **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_information_statics_GetHostNames( INetworkInformationStatics *iface, IVectorView_HostName **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_information_statics_GetProxyConfigurationAsync( INetworkInformationStatics *iface, IUriRuntimeClass *uri, IAsyncOperation_ProxyConfiguration **value ) +{ + FIXME( "iface %p, uri %p, value %p stub!\n", iface, uri, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_information_statics_GetSortedEndpointPairs( INetworkInformationStatics *iface, IIterable_EndpointPair *endpoint, + HostNameSortOptions options, IVectorView_EndpointPair **value ) +{ + FIXME( "iface %p, endpoint %p, options %d, value %p stub!\n", iface, endpoint, options, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_information_statics_add_NetworkStatusChanged( INetworkInformationStatics *iface, INetworkStatusChangedEventHandler *handler, + EventRegistrationToken *cookie ) +{ + FIXME( "iface %p, handler %p, cookie %p stub!\n", iface, handler, cookie ); + *cookie = dummy_cookie; + return S_OK; +} + +static HRESULT WINAPI network_information_statics_remove_NetworkStatusChanged( INetworkInformationStatics *iface, EventRegistrationToken cookie ) +{ + FIXME( "iface %p, cookie %#I64x stub!\n", iface, cookie.value ); + return S_OK; +} + +static const struct INetworkInformationStaticsVtbl network_information_statics_vtbl = +{ + network_information_statics_QueryInterface, + network_information_statics_AddRef, + network_information_statics_Release, + /* IInspectable methods */ + network_information_statics_GetIids, + network_information_statics_GetRuntimeClassName, + network_information_statics_GetTrustLevel, + /* INetworkInformationStatics methods */ + network_information_statics_GetConnectionProfiles, + network_information_statics_GetInternetConnectionProfile, + network_information_statics_GetLanIdentifiers, + network_information_statics_GetHostNames, + network_information_statics_GetProxyConfigurationAsync, + network_information_statics_GetSortedEndpointPairs, + network_information_statics_add_NetworkStatusChanged, + network_information_statics_remove_NetworkStatusChanged, +}; + static struct network_information_statics network_information_statics = { {&factory_vtbl}, + {&network_information_statics_vtbl}, 1, }; diff --git a/dlls/windows.networking.connectivity/private.h b/dlls/windows.networking.connectivity/private.h index 0055b143d4f..9cff12a6cc6 100644 --- a/dlls/windows.networking.connectivity/private.h +++ b/dlls/windows.networking.connectivity/private.h @@ -34,9 +34,49 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Networking #define WIDL_using_Windows_Networking_Connectivity #include "windows.networking.connectivity.h" +#include "windows.networking.h" extern IActivationFactory *network_information_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.networking.connectivity/tests/connectivity.c b/dlls/windows.networking.connectivity/tests/connectivity.c index 83bd13ff0e4..b49d2ca3a19 100644 --- a/dlls/windows.networking.connectivity/tests/connectivity.c +++ b/dlls/windows.networking.connectivity/tests/connectivity.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_NetworkInformationStatics(void) { static const WCHAR *network_information_statics_name = L"Windows.Networking.Connectivity.NetworkInformation"; + INetworkInformationStatics *network_information_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -69,6 +70,11 @@ static void test_NetworkInformationStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_INetworkInformationStatics, (void **)&network_information_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = INetworkInformationStatics_Release( network_information_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../Makefile.in | 2 +- .../network_information.c | 162 +++++++++++++++++- 2 files changed, 161 insertions(+), 3 deletions(-) diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in index f7fa3cb0002..7e902c657f5 100644 --- a/dlls/windows.networking.connectivity/Makefile.in +++ b/dlls/windows.networking.connectivity/Makefile.in @@ -1,5 +1,5 @@ MODULE = windows.networking.connectivity.dll -IMPORTS = combase +IMPORTS = combase wininet EXTRAIDLFLAGS = -DDO_NO_IMPORTS SOURCES = \ diff --git a/dlls/windows.networking.connectivity/network_information.c b/dlls/windows.networking.connectivity/network_information.c index 2e203cea88e..65a03ad93a6 100644 --- a/dlls/windows.networking.connectivity/network_information.c +++ b/dlls/windows.networking.connectivity/network_information.c @@ -18,6 +18,7 @@ */ #include "private.h" +#include "wininet.h" WINE_DEFAULT_DEBUG_CHANNEL(connectivity); @@ -116,6 +117,149 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct connection_profile +{ + IConnectionProfile IConnectionProfile_iface; + LONG ref; + + NetworkConnectivityLevel network_connectivity_level; +}; + +static inline struct connection_profile *impl_from_IConnectionProfile( IConnectionProfile *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_profile, IConnectionProfile_iface ); +} + +static HRESULT WINAPI connection_profile_QueryInterface( IConnectionProfile *iface, REFIID iid, void **out ) +{ + struct connection_profile *impl = impl_from_IConnectionProfile( 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_IConnectionProfile )) + { + *out = &impl->IConnectionProfile_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 connection_profile_AddRef( IConnectionProfile *iface ) +{ + struct connection_profile *impl = impl_from_IConnectionProfile( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI connection_profile_Release( IConnectionProfile *iface ) +{ + struct connection_profile *impl = impl_from_IConnectionProfile( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI connection_profile_GetIids( IConnectionProfile *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 connection_profile_GetRuntimeClassName( IConnectionProfile *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetTrustLevel( IConnectionProfile *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_get_ProfileName( IConnectionProfile *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetNetworkConnectivityLevel( IConnectionProfile *iface, NetworkConnectivityLevel *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetNetworkNames( IConnectionProfile *iface, IVectorView_HSTRING **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetConnectionCost( IConnectionProfile *iface, IConnectionCost **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetDataPlanStatus( IConnectionProfile *iface, IDataPlanStatus **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_get_NetworkAdapter( IConnectionProfile *iface, INetworkAdapter **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetLocalUsage( IConnectionProfile *iface, DateTime start, DateTime end, IDataUsage **value ) +{ + FIXME( "iface %p, start %llu, end %llu, value %p stub!\n", iface, start.UniversalTime, end.UniversalTime, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_GetLocalUsagePerRoamingStates( IConnectionProfile *iface, DateTime start, DateTime end, RoamingStates states, IDataUsage **value ) +{ + FIXME( "iface %p, start %llu, end %llu, states %u, value %p stub!\n", iface, start.UniversalTime, end.UniversalTime, states, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_profile_get_NetworkSecuritySettings( IConnectionProfile *iface, INetworkSecuritySettings **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IConnectionProfileVtbl connection_profile_vtbl = +{ + connection_profile_QueryInterface, + connection_profile_AddRef, + connection_profile_Release, + /* IInspectable methods */ + connection_profile_GetIids, + connection_profile_GetRuntimeClassName, + connection_profile_GetTrustLevel, + /* IConnectionProfile methods */ + connection_profile_get_ProfileName, + connection_profile_GetNetworkConnectivityLevel, + connection_profile_GetNetworkNames, + connection_profile_GetConnectionCost, + connection_profile_GetDataPlanStatus, + connection_profile_get_NetworkAdapter, + connection_profile_GetLocalUsage, + connection_profile_GetLocalUsagePerRoamingStates, + connection_profile_get_NetworkSecuritySettings, +}; + DEFINE_IINSPECTABLE( network_information_statics, INetworkInformationStatics, struct network_information_statics, IActivationFactory_iface ) static HRESULT WINAPI network_information_statics_GetConnectionProfiles( INetworkInformationStatics *iface, IVectorView_ConnectionProfile **value ) @@ -126,8 +270,22 @@ static HRESULT WINAPI network_information_statics_GetConnectionProfiles( INetwor static HRESULT WINAPI network_information_statics_GetInternetConnectionProfile( INetworkInformationStatics *iface, IConnectionProfile **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct connection_profile *impl; + LPDWORD flags = 0; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = NULL; + if (!InternetGetConnectedState( flags, 0 )) return S_OK; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IConnectionProfile_iface.lpVtbl = &connection_profile_vtbl; + impl->ref = 1; + impl->network_connectivity_level = NetworkConnectivityLevel_InternetAccess; + + *value = &impl->IConnectionProfile_iface; + TRACE( "created IConnectionProfile %p.\n", *value ); + return S_OK; } static HRESULT WINAPI network_information_statics_GetLanIdentifiers( INetworkInformationStatics *iface, IVectorView_LanIdentifier **value ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../tests/Makefile.in | 2 +- .../tests/connectivity.c | 23 +++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/windows.networking.connectivity/tests/Makefile.in b/dlls/windows.networking.connectivity/tests/Makefile.in index 351f6ceeafc..58707a80348 100644 --- a/dlls/windows.networking.connectivity/tests/Makefile.in +++ b/dlls/windows.networking.connectivity/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.networking.connectivity.dll -IMPORTS = combase +IMPORTS = combase wininet SOURCES = \ connectivity.c diff --git a/dlls/windows.networking.connectivity/tests/connectivity.c b/dlls/windows.networking.connectivity/tests/connectivity.c index b49d2ca3a19..7b568685669 100644 --- a/dlls/windows.networking.connectivity/tests/connectivity.c +++ b/dlls/windows.networking.connectivity/tests/connectivity.c @@ -31,6 +31,8 @@ #define WIDL_using_Windows_Networking_Connectivity #include "windows.networking.connectivity.h" +#include "wininet.h" + #include "wine/test.h" #define check_interface( obj, iid ) check_interface_( __LINE__, obj, iid ) @@ -48,8 +50,10 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_NetworkInformationStatics(void) { static const WCHAR *network_information_statics_name = L"Windows.Networking.Connectivity.NetworkInformation"; - INetworkInformationStatics *network_information_statics; - IActivationFactory *factory; + INetworkInformationStatics *network_information_statics = (void *)0xdeadbeef; + IConnectionProfile *connection_profile = (void *)0xdeadbeef; + IActivationFactory *factory = (void *)0xdeadbeef; + LPDWORD flags = 0; HSTRING str; HRESULT hr; LONG ref; @@ -73,6 +77,21 @@ static void test_NetworkInformationStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_INetworkInformationStatics, (void **)&network_information_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + if (!InternetGetConnectedState( flags, 0 )) + { + hr = INetworkInformationStatics_GetInternetConnectionProfile( network_information_statics, &connection_profile ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !connection_profile, "expected NULL, got connection_profile %p.\n", connection_profile ); + win_skip( "Internet connection unavailable, skipping tests.\n" ); + goto out; + } + + hr = INetworkInformationStatics_GetInternetConnectionProfile( network_information_statics, &connection_profile ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IConnectionProfile_Release( connection_profile ); + ok( ref == 0, "got ref %ld.\n", ref ); +out: ref = INetworkInformationStatics_Release( network_information_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../tests/connectivity.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/windows.networking.connectivity/tests/connectivity.c b/dlls/windows.networking.connectivity/tests/connectivity.c index 7b568685669..8efdb733df1 100644 --- a/dlls/windows.networking.connectivity/tests/connectivity.c +++ b/dlls/windows.networking.connectivity/tests/connectivity.c @@ -53,6 +53,7 @@ static void test_NetworkInformationStatics(void) INetworkInformationStatics *network_information_statics = (void *)0xdeadbeef; IConnectionProfile *connection_profile = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; + NetworkConnectivityLevel network_connectivity_level; LPDWORD flags = 0; HSTRING str; HRESULT hr; @@ -89,6 +90,19 @@ static void test_NetworkInformationStatics(void) hr = INetworkInformationStatics_GetInternetConnectionProfile( network_information_statics, &connection_profile ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + IConnectionProfile_GetNetworkConnectivityLevel( connection_profile, NULL ); + todo_wine + ok( hr == S_OK, "got hr %#lx.\n", hr ); + IConnectionProfile_GetNetworkConnectivityLevel( connection_profile, &network_connectivity_level ); + todo_wine + ok( hr == S_OK, "got hr %#lx.\n", hr ); + if (!InternetGetConnectedState( flags, 0 )) + todo_wine + ok( network_connectivity_level == NetworkConnectivityLevel_None, "got network_connectivity_level %d.\n", network_connectivity_level ); + else + todo_wine + ok( network_connectivity_level == NetworkConnectivityLevel_InternetAccess, "got network_connectivity_level %d.\n", network_connectivity_level ); + ref = IConnectionProfile_Release( connection_profile ); ok( ref == 0, "got ref %ld.\n", ref ); out: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Needed by Just Cause 4. --- .../windows.networking.connectivity/network_information.c | 8 ++++++-- dlls/windows.networking.connectivity/tests/connectivity.c | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/windows.networking.connectivity/network_information.c b/dlls/windows.networking.connectivity/network_information.c index 65a03ad93a6..93cd3ae68b1 100644 --- a/dlls/windows.networking.connectivity/network_information.c +++ b/dlls/windows.networking.connectivity/network_information.c @@ -193,8 +193,12 @@ static HRESULT WINAPI connection_profile_get_ProfileName( IConnectionProfile *if static HRESULT WINAPI connection_profile_GetNetworkConnectivityLevel( IConnectionProfile *iface, NetworkConnectivityLevel *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct connection_profile *impl = impl_from_IConnectionProfile( iface ); + + TRACE( "iface %p, value %p\n", iface, value ); + + if (value) *value = impl->network_connectivity_level; + return S_OK; } static HRESULT WINAPI connection_profile_GetNetworkNames( IConnectionProfile *iface, IVectorView_HSTRING **value ) diff --git a/dlls/windows.networking.connectivity/tests/connectivity.c b/dlls/windows.networking.connectivity/tests/connectivity.c index 8efdb733df1..192b60f05f9 100644 --- a/dlls/windows.networking.connectivity/tests/connectivity.c +++ b/dlls/windows.networking.connectivity/tests/connectivity.c @@ -91,16 +91,13 @@ static void test_NetworkInformationStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); IConnectionProfile_GetNetworkConnectivityLevel( connection_profile, NULL ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); IConnectionProfile_GetNetworkConnectivityLevel( connection_profile, &network_connectivity_level ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); if (!InternetGetConnectedState( flags, 0 )) todo_wine ok( network_connectivity_level == NetworkConnectivityLevel_None, "got network_connectivity_level %d.\n", network_connectivity_level ); else - todo_wine ok( network_connectivity_level == NetworkConnectivityLevel_InternetAccess, "got network_connectivity_level %d.\n", network_connectivity_level ); ref = IConnectionProfile_Release( connection_profile ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6917
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=150042 Your paranoid android. === debian11b (64 bit WoW report) === user32: monitor.c:1295: Test failed: Device \\.\DISPLAY1 expect dmPelsWidth 800, got 640 monitor.c:1295: Test failed: Device \\.\DISPLAY1 expect dmPelsHeight 600, got 480 monitor.c:390: Test failed: WaitForSingleObject returned 102. monitor.c:390: Test failed: WaitForSingleObject returned 102.
Nikolay Sivov (@nsivov) commented about dlls/windows.networking.connectivity/network_information.c:
static HRESULT WINAPI network_information_statics_GetInternetConnectionProfile( INetworkInformationStatics *iface, IConnectionProfile **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct connection_profile *impl; + LPDWORD flags = 0; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = NULL; + if (!InternetGetConnectedState( flags, 0 )) return S_OK; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY;
This allocation does not appear to be released. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6917#note_89110
Nikolay Sivov (@nsivov) commented about dlls/windows.networking.connectivity/network_information.c:
static HRESULT WINAPI network_information_statics_GetInternetConnectionProfile( INetworkInformationStatics *iface, IConnectionProfile **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct connection_profile *impl; + LPDWORD flags = 0; + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = NULL; + if (!InternetGetConnectedState( flags, 0 )) return S_OK;
You're passing NULL for flags argument, likely unintentionally. It's not clear if this wininet function is suitable in this context. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6917#note_89109
On Thu Nov 28 12:35:52 2024 +0000, Nikolay Sivov wrote:
You're passing NULL for flags argument, likely unintentionally. It's not clear if this wininet function is suitable in this context. netprofm may be a better match.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6917#note_89111
participants (5)
-
Hans Leidekker (＠hans) -
Marvin -
Mohamad Al-Jaf
-
Mohamad Al-Jaf (＠maljaf)
-
Nikolay Sivov (＠nsivov)