From df9ad11eefefc7e8827a15e6e78dfbe0e7a2e6a3 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 10 Jul 2023 15:45:46 +1000 Subject: [PATCH] Updated windows.networking.connectivity-new-dll patchset --- ...-windows.networking.connectivity.idl.patch | 11 +- ...2-include-Add-windows.networking.idl.patch | 221 ------------------ 2 files changed, 5 insertions(+), 227 deletions(-) delete mode 100644 patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch diff --git a/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch b/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch index addd55ab..15cd7e6c 100644 --- a/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch +++ b/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch @@ -1,15 +1,14 @@ -From 9789c1d011a23982e1d99081c41e5417125740bb Mon Sep 17 00:00:00 2001 +From 31bf9cce575827299aae5e2bbf8f97f6e5f44cc6 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 28 May 2021 12:34:37 +1000 Subject: [PATCH] include: Add windows.networking.connectivity.idl --- - include/Makefile.in | 3 + include/windows.networking.connectivity.idl | 358 ++++++++++++++++++-- - 2 files changed, 334 insertions(+), 27 deletions(-) + 1 file changed, 331 insertions(+), 27 deletions(-) diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl -index 8c6489ba13b..4e820ab8bcd 100644 +index 8c6489ba13b..97727da8962 100644 --- a/include/windows.networking.connectivity.idl +++ b/include/windows.networking.connectivity.idl @@ -28,39 +28,343 @@ import "windows.foundation.idl"; @@ -209,8 +208,8 @@ index 8c6489ba13b..4e820ab8bcd 100644 + [uuid(d85145e0-138f-47d7-9b3a-36bb488cef33)] + interface IIPInformation : IInspectable + { -+ [propget] HRESULT NetworkAdapter([out, retval] Windows.Networking.Connectivity.NetworkAdapter** value); -+ [propget] HRESULT PrefixLength([out, retval] /*Windows.Foundation.IReference** */ BYTE **value); ++ [propget] HRESULT NetworkAdapter([out, retval] Windows.Networking.Connectivity.NetworkAdapter **value); ++ [propget] HRESULT PrefixLength([out, retval] Windows.Foundation.IReference **value); + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] diff --git a/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch b/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch deleted file mode 100644 index 2936e018..00000000 --- a/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 2147d0c15027f4c5890403b38ed88c974b881e32 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Tue, 1 Jun 2021 10:26:28 +1000 -Subject: [PATCH] include: Add windows.networking.idl - -Signed-off-by: Alistair Leslie-Hughes ---- - include/Makefile.in | 1 + - include/windows.networking.idl | 200 ++++++++++----------------------- - 2 files changed, 60 insertions(+), 141 deletions(-) - -diff --git a/include/windows.networking.idl b/include/windows.networking.idl -index e864a3bb1ad..b550308cd8e 100644 ---- a/include/windows.networking.idl -+++ b/include/windows.networking.idl -@@ -27,147 +31,61 @@ import "windowscontracts.idl"; - import "windows.foundation.idl"; - import "windows.networking.connectivity.idl"; - --namespace Windows.Networking { -- typedef enum DomainNameType DomainNameType; -- typedef enum HostNameSortOptions HostNameSortOptions; -- typedef enum HostNameType HostNameType; -- -- interface IEndpointPair; -- interface IEndpointPairFactory; -- interface IHostName; -- interface IHostNameFactory; -- interface IHostNameStatics; -- -- runtimeclass EndpointPair; -- runtimeclass HostName; -- -- declare { -- interface Windows.Foundation.Collections.IIterable; -- interface Windows.Foundation.Collections.IIterable; -- interface Windows.Foundation.Collections.IIterator; -- interface Windows.Foundation.Collections.IIterator; -- interface Windows.Foundation.Collections.IVectorView; -- interface Windows.Foundation.Collections.IVectorView; -- interface Windows.Foundation.Collections.IVector; -- interface Windows.Foundation.AsyncOperationCompletedHandler *>; -- interface Windows.Foundation.IAsyncOperation *>; -- } -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0) -- ] -- enum DomainNameType -- { -- Suffix = 0, -- FullyQualified = 1, -- }; -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- flags -- ] -- enum HostNameSortOptions -- { -- None = 0x0, -- OptimizeForLongConnections = 0x2, -- }; -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0) -- ] -- enum HostNameType -- { -- DomainName = 0, -- Ipv4 = 1, -- Ipv6 = 2, -- Bluetooth = 3, -- }; -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- exclusiveto(Windows.Networking.EndpointPair), -- uuid(33a0aa36-f8fa-4b30-b856-76517c3bd06d) -- ] -- interface IEndpointPair : IInspectable -- { -- [propget] HRESULT LocalHostName([out, retval] Windows.Networking.HostName **value); -- [propput] HRESULT LocalHostName([in] Windows.Networking.HostName *value); -- [propget] HRESULT LocalServiceName([out, retval] HSTRING *value); -- [propput] HRESULT LocalServiceName([in] HSTRING value); -- [propget] HRESULT RemoteHostName([out, retval] Windows.Networking.HostName **value); -- [propput] HRESULT RemoteHostName([in] Windows.Networking.HostName *value); -- [propget] HRESULT RemoteServiceName([out, retval] HSTRING *value); -- [propput] HRESULT RemoteServiceName([in] HSTRING value); -- } -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- exclusiveto(Windows.Networking.EndpointPair), -- uuid(b609d971-64e0-442b-aa6f-cc8c8f181f78) -- ] -- interface IEndpointPairFactory : IInspectable -- { -- HRESULT CreateEndpointPair([in] Windows.Networking.HostName *host, [in] HSTRING service, -- [in] Windows.Networking.HostName *remote_host, [in] HSTRING remote_service, -- [out, retval] Windows.Networking.EndpointPair **value); -- } -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- exclusiveto(Windows.Networking.HostName), -- uuid(bf8ecaad-ed96-49a7-9084-d416cae88dcb) -- ] -- interface IHostName : IInspectable -- { -- [propget] HRESULT IPInformation([out, retval] Windows.Networking.Connectivity.IPInformation **value); -- [propget] HRESULT RawName([out, retval] HSTRING *value); -- [propget] HRESULT DisplayName([out, retval] HSTRING *value); -- [propget] HRESULT CanonicalName([out, retval] HSTRING *value); -- [propget] HRESULT Type([out, retval] Windows.Networking.HostNameType *value); -- HRESULT IsEqual([in] Windows.Networking.HostName *name, [out, retval] boolean *equal); -- } -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- exclusiveto(Windows.Networking.HostName), -- uuid(458c23ed-712f-4576-adf1-c20b2c643558) -- ] -- interface IHostNameFactory : IInspectable -- { -- HRESULT CreateHostName([in] HSTRING name, [out, retval] Windows.Networking.HostName **value); -- } -- -- [ -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- exclusiveto(Windows.Networking.HostName), -- uuid(f68cd4bf-a388-4e8b-91ea-54dd6dd901c0) -- ] -- interface IHostNameStatics : IInspectable -- { -- HRESULT Compare([in] HSTRING value1, [in] HSTRING value2, [out, retval] INT32 *result); -- } -- -- [ -- activatable(Windows.Networking.IEndpointPairFactory, Windows.Foundation.UniversalApiContract, 1.0), -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- marshaling_behavior(agile), -- threading(both) -- ] -- runtimeclass EndpointPair -- { -- [default] interface Windows.Networking.IEndpointPair; -- } -- -- [ -- activatable(Windows.Networking.IHostNameFactory, Windows.Foundation.UniversalApiContract, 1.0), -- contract(Windows.Foundation.UniversalApiContract, 1.0), -- marshaling_behavior(agile), -- static(Windows.Networking.IHostNameStatics, Windows.Foundation.UniversalApiContract, 1.0), -- threading(both) -- ] -- runtimeclass HostName -+namespace Windows -+{ -+ namespace Networking - { -- [default] interface Windows.Networking.IHostName; -- [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; -+ typedef enum HostNameType HostNameType; -+ -+ runtimeclass HostName; -+ -+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] -+ enum HostNameType -+ { -+ DomainName, -+ Ipv4, -+ Ipv6, -+ Bluetooth -+ }; -+ -+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] -+ [exclusiveto(Windows.Networking.HostName)] -+ [uuid(bf8ecaad-ed96-49a7-9084-d416cae88dcb)] -+ interface IHostName : IInspectable -+ { -+ [propget] HRESULT IPInformation([out, retval] Windows.Networking.Connectivity.IPInformation** value); -+ [propget] HRESULT RawName([out, retval] HSTRING* value); -+ [propget] HRESULT DisplayName([out, retval] HSTRING* value); -+ [propget] HRESULT CanonicalName([out, retval] HSTRING* value); -+ [propget] HRESULT Type([out, retval] Windows.Networking.HostNameType* value); -+ HRESULT IsEqual([in] Windows.Networking.HostName* hostName, [out, retval] boolean* equal); -+ } -+ -+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] -+ [exclusiveto(Windows.Networking.HostName)] -+ [uuid(458c23ed-712f-4576-adf1-c20b2c643558)] -+ interface IHostNameFactory : IInspectable -+ { -+ HRESULT CreateHostName([in] HSTRING hostname, [out, retval] Windows.Networking.HostName** value); -+ } -+ -+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] -+ [exclusiveto(Windows.Networking.HostName)] -+ [uuid(f68cd4bf-a388-4e8b-91ea-54dd6dd901c0)] -+ interface IHostNameStatics : IInspectable -+ { -+ HRESULT Compare([in] HSTRING value1, [in] HSTRING value2, [out, retval] INT32* result); -+ } -+ -+ [activatable(Windows.Networking.IHostNameFactory, Windows.Foundation.UniversalApiContract, 1.0)] -+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] -+ [marshaling_behavior(agile)] -+ [static(Windows.Networking.IHostNameStatics, Windows.Foundation.UniversalApiContract, 1.0)] -+ [threading(both)] -+ runtimeclass HostName -+ { -+ [default] interface Windows.Networking.IHostName; -+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; -+ } - } - } --- -2.40.1 -