summaryrefslogtreecommitdiff
path: root/emulators/wine-devel/files
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2024-08-02 06:24:26 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2024-08-02 06:24:26 +0000
commit017665613e15852d92e105f95ba16d0dc8098a6e (patch)
treec4dc4eb2e3f0a59fba30e26a8de5cc44acc224f4 /emulators/wine-devel/files
parentdevel/py-qutip: update 4.7.3 → 5.0.2 (diff)
emulators/wine-devel: Update to Wine 9.14
This includes the following changes: - Mailslots reimplemented using server-side I/O. - More support for ODBC Windows drivers (if enabled). - Still more user32 data structures in shared memory. - Various bug fixes. We also need a patch of mine to address an upstream regression on non-macos, non-Linux systems: files/patch-nsiproxy.sys-buildfix .
Diffstat (limited to 'emulators/wine-devel/files')
-rw-r--r--emulators/wine-devel/files/patch-nsiproxy.sys-buildfix38
1 files changed, 38 insertions, 0 deletions
diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix b/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix
new file mode 100644
index 000000000000..f138e5d3e075
--- /dev/null
+++ b/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix
@@ -0,0 +1,38 @@
+commit ba1393465b53e0ef251e3a62b632c4d1b326433e
+Author: Gerald Pfeifer <gerald@pfeifer.com>
+Date: Wed Jul 31 09:21:52 2024 +0200
+
+ nsiproxy.sys: Fix the build on non-Apple, non-Linux systems
+
+ commit 5261811d471 revamped the code around pcblist structures,
+ alas assumes a variable mib is always present on non-Apple, non-Linux
+ systems when it is not. And in any case, ARRAY_SIZE should be used for
+ the actual structure it applies to, not a similar one.
+
+--- UTC
+diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c
+index 67dcfed19f3..dd8c9d1102a 100644
+--- dlls/nsiproxy.sys/tcp.c
++++ dlls/nsiproxy.sys/tcp.c
+@@ -645,7 +645,7 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k
+ pthread_once( &mib_init_once, init_pcblist64_mib );
+ #else
+ int pcblist_mib[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_PCBLIST };
+- size_t pcblist_mib_len = ARRAY_SIZE(mib);
++ size_t pcblist_mib_len = ARRAY_SIZE(pcblist_mib);
+ #endif
+
+ if (sysctl( pcblist_mib, pcblist_mib_len, NULL, &len, NULL, 0 ) < 0)
+diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c
+index 3cb215c1c58..80d6d1aa89f 100644
+--- dlls/nsiproxy.sys/udp.c
++++ dlls/nsiproxy.sys/udp.c
+@@ -316,7 +316,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void
+ pthread_once( &mib_init_once, init_pcblist64_mib );
+ #else
+ int pcblist_mib[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_PCBLIST };
+- size_t pcblist_mib_len = ARRAY_SIZE(mib);
++ size_t pcblist_mib_len = ARRAY_SIZE(pcblist_mib);
+ #endif
+
+ if (sysctl( pcblist_mib, pcblist_mib_len, NULL, &len, NULL, 0 ) < 0)