From 9fa3c96cffb315134a93ea83abc54b74e756457e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 4 Mar 2022 07:28:25 +1100 Subject: [PATCH] Updated windows.networking.connectivity-new-dll patchset --- ...-windows.networking.connectivity.idl.patch | 8 ++++---- ...2-include-Add-windows.networking.idl.patch | 19 ++++++++++--------- ...ng.connectivity-Implement-IActivatio.patch | 4 ++-- ...ng.connectivity-Implement-INetworkIn.patch | 14 +++++++------- ...ng.connectivity-Implement-INetworkIn.patch | 4 ++-- 5 files changed, 25 insertions(+), 24 deletions(-) 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 dd96b860..c64042f5 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,4 +1,4 @@ -From beb2d6ed1dd39b4028e848a7429a82d55ce690a7 Mon Sep 17 00:00:00 2001 +From 0a8b258346219cd9cfd85fe906a5f758a5921d2a 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 @@ -10,10 +10,10 @@ Subject: [PATCH] include: Add windows.networking.connectivity.idl create mode 100644 include/windows.networking.connectivity.idl diff --git a/include/Makefile.in b/include/Makefile.in -index 04537ea72ef..c9154df8a8b 100644 +index ae551abd4c0..e9f0fb84070 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -786,6 +786,7 @@ SOURCES = \ +@@ -790,6 +790,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ @@ -23,7 +23,7 @@ index 04537ea72ef..c9154df8a8b 100644 windows.system.userprofile.idl \ diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl new file mode 100644 -index 00000000000..3ccefca02fa +index 00000000000..3061512bd1a --- /dev/null +++ b/include/windows.networking.connectivity.idl @@ -0,0 +1,368 @@ 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 index 61fca6b2..e5599667 100644 --- 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 @@ -1,19 +1,20 @@ -From 16f658992146eb464e1b00f9dbb468a21e4fbefb Mon Sep 17 00:00:00 2001 +From b189394f92c14fb530e3995230ad44b9af368150 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 | 87 ++++++++++++++++++++++++++++++++++ - 2 files changed, 88 insertions(+) + include/windows.networking.idl | 88 ++++++++++++++++++++++++++++++++++ + 2 files changed, 89 insertions(+) create mode 100644 include/windows.networking.idl diff --git a/include/Makefile.in b/include/Makefile.in -index c9154df8a8b..a9c0a023978 100644 +index e9f0fb84070..5bf61ef08bc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -786,6 +786,7 @@ SOURCES = \ +@@ -790,6 +790,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ @@ -23,10 +24,10 @@ index c9154df8a8b..a9c0a023978 100644 windows.system.idl \ diff --git a/include/windows.networking.idl b/include/windows.networking.idl new file mode 100644 -index 00000000000..160cd78e540 +index 00000000000..71defa25270 --- /dev/null +++ b/include/windows.networking.idl -@@ -0,0 +1,87 @@ +@@ -0,0 +1,88 @@ +/* + * Copyright 2021 Alistair Leslie-Hughes + * @@ -102,7 +103,7 @@ index 00000000000..160cd78e540 + HRESULT Compare([in] HSTRING value1, [in] HSTRING value2, [out, retval] INT32* result); + } + -+ /*[activatable(Windows.Networking.IHostNameFactory, Windows.Foundation.UniversalApiContract, 1.0)]*/ ++ [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)] @@ -114,7 +115,7 @@ index 00000000000..160cd78e540 + } + } +} -\ No newline at end of file ++ -- 2.34.1 diff --git a/patches/windows.networking.connectivity-new-dll/0004-windows.networking.connectivity-Implement-IActivatio.patch b/patches/windows.networking.connectivity-new-dll/0004-windows.networking.connectivity-Implement-IActivatio.patch index 9ac057ea..c1cfda24 100644 --- a/patches/windows.networking.connectivity-new-dll/0004-windows.networking.connectivity-Implement-IActivatio.patch +++ b/patches/windows.networking.connectivity-new-dll/0004-windows.networking.connectivity-Implement-IActivatio.patch @@ -55,7 +55,7 @@ index 96ff0ea5af2..2463cc2c93c 100644 +{ + struct windows_networking_connectivity *impl = impl_from_IActivationFactory(iface); + ULONG rc = InterlockedIncrement(&impl->refcount); -+ TRACE("%p increasing refcount to %u.\n", impl, rc); ++ TRACE("%p increasing refcount to %lu.\n", impl, rc); + return rc; +} + @@ -64,7 +64,7 @@ index 96ff0ea5af2..2463cc2c93c 100644 +{ + struct windows_networking_connectivity *impl = impl_from_IActivationFactory(iface); + ULONG rc = InterlockedDecrement(&impl->refcount); -+ TRACE("%p decreasing refcount to %u.\n", impl, rc); ++ TRACE("%p decreasing refcount to %lu.\n", impl, rc); + return rc; +} + diff --git a/patches/windows.networking.connectivity-new-dll/0005-windows.networking.connectivity-Implement-INetworkIn.patch b/patches/windows.networking.connectivity-new-dll/0005-windows.networking.connectivity-Implement-INetworkIn.patch index b7f03889..38defe97 100644 --- a/patches/windows.networking.connectivity-new-dll/0005-windows.networking.connectivity-Implement-INetworkIn.patch +++ b/patches/windows.networking.connectivity-new-dll/0005-windows.networking.connectivity-Implement-INetworkIn.patch @@ -61,7 +61,7 @@ index 2463cc2c93c..b96e6c4f0a4 100644 +{ + struct windows_networking_connectivity *impl = impl_from_IVectorView_ConnectionProfile(iface); + ULONG rc = InterlockedIncrement(&impl->refcount); -+ TRACE("%p increasing refcount to %u.\n", impl, rc); ++ TRACE("%p increasing refcount to %lu.\n", impl, rc); + return rc; +} + @@ -69,7 +69,7 @@ index 2463cc2c93c..b96e6c4f0a4 100644 +{ + struct windows_networking_connectivity *impl = impl_from_IVectorView_ConnectionProfile(iface); + ULONG rc = InterlockedDecrement(&impl->refcount); -+ TRACE("%p decreasing refcount to %u.\n", impl, rc); ++ TRACE("%p decreasing refcount to %lu.\n", impl, rc); + return rc; +} + @@ -91,14 +91,14 @@ index 2463cc2c93c..b96e6c4f0a4 100644 + return E_NOTIMPL; +} + -+static HRESULT STDMETHODCALLTYPE vector_view_GetAt(IVectorView_ConnectionProfile *iface, ULONG index, IConnectionProfile **out_value) ++static HRESULT STDMETHODCALLTYPE vector_view_GetAt(IVectorView_ConnectionProfile *iface, UINT32 index, IConnectionProfile **out_value) +{ + FIXME("iface %p, index %#x, out_value %p stub!\n", iface, index, out_value); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE vector_view_get_Size( -+ IVectorView_ConnectionProfile *iface, ULONG *out_value) ++ IVectorView_ConnectionProfile *iface, UINT32 *out_value) +{ + FIXME("iface %p, out_value %p stub!\n", iface, out_value); + *out_value = 0; @@ -106,7 +106,7 @@ index 2463cc2c93c..b96e6c4f0a4 100644 +} + +static HRESULT STDMETHODCALLTYPE vector_view_IndexOf( -+ IVectorView_ConnectionProfile *iface, IConnectionProfile *value, ULONG *index, BOOLEAN *out_value) ++ IVectorView_ConnectionProfile *iface, IConnectionProfile *value, UINT32 *index, BOOLEAN *out_value) +{ + FIXME("iface %p, value %p, index %p, out_value %p stub!\n", iface, value, index, out_value); + *out_value = FALSE; @@ -160,7 +160,7 @@ index 2463cc2c93c..b96e6c4f0a4 100644 +{ + struct windows_networking_connectivity *impl = impl_from_INetworkInformationStatics(iface); + ULONG rc = InterlockedIncrement(&impl->refcount); -+ TRACE("%p increasing refcount to %u.\n", impl, rc); ++ TRACE("%p increasing refcount to %lu.\n", impl, rc); + return rc; +} + @@ -169,7 +169,7 @@ index 2463cc2c93c..b96e6c4f0a4 100644 +{ + struct windows_networking_connectivity *impl = impl_from_INetworkInformationStatics(iface); + ULONG rc = InterlockedDecrement(&impl->refcount); -+ TRACE("%p decreasing refcount to %u.\n", impl, rc); ++ TRACE("%p decreasing refcount to %lu.\n", impl, rc); + return rc; +} + diff --git a/patches/windows.networking.connectivity-new-dll/0007-windows.networking.connectivity-Implement-INetworkIn.patch b/patches/windows.networking.connectivity-new-dll/0007-windows.networking.connectivity-Implement-INetworkIn.patch index c3454050..9caedf3d 100644 --- a/patches/windows.networking.connectivity-new-dll/0007-windows.networking.connectivity-Implement-INetworkIn.patch +++ b/patches/windows.networking.connectivity-new-dll/0007-windows.networking.connectivity-Implement-INetworkIn.patch @@ -59,7 +59,7 @@ index b96e6c4f0a4..ba1f5a5401d 100644 +{ + struct connection_profile *impl = impl_from_IConnectionProfile(iface); + ULONG rc = InterlockedIncrement(&impl->ref); -+ TRACE("%p increasing refcount to %u.\n", impl, rc); ++ TRACE("%p increasing refcount to %lu.\n", impl, rc); + return rc; +} + @@ -67,7 +67,7 @@ index b96e6c4f0a4..ba1f5a5401d 100644 +{ + struct connection_profile *impl = impl_from_IConnectionProfile(iface); + ULONG rc = InterlockedIncrement(&impl->ref); -+ TRACE("%p increasing refcount to %u.\n", impl, rc); ++ TRACE("%p increasing refcount to %lu.\n", impl, rc); + return rc; +} +