You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against aaf304f2441ebe52834fdda2b8a02a5349d2ca43.
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,74 +1,56 @@
|
||||
From d25b2276d2e5bcc46998a29ce1607e0091372203 Mon Sep 17 00:00:00 2001
|
||||
From 9789c1d011a23982e1d99081c41e5417125740bb Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Fri, 28 May 2021 12:34:37 +1000
|
||||
Subject: [PATCH] include: Add windows.networking.connectivity.idl
|
||||
|
||||
---
|
||||
include/Makefile.in | 1 +
|
||||
include/windows.networking.connectivity.idl | 368 ++++++++++++++++++++
|
||||
2 files changed, 369 insertions(+)
|
||||
create mode 100644 include/windows.networking.connectivity.idl
|
||||
include/Makefile.in | 3 +
|
||||
include/windows.networking.connectivity.idl | 358 ++++++++++++++++++--
|
||||
2 files changed, 334 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index 410aab03ac8..65e2a30c30f 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -824,6 +824,7 @@ SOURCES = \
|
||||
windows.media.idl \
|
||||
windows.media.speechrecognition.idl \
|
||||
windows.media.speechsynthesis.idl \
|
||||
+ windows.networking.connectivity.idl \
|
||||
windows.perception.spatial.idl \
|
||||
windows.perception.spatial.surfaces.idl \
|
||||
windows.security.credentials.idl \
|
||||
diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl
|
||||
new file mode 100644
|
||||
index 00000000000..3ccefca02fa
|
||||
--- /dev/null
|
||||
index 8c6489ba13b..4e820ab8bcd 100644
|
||||
--- a/include/windows.networking.connectivity.idl
|
||||
+++ b/include/windows.networking.connectivity.idl
|
||||
@@ -0,0 +1,368 @@
|
||||
+/*
|
||||
+ * Copyright 2021 Alistair Leslie-Hughes
|
||||
+ *
|
||||
+ * 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";
|
||||
+
|
||||
@@ -28,39 +28,343 @@ import "windows.foundation.idl";
|
||||
/* import "windows.networking.idl"; */
|
||||
import "windows.storage.streams.idl";
|
||||
|
||||
-namespace Windows.Networking.Connectivity {
|
||||
- interface IIPInformation;
|
||||
- interface INetworkAdapter;
|
||||
-
|
||||
- runtimeclass IPInformation;
|
||||
- runtimeclass NetworkAdapter;
|
||||
-
|
||||
- [
|
||||
- contract(Windows.Foundation.UniversalApiContract, 1.0),
|
||||
- exclusiveto(Windows.Networking.Connectivity.IPInformation),
|
||||
- uuid(d85145e0-138f-47d7-9b3a-36bb488cef33)
|
||||
- ]
|
||||
- interface IIPInformation : IInspectable
|
||||
+namespace Windows
|
||||
+{
|
||||
+ namespace Foundation
|
||||
+ {
|
||||
{
|
||||
- [propget] HRESULT NetworkAdapter([out, retval] Windows.Networking.Connectivity.NetworkAdapter **value);
|
||||
- [propget] HRESULT PrefixLength([out, retval] Windows.Foundation.IReference<BYTE> **value);
|
||||
+ interface IClosable;
|
||||
+
|
||||
+ /*runtimeclass Uri;*/
|
||||
+ }
|
||||
}
|
||||
+}
|
||||
+
|
||||
|
||||
- [
|
||||
- contract(Windows.Foundation.UniversalApiContract, 1.0),
|
||||
- marshaling_behavior(agile)
|
||||
- ]
|
||||
- runtimeclass IPInformation
|
||||
+namespace Windows
|
||||
+{
|
||||
+ namespace Networking
|
||||
+ {
|
||||
{
|
||||
- [default] interface Windows.Networking.Connectivity.IIPInformation;
|
||||
+ /*typedef enum DomainNameType DomainNameType;*/
|
||||
+
|
||||
+ /*runtimeclass EndpointPair;*/
|
||||
@@ -76,13 +58,19 @@ index 00000000000..3ccefca02fa
|
||||
+ /*runtimeclass HostName;*/
|
||||
+
|
||||
+ /*typedef enum HostNameSortOptions HostNameSortOptions;*/
|
||||
+ }
|
||||
}
|
||||
+}
|
||||
+
|
||||
|
||||
- [
|
||||
- contract(Windows.Foundation.UniversalApiContract, 1.0),
|
||||
- marshaling_behavior(agile),
|
||||
- ]
|
||||
- runtimeclass NetworkAdapter
|
||||
+namespace Windows
|
||||
+{
|
||||
+ namespace Networking
|
||||
+ {
|
||||
{
|
||||
- [default] interface Windows.Networking.Connectivity.INetworkAdapter;
|
||||
+ namespace Connectivity
|
||||
+ {
|
||||
+ runtimeclass ConnectionCost;
|
||||
@@ -393,8 +381,8 @@ index 00000000000..3ccefca02fa
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.39.2
|
||||
2.40.1
|
||||
|
||||
|
||||
@@ -1,66 +1,167 @@
|
||||
From 865590e19a61d9d20601cd1925be794e89c368d5 Mon Sep 17 00:00:00 2001
|
||||
From 2147d0c15027f4c5890403b38ed88c974b881e32 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Tue, 1 Jun 2021 10:26:28 +1000
|
||||
Subject: [PATCH] include: Add windows.networking.idl
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
include/Makefile.in | 1 +
|
||||
include/windows.networking.idl | 87 ++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 88 insertions(+)
|
||||
create mode 100644 include/windows.networking.idl
|
||||
include/Makefile.in | 1 +
|
||||
include/windows.networking.idl | 200 ++++++++++-----------------------
|
||||
2 files changed, 60 insertions(+), 141 deletions(-)
|
||||
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index 65e2a30c30f..798535839d1 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -824,6 +824,7 @@ SOURCES = \
|
||||
windows.media.idl \
|
||||
windows.media.speechrecognition.idl \
|
||||
windows.media.speechsynthesis.idl \
|
||||
+ windows.networking.idl \
|
||||
windows.networking.connectivity.idl \
|
||||
windows.perception.spatial.idl \
|
||||
windows.perception.spatial.surfaces.idl \
|
||||
diff --git a/include/windows.networking.idl b/include/windows.networking.idl
|
||||
new file mode 100644
|
||||
index 00000000000..67d8e6a8d0b
|
||||
--- /dev/null
|
||||
index e864a3bb1ad..b550308cd8e 100644
|
||||
--- a/include/windows.networking.idl
|
||||
+++ b/include/windows.networking.idl
|
||||
@@ -0,0 +1,87 @@
|
||||
+/*
|
||||
+ * Copyright 2021 Alistair Leslie-Hughes
|
||||
+ *
|
||||
+ * 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";
|
||||
+import "windows.networking.connectivity.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<Windows.Networking.EndpointPair *>;
|
||||
- interface Windows.Foundation.Collections.IIterable<Windows.Networking.HostName *>;
|
||||
- interface Windows.Foundation.Collections.IIterator<Windows.Networking.EndpointPair *>;
|
||||
- interface Windows.Foundation.Collections.IIterator<Windows.Networking.HostName *>;
|
||||
- interface Windows.Foundation.Collections.IVectorView<Windows.Networking.EndpointPair *>;
|
||||
- interface Windows.Foundation.Collections.IVectorView<Windows.Networking.HostName *>;
|
||||
- interface Windows.Foundation.Collections.IVector<Windows.Networking.HostName *>;
|
||||
- interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Networking.EndpointPair *> *>;
|
||||
- interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Networking.EndpointPair *> *>;
|
||||
- }
|
||||
-
|
||||
- [
|
||||
- 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;
|
||||
@@ -113,8 +214,8 @@ index 00000000000..67d8e6a8d0b
|
||||
+ [default] interface Windows.Networking.IHostName;
|
||||
+ [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.39.2
|
||||
2.40.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 034dd5bc24c566781bd2012e84b58bb08abb2813 Mon Sep 17 00:00:00 2001
|
||||
From cdd3a16e15d5f3add4f26cef603e785d8be6a8a5 Mon Sep 17 00:00:00 2001
|
||||
From: Esdras Tarsis <esdrastarsis@gmail.com>
|
||||
Date: Wed, 2 Sep 2020 23:41:19 -0300
|
||||
Subject: [PATCH] windows.networking.connectivity: Add stub dll.
|
||||
@@ -7,21 +7,21 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46534
|
||||
Signed-off-by: Esdras Tarsis <esdrastarsis@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
.../Makefile.in | 7 ++++
|
||||
.../windows.networking.connectivity.spec | 3 ++
|
||||
.../windows.networking.connectivity_main.c | 35 +++++++++++++++++++
|
||||
4 files changed, 46 insertions(+)
|
||||
.../Makefile.in | 7 +++++
|
||||
.../windows.networking.connectivity.spec | 3 +++
|
||||
.../windows.networking.connectivity_main.c | 26 +++++++++++++++++++
|
||||
4 files changed, 37 insertions(+)
|
||||
create mode 100644 dlls/windows.networking.connectivity/Makefile.in
|
||||
create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity.spec
|
||||
create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1957181ee31..c9fd784fd50 100644
|
||||
index b162fac4bea..d438bed30f3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3127,6 +3127,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/windows.media)
|
||||
WINE_CONFIG_MAKEFILE(dlls/windows.media/tests)
|
||||
@@ -3169,6 +3169,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname)
|
||||
WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/windows.networking)
|
||||
+WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity)
|
||||
WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub)
|
||||
@@ -52,7 +52,7 @@ index 00000000000..4b286869e02
|
||||
\ No newline at end of file
|
||||
diff --git a/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c b/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
|
||||
new file mode 100644
|
||||
index 00000000000..96ff0ea5af2
|
||||
index 00000000000..b6d4561c493
|
||||
--- /dev/null
|
||||
+++ b/dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
|
||||
@@ -0,0 +1,26 @@
|
||||
@@ -84,5 +84,5 @@ index 00000000000..96ff0ea5af2
|
||||
+}
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.39.2
|
||||
2.40.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user