wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against aaf304f2441ebe52834fdda2b8a02a5349d2ca43.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-07-08 10:46:04 +10:00
parent e57244a59e
commit 01fbf6d356
9 changed files with 291 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patches/dsound-EAX/0004-dsound-Add-EAX-propset-stubs.patch
View File

@ -1,4 +1,4 @@
From c2c33dff38e55d87582d8d6526b3d321ba577570 Mon Sep 17 00:00:00 2001
From c3f44de2b3a1dbcc91b1ed1a864e6995ce1eb87b Mon Sep 17 00:00:00 2001
From: Mark Harmstone <mark@harmstone.com>
Date: Sun, 22 Mar 2015 13:58:53 +0000
Subject: [PATCH] dsound: Add EAX propset stubs.
@ -24,10 +24,10 @@ index 6cb653fdfa0..1c04bf34162 100644
primary.c \
propset.c \
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index 8d5ca27c90c..ed710fad43d 100644
index 447b41bffbb..5c8c495bfe4 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -1346,6 +1346,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid
@@ -1338,6 +1338,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid
TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
@ -37,7 +37,7 @@ index 8d5ca27c90c..ed710fad43d 100644
return E_PROP_ID_UNSUPPORTED;
}
@@ -1357,6 +1360,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
@@ -1349,6 +1352,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
@ -48,12 +48,12 @@ index 8d5ca27c90c..ed710fad43d 100644
}
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 304708c26da..c0e254f7a6e 100644
index b5546c7d9db..185b8efd014 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -229,6 +229,14 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
@@ -230,6 +230,14 @@ LONG capped_refcount_dec(LONG *ref);
HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv);
+/* eax.c */
+HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
@ -64,8 +64,8 @@ index 304708c26da..c0e254f7a6e 100644
+ ULONG cbPropData) DECLSPEC_HIDDEN;
+
/* mixer.c */
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN;
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan);
diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
new file mode 100644
index 00000000000..c1264f977b6
@ -127,5 +127,5 @@ index 00000000000..c1264f977b6
+ return E_PROP_ID_UNSUPPORTED;
+}
--
2.35.1
2.40.1

8
patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch
View File

@ -1,4 +1,4 @@
From e484e3dc512eacc9708c245a9e64372428bc1875 Mon Sep 17 00:00:00 2001
From 3a08f97fcd9ffd224c917cc52298702b6feaea9e Mon Sep 17 00:00:00 2001
From: Mark Harmstone <mark@harmstone.com>
Date: Fri, 27 Mar 2015 20:58:37 +0000
Subject: [PATCH] dsound: Add EAX init and free stubs.
@ -32,10 +32,10 @@ index ede6d9f1ba1..309d632397a 100644
free(This);
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 7a89b047b42..c5e84f07763 100644
index c2dcda9da67..12203876623 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -240,6 +240,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
@@ -241,6 +241,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
ULONG cbPropData) DECLSPEC_HIDDEN;
@ -43,7 +43,7 @@ index 7a89b047b42..c5e84f07763 100644
+void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
/* mixer.c */
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
index 03b6e0a9813..91438efc335 100644
--- a/dlls/dsound/eax.c

20
patches/dsound-EAX/0009-dsound-Feed-data-through-EAX-function.patch
View File

@ -1,7 +1,7 @@
From 735da63bda0fed9b01779bd8922a4cc13b05d598 Mon Sep 17 00:00:00 2001
From a0ff76bc868a22624a06989f675c5d574125aa5c Mon Sep 17 00:00:00 2001
From: Mark Harmstone <mark@harmstone.com>
Date: Fri, 27 Mar 2015 20:59:57 +0000
Subject: dsound: Feed data through EAX function.
Subject: [PATCH] dsound: Feed data through EAX function.
---
dlls/dsound/dsound_private.h | 1 +
@ -10,19 +10,19 @@ Subject: dsound: Feed data through EAX function.
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index a918cd2..cc55d70 100644
index 12203876623..11cfa641d77 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -242,6 +242,7 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
@@ -243,6 +243,7 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
ULONG cbPropData) DECLSPEC_HIDDEN;
void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
+void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
/* mixer.c */
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
index c0afb0f..4368594 100644
index 91438efc335..bf7efdc4f38 100644
--- a/dlls/dsound/eax.c
+++ b/dlls/dsound/eax.c
@@ -92,6 +92,11 @@ static const EFXEAXREVERBPROPERTIES efx_presets[] = {
@ -38,10 +38,10 @@ index c0afb0f..4368594 100644
{
/* stub */
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index ff92cc1..b159834 100644
index f261588454a..33dcd8a953c 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -453,7 +453,7 @@ static void putieee32_dsp(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD ch
@@ -514,7 +514,7 @@ static void putieee32_dsp(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD ch
*/
static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
{
@ -50,7 +50,7 @@ index ff92cc1..b159834 100644
UINT istride, ostride, size_bytes;
DWORD channel, i;
bitsputfunc put;
@@ -500,6 +500,9 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
@@ -561,6 +561,9 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
}
}
@ -61,5 +61,5 @@ index ff92cc1..b159834 100644
ostride = dsb->device->pwfx->nChannels * sizeof(float);
for (i = 0; i < frames; i++) {
--
2.3.3
2.40.1

55
patches/dsound-EAX/0019-dsound-Allow-disabling-of-EAX-support-in-the-registr.patch
View File

@ -1,4 +1,4 @@
From 38fec88e8dee99a012773648289b228245001c6c Mon Sep 17 00:00:00 2001
From 375f83afce055fc37c5d453b0f922c604d9ad6f8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 5 Apr 2015 19:13:18 +0200
Subject: [PATCH] dsound: Allow disabling of EAX support in the registry.
@ -7,12 +7,12 @@ Based on a patch by Mark Harmstone.
---
dlls/dsound/buffer.c | 16 ++++++----------
dlls/dsound/dsound_main.c | 8 ++++++++
dlls/dsound/dsound_private.h | 2 ++
dlls/dsound/dsound_private.h | 15 ++++++++-------
dlls/dsound/eax.c | 28 ++++++++++++++++++++++++++++
4 files changed, 44 insertions(+), 10 deletions(-)
4 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index 9a603a70ed9..39ce9101266 100644
index aa7bbe13cc5..18a16535978 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -34,6 +34,7 @@
@ -23,7 +23,7 @@ index 9a603a70ed9..39ce9101266 100644
/*******************************************************************************
* IDirectSoundNotify
@@ -1381,16 +1382,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
@@ -1373,16 +1374,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
@ -46,10 +46,10 @@ index 9a603a70ed9..39ce9101266 100644
return E_PROP_ID_UNSUPPORTED;
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index da5912e216e..808425161a6 100644
index 11983a4cb47..2c09f9c5b42 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -93,6 +93,10 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
@@ -94,6 +94,10 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
/* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
int ds_hel_buflen = 32768 * 2;
int ds_hq_buffers_max = 4;
@ -60,7 +60,7 @@ index da5912e216e..808425161a6 100644
/*
* Get a config key from either the app-specific or the default config
@@ -147,11 +151,15 @@ void setup_dsound_options(void)
@@ -148,11 +152,15 @@ void setup_dsound_options(void)
if (!get_config_key( hkey, appkey, "HQBuffersMax", buffer, MAX_PATH ))
ds_hq_buffers_max = atoi(buffer);
@ -77,25 +77,44 @@ index da5912e216e..808425161a6 100644
static const char * get_device_id(LPCGUID pGuid)
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 0bca36b2540..7d488ab1e45 100644
index 1c544ad2e96..43f9df866a3 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -37,6 +37,7 @@
@@ -35,9 +35,9 @@
extern int ds_hel_buflen DECLSPEC_HIDDEN;
extern int ds_hq_buffers_max DECLSPEC_HIDDEN;
+extern BOOL ds_eax_enabled DECLSPEC_HIDDEN;
#define DS_MAX_CHANNELS 6
-
extern int ds_hel_buflen;
extern int ds_hq_buffers_max;
+extern BOOL ds_eax_enabled;
/*****************************************************************************
* Predeclare the interface implementation structures
@@ -234,6 +235,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
@@ -235,16 +235,17 @@ LONG capped_refcount_dec(LONG *ref);
HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv);
/* eax.c */
+BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport) DECLSPEC_HIDDEN;
+BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport);
HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
- ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
+ ULONG cbPropData, ULONG *pcbReturned);
HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
- ULONG cbPropData) DECLSPEC_HIDDEN;
-void init_eax_device(DirectSoundDevice *dev) DECLSPEC_HIDDEN;
-void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
-void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
-void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
+ ULONG cbPropData);
+void init_eax_device(DirectSoundDevice *dev);
+void free_eax_buffer(IDirectSoundBufferImpl *dsb);
+void init_eax_buffer(IDirectSoundBufferImpl *dsb);
+void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count);
/* mixer.c */
void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
index 2244565897b..3e15ac59480 100644
--- a/dlls/dsound/eax.c
@ -150,5 +169,5 @@ index 2244565897b..3e15ac59480 100644
buf->device->eax.using_eax = TRUE;
--
2.35.1
2.40.1

30
patches/dsound-Fast_Mixer/0001-dsound-Add-a-linear-resampler-for-use-with-a-large-n.patch
View File

@ -1,4 +1,4 @@
From cdbe11004fe8b7fb87fff18f2a458259be02fe2d Mon Sep 17 00:00:00 2001
From 3124bfe7d388479e6c82a766735cc5032654083a Mon Sep 17 00:00:00 2001
From: "Alexander E. Patrakov" <patrakov at gmail.com>
Date: Thu, 7 Aug 2014 17:15:00 -0600
Subject: [PATCH] dsound: Add a linear resampler for use with a large number of
@ -6,15 +6,15 @@ Subject: [PATCH] dsound: Add a linear resampler for use with a large number of
---
dlls/dsound/dsound_main.c | 5 ++++
dlls/dsound/dsound_private.h | 1 +
dlls/dsound/dsound_private.h | 2 ++
dlls/dsound/mixer.c | 48 +++++++++++++++++++++++++++++++++---
3 files changed, 51 insertions(+), 3 deletions(-)
3 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index f3bce6062fe..fecb9489678 100644
index 69cbec72ea3..11983a4cb47 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -92,6 +92,7 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
@@ -93,6 +93,7 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
/* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
int ds_hel_buflen = 32768 * 2;
@ -22,7 +22,7 @@ index f3bce6062fe..fecb9489678 100644
/*
* Get a config key from either the app-specific or the default config
@@ -143,10 +144,14 @@ void setup_dsound_options(void)
@@ -144,10 +145,14 @@ void setup_dsound_options(void)
if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH ))
ds_hel_buflen = atoi(buffer);
@ -38,22 +38,24 @@ index f3bce6062fe..fecb9489678 100644
static const char * get_device_id(LPCGUID pGuid)
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index bdb9ebee544..d154e67b0a0 100644
index 80e6725fd27..172efd6c1cc 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -35,6 +35,7 @@
@@ -34,7 +34,9 @@
#define DS_MAX_CHANNELS 6
extern int ds_hel_buflen DECLSPEC_HIDDEN;
+extern int ds_hq_buffers_max DECLSPEC_HIDDEN;
+
extern int ds_hel_buflen;
+extern int ds_hq_buffers_max;
/*****************************************************************************
* Predeclare the interface implementation structures
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index a6402b09eff..28f32e9d092 100644
index bf05805221b..042b9499727 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -295,7 +295,47 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
@@ -314,7 +314,47 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
return count;
}
@ -102,7 +104,7 @@ index a6402b09eff..28f32e9d092 100644
{
UINT i, channel;
UINT istride = dsb->pwfx->nBlockAlign;
@@ -374,9 +414,11 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu
@@ -405,9 +445,11 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu
DWORD ipos, adv;
if (dsb->freqAdjustNum == dsb->freqAdjustDen)
@ -117,5 +119,5 @@ index a6402b09eff..28f32e9d092 100644
ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
if (ipos >= dsb->buflen) {
--
2.30.2
2.40.1

106
patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch
View File

@ -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

209
patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch
View File

@ -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

22
patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch
View File

@ -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

2
staging/upstream-commit
View File

@ -1 +1 @@
9617c784b9d7ffa88182c24aa2f110a6867aa67d
aaf304f2441ebe52834fdda2b8a02a5349d2ca43